diff --git a/_maps/shuttles/emergency_birdboat.dmm b/_maps/shuttles/emergency_birdboat.dmm index 41860e3beab..fd82a5b0e2b 100644 --- a/_maps/shuttles/emergency_birdboat.dmm +++ b/_maps/shuttles/emergency_birdboat.dmm @@ -158,7 +158,8 @@ /obj/docking_port/mobile/emergency{ dir = 8; name = "Birdboat emergency escape shuttle"; - port_direction = 4 + port_direction = 2; + preferred_direction = 8 }, /turf/open/floor/mineral/titanium, /area/shuttle/escape) diff --git a/_maps/shuttles/emergency_birdshot.dmm b/_maps/shuttles/emergency_birdshot.dmm index 0e265110bde..bbcad398257 100644 --- a/_maps/shuttles/emergency_birdshot.dmm +++ b/_maps/shuttles/emergency_birdshot.dmm @@ -9,9 +9,6 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/mineral/titanium/white, /area/shuttle/escape) -"ax" = ( -/turf/closed/wall/mineral/titanium/overspace, -/area/shuttle/escape) "aQ" = ( /obj/effect/decal/cleanable/insectguts, /turf/open/floor/mineral/plastitanium/red, @@ -235,7 +232,8 @@ }, /obj/docking_port/mobile/emergency{ dir = 8; - name = "birdshot emergency shuttle" + name = "birdshot emergency shuttle"; + port_direction = 4 }, /turf/open/floor/mineral/titanium, /area/shuttle/escape) @@ -1001,15 +999,15 @@ nQ nQ nQ nQ -ax +LX LX rZ LX -ax +LX nQ nQ nQ -ax +LX rZ LX LX @@ -1018,7 +1016,7 @@ LX LX LX LX -ax +LX nQ "} (2,1,1) = {" @@ -1030,7 +1028,7 @@ nQ nQ nQ nQ -ax +LX LX LX ON @@ -1058,7 +1056,7 @@ nQ nQ nQ nQ -ax +LX rZ rZ LX @@ -1086,7 +1084,7 @@ vk (4,1,1) = {" nQ nQ -ax +LX LX LX LX @@ -1185,13 +1183,13 @@ ye LX mU nQ -ax +LX LX LX hF LX LX -ax +LX nQ nQ mU @@ -1200,9 +1198,9 @@ hF LX rZ LX -ax +LX nQ -ax +LX LX nQ nQ @@ -1309,13 +1307,13 @@ eR LX mU nQ -ax +LX LX LX hF LX LX -ax +LX nQ nQ mU @@ -1324,7 +1322,7 @@ hF LX rZ LX -ax +LX nQ bo mU @@ -1396,7 +1394,7 @@ ST (14,1,1) = {" nQ nQ -ax +LX LX LX LX @@ -1430,7 +1428,7 @@ nQ nQ nQ nQ -ax +LX rZ rZ LX @@ -1464,7 +1462,7 @@ nQ nQ nQ nQ -ax +LX LX LX dv @@ -1497,15 +1495,15 @@ nQ nQ nQ nQ -ax +LX Xy rZ Xy -ax +LX nQ nQ nQ -ax +LX ll LX lp @@ -1514,6 +1512,6 @@ LX rZ rZ rZ -ax +LX nQ "} diff --git a/_maps/shuttles/emergency_humpback.dmm b/_maps/shuttles/emergency_humpback.dmm index f4c50bf6b84..f76d06925a3 100644 --- a/_maps/shuttles/emergency_humpback.dmm +++ b/_maps/shuttles/emergency_humpback.dmm @@ -750,7 +750,10 @@ /obj/machinery/door/airlock/grunge{ name = "Emergency Shuttle Airlock" }, -/obj/docking_port/mobile/emergency, +/obj/docking_port/mobile/emergency{ + port_direction = 4; + preferred_direction = 2 + }, /turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape) "UR" = ( diff --git a/_maps/shuttles/emergency_monastery.dmm b/_maps/shuttles/emergency_monastery.dmm index 4041e4e0588..da8641ee0b1 100644 --- a/_maps/shuttles/emergency_monastery.dmm +++ b/_maps/shuttles/emergency_monastery.dmm @@ -8,10 +8,6 @@ }, /turf/open/floor/iron/dark, /area/shuttle/escape) -"af" = ( -/obj/structure/window/reinforced/spawner/directional/east, -/turf/open/space, -/area/shuttle/escape) "ap" = ( /obj/structure/chair/wood/wings{ dir = 1 @@ -25,10 +21,6 @@ }, /turf/open/floor/carpet, /area/shuttle/escape) -"as" = ( -/obj/structure/window/reinforced/spawner/directional/south, -/turf/open/space, -/area/shuttle/escape) "aF" = ( /obj/machinery/light/small/directional/south, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -58,11 +50,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/closed/wall, /area/shuttle/escape) -"aW" = ( -/obj/structure/window/reinforced/spawner/directional/east, -/obj/structure/lattice, -/turf/open/space/basic, -/area/shuttle/escape) "bb" = ( /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, @@ -176,6 +163,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/shuttle/escape) +"cH" = ( +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/space, +/area/shuttle/escape) "cT" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -350,11 +341,6 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/iron/dark, /area/shuttle/escape) -"fA" = ( -/obj/structure/window/reinforced/spawner/directional/east, -/obj/structure/window/reinforced/spawner/directional/south, -/turf/open/space, -/area/shuttle/escape) "fL" = ( /obj/structure/window/reinforced/spawner/directional/east, /obj/structure/lattice, @@ -715,14 +701,15 @@ /obj/machinery/door/airlock/external/ruin, /turf/open/floor/plating, /area/shuttle/escape) -"lj" = ( -/obj/structure/lattice/catwalk, -/turf/open/space/basic, -/area/shuttle/escape) "lm" = ( /obj/machinery/meter, /turf/open/floor/plating, /area/shuttle/escape) +"ln" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/space, +/area/shuttle/escape) "lB" = ( /turf/open/floor/iron/chapel{ dir = 8 @@ -750,6 +737,10 @@ }, /turf/open/floor/iron, /area/shuttle/escape) +"ml" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/space, +/area/shuttle/escape) "mm" = ( /obj/structure/lattice/catwalk, /turf/open/space, @@ -1160,6 +1151,11 @@ }, /turf/open/floor/iron/dark, /area/shuttle/escape) +"rZ" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/lattice, +/turf/open/space/basic, +/area/shuttle/escape) "sa" = ( /obj/structure/chair/wood{ dir = 4 @@ -1258,6 +1254,10 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/dark, /area/shuttle/escape) +"ti" = ( +/obj/structure/lattice/catwalk, +/turf/open/space/basic, +/area/shuttle/escape) "tm" = ( /obj/structure/table/wood/fancy, /obj/item/storage/box/matches{ @@ -1323,6 +1323,10 @@ }, /turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) +"uP" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/space, +/area/shuttle/escape) "uX" = ( /obj/machinery/power/smes, /turf/open/floor/plating, @@ -2353,10 +2357,6 @@ /obj/effect/decal/cleanable/blood/old, /turf/open/floor/iron/dark, /area/shuttle/escape) -"Jl" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/turf/open/space, -/area/shuttle/escape) "Jp" = ( /obj/structure/table, /obj/item/crowbar, @@ -2447,8 +2447,7 @@ "JZ" = ( /obj/docking_port/mobile/emergency{ movement_force = list("KNOCKDOWN"=3,"THROW"=6); - name = "\proper a monastery with engines strapped to it"; - port_direction = 1 + name = "\proper a monastery with engines strapped to it" }, /turf/closed/mineral, /area/shuttle/escape) @@ -2605,10 +2604,6 @@ }, /turf/open/floor/iron/dark, /area/shuttle/escape) -"Mt" = ( -/obj/structure/lattice, -/turf/open/space, -/area/shuttle/escape) "MC" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -2800,6 +2795,10 @@ /obj/effect/station_crash/devastating, /turf/open/floor/iron/dark, /area/shuttle/escape) +"OL" = ( +/obj/structure/lattice, +/turf/open/space, +/area/shuttle/escape) "OM" = ( /obj/item/cultivator, /turf/open/floor/grass, @@ -4296,7 +4295,7 @@ nr nr nr nr -af +uP hq JG JG @@ -4833,7 +4832,7 @@ JG JG JG PB -lj +ti iw iw iw @@ -4915,7 +4914,7 @@ JG JG JG PB -lj +ti iw JG JG @@ -4997,10 +4996,10 @@ JG JG JG PB -lj -Mt -af -fA +ti +OL +uP +ln zE zE AJ @@ -5074,7 +5073,7 @@ JG JG JG iw -Mt +OL iw iw iw @@ -5159,7 +5158,7 @@ iw JG JG dp -af +uP zE Zf zE @@ -5238,7 +5237,7 @@ JG JG JG bd -Mt +OL bT zE zE @@ -5320,7 +5319,7 @@ aH iw iw iw -as +cH zE zE jc @@ -5397,10 +5396,10 @@ JG JG "} (21,1,1) = {" -af -af +uP +uP hq -aW +rZ hq bl zE @@ -5807,7 +5806,7 @@ JG JG "} (26,1,1) = {" -as +cH zE ox bb @@ -6226,7 +6225,7 @@ LK zE LK dX -Jl +ml fm zE zE @@ -6303,9 +6302,9 @@ JG JG IM IM -Jl -Jl -Jl +ml +ml +ml IM JG JG @@ -6393,7 +6392,7 @@ JG JG JG JG -Jl +ml fm zE zE @@ -6644,8 +6643,8 @@ JG JG JG JG -Jl -Jl +ml +ml jS zE ko @@ -6893,7 +6892,7 @@ JG JG JG JG -Mt +OL mm kJ IM diff --git a/_maps/shuttles/escape_pod_large.dmm b/_maps/shuttles/escape_pod_large.dmm index d803a681abe..9877e44bf12 100644 --- a/_maps/shuttles/escape_pod_large.dmm +++ b/_maps/shuttles/escape_pod_large.dmm @@ -58,7 +58,9 @@ /obj/machinery/door/airlock/titanium{ name = "Shuttle Airlock" }, -/obj/docking_port/mobile/monastery, +/obj/docking_port/mobile/monastery{ + port_direction = 2 + }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/pod_1) "W" = (