From 64ab4a32a35a8a142d4535ead236c0f18fd15bca Mon Sep 17 00:00:00 2001 From: deathride58 Date: Mon, 4 Mar 2019 21:38:34 -0500 Subject: [PATCH] Fixes centcom zlevel hyperspace not instantly teleporting mobs out of the z-level (and also fixes the title screen while im at it) --- _maps/map_files/generic/CentCom.dmm | 6 +++--- code/game/turfs/space/transit.dm | 8 ++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 14d16fe659..d005f1eb40 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -4696,7 +4696,7 @@ }, /area/abductor_ship) "lI" = ( -/turf/open/space/transit, +/turf/open/space/transit/centcom, /area/space) "lJ" = ( /obj/machinery/door/airlock/centcom{ @@ -20511,7 +20511,7 @@ fX fX fX fX -fY +fX fX fX fX @@ -21282,7 +21282,7 @@ fX fX fX fX -fX +fY fX fX fX diff --git a/code/game/turfs/space/transit.dm b/code/game/turfs/space/transit.dm index 7dcf27ce4b..f0f0667c37 100644 --- a/code/game/turfs/space/transit.dm +++ b/code/game/turfs/space/transit.dm @@ -41,6 +41,14 @@ /turf/open/space/transit/border/east dir = EAST +/turf/open/space/transit/centcom + dir = SOUTH + +/turf/open/space/transit/centcom/Entered(atom/movable/AM, atom/OldLoc) + ..() + if(!locate(/obj/structure/lattice) in src) + throw_atom(AM) + /turf/open/space/transit/border/Entered(atom/movable/AM, atom/OldLoc) ..() if(!locate(/obj/structure/lattice) in src)