Merge pull request #7157 from Citadel-Station-13/upstream-merge-38461

[MIRROR] Fixes the Blob being banished to the shadow realm

code/datums/components/stationloving.dm

@@ -2,20 +2,23 @@
 	dupe_mode = COMPONENT_DUPE_UNIQUE_PASSARGS
 	var/inform_admins = FALSE
 	var/disallow_soul_imbue = TRUE
+	var/allow_death = FALSE
 
-/datum/component/stationloving/Initialize(inform_admins = FALSE)
+/datum/component/stationloving/Initialize(inform_admins = FALSE, allow_death = FALSE)
 	if(!ismovableatom(parent))
 		return COMPONENT_INCOMPATIBLE
 	RegisterSignal(list(COMSIG_MOVABLE_Z_CHANGED), .proc/check_in_bounds)
 	RegisterSignal(list(COMSIG_PARENT_PREQDELETED), .proc/check_deletion)
 	RegisterSignal(list(COMSIG_ITEM_IMBUE_SOUL), .proc/check_soul_imbue)
 	src.inform_admins = inform_admins
+	src.allow_death = allow_death
 	check_in_bounds() // Just in case something is being created outside of station/centcom
 
 /datum/component/stationloving/InheritComponent(datum/component/stationloving/newc, original, list/arguments)
 	if (original)
 		if (istype(newc))
 			inform_admins = newc.inform_admins
+			allow_death = newc.allow_death
 		else if (LAZYLEN(arguments))
 			inform_admins = arguments[1]
 
@@ -70,7 +73,7 @@
 		message_admins("[parent] has been !!force deleted!! in [ADMIN_VERBOSEJMP(T)].")
 		log_game("[parent] has been !!force deleted!! in [AREACOORD(T)].")
 
-	if(!force)
+	if(!force && !allow_death)
 		var/turf/targetturf = relocate()
 		log_game("[parent] has been destroyed in [AREACOORD(T)]. Moving it to [AREACOORD(targetturf)].")
 		if(inform_admins)