Merge pull request #6536 from Citadel-Station-13/upstream-merge-37436

[MIRROR] Adds a stationloving component to replace a couple of flags and SSinbounds with

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))

code/modules/antagonists/nukeop/equipment/nuclearbomb.dm

@@ -504,15 +504,12 @@ This is here to make the tiles around the station mininuke change when it's arme
 
 /obj/item/disk/nuclear/Initialize()
 	. = ..()
-	var/tell_the_admins
-	// Only tell the admins if a REAL nuke disk is relocated
-	if(fake)
-		tell_the_admins = FALSE
-	else
+	if(!fake)
 		GLOB.poi_list |= src
-		tell_the_admins = TRUE
 
-	set_stationloving(TRUE, inform_admins=tell_the_admins)
+/obj/item/disk/nuclear/ComponentInitialize()
+	. = ..()
+	AddComponent(/datum/component/stationloving, !fake)
 
 /obj/item/disk/nuclear/examine(mob/user)
 	. = ..()

code/modules/spells/spell_types/lichdom.dm

@@ -34,7 +34,7 @@
 		for(var/obj/item in hand_items)
 			// I ensouled the nuke disk once. But it's probably a really
 			// mean tactic, so probably should discourage it.
-			if((item.flags_1 & ABSTRACT_1) || (item.flags_1 & NODROP_1) || (item.flags_2 & STATIONLOVING_2))
+			if((item.flags_1 & ABSTRACT_1) || (item.flags_1 & NODROP_1) || item.SendSignal(COMSIG_ITEM_IMBUE_SOUL, user))
 				continue
 			marked_item = item
 			to_chat(M, "<span class='warning'>You begin to focus your very being into [item]...</span>")