From aa1575c27f31e7a41aa5659cdf79cf25971f3d30 Mon Sep 17 00:00:00 2001 From: Atermonera Date: Mon, 31 Aug 2020 20:40:13 -0700 Subject: [PATCH] Merge pull request #7593 from Cyantime/patch-3 Increases number of things that survive overmap ztransit --- code/modules/overmap/spacetravel.dm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/code/modules/overmap/spacetravel.dm b/code/modules/overmap/spacetravel.dm index ac5846202a..658ae729a4 100644 --- a/code/modules/overmap/spacetravel.dm +++ b/code/modules/overmap/spacetravel.dm @@ -47,8 +47,29 @@ proc/get_deepspace(x,y) for(var/atom/movable/AM in contents) if(!AM.lost_in_space()) return FALSE + if(has_buckled_mobs()) + for(var/mob/M in buckled_mobs) + if(!M.lost_in_space()) + return FALSE + return TRUE +/obj/item/device/uav/lost_in_space() + if(state == 1) + return FALSE + return ..() + +/obj/machinery/power/supermatter/lost_in_space() + return FALSE + +/obj/singularity/lost_in_space() + return FALSE + +/obj/vehicle/lost_in_space() + if(load && !load.lost_in_space()) + return FALSE + return ..() + /mob/lost_in_space() return isnull(client)