Merge pull request Citadel-Station-13#8091 from deathride58/fixesz1hy…

…perspace Fixes centcom zlevel hyperspace acting like normal space (and also fixes the title screen while im at it)
greggbot · Mar 10, 2019 · 7628289 · 7628289
2 parents 23d5d38 + 64ab4a3
commit 7628289
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git 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
@@ -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)