Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into kitchen

code/datums/action.dm

@@ -216,8 +216,8 @@
 	desc = "Change the type of instrument your synthesizer is playing as."
 
 /datum/action/item_action/synthswitch/Trigger()
-	if(istype(target, /obj/item/device/instrument/piano_synth))
-		var/obj/item/device/instrument/piano_synth/synth = target
+	if(istype(target, /obj/item/instrument/piano_synth))
+		var/obj/item/instrument/piano_synth/synth = target
 		var/chosen = input("Choose the type of instrument you want to use", "Instrument Selection", "piano") as null|anything in synth.insTypes
 		if(!synth.insTypes[chosen])
 			return
@@ -357,8 +357,8 @@
 	desc = "Use the instrument specified"
 
 /datum/action/item_action/instrument/Trigger()
-	if(istype(target, /obj/item/device/instrument))
-		var/obj/item/device/instrument/I = target
+	if(istype(target, /obj/item/instrument))
+		var/obj/item/instrument/I = target
 		I.interact(usr)
 		return
 	return ..()

code/datums/cargoprofile.dm

@@ -235,7 +235,7 @@
 	blacklist = list(/obj/item/tank/plasma,/obj/item/tank/anesthetic, // the rest are air tanks
 					/obj/item/clothing/mask/facehugger) // NOT CLOTHING AT ALLLLL
 	whitelist = list(/obj/item/clothing,/obj/item/storage/belt,/obj/item/storage/backpack,
-					/obj/item/device/radio/headset,/obj/item/device/pda,/obj/item/card/id,/obj/item/tank,
+					/obj/item/radio/headset,/obj/item/pda,/obj/item/card/id,/obj/item/tank,
 					/obj/item/restraints/handcuffs, /obj/item/restraints/legcuffs)
 
 /datum/cargoprofile/trash
@@ -262,7 +262,7 @@
 	name = "Devices & Tools"
 	id = "tools"
 	blacklist = null
-	whitelist = list(/obj/item/device,/obj/item/card,/obj/item/cartridge,/obj/item/cautery,/obj/item/stock_parts/cell,/obj/item/circuitboard,
+	whitelist = list(/obj/item,/obj/item/card,/obj/item/cartridge,/obj/item/cautery,/obj/item/stock_parts/cell,/obj/item/circuitboard,
 					/obj/item/aiModule,/obj/item/airalarm_electronics,/obj/item/airlock_electronics,/obj/item/circular_saw,
 					/obj/item/crowbar,/obj/item/disk,/obj/item/firealarm_electronics,/obj/item/hand_tele,
 					/obj/item/hand_labeler,/obj/item/hemostat,/obj/item/mop,/obj/item/locator,/obj/item/cultivator,

code/datums/mind.dm

@@ -175,7 +175,7 @@
 			text += "<br>Flash: <a href='?src=[UID()];revolution=flash'>give</a>"
 
 			var/list/L = current.get_contents()
-			var/obj/item/device/flash/flash = locate() in L
+			var/obj/item/flash/flash = locate() in L
 			if(flash)
 				if(!flash.broken)
 					text += "|<a href='?src=[UID()];revolution=takeflash'>take</a>."
@@ -419,7 +419,7 @@
 		ishuman(current)      )
 
 		text = "Uplink: <a href='?src=[UID()];common=uplink'>give</a>"
-		var/obj/item/device/uplink/hidden/suplink = find_syndicate_uplink()
+		var/obj/item/uplink/hidden/suplink = find_syndicate_uplink()
 		var/crystals
 		if(suplink)
 			crystals = suplink.uses
@@ -762,7 +762,7 @@
 
 			if("takeflash")
 				var/list/L = current.get_contents()
-				var/obj/item/device/flash/flash = locate() in L
+				var/obj/item/flash/flash = locate() in L
 				if(!flash)
 					to_chat(usr, "<span class='warning'>Deleting flash failed!</span>")
 				qdel(flash)
@@ -771,7 +771,7 @@
 
 			if("repairflash")
 				var/list/L = current.get_contents()
-				var/obj/item/device/flash/flash = locate() in L
+				var/obj/item/flash/flash = locate() in L
 				if(!flash)
 					to_chat(usr, "<span class='warning'>Repairing flash failed!</span>")
 				else
@@ -781,7 +781,7 @@
 
 			if("reequip")
 				var/list/L = current.get_contents()
-				var/obj/item/device/flash/flash = locate() in L
+				var/obj/item/flash/flash = locate() in L
 				qdel(flash)
 				take_uplink()
 				var/fail = 0
@@ -1183,7 +1183,7 @@
 				message_admins("[key_name_admin(usr)] has taken [key_name_admin(current)]'s uplink")
 			if("crystals")
 				if(usr.client.holder.rights & (R_SERVER|R_EVENT))
-					var/obj/item/device/uplink/hidden/suplink = find_syndicate_uplink()
+					var/obj/item/uplink/hidden/suplink = find_syndicate_uplink()
 					var/crystals
 					if(suplink)
 						crystals = suplink.uses
@@ -1218,16 +1218,16 @@
 	// remove traitor uplinks
 	var/list/L = current.get_contents()
 	for(var/t in L)
-		if(istype(t, /obj/item/device/pda))
+		if(istype(t, /obj/item/pda))
 			if(t:uplink) qdel(t:uplink)
 			t:uplink = null
-		else if(istype(t, /obj/item/device/radio))
+		else if(istype(t, /obj/item/radio))
 			if(t:traitorradio) qdel(t:traitorradio)
 			t:traitorradio = null
 			t:traitor_frequency = 0.0
 		else if(istype(t, /obj/item/SWF_uplink) || istype(t, /obj/item/syndicate_uplink))
 			if(t:origradio)
-				var/obj/item/device/radio/R = t:origradio
+				var/obj/item/radio/R = t:origradio
 				R.loc = current.loc
 				R.traitorradio = null
 				R.traitor_frequency = 0.0
@@ -1251,7 +1251,7 @@
 	return null
 
 /datum/mind/proc/take_uplink()
-	var/obj/item/device/uplink/hidden/H = find_syndicate_uplink()
+	var/obj/item/uplink/hidden/H = find_syndicate_uplink()
 	if(H)
 		qdel(H)
 
@@ -1380,7 +1380,7 @@
 	ticker.mode.greet_revolutionary(src,0)
 
 	var/list/L = current.get_contents()
-	var/obj/item/device/flash/flash = locate() in L
+	var/obj/item/flash/flash = locate() in L
 	qdel(flash)
 	take_uplink()
 	var/fail = 0

code/datums/outfits/outfit_admin.dm

@@ -32,12 +32,12 @@
 	belt = /obj/item/storage/belt/utility/full/multitool
 	gloves = /obj/item/clothing/gloves/combat
 	shoes = /obj/item/clothing/shoes/combat
-	l_ear = /obj/item/device/radio/headset/syndicate
+	l_ear = /obj/item/radio/headset/syndicate
 	id = /obj/item/card/id/syndicate
-	r_pocket = /obj/item/device/radio/uplink
+	r_pocket = /obj/item/radio/uplink
 	backpack_contents = list(
 		/obj/item/storage/box/engineer = 1,
-		/obj/item/device/flashlight = 1,
+		/obj/item/flashlight = 1,
 		/obj/item/card/emag = 1,
 		/obj/item/reagent_containers/food/snacks/syndidonkpocket = 1
 	)
@@ -55,12 +55,12 @@
 	if(istype(I))
 		apply_to_card(I, H, get_syndicate_access(id_access), name, id_icon)
 
-	var/obj/item/device/radio/uplink/U = H.r_store
+	var/obj/item/radio/uplink/U = H.r_store
 	if(istype(U))
 		U.hidden_uplink.uplink_owner = "[H.key]"
 		U.hidden_uplink.uses = uplink_uses
 
-	var/obj/item/device/radio/R = H.l_ear
+	var/obj/item/radio/R = H.l_ear
 	if(istype(R))
 		R.set_frequency(SYND_FREQ)
 
@@ -71,11 +71,11 @@
 	glasses = /obj/item/clothing/glasses/hud/security/chameleon
 	shoes = /obj/item/clothing/shoes/syndigaloshes
 	r_pocket = null
-	pda = /obj/item/device/pda
+	pda = /obj/item/pda
 
 	backpack_contents = list(
 		/obj/item/storage/box/engineer = 1,
-		/obj/item/device/flashlight = 1,
+		/obj/item/flashlight = 1,
 		/obj/item/reagent_containers/food/snacks/syndidonkpocket = 1
 	)
 
@@ -100,7 +100,7 @@
 	belt = /obj/item/storage/belt/military
 	head = /obj/item/clothing/head/helmet/space/hardsuit/syndi
 	mask = /obj/item/clothing/mask/gas/syndicate
-	l_ear = /obj/item/device/radio/headset/syndicate/alt
+	l_ear = /obj/item/radio/headset/syndicate/alt
 	glasses = /obj/item/clothing/glasses/night
 	shoes = /obj/item/clothing/shoes/magboots/syndie
 	l_pocket = /obj/item/pinpointer/advpinpointer
@@ -114,7 +114,7 @@
 		/obj/item/crowbar/red = 1,
 		/obj/item/grenade/plastic/c4 = 1,
 		/obj/item/reagent_containers/food/snacks/syndidonkpocket = 1,
-		/obj/item/device/flashlight = 1,
+		/obj/item/flashlight = 1,
 		/obj/item/clothing/shoes/combat = 1
 	)
 
@@ -143,12 +143,12 @@
 	head = /obj/item/clothing/head/beret
 	mask = /obj/item/clothing/mask/cigarette/cigar/havana
 	belt = /obj/item/gun/projectile/automatic/pistol/deagle/camo
-	l_ear = /obj/item/device/radio/headset/syndicate/alt
+	l_ear = /obj/item/radio/headset/syndicate/alt
 	l_pocket = /obj/item/pinpointer/advpinpointer
 
 	backpack_contents = list(
 		/obj/item/storage/box/engineer = 1,
-		/obj/item/device/flashlight = 1,
+		/obj/item/flashlight = 1,
 		/obj/item/reagent_containers/food/pill/initropidril = 1,
 		/obj/item/reagent_containers/food/snacks/syndidonkpocket = 1,
 		/obj/item/ammo_box/magazine/m50 = 2,
@@ -181,9 +181,9 @@
 	gloves = /obj/item/clothing/gloves/color/black
 	shoes = /obj/item/clothing/shoes/black
 	head = /obj/item/clothing/head/that
-	l_ear = /obj/item/device/radio/headset/ert
+	l_ear = /obj/item/radio/headset/ert
 	id = /obj/item/card/id/centcom
-	pda = /obj/item/device/pda
+	pda = /obj/item/pda
 	backpack_contents = list(
 		/obj/item/storage/box/engineer = 1
 	)
@@ -207,10 +207,10 @@
 	gloves = /obj/item/clothing/gloves/color/white
 	shoes = /obj/item/clothing/shoes/centcom
 	head = /obj/item/clothing/head/beret/centcom/captain
-	l_ear = /obj/item/device/radio/headset/centcom
+	l_ear = /obj/item/radio/headset/centcom
 	glasses = /obj/item/clothing/glasses/hud/security/sunglasses
 	id = /obj/item/card/id/centcom
-	pda = /obj/item/device/pda/centcom
+	pda = /obj/item/pda/centcom
 	backpack_contents = list(
 		/obj/item/storage/box/centcomofficer = 1,
 		/obj/item/implanter/death_alarm = 1
@@ -236,11 +236,11 @@
 	back = /obj/item/storage/backpack/satchel
 	gloves = /obj/item/clothing/gloves/color/white
 	shoes = /obj/item/clothing/shoes/centcom
-	l_ear = /obj/item/device/radio/headset/centcom
+	l_ear = /obj/item/radio/headset/centcom
 	id = /obj/item/card/id/centcom
 	r_pocket = /obj/item/lighter/zippo/nt_rep
 	l_pocket = /obj/item/storage/fancy/cigarettes/dromedaryco
-	pda = /obj/item/device/pda/centcom
+	pda = /obj/item/pda/centcom
 	backpack_contents = list(
 		/obj/item/storage/box/survival = 1,
 		/obj/item/implanter/death_alarm = 1,
@@ -269,12 +269,12 @@
 	belt = /obj/item/storage/belt/utility/full/multitool
 	gloves = /obj/item/clothing/gloves/combat
 	shoes = /obj/item/clothing/shoes/syndigaloshes
-	l_ear = /obj/item/device/radio/headset/heads/captain
+	l_ear = /obj/item/radio/headset/heads/captain
 	id = /obj/item/card/id/syndicate
-	pda = /obj/item/device/pda
+	pda = /obj/item/pda
 	backpack_contents = list(
 		/obj/item/storage/box/engineer = 1,
-		/obj/item/device/flashlight = 1,
+		/obj/item/flashlight = 1,
 		/obj/item/gun/projectile/automatic/proto = 1, // NT saber SMG
 		/obj/item/suppressor = 1, // silencer for SMG
 		/obj/item/ammo_box/magazine/smgm9mm = 3, // SMG ammo
@@ -304,7 +304,7 @@
 		I.icon_state = "deathsquad"
 
 
-	var/obj/item/device/radio/R = H.l_ear
+	var/obj/item/radio/R = H.l_ear
 	if(istype(R))
 		R.name = "radio headset"
 		R.icon_state = "headset"
@@ -358,15 +358,15 @@
 	shoes = /obj/item/clothing/shoes/magboots/vox
 	head = /obj/item/clothing/head/helmet/space/vox/carapace
 	mask = /obj/item/clothing/mask/gas/syndicate
-	l_ear = /obj/item/device/radio/headset/syndicate
+	l_ear = /obj/item/radio/headset/syndicate
 	glasses = /obj/item/clothing/glasses/thermal/monocle
 	id = /obj/item/card/id/syndicate/vox
 	l_pocket = /obj/item/melee/classic_baton/telescopic
 	r_pocket = /obj/item/tank/emergency_oxygen/vox
 	backpack_contents = list(
-		/obj/item/device/flashlight = 1,
+		/obj/item/flashlight = 1,
 		/obj/item/restraints/handcuffs/cable/zipties = 1,
-		/obj/item/device/flash = 1,
+		/obj/item/flash = 1,
 		/obj/item/gun/energy/noisecannon = 1
 	)
 
@@ -396,7 +396,7 @@
 	gloves = /obj/item/clothing/gloves/color/black
 	shoes = /obj/item/clothing/shoes/clown_shoes
 	mask = /obj/item/clothing/mask/gas/clown_hat
-	l_ear = /obj/item/device/radio/headset
+	l_ear = /obj/item/radio/headset
 	glasses = /obj/item/clothing/glasses/thermal/monocle
 	id = /obj/item/card/id
 	l_pocket = /obj/item/reagent_containers/food/snacks/grown/banana
@@ -404,7 +404,7 @@
 	r_hand = /obj/item/twohanded/fireaxe
 	backpack_contents = list(
 		/obj/item/storage/box/survival = 1,
-		/obj/item/device/flashlight = 1,
+		/obj/item/flashlight = 1,
 		/obj/item/reagent_containers/food/drinks/bottle/bottleofbanana = 1
 	)
 
@@ -428,19 +428,19 @@
 	shoes = /obj/item/clothing/shoes/black
 	head = /obj/item/clothing/head/beret
 	mask = /obj/item/clothing/mask/gas/mime
-	l_ear = /obj/item/device/radio/headset
+	l_ear = /obj/item/radio/headset
 	glasses = /obj/item/clothing/glasses/thermal/monocle
 	id = /obj/item/card/id/syndicate
-	pda = /obj/item/device/pda/mime
+	pda = /obj/item/pda/mime
 	backpack_contents = list(
 		/obj/item/storage/box/survival = 1,
 		/obj/item/reagent_containers/food/drinks/bottle/bottleofnothing = 1,
 		/obj/item/toy/crayon/mime = 1,
 		/obj/item/storage/box/syndie_kit/caneshotgun = 1,
 		/obj/item/ammo_casing/shotgun/incendiary/dragonsbreath = 2,
-		/obj/item/device/radio/uplink = 1,
+		/obj/item/radio/uplink = 1,
 		/obj/item/reagent_containers/food/snacks/syndidonkpocket = 1,
-		/obj/item/device/flashlight = 1
+		/obj/item/flashlight = 1
 	)
 
 /datum/outfit/admin/mime_assassin/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -454,7 +454,7 @@
 	if(visualsOnly)
 		return
 
-	var/obj/item/device/pda/PDA = H.wear_pda
+	var/obj/item/pda/PDA = H.wear_pda
 	if(istype(PDA))
 		PDA.owner = H.real_name
 		PDA.ownjob = "Mime"
@@ -471,13 +471,13 @@
 	back = /obj/item/storage/backpack
 	shoes = /obj/item/clothing/shoes/brown
 	mask = /obj/item/clothing/mask/gas
-	l_ear = /obj/item/device/radio/headset
+	l_ear = /obj/item/radio/headset
 	id = /obj/item/card/id
 	l_hand = /obj/item/storage/toolbox/mechanical
 	r_hand = /obj/item/flag/grey
 	backpack_contents = list(
 		/obj/item/storage/box/survival = 1,
-		/obj/item/device/flashlight = 1
+		/obj/item/flashlight = 1
 	)
 
 /datum/outfit/admin/greytide/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -498,7 +498,7 @@
 	backpack_contents = list(
 		/obj/item/storage/box/survival = 1,
 		/obj/item/clothing/head/welding = 1,
-		/obj/item/device/flashlight = 1
+		/obj/item/flashlight = 1
 	)
 
 /datum/outfit/admin/greytide/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -526,7 +526,7 @@
 	backpack_contents = list(
 		/obj/item/storage/box/survival = 1,
 		/obj/item/clothing/head/welding = 1,
-		/obj/item/device/flashlight = 1
+		/obj/item/flashlight = 1
 	)
 
 /datum/outfit/admin/greytide/xeno/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -560,7 +560,7 @@
 
 	gloves = /obj/item/clothing/gloves/color/black
 	shoes = /obj/item/clothing/shoes/black
-	l_ear = /obj/item/device/radio/headset
+	l_ear = /obj/item/radio/headset
 	backpack_contents = list(
 		/obj/item/storage/box/survival = 1
 	)
@@ -570,13 +570,13 @@
 
 	gloves = /obj/item/clothing/gloves/combat
 	shoes = /obj/item/clothing/shoes/combat
-	l_ear = /obj/item/device/radio/headset/syndicate
+	l_ear = /obj/item/radio/headset/syndicate
 	glasses = /obj/item/clothing/glasses/sunglasses
 
 	backpack_contents = list(
 		/obj/item/storage/box/engineer = 1,
 		/obj/item/card/emag = 1,
-		/obj/item/device/flashlight = 1,
+		/obj/item/flashlight = 1,
 		/obj/item/grenade/plastic/c4 = 2,
 		/obj/item/gun/projectile/revolver/mateba = 1,
 		/obj/item/ammo_box/a357 = 3
@@ -591,7 +591,7 @@
 	shoes = /obj/item/clothing/shoes/combat
 	head = /obj/item/clothing/head/hgpiratecap
 	mask = null
-	l_ear = /obj/item/device/radio/headset/syndicate
+	l_ear = /obj/item/radio/headset/syndicate
 	r_ear = null
 	glasses = /obj/item/clothing/glasses/thermal/eyepatch
 	id = null
@@ -615,11 +615,11 @@
 	back = /obj/item/storage/backpack/satchel
 	gloves = /obj/item/clothing/gloves/color/white
 	shoes = /obj/item/clothing/shoes/centcom
-	l_ear = /obj/item/device/radio/headset
+	l_ear = /obj/item/radio/headset
 	id = /obj/item/card/id/silver
 	r_pocket = /obj/item/lighter/zippo/blue
 	l_pocket = /obj/item/storage/fancy/cigarettes/cigpack_robustgold
-	pda = /obj/item/device/pda
+	pda = /obj/item/pda
 	backpack_contents = list(
 		/obj/item/storage/box/survival = 1,
 		/obj/item/implanter/dust = 1,
@@ -711,7 +711,7 @@
 	shoes = /obj/item/clothing/shoes/magboots
 	head = /obj/item/clothing/head/helmet/space
 	mask = /obj/item/clothing/mask/breath
-	l_ear = /obj/item/device/radio/headset
+	l_ear = /obj/item/radio/headset
 	id = /obj/item/card/id
 
 /datum/outfit/admin/spacegear/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -854,7 +854,7 @@
 	back = /obj/item/storage/backpack
 	gloves = /obj/item/clothing/gloves/color/latex
 	shoes = /obj/item/clothing/shoes/white
-	l_ear = /obj/item/device/radio/headset
+	l_ear = /obj/item/radio/headset
 	id = /obj/item/card/id
 	backpack_contents = list(
 		/obj/item/storage/box/survival = 1
@@ -884,7 +884,7 @@
 	shoes = /obj/item/clothing/shoes/white
 	head = /obj/item/clothing/head/welding
 	mask = /obj/item/clothing/mask/surgical
-	l_ear = /obj/item/device/radio/headset
+	l_ear = /obj/item/radio/headset
 	glasses = /obj/item/clothing/glasses/thermal/monocle
 	id = /obj/item/card/id/syndicate
 	l_pocket = /obj/item/kitchen/knife
@@ -892,7 +892,7 @@
 	r_hand = /obj/item/twohanded/fireaxe
 	backpack_contents = list(
 		/obj/item/storage/box/survival = 1,
-		/obj/item/device/flashlight = 1
+		/obj/item/flashlight = 1
 	)
 
 /datum/outfit/admin/masked_killer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -920,7 +920,7 @@
 	shoes = /obj/item/clothing/shoes/magboots
 	head = /obj/item/clothing/head/helmet/space/hardsuit/singuloth
 	mask = /obj/item/clothing/mask/breath
-	l_ear = /obj/item/device/radio/headset/ert
+	l_ear = /obj/item/radio/headset/ert
 	glasses = /obj/item/clothing/glasses/meson/cyber
 	id = /obj/item/card/id
 	suit_store = /obj/item/tank/oxygen
@@ -942,15 +942,15 @@
 	back = /obj/item/storage/backpack
 	gloves = /obj/item/clothing/gloves/color/black
 	shoes = /obj/item/clothing/shoes/black
-	l_ear = /obj/item/device/radio/headset/syndicate
+	l_ear = /obj/item/radio/headset/syndicate
 	glasses = /obj/item/clothing/glasses/sunglasses
 	id = /obj/item/card/id/syndicate
 	l_pocket = /obj/item/melee/energy/sword/saber
 	l_hand = /obj/item/storage/secure/briefcase/reaper
-	pda = /obj/item/device/pda/heads
+	pda = /obj/item/pda/heads
 	backpack_contents = list(
 		/obj/item/storage/box/survival = 1,
-		/obj/item/device/flashlight = 1
+		/obj/item/flashlight = 1
 	)
 	implants = list(
 		/obj/item/implant/dust
@@ -961,7 +961,7 @@
 	if(visualsOnly)
 		return
 
-	var/obj/item/device/pda/PDA = H.wear_pda
+	var/obj/item/pda/PDA = H.wear_pda
 	if(istype(PDA))
 		PDA.owner = H.real_name
 		PDA.ownjob = "Reaper"
@@ -978,18 +978,18 @@
 	back = /obj/item/storage/backpack
 	gloves = /obj/item/clothing/gloves/combat
 	shoes = /obj/item/clothing/shoes/black
-	l_ear = /obj/item/device/radio/headset/syndicate
+	l_ear = /obj/item/radio/headset/syndicate
 	glasses = /obj/item/clothing/glasses/hud/security/chameleon
 	id = /obj/item/card/id/syndicate
 	l_pocket = /obj/item/melee/energy/sword/saber
 	r_pocket = /obj/item/pen/sleepy
-	pda = /obj/item/device/pda/heads
+	pda = /obj/item/pda/heads
 	backpack_contents = list(
 		/obj/item/storage/box/survival = 1,
 		/obj/item/gun/projectile/automatic/pistol = 1,
 		/obj/item/suppressor = 1,
 		/obj/item/card/emag = 1,
-		/obj/item/device/flashlight = 1,
+		/obj/item/flashlight = 1,
 		/obj/item/implanter/storage = 1 // do not auto-implant this, that causes a bug
 	)
 	implants = list(
@@ -1005,7 +1005,7 @@
 	if(istype(G))
 		G.name = "black gloves"
 
-	var/obj/item/device/pda/PDA = H.wear_pda
+	var/obj/item/pda/PDA = H.wear_pda
 	if(istype(PDA))
 		PDA.owner = H.real_name
 		PDA.ownjob = "Spy"
@@ -1023,12 +1023,12 @@
 	back = /obj/item/storage/backpack
 	gloves = /obj/item/clothing/gloves/color/black
 	shoes = /obj/item/clothing/shoes/black
-	l_ear = /obj/item/device/radio/headset/syndicate
+	l_ear = /obj/item/radio/headset/syndicate
 	id = /obj/item/card/id/syndicate
 	l_hand = /obj/item/twohanded/dualsaber/red
 	backpack_contents = list(
 		/obj/item/storage/box/survival = 1,
-		/obj/item/device/flashlight = 1,
+		/obj/item/flashlight = 1,
 	)
 
 /datum/outfit/admin/dark_lord/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -1052,7 +1052,7 @@
 	back = /obj/item/storage/backpack
 	shoes = /obj/item/clothing/shoes/sandal
 	head = /obj/item/clothing/head/wizard
-	l_ear = /obj/item/device/radio/headset
+	l_ear = /obj/item/radio/headset
 	id = /obj/item/card/id
 	r_pocket = /obj/item/teleportation_scroll
 	l_hand = /obj/item/twohanded/staff
@@ -1127,12 +1127,12 @@
 	head = /obj/item/clothing/head/chaplain_hood
 	gloves = /obj/item/clothing/gloves/color/black
 	shoes = /obj/item/clothing/shoes/black
-	l_ear = /obj/item/device/radio/headset/syndicate
+	l_ear = /obj/item/radio/headset/syndicate
 	id = /obj/item/card/id/syndicate
 	r_hand = /obj/item/nullrod/armblade
 	backpack_contents = list(
 		/obj/item/storage/box/survival = 1,
-		/obj/item/device/flashlight = 1,
+		/obj/item/flashlight = 1,
 	)
 	implants = list(
 		/obj/item/implant/dust
@@ -1150,6 +1150,6 @@
 		B.force = 20
 		B.name = "blessing of the reaper"
 		B.desc = "Sometimes, someone's just gotta die."
-	var/obj/item/device/radio/headset/R = H.l_ear
+	var/obj/item/radio/headset/R = H.l_ear
 	if(istype(R))
 		R.flags |= NODROP

code/datums/spell.dm

@@ -140,13 +140,13 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
 	var/obj/effect/proc_holder/spell/noclothes/clothes_spell = locate() in (user.mob_spell_list | (user.mind ? user.mind.spell_list : list()))
 	if((ishuman(user) && clothes_req) && !istype(clothes_spell))//clothes check
 		var/mob/living/carbon/human/H = user
-		if(!istype(H.wear_suit, /obj/item/clothing/suit/wizrobe) && !istype(H.wear_suit, /obj/item/clothing/suit/space/hardsuit/wizard))
+		if(!istype(H.wear_suit, /obj/item/clothing/suit/wizrobe) && !istype(H.wear_suit, /obj/item/clothing/suit/space/hardsuit/wizard) && !istype(H.wear_suit, /obj/item/clothing/suit/space/eva/plasmaman/wizard))
 			to_chat(user, "<span class='notice'>I don't feel strong enough without my robe.</span>")
 			return 0
 		if(!istype(H.shoes, /obj/item/clothing/shoes/sandal))
 			to_chat(user, "<span class='notice'>I don't feel strong enough without my sandals.</span>")
 			return 0
-		if(!istype(H.head, /obj/item/clothing/head/wizard) && !istype(H.head, /obj/item/clothing/head/helmet/space/hardsuit/wizard))
+		if(!istype(H.head, /obj/item/clothing/head/wizard) && !istype(H.head, /obj/item/clothing/head/helmet/space/hardsuit/wizard) && !istype(H.wear_suit, /obj/item/clothing/head/helmet/space/eva/plasmaman/wizard))
 			to_chat(user, "<span class='notice'>I don't feel strong enough without my hat.</span>")
 			return 0
 	else if(!ishuman(user))

code/datums/spells/construct_spells.dm

@@ -60,7 +60,7 @@
 	invocation_type = "none"
 	range = 0
 
-	summon_type = list(/obj/item/device/soulstone)
+	summon_type = list(/obj/item/soulstone)
 
 /obj/effect/proc_holder/spell/aoe_turf/conjure/pylon
 	name = "Cult Pylon"

code/datums/supplypacks.dm

@@ -115,8 +115,8 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
 					/obj/item/clothing/suit/fire/firefighter,
 					/obj/item/clothing/mask/gas,
 					/obj/item/clothing/mask/gas,
-					/obj/item/device/flashlight,
-					/obj/item/device/flashlight,
+					/obj/item/flashlight,
+					/obj/item/flashlight,
 					/obj/item/tank/oxygen/red,
 					/obj/item/tank/oxygen/red,
 					/obj/item/extinguisher,
@@ -252,10 +252,10 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
 
 /datum/supply_packs/security/forensics
 	name = "Forensics Crate"
-	contains = list(/obj/item/device/detective_scanner,
+	contains = list(/obj/item/detective_scanner,
 					/obj/item/storage/box/evidence,
-					/obj/item/device/camera,
-					/obj/item/device/taperecorder,
+					/obj/item/camera,
+					/obj/item/taperecorder,
 					/obj/item/toy/crayon/white,
 					/obj/item/clothing/head/det_hat)
 	cost = 20
@@ -845,9 +845,9 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
 
 /datum/supply_packs/science/robotics
 	name = "Robotics Assembly Crate"
-	contains = list(/obj/item/device/assembly/prox_sensor,
-					/obj/item/device/assembly/prox_sensor,
-					/obj/item/device/assembly/prox_sensor,
+	contains = list(/obj/item/assembly/prox_sensor,
+					/obj/item/assembly/prox_sensor,
+					/obj/item/assembly/prox_sensor,
 					/obj/item/storage/toolbox/electrical,
 					/obj/item/storage/box/flashes,
 					/obj/item/stock_parts/cell/high,
@@ -879,15 +879,15 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
 	contains = list(/obj/item/tank/plasma,
 					/obj/item/tank/plasma,
 					/obj/item/tank/plasma,
-					/obj/item/device/assembly/igniter,
-					/obj/item/device/assembly/igniter,
-					/obj/item/device/assembly/igniter,
-					/obj/item/device/assembly/prox_sensor,
-					/obj/item/device/assembly/prox_sensor,
-					/obj/item/device/assembly/prox_sensor,
-					/obj/item/device/assembly/timer,
-					/obj/item/device/assembly/timer,
-					/obj/item/device/assembly/timer)
+					/obj/item/assembly/igniter,
+					/obj/item/assembly/igniter,
+					/obj/item/assembly/igniter,
+					/obj/item/assembly/prox_sensor,
+					/obj/item/assembly/prox_sensor,
+					/obj/item/assembly/prox_sensor,
+					/obj/item/assembly/timer,
+					/obj/item/assembly/timer,
+					/obj/item/assembly/timer)
 	cost = 10
 	containertype = /obj/structure/closet/crate/secure/plasma
 	containername = "plasma assembly crate"
@@ -908,8 +908,8 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
 
 /datum/supply_packs/science/transfer_valves
 	name = "Tank Transfer Valves Crate"
-	contains = list(/obj/item/device/transfer_valve,
-					/obj/item/device/transfer_valve)
+	contains = list(/obj/item/transfer_valve,
+					/obj/item/transfer_valve)
 	cost = 60
 	containertype = /obj/structure/closet/crate/secure/scisec
 	containername = "tank transfer valves crate"
@@ -917,7 +917,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
 
 /datum/supply_packs/science/prototype
 	name = "Machine Prototype Crate"
-	contains = list(/obj/item/device/machineprototype)
+	contains = list(/obj/item/machineprototype)
 	cost = 80
 	containertype = /obj/structure/closet/crate/secure/scisec
 	containername = "machine prototype crate"
@@ -1091,7 +1091,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
 					/obj/item/reagent_containers/glass/bottle/ammonia,
 					/obj/item/hatchet,
 					/obj/item/cultivator,
-					/obj/item/device/plant_analyzer,
+					/obj/item/plant_analyzer,
 					/obj/item/clothing/gloves/botanic_leather,
 					/obj/item/clothing/suit/apron) // Updated with new things
 	cost = 15
@@ -1307,7 +1307,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
 /datum/supply_packs/misc/paper
 	name = "Bureaucracy Crate"
 	contains = list(/obj/structure/filingcabinet/chestdrawer,
-					/obj/item/device/camera_film,
+					/obj/item/camera_film,
 					/obj/item/hand_labeler,
 					/obj/item/stack/tape_roll,
 					/obj/item/paper_bin,
@@ -1326,21 +1326,21 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
 
 /datum/supply_packs/misc/toner
 	name = "Toner Cartridges Crate"
-	contains = list(/obj/item/device/toner,
-					/obj/item/device/toner,
-					/obj/item/device/toner,
-					/obj/item/device/toner,
-					/obj/item/device/toner,
-					/obj/item/device/toner)
+	contains = list(/obj/item/toner,
+					/obj/item/toner,
+					/obj/item/toner,
+					/obj/item/toner,
+					/obj/item/toner,
+					/obj/item/toner)
 	cost = 10
 	containername = "toner cartridges crate"
 
 /datum/supply_packs/misc/artscrafts
 	name = "Arts and Crafts Supplies Crate"
 	contains = list(/obj/item/storage/fancy/crayons,
-	/obj/item/device/camera,
-	/obj/item/device/camera_film,
-	/obj/item/device/camera_film,
+	/obj/item/camera,
+	/obj/item/camera_film,
+	/obj/item/camera_film,
 	/obj/item/storage/photo_album,
 	/obj/item/stack/packageWrap,
 	/obj/item/reagent_containers/glass/paint/red,
@@ -1527,16 +1527,16 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
 
 /datum/supply_packs/misc/bigband
 	name = "Big band instrument collection"
-	contains = list(/obj/item/device/instrument/violin,
-					/obj/item/device/instrument/guitar,
-					/obj/item/device/instrument/eguitar,
-					/obj/item/device/instrument/glockenspiel,
-					/obj/item/device/instrument/accordion,
-					/obj/item/device/instrument/saxophone,
-					/obj/item/device/instrument/trombone,
-					/obj/item/device/instrument/recorder,
-					/obj/item/device/instrument/harmonica,
-					/obj/item/device/instrument/xylophone,
+	contains = list(/obj/item/instrument/violin,
+					/obj/item/instrument/guitar,
+					/obj/item/instrument/eguitar,
+					/obj/item/instrument/glockenspiel,
+					/obj/item/instrument/accordion,
+					/obj/item/instrument/saxophone,
+					/obj/item/instrument/trombone,
+					/obj/item/instrument/recorder,
+					/obj/item/instrument/harmonica,
+					/obj/item/instrument/xylophone,
 					/obj/structure/piano)
 	cost = 50
 	containername = "Big band musical instruments collection"
@@ -1644,11 +1644,11 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
 	name = "DNA Vault Samplers"
 	cost = 30
 	special = TRUE
-	contains = list(/obj/item/device/dna_probe,
-					/obj/item/device/dna_probe,
-					/obj/item/device/dna_probe,
-					/obj/item/device/dna_probe,
-					/obj/item/device/dna_probe
+	contains = list(/obj/item/dna_probe,
+					/obj/item/dna_probe,
+					/obj/item/dna_probe,
+					/obj/item/dna_probe,
+					/obj/item/dna_probe
 					)
 	containername = "dna samplers crate"
 

code/datums/uplink_item.dm

@@ -56,7 +56,7 @@ var/list/uplink_items = list()
 	var/surplus = 100 //Chance of being included in the surplus crate (when pick() selects it)
 	var/hijack_only = FALSE //can this item be purchased only during hijackings?
 
-/datum/uplink_item/proc/spawn_item(var/turf/loc, var/obj/item/device/uplink/U)
+/datum/uplink_item/proc/spawn_item(var/turf/loc, var/obj/item/uplink/U)
 	if(hijack_only)
 		if(!(locate(/datum/objective/hijack) in usr.mind.objectives))
 			to_chat(usr, "<span class='warning'>The Syndicate lacks resources to provide you with this item.</span>")
@@ -74,7 +74,7 @@ var/list/uplink_items = list()
 		desc = replacetext(initial(temp.desc), "\n", "<br>")
 	return desc
 
-/datum/uplink_item/proc/buy(var/obj/item/device/uplink/hidden/U, var/mob/user)
+/datum/uplink_item/proc/buy(var/obj/item/uplink/hidden/U, var/mob/user)
 	..()
 
 	if(!istype(U))
@@ -207,7 +207,7 @@ var/list/uplink_items = list()
 	name = "Radiation Laser"
 	desc = "A radiation laser concealed inside of a Health Analyser. After a moderate delay, causes temporary collapse and radiation. Has adjustable controls, but will not function as a regular health analyser, only appears like one. May not function correctly on radiation resistant humanoids!"
 	reference = "RL"
-	item = /obj/item/device/rad_laser
+	item = /obj/item/rad_laser
 	cost = 5
 	job = list("Chief Medical Officer", "Medical Doctor", "Geneticist", "Psychiatrist",	"Chemist", "Paramedic", "Coroner", "Virologist")
 
@@ -449,7 +449,7 @@ var/list/uplink_items = list()
 	name = "Mind Batterer"
 	desc = "A device that has a chance of knocking down people around you for a long amount of time. 50% chance per person. The user is unaffected. Has 5 charges."
 	reference = "BTR"
-	item = /obj/item/device/batterer
+	item = /obj/item/batterer
 	cost = 5
 
 /datum/uplink_item/dangerous/manhacks
@@ -812,7 +812,7 @@ var/list/uplink_items = list()
 	name = "Pizza Bomb"
 	desc = "A pizza box with a bomb taped inside of it. The timer needs to be set by opening the box; afterwards, opening the box again will trigger the detonation."
 	reference = "PB"
-	item = /obj/item/device/pizza_bomb
+	item = /obj/item/pizza_bomb
 	cost = 5
 	surplus = 8
 
@@ -874,6 +874,16 @@ var/list/uplink_items = list()
 	gamemodes = list(/datum/game_mode/nuclear)
 	excludefrom = list()
 
+/datum/uplink_item/stealthy_tools/frame
+	name = "F.R.A.M.E. PDA Cartridge"
+	desc = "When inserted into a personal digital assistant, this cartridge gives you five PDA viruses which \
+			when used cause the targeted PDA to become a new uplink with zero TCs, and immediately become unlocked.  \
+			You will receive the unlock code upon activating the virus, and the new uplink may be charged with \
+			telecrystals normally."
+	reference = "FRAME"
+	item = /obj/item/cartridge/frame
+	cost = 4
+
 /datum/uplink_item/stealthy_tools/agent_card
 	name = "Agent ID Card"
 	desc = "Agent cards prevent artificial intelligences from tracking the wearer, and can copy access from other identification cards. The access is cumulative, so scanning one card does not erase the access gained from another."
@@ -892,14 +902,14 @@ var/list/uplink_items = list()
 	name = "Chameleon-Projector"
 	desc = "Projects an image across a user, disguising them as an object scanned with it, as long as they don't move the projector from their hand. The disguised user cannot run and projectiles pass over them."
 	reference = "CP"
-	item = /obj/item/device/chameleon
+	item = /obj/item/chameleon
 	cost = 7
 
 /datum/uplink_item/stealthy_tools/camera_bug
 	name = "Camera Bug"
 	desc = "Enables you to view all cameras on the network and track a target. Bugging cameras allows you to disable them remotely."
 	reference = "CB"
-	item = /obj/item/device/camera_bug
+	item = /obj/item/camera_bug
 	cost = 1
 	surplus = 90
 
@@ -923,7 +933,7 @@ var/list/uplink_items = list()
 	desc = "A small, self-charging, short-ranged EMP device disguised as a flashlight. \
 		Useful for disrupting headsets, cameras, and borgs during stealth operations."
 	reference = "EMPL"
-	item = /obj/item/device/flashlight/emp
+	item = /obj/item/flashlight/emp
 	cost = 2
 	surplus = 30
 
@@ -1044,7 +1054,7 @@ var/list/uplink_items = list()
 	name = "Binary Translator Key"
 	desc = "A key, that when inserted into a radio headset, allows you to listen to and talk with artificial intelligences and cybernetic organisms in binary."
 	reference = "BITK"
-	item = /obj/item/device/encryptionkey/binary
+	item = /obj/item/encryptionkey/binary
 	cost = 5
 	surplus = 75
 
@@ -1052,7 +1062,7 @@ var/list/uplink_items = list()
 	name = "Syndicate Encryption Key"
 	desc = "A key, that when inserted into a radio headset, allows you to listen to all station department channels as well as talk on an encrypted Syndicate channel."
 	reference = "SEK"
-	item = /obj/item/device/encryptionkey/syndicate
+	item = /obj/item/encryptionkey/syndicate
 	cost = 2 //Nowhere near as useful as the Binary Key!
 	surplus = 75
 
@@ -1100,7 +1110,7 @@ var/list/uplink_items = list()
 	name = "Power Sink"
 	desc = "When screwed to wiring attached to an electric grid, then activated, this large device places excessive load on the grid, causing a stationwide blackout. The sink cannot be carried because of its excessive size. Ordering this sends you a small beacon that will teleport the power sink to your location on activation."
 	reference = "PS"
-	item = /obj/item/device/powersink
+	item = /obj/item/powersink
 	cost = 10
 
 /datum/uplink_item/device_tools/singularity_beacon
@@ -1110,7 +1120,7 @@ var/list/uplink_items = list()
 			in containment. Because of its size, it cannot be carried. Ordering this \
 			sends you a small beacon that will teleport the larger beacon to your location upon activation."
 	reference = "SNGB"
-	item = /obj/item/device/radio/beacon/syndicate
+	item = /obj/item/radio/beacon/syndicate
 	cost = 12
 	surplus = 0
 
@@ -1119,7 +1129,7 @@ var/list/uplink_items = list()
 	desc = "The Syndicate Bomb has an adjustable timer with a minimum setting of 60 seconds. Ordering the bomb sends you a small beacon, which will teleport the explosive to your location when you activate it. \
 	You can wrench the bomb down to prevent removal. The crew may attempt to defuse the bomb."
 	reference = "SB"
-	item = /obj/item/device/radio/beacon/syndicate/bomb
+	item = /obj/item/radio/beacon/syndicate/bomb
 	cost = 11
 
 /datum/uplink_item/device_tools/syndicate_detonator
@@ -1127,7 +1137,7 @@ var/list/uplink_items = list()
 	desc = "The Syndicate Detonator is a companion device to the Syndicate Bomb. Simply press the included button and an encrypted radio frequency will instruct all live syndicate bombs to detonate. \
 	Useful for when speed matters or you wish to synchronize multiple bomb blasts. Be sure to stand clear of the blast radius before using the detonator."
 	reference = "SD"
-	item = /obj/item/device/syndicatedetonator
+	item = /obj/item/syndicatedetonator
 	cost = 3
 	gamemodes = list(/datum/game_mode/nuclear)
 
@@ -1142,7 +1152,7 @@ var/list/uplink_items = list()
 	name = "Artificial Intelligence Detector" // changed name in case newfriends thought it detected disguised ai's
 	desc = "A functional multitool that turns red when it detects an artificial intelligence watching it or its holder. Knowing when an artificial intelligence is watching you is useful for knowing when to maintain cover."
 	reference = "AID"
-	item = /obj/item/device/multitool/ai_detect
+	item = /obj/item/multitool/ai_detect
 	cost = 1
 
 /datum/uplink_item/device_tools/telecrystal
@@ -1153,11 +1163,25 @@ var/list/uplink_items = list()
 	cost = 1
 	surplus = 0
 
+/datum/uplink_item/device_tools/telecrystal/five
+	name = "5 Raw Telecrystals"
+	desc = "Five telecrystals in their rawest and purest form; can be utilized on active uplinks to increase their telecrystal count."
+	reference = "RTCF"
+	item = /obj/item/stack/telecrystal/five
+	cost = 5
+
+/datum/uplink_item/device_tools/telecrystal/twenty
+	name = "20 Raw Telecrystals"
+	desc = "Twenty telecrystals in their rawest and purest form; can be utilized on active uplinks to increase their telecrystal count."
+	reference = "RTCT"
+	item = /obj/item/stack/telecrystal/twenty
+	cost = 20
+
 /datum/uplink_item/device_tools/jammer
 	name = "Radio Jammer"
 	desc = "This device will disrupt any nearby outgoing radio communication when activated."
 	reference = "RJ"
-	item = /obj/item/device/jammer
+	item = /obj/item/jammer
 	cost = 5
 
 /datum/uplink_item/device_tools/teleporter
@@ -1172,7 +1196,7 @@ var/list/uplink_items = list()
 /datum/uplink_item/device_tools/assault_pod
 	name = "Assault Pod Targetting Device"
 	desc = "Use to select the landing zone of your assault pod."
-	item = /obj/item/device/assault_pod
+	item = /obj/item/assault_pod
 	reference = "APT"
 	cost = 25
 	gamemodes = list(/datum/game_mode/nuclear)
@@ -1252,7 +1276,7 @@ var/list/uplink_items = list()
 	surplus = 0
 	gamemodes = list(/datum/game_mode/nuclear)
 
-/datum/uplink_item/cyber_implants/spawn_item(turf/loc, obj/item/device/uplink/U)
+/datum/uplink_item/cyber_implants/spawn_item(turf/loc, obj/item/uplink/U)
 	if(item)
 		if(findtext(item, /obj/item/organ/internal/cyberimp))
 			U.uses -= max(cost, 0)
@@ -1360,7 +1384,7 @@ var/list/uplink_items = list()
 	item = /obj/item/storage/box/syndicate
 	cost = 0
 
-/datum/uplink_item/badass/random/spawn_item(var/turf/loc, var/obj/item/device/uplink/U)
+/datum/uplink_item/badass/random/spawn_item(var/turf/loc, var/obj/item/uplink/U)
 
 	var/list/buyable_items = get_uplink_items()
 	var/list/possible_items = list()
@@ -1387,7 +1411,7 @@ var/list/uplink_items = list()
 	item = /obj/item/storage/box/syndicate
 	excludefrom = list(/datum/game_mode/nuclear)
 
-/datum/uplink_item/badass/surplus_crate/spawn_item(turf/loc, obj/item/device/uplink/U)
+/datum/uplink_item/badass/surplus_crate/spawn_item(turf/loc, obj/item/uplink/U)
 	var/obj/structure/closet/crate/C = new(loc)
 	var/list/temp_uplink_list = get_uplink_items()
 	var/list/buyable_items = list()

code/datums/wires/radio.dm

@@ -1,5 +1,5 @@
 /datum/wires/radio
-	holder_type = /obj/item/device/radio
+	holder_type = /obj/item/radio
 	wire_count = 3
 
 var/const/WIRE_SIGNAL = 1
@@ -18,13 +18,13 @@ var/const/WIRE_TRANSMIT = 4
 			return "Transmitter"
 
 /datum/wires/radio/CanUse(mob/living/L)
-	var/obj/item/device/radio/R = holder
+	var/obj/item/radio/R = holder
 	if(R.b_stat)
 		return 1
 	return 0
 
 /datum/wires/radio/UpdatePulsed(index)
-	var/obj/item/device/radio/R = holder
+	var/obj/item/radio/R = holder
 	switch(index)
 		if(WIRE_SIGNAL)
 			R.listening = !R.listening && !IsIndexCut(WIRE_RECEIVE)
@@ -38,7 +38,7 @@ var/const/WIRE_TRANSMIT = 4
 	..()
 
 /datum/wires/radio/UpdateCut(index, mended)
-	var/obj/item/device/radio/R = holder
+	var/obj/item/radio/R = holder
 	switch(index)
 		if(WIRE_SIGNAL)
 			R.listening = mended && !IsIndexCut(WIRE_RECEIVE)

code/datums/wires/wires.dm

@@ -131,8 +131,8 @@ var/list/wireColours = list("red", "blue", "green", "black", "orange", "brown",
 /datum/wires/proc/can_see_wire_index(mob/user)
 	if(user.can_admin_interact())
 		return TRUE
-	else if(istype(user.get_active_hand(), /obj/item/device/multitool))
-		var/obj/item/device/multitool/M = user.get_active_hand()
+	else if(istype(user.get_active_hand(), /obj/item/multitool))
+		var/obj/item/multitool/M = user.get_active_hand()
 		if(M.shows_wire_information)
 			return TRUE
 
@@ -155,7 +155,7 @@ var/list/wireColours = list("red", "blue", "green", "black", "orange", "brown",
 				else
 					to_chat(L, "<span class='error'>You need wirecutters!</span>")
 			if("pulse")
-				if(istype(I, /obj/item/device/multitool) || L.can_admin_interact())
+				if(istype(I, /obj/item/multitool) || L.can_admin_interact())
 					playsound(holder, 'sound/weapons/empty.ogg', 20, 1)
 					PulseColour(colour)
 				else
@@ -166,7 +166,7 @@ var/list/wireColours = list("red", "blue", "green", "black", "orange", "brown",
 					if(O)
 						L.put_in_hands(O)
 				else
-					if(istype(I, /obj/item/device/assembly/signaler))
+					if(istype(I, /obj/item/assembly/signaler))
 						if(L.drop_item())
 							Attach(colour, I)
 						else
@@ -268,7 +268,7 @@ var/const/POWER = 8
 		return signallers[colour]
 	return null
 
-/datum/wires/proc/Attach(colour, obj/item/device/assembly/signaler/S)
+/datum/wires/proc/Attach(colour, obj/item/assembly/signaler/S)
 	if(colour && S)
 		if(!IsAttached(colour))
 			signallers[colour] = S
@@ -278,7 +278,7 @@ var/const/POWER = 8
 
 /datum/wires/proc/Detach(colour)
 	if(colour)
-		var/obj/item/device/assembly/signaler/S = GetAttached(colour)
+		var/obj/item/assembly/signaler/S = GetAttached(colour)
 		if(S)
 			signallers -= colour
 			S.connected = null
@@ -286,7 +286,7 @@ var/const/POWER = 8
 			return S
 
 
-/datum/wires/proc/Pulse(obj/item/device/assembly/signaler/S)
+/datum/wires/proc/Pulse(obj/item/assembly/signaler/S)
 
 	for(var/colour in signallers)
 		if(S == signallers[colour])