Merge branch 'master' into upstream-merge-37476

code/modules/admin/create_object.dm

@@ -16,7 +16,7 @@
 /datum/admins/proc/quick_create_object(mob/user)
 	var/static/list/create_object_forms = list(
 	/obj, /obj/structure, /obj/machinery, /obj/effect,
-	/obj/item, /obj/item/clothing, /obj/item/stack, /obj/item/device,
+	/obj/item, /obj/item/clothing, /obj/item/stack, /obj/item,
 	/obj/item/reagent_containers, /obj/item/gun)
 
 	var/path = input("Select the path of the object you wish to create.", "Path", /obj) in create_object_forms

code/modules/admin/topic.dm

@@ -1804,7 +1804,7 @@
 		if(!istype(H))
 			to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
 			return
-		if(!istype(H.ears, /obj/item/device/radio/headset))
+		if(!istype(H.ears, /obj/item/radio/headset))
 			to_chat(usr, "The person you are trying to contact is not wearing a headset.")
 			return
 
@@ -1823,7 +1823,7 @@
 		if(!istype(H))
 			to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human.")
 			return
-		if(!istype(H.ears, /obj/item/device/radio/headset))
+		if(!istype(H.ears, /obj/item/radio/headset))
 			to_chat(usr, "The person you are trying to contact is not wearing a headset.")
 			return
 

code/modules/admin/verbs/debug.dm

@@ -308,7 +308,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
 		var/confirm = input("[choice.key] isn't ghosting right now. Are you sure you want to yank him out of them out of their body and place them in this pAI?", "Spawn pAI Confirmation", "No") in list("Yes", "No")
 		if(confirm != "Yes")
 			return 0
-	var/obj/item/device/paicard/card = new(T)
+	var/obj/item/paicard/card = new(T)
 	var/mob/living/silicon/pai/pai = new(card)
 	pai.name = input(choice, "Enter your pAI name:", "pAI Name", "Personal AI") as text
 	pai.real_name = pai.name
@@ -357,7 +357,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
 		var/typename = "[type]"
 		var/static/list/TYPES_SHORTCUTS = list(
 			/obj/effect/decal/cleanable = "CLEANABLE",
-			/obj/item/device/radio/headset = "HEADSET",
+			/obj/item/radio/headset = "HEADSET",
 			/obj/item/clothing/head/helmet/space = "SPESSHELMET",
 			/obj/item/book/manual = "MANUAL",
 			/obj/item/reagent_containers/food/drinks = "DRINK", //longest paths comes first
@@ -466,8 +466,8 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
 			id.update_label()
 
 			if(worn)
-				if(istype(worn, /obj/item/device/pda))
-					var/obj/item/device/pda/PDA = worn
+				if(istype(worn, /obj/item/pda))
+					var/obj/item/pda/PDA = worn
 					PDA.id = id
 					id.forceMove(PDA)
 				else if(istype(worn, /obj/item/storage/wallet))
@@ -626,7 +626,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
 			areas_with_LS.Add(A.type)
 		CHECK_TICK
 
-	for(var/obj/item/device/radio/intercom/I in GLOB.machines)
+	for(var/obj/item/radio/intercom/I in GLOB.machines)
 		var/area/A = get_area(I)
 		if(!A)
 			dat += "Skipped over [I] in invalid location, [I.loc].<br>"

code/modules/admin/verbs/mapping.dm

@@ -136,7 +136,7 @@ GLOBAL_LIST_INIT(admin_verbs_debug_mapping, list(
 		qdel(M)
 
 	if(intercom_range_display_status)
-		for(var/obj/item/device/radio/intercom/I in world)
+		for(var/obj/item/radio/intercom/I in world)
 			for(var/turf/T in orange(7,I))
 				var/obj/effect/debugging/marker/F = new/obj/effect/debugging/marker(T)
 				if (!(F in view(7,I.loc)))

code/modules/admin/verbs/onlyone.dm

@@ -8,7 +8,9 @@ GLOBAL_VAR_INIT(highlander, FALSE)
 	send_to_playing_players("<span class='boldannounce'><font size=6>THERE CAN BE ONLY ONE</font></span>")
 
 	for(var/obj/item/disk/nuclear/N in GLOB.poi_list)
-		N.relocate() //Gets it out of bags and such
+		var/datum/component/stationloving/component = N.GetComponent(/datum/component/stationloving)
+		if (component)
+			component.relocate() //Gets it out of bags and such
 
 	for(var/mob/living/carbon/human/H in GLOB.player_list)
 		if(H.stat == DEAD || !(H.client))