Merge branch 'master' into upstream-merge-37486

code/game/gamemodes/clown_ops/clown_ops.dm

@@ -39,7 +39,7 @@
 	mask = /obj/item/clothing/mask/gas/clown_hat
 	gloves = /obj/item/clothing/gloves/combat
 	back = /obj/item/storage/backpack/clown
-	ears = /obj/item/device/radio/headset/syndicate/alt
+	ears = /obj/item/radio/headset/syndicate/alt
 	l_pocket = /obj/item/pinpointer/nuke/syndicate
 	r_pocket = /obj/item/bikehorn
 	id = /obj/item/card/id/syndicate
@@ -48,7 +48,7 @@
 		/obj/item/reagent_containers/spray/waterflower/lube)
 	implants = list(/obj/item/implant/sad_trombone)
 
-	uplink_type = /obj/item/device/radio/uplink/clownop
+	uplink_type = /obj/item/radio/uplink/clownop
 
 /datum/outfit/syndicate/clownop/no_crystals
 	tc = 0
@@ -62,5 +62,5 @@
 /datum/outfit/syndicate/clownop/leader
 	name = "Clown Operative Leader - Basic"
 	id = /obj/item/card/id/syndicate/nuke_leader
-	r_hand = /obj/item/device/nuclear_challenge/clownops
+	r_hand = /obj/item/nuclear_challenge/clownops
 	command_radio = TRUE