Merge pull request #8091 from deathride58/fixesz1hyperspace

Fixes centcom zlevel hyperspace acting like normal space (and also fixes the title screen while im at it)
This commit is contained in:
kevinz000
2019-03-10 13:43:21 -07:00
committed by GitHub
2 changed files with 11 additions and 3 deletions
+3 -3
View File
@@ -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
+8
View File
@@ -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)