Merge pull request #13896 from Kyep/sleeper_teleport_fix

Fixes issues with machines/mechs when a person is teleported out of them
This commit is contained in:
AffectedArc07
2020-08-11 14:29:41 +01:00
committed by GitHub
12 changed files with 69 additions and 5 deletions
+6
View File
@@ -351,3 +351,9 @@ a {
/obj/proc/check_uplink_validity()
return TRUE
/obj/proc/force_eject_occupant()
// This proc handles safely removing occupant mobs from the object if they must be teleported out (due to being SSD/AFK, by admin teleport, etc) or transformed.
// In the event that the object doesn't have an overriden version of this proc to do it, log a runtime so one can be added.
CRASH("Proc force_eject_occupant() is not overriden on a machine containing a mob.")
@@ -354,6 +354,11 @@
/obj/structure/closet/AllowDrop()
return TRUE
/obj/structure/closet/force_eject_occupant()
// Its okay to silently teleport mobs out of lockers, since the only thing affected is their contents list.
return
/obj/structure/closet/bluespace
name = "bluespace closet"
desc = "A storage unit that moves and stores through the fourth dimension."