From 46a3ef1d35a765cea7108ac4ff90850142bffe12 Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Mon, 7 Dec 2020 22:34:31 -0500 Subject: [PATCH] Merge pull request #9424 from VOREStation/upstream-merge-7773 [MIRROR] Fixes unreachable landmarks breaking spacetravel --- code/modules/overmap/spacetravel.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/overmap/spacetravel.dm b/code/modules/overmap/spacetravel.dm index 8bae95434a..cf1787c4ab 100644 --- a/code/modules/overmap/spacetravel.dm +++ b/code/modules/overmap/spacetravel.dm @@ -85,6 +85,10 @@ proc/overmap_spacetravel(var/turf/space/T, var/atom/movable/A) if (!M) return + // Is the landmark still on the map. + if(!isturf(M.loc)) + return + // Don't let AI eyes yeet themselves off the map if(istype(A, /mob/observer/eye)) return