From a2e0134186715eea916dcddefd41a55a35c9bfab Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Thu, 4 Jul 2024 18:39:40 +0200 Subject: [PATCH] [MIRROR] Various minor fixes to Emergency Shuttles (#28620) * Various minor fixes to Emergency Shuttles (#84613) ## About The Pull Request Another another continuation of fixing issues on shuttles. This one is mostly just fixing a few shuttles flying in the wrong direction. Next PR should be the last one for shuttle fixes as there's only a few more scattered around.
Spoiler warning - Fixed the following shuttles flying in unexpected directions: escape_pod_large.dmm, emergency_humpback.dmm, emergency_monastery.dmm, emergency_birdboat.dmm, emergency_birdshot.dmm - Removed use of /turf/closed/wall/mineral/titanium/overspace on emergency_birdshot.dmm
## Why It's Good For The Game it's just more bug fixes for shuttles ## Changelog :cl: fix: Fixed the following shuttles flying in unexpected directions: Pubby escape pod, Humpback emergency shuttle, Pubby monastery shuttle, Birdboat emergency shuttle, Birdshot emergency shuttle /:cl: * Various minor fixes to Emergency Shuttles --------- Co-authored-by: aaaa1023 <74441292+aaaa1023@users.noreply.github.com> --- _maps/shuttles/emergency_birdboat.dmm | 3 +- _maps/shuttles/emergency_birdshot.dmm | 204 +++++---- _maps/shuttles/emergency_humpback.dmm | 5 +- _maps/shuttles/emergency_monastery.dmm | 561 ++++++++++++------------- _maps/shuttles/escape_pod_large.dmm | 4 +- 5 files changed, 390 insertions(+), 387 deletions(-) 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 b5d289fc721..2f89b834530 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, @@ -88,6 +85,23 @@ }, /turf/open/floor/mineral/titanium/tiled/white, /area/shuttle/escape) +"eY" = ( +/obj/machinery/light/small/directional/south, +/obj/structure/table, +/obj/item/reagent_containers/cup/glass/bottle/vodka{ + pixel_x = -6; + pixel_y = 14 + }, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_x = 3; + pixel_y = 2 + }, +/obj/item/cigarette/dromedary{ + pixel_x = 8; + pixel_y = 15 + }, +/turf/open/floor/mineral/titanium/white, +/area/shuttle/escape) "fd" = ( /obj/effect/decal/cleanable/plastic, /turf/open/floor/glass/reinforced, @@ -117,13 +131,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/mineral/titanium/yellow, /area/shuttle/escape) -"gk" = ( -/obj/structure/window/reinforced/survival_pod/spawner/directional/north, -/obj/structure/table, -/obj/machinery/cell_charger, -/obj/item/stock_parts/power_store/cell, -/turf/open/floor/glass/reinforced, -/area/shuttle/escape) "gl" = ( /obj/structure/chair/comfy/shuttle{ dir = 8 @@ -194,31 +201,10 @@ /obj/effect/decal/cleanable/oil, /turf/open/floor/plating, /area/shuttle/escape) -"iI" = ( -/obj/machinery/light/small/directional/south, -/obj/structure/table, -/obj/item/reagent_containers/cup/glass/bottle/vodka{ - pixel_x = -6; - pixel_y = 14 - }, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ - pixel_x = 3; - pixel_y = 2 - }, -/obj/item/cigarette/dromedary{ - pixel_x = 8; - pixel_y = 15 - }, -/turf/open/floor/mineral/titanium/white, -/area/shuttle/escape) "iU" = ( /obj/effect/decal/cleanable/insectguts, /turf/open/floor/mineral/titanium/tiled, /area/shuttle/escape) -"jn" = ( -/obj/structure/lattice, -/turf/template_noop, -/area/shuttle/escape) "jt" = ( /obj/effect/decal/cleanable/glass, /turf/open/floor/glass/reinforced, @@ -240,16 +226,6 @@ /obj/item/trash/cheesie, /turf/open/floor/mineral/titanium/tiled, /area/shuttle/escape) -"ll" = ( -/obj/machinery/door/airlock/titanium{ - name = "Emergency Shuttle Airlock" - }, -/obj/docking_port/mobile/emergency{ - dir = 8; - name = "birdshot emergency shuttle" - }, -/turf/open/floor/mineral/titanium, -/area/shuttle/escape) "lp" = ( /obj/machinery/door/airlock/titanium{ name = "Emergency Shuttle Airlock" @@ -295,6 +271,10 @@ }, /turf/open/floor/glass/reinforced, /area/shuttle/escape) +"mU" = ( +/obj/structure/lattice, +/turf/template_noop, +/area/shuttle/escape) "no" = ( /obj/item/trash/popcorn/caramel, /turf/open/floor/mineral/titanium, @@ -405,11 +385,6 @@ }, /turf/open/floor/mineral/titanium/white, /area/shuttle/escape) -"qF" = ( -/obj/structure/lattice, -/obj/item/stack/rods/two, -/turf/template_noop, -/area/shuttle/escape) "ry" = ( /obj/structure/chair/comfy/shuttle{ dir = 1 @@ -553,6 +528,17 @@ /obj/machinery/power/shuttle_engine/heater, /turf/open/floor/plating/airless, /area/shuttle/escape) +"zL" = ( +/obj/machinery/door/airlock/titanium{ + name = "Emergency Shuttle Airlock" + }, +/obj/docking_port/mobile/emergency{ + dir = 8; + name = "birdshot emergency shuttle"; + port_direction = 4 + }, +/turf/open/floor/mineral/titanium, +/area/shuttle/escape) "zV" = ( /obj/structure/toilet{ dir = 4 @@ -560,6 +546,11 @@ /obj/item/trash/can/food/beans, /turf/open/floor/mineral/titanium, /area/shuttle/escape) +"Aw" = ( +/obj/structure/lattice, +/obj/item/stack/rods/two, +/turf/template_noop, +/area/shuttle/escape) "Ay" = ( /obj/item/shard{ pixel_y = 19 @@ -700,6 +691,13 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/mineral/titanium, /area/shuttle/escape) +"HS" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/north, +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/item/stock_parts/power_store/cell, +/turf/open/floor/glass/reinforced, +/area/shuttle/escape) "Id" = ( /obj/structure/chair{ dir = 4 @@ -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,12 +1028,12 @@ nQ nQ nQ nQ -ax +LX LX LX ON Ko -iI +eY LX rZ LX @@ -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 @@ -1183,26 +1181,26 @@ WH De ye LX -jn +mU nQ -ax +LX LX LX hF LX LX -ax +LX nQ nQ -jn +mU Sm hF LX rZ LX -ax +LX nQ -ax +LX LX nQ nQ @@ -1214,23 +1212,23 @@ yj MW rZ rZ -jn -jn -jn -jn +mU +mU +mU +mU IN pl ry -jn -jn -jn -jn -jn +mU +mU +mU +mU +mU mp ig Kh Uh -jn +mU nQ nQ nQ @@ -1248,20 +1246,20 @@ nQ nQ nQ nQ -jn +mU IN cr oC -jn +mU nQ nQ nQ nQ -gk +HS ig fd AK -jn +mU nQ nQ nQ @@ -1276,23 +1274,23 @@ nO MW rZ rZ -jn -jn -jn -jn +mU +mU +mU +mU bx ig ry -jn -jn -jn -jn -jn +mU +mU +mU +mU +mU Vo jt oN IK -jn +mU nQ nQ nQ @@ -1307,27 +1305,27 @@ xg De eR LX -jn +mU nQ -ax +LX LX LX hF LX LX -ax +LX nQ nQ -jn +mU Sm hF LX rZ LX -ax +LX nQ bo -jn +mU nQ nQ "} @@ -1359,7 +1357,7 @@ ho LX LX RW -jn +mU nQ "} (13,1,1) = {" @@ -1389,14 +1387,14 @@ Ly Oq tb MC -jn +mU LX ST "} (14,1,1) = {" nQ nQ -ax +LX LX LX LX @@ -1422,7 +1420,7 @@ LX VA Em Ay -jn +mU "} (15,1,1) = {" nQ @@ -1430,7 +1428,7 @@ nQ nQ nQ nQ -ax +LX rZ rZ LX @@ -1451,7 +1449,7 @@ tu xC tj Iv -jn +mU fv ce "} @@ -1464,7 +1462,7 @@ nQ nQ nQ nQ -ax +LX LX LX dv @@ -1481,7 +1479,7 @@ eH oL ho kH -qF +Aw sU LX bo @@ -1497,16 +1495,16 @@ nQ nQ nQ nQ -ax +LX Xy rZ Xy -ax +LX nQ nQ nQ -ax -ll +LX +zL LX lp rZ @@ -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 b68f934ca9c..699f4618de4 100644 --- a/_maps/shuttles/emergency_monastery.dmm +++ b/_maps/shuttles/emergency_monastery.dmm @@ -12,6 +12,12 @@ /obj/structure/window/reinforced/spawner/directional/east, /turf/open/space, /area/shuttle/escape) +"ao" = ( +/obj/structure/window/reinforced/spawner/directional/west{ + layer = 2.9 + }, +/turf/open/space/basic, +/area/shuttle/escape) "ap" = ( /obj/structure/chair/wood/wings{ dir = 1 @@ -40,13 +46,6 @@ /obj/structure/grille/broken, /turf/open/space/basic, /area/shuttle/escape) -"aN" = ( -/obj/structure/window/reinforced/spawner/directional/south, -/obj/structure/window/reinforced/spawner/directional/west{ - layer = 2.9 - }, -/turf/open/space/basic, -/area/shuttle/escape) "aO" = ( /obj/structure/sign/plaques/kiddie{ desc = "It reads: PRIVATE EXHIBIT - Please inquire with library staff for guided tours."; @@ -65,19 +64,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/closed/wall, /area/shuttle/escape) -"aT" = ( -/obj/structure/window/reinforced/spawner/directional/west{ - layer = 2.9 - }, -/turf/open/space/basic, -/area/shuttle/escape) -"aW" = ( -/obj/structure/window/reinforced/spawner/directional/east{ - layer = 2.9 - }, -/obj/structure/lattice, -/turf/open/space/basic, -/area/shuttle/escape) "bb" = ( /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, @@ -101,13 +87,6 @@ }, /turf/open/floor/iron/dark, /area/shuttle/escape) -"bl" = ( -/obj/structure/window/reinforced/spawner/directional/south, -/obj/structure/window/reinforced/spawner/directional/east{ - layer = 2.9 - }, -/turf/open/space/basic, -/area/shuttle/escape) "bn" = ( /obj/machinery/light/small/directional/east, /obj/machinery/power/apc/auto_name/directional/east, @@ -145,13 +124,6 @@ /obj/structure/window/reinforced/spawner/directional/west, /turf/open/floor/plating, /area/shuttle/escape) -"bx" = ( -/obj/machinery/power/shuttle_engine/propulsion, -/obj/structure/window/reinforced/spawner/directional/west{ - layer = 2.9 - }, -/turf/open/floor/plating, -/area/shuttle/escape) "by" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sign/painting/library_private{ @@ -160,17 +132,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/dark, /area/shuttle/escape) -"bC" = ( -/obj/machinery/power/shuttle_engine/heater, -/obj/structure/window/reinforced/spawner/directional/east{ - layer = 2.9 - }, -/obj/structure/window/reinforced/spawner/directional/north, -/obj/structure/window/reinforced/spawner/directional/west{ - layer = 2.9 - }, -/turf/open/floor/plating, -/area/shuttle/escape) "bI" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -189,11 +150,6 @@ /obj/structure/lattice, /turf/open/space, /area/shuttle/escape) -"cb" = ( -/obj/machinery/power/smes/full, -/obj/structure/cable, -/turf/open/floor/plating, -/area/shuttle/escape) "cu" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/cobweb/cobweb2, @@ -209,6 +165,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/shuttle/escape) +"cN" = ( +/obj/machinery/power/shuttle_engine/propulsion, +/obj/structure/window/reinforced/spawner/directional/west{ + layer = 2.9 + }, +/turf/open/floor/plating, +/area/shuttle/escape) "cT" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -429,16 +392,15 @@ /obj/structure/closet/crate/bin, /turf/open/floor/iron, /area/shuttle/escape) -"hq" = ( -/obj/structure/window/reinforced/spawner/directional/east, -/turf/open/space/basic, -/area/shuttle/escape) -"hC" = ( -/obj/machinery/power/shuttle_engine/propulsion, +"hl" = ( /obj/structure/window/reinforced/spawner/directional/east{ layer = 2.9 }, -/turf/open/floor/plating, +/turf/open/space, +/area/shuttle/escape) +"hq" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/space/basic, /area/shuttle/escape) "hI" = ( /obj/machinery/atmospherics/components/binary/pump/on{ @@ -468,15 +430,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/shuttle/escape) -"hV" = ( -/obj/structure/window/reinforced/spawner/directional/north{ - pixel_y = 1 - }, -/obj/structure/window/reinforced/spawner/directional/west{ - layer = 2.9 - }, -/turf/open/space/basic, -/area/shuttle/escape) "hW" = ( /obj/structure/flora/bush/leavy/style_random, /obj/structure/flora/bush/reed/style_random, @@ -497,15 +450,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/shuttle/escape) -"hZ" = ( -/obj/structure/table/wood, -/obj/item/paper_bin{ - layer = 2.9; - pixel_x = -2; - pixel_y = 4 - }, -/turf/open/floor/iron/dark, -/area/shuttle/escape) "ib" = ( /obj/effect/spawner/structure/window/reinforced, /turf/closed/mineral, @@ -635,14 +579,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/shuttle/escape) -"jt" = ( -/obj/machinery/power/shuttle_engine/heater, -/obj/structure/window/reinforced/spawner/directional/north, -/obj/structure/window/reinforced/spawner/directional/west{ - layer = 2.9 - }, -/turf/open/floor/plating, -/area/shuttle/escape) "jx" = ( /turf/open/floor/iron/dark, /area/shuttle/escape) @@ -696,6 +632,16 @@ }, /turf/open/floor/iron/dark, /area/shuttle/escape) +"km" = ( +/obj/structure/table/wood, +/obj/item/paper_bin{ + layer = 2.9; + pixel_x = -2; + pixel_y = 4 + }, +/obj/item/pen, +/turf/open/floor/iron/dark, +/area/shuttle/escape) "kn" = ( /obj/machinery/light/small/directional/east, /turf/open/floor/iron/dark, @@ -753,6 +699,25 @@ }, /turf/open/floor/iron/dark, /area/shuttle/escape) +"kR" = ( +/obj/machinery/power/shuttle_engine/heater, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/window/reinforced/spawner/directional/east{ + layer = 2.9 + }, +/turf/open/floor/plating, +/area/shuttle/escape) +"lb" = ( +/obj/machinery/power/shuttle_engine/heater, +/obj/structure/window/reinforced/spawner/directional/east{ + layer = 2.9 + }, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/window/reinforced/spawner/directional/west{ + layer = 2.9 + }, +/turf/open/floor/plating, +/area/shuttle/escape) "lc" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -832,6 +797,20 @@ }, /turf/open/floor/iron/dark, /area/shuttle/escape) +"mI" = ( +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/item/stack/sheet/glass/fifty{ + layer = 4 + }, +/obj/item/stack/sheet/iron{ + amount = 20; + layer = 3.1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 10 + }, +/turf/open/floor/plating, +/area/shuttle/escape) "mK" = ( /obj/machinery/camera/directional/south{ c_tag = "Chapel Office Tunnel"; @@ -915,12 +894,6 @@ /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/iron/dark, /area/shuttle/escape) -"nQ" = ( -/obj/structure/window/reinforced/spawner/directional/east{ - layer = 2.9 - }, -/turf/open/space/basic, -/area/shuttle/escape) "oa" = ( /obj/structure/chair/wood, /turf/open/floor/carpet, @@ -937,12 +910,6 @@ /obj/machinery/vending/wardrobe/curator_wardrobe, /turf/open/floor/iron/dark, /area/shuttle/escape) -"om" = ( -/obj/structure/window/reinforced/spawner/directional/east{ - layer = 2.9 - }, -/turf/open/space, -/area/shuttle/escape) "ov" = ( /obj/machinery/light/small/directional/east, /obj/machinery/camera/directional/east{ @@ -977,6 +944,13 @@ /obj/item/book/bible, /turf/open/floor/carpet, /area/shuttle/escape) +"oF" = ( +/obj/machinery/power/shuttle_engine/propulsion, +/obj/structure/window/reinforced/spawner/directional/east{ + layer = 2.9 + }, +/turf/open/floor/plating, +/area/shuttle/escape) "oH" = ( /obj/structure/sign/picture_frame/portrait{ pixel_y = 28 @@ -1080,16 +1054,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/shuttle/escape) -"qi" = ( -/obj/structure/table/wood, -/obj/item/paper_bin{ - layer = 2.9; - pixel_x = -2; - pixel_y = 4 - }, -/obj/item/pen, -/turf/open/floor/carpet/black, -/area/shuttle/escape) "qj" = ( /obj/effect/turf_decal/sand, /turf/open/floor/iron, @@ -1101,6 +1065,15 @@ /obj/effect/turf_decal/sand, /turf/open/floor/iron, /area/shuttle/escape) +"qo" = ( +/obj/structure/window/reinforced/spawner/directional/north{ + pixel_y = 1 + }, +/obj/structure/window/reinforced/spawner/directional/east{ + layer = 2.9 + }, +/turf/open/space/basic, +/area/shuttle/escape) "qp" = ( /obj/machinery/door/airlock/grunge{ name = "Monastery Cemetery" @@ -1325,12 +1298,27 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/iron/dark, /area/shuttle/escape) +"tn" = ( +/obj/structure/window/reinforced/spawner/directional/north{ + pixel_y = 1 + }, +/obj/structure/window/reinforced/spawner/directional/west{ + layer = 2.9 + }, +/turf/open/space/basic, +/area/shuttle/escape) "tz" = ( /obj/structure/table/wood/fancy, /obj/item/storage/fancy/candle_box, /obj/machinery/light/small/directional/south, /turf/open/floor/iron/dark, /area/shuttle/escape) +"tM" = ( +/obj/structure/window/reinforced/spawner/directional/west{ + layer = 2.9 + }, +/turf/open/space, +/area/shuttle/escape) "tR" = ( /obj/structure/table/wood, /obj/machinery/computer/libraryconsole/bookmanagement, @@ -1634,19 +1622,6 @@ /obj/item/melee/flyswatter, /turf/open/floor/iron, /area/shuttle/escape) -"yP" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/condiment/saltshaker{ - layer = 3.1; - pixel_x = -2; - pixel_y = 2 - }, -/obj/item/reagent_containers/condiment/peppermill{ - pixel_x = 5; - pixel_y = 6 - }, -/turf/open/floor/iron/dark, -/area/shuttle/escape) "yR" = ( /obj/machinery/door/airlock/grunge{ name = "Chapel" @@ -1654,6 +1629,13 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/shuttle/escape) +"yY" = ( +/obj/structure/window/reinforced/spawner/directional/east{ + layer = 2.9 + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/shuttle/escape) "yZ" = ( /obj/machinery/light/small/directional/south, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -1665,20 +1647,6 @@ /obj/effect/turf_decal/tile/yellow, /turf/open/floor/iron/dark, /area/shuttle/escape) -"zh" = ( -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/item/stack/sheet/glass/fifty{ - layer = 4 - }, -/obj/item/stack/sheet/iron{ - amount = 20; - layer = 3.1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 10 - }, -/turf/open/floor/plating, -/area/shuttle/escape) "zp" = ( /obj/item/storage/bag/plants, /obj/structure/extinguisher_cabinet/directional/east, @@ -1700,6 +1668,15 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/plating, /area/shuttle/escape) +"zA" = ( +/obj/structure/window/reinforced/spawner/directional/east{ + layer = 2.9 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/shuttle/escape) "zB" = ( /obj/structure/flora/bush/pointy/style_random, /obj/structure/flora/bush/sparsegrass/style_random, @@ -1726,6 +1703,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/shuttle/escape) +"zR" = ( +/obj/structure/table/wood, +/obj/item/paper_bin{ + layer = 2.9; + pixel_x = -2; + pixel_y = 4 + }, +/turf/open/floor/iron/dark, +/area/shuttle/escape) "zU" = ( /obj/structure/dresser, /obj/structure/sign/picture_frame/portrait{ @@ -1975,6 +1961,13 @@ /obj/structure/cable, /turf/open/floor/grass, /area/shuttle/escape) +"Dg" = ( +/obj/structure/window/reinforced/spawner/directional/south, +/obj/structure/window/reinforced/spawner/directional/west{ + layer = 2.9 + }, +/turf/open/space/basic, +/area/shuttle/escape) "Dk" = ( /obj/structure/chair/wood{ dir = 8 @@ -2078,6 +2071,16 @@ }, /turf/open/floor/iron/dark, /area/shuttle/escape) +"Er" = ( +/obj/structure/table/wood, +/obj/item/paper_bin{ + layer = 2.9; + pixel_x = -2; + pixel_y = 4 + }, +/obj/item/pen, +/turf/open/floor/carpet/black, +/area/shuttle/escape) "Eu" = ( /obj/machinery/door/airlock/grunge{ name = "Library" @@ -2098,6 +2101,12 @@ "Ex" = ( /turf/open/floor/iron, /area/shuttle/escape) +"EC" = ( +/obj/structure/window/reinforced/spawner/directional/east{ + layer = 2.9 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/shuttle/escape/brig) "ED" = ( /obj/machinery/door/window/right/directional/north{ name = "Secure Art Exhibit"; @@ -2160,18 +2169,6 @@ /obj/machinery/reagentgrinder, /turf/open/floor/iron, /area/shuttle/escape) -"Fx" = ( -/obj/structure/table, -/obj/item/reagent_containers/condiment/saltshaker{ - pixel_x = 3; - pixel_y = 4 - }, -/obj/item/reagent_containers/condiment/peppermill, -/obj/item/storage/box/ingredients/wildcard{ - layer = 3.1 - }, -/turf/open/floor/iron, -/area/shuttle/escape) "FA" = ( /obj/machinery/button/crematorium{ id = "foo"; @@ -2406,12 +2403,24 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/shuttle/escape) +"Jf" = ( +/obj/machinery/power/smes/full, +/obj/structure/cable, +/turf/open/floor/plating, +/area/shuttle/escape) "Jg" = ( /obj/structure/closet/emcloset, /obj/effect/decal/cleanable/cobweb, /obj/effect/decal/cleanable/blood/old, /turf/open/floor/iron/dark, /area/shuttle/escape) +"Jj" = ( +/obj/docking_port/mobile/emergency{ + movement_force = list("KNOCKDOWN"=3,"THROW"=6); + name = "\proper a monastery with engines strapped to it" + }, +/turf/closed/mineral, +/area/shuttle/escape) "Jl" = ( /obj/structure/window/reinforced/spawner/directional/west, /turf/open/space, @@ -2430,6 +2439,15 @@ }, /turf/open/floor/carpet, /area/shuttle/escape) +"Ju" = ( +/obj/item/book/codex_gigas, +/obj/machinery/camera/directional/south{ + c_tag = "Monastery Archives Aft"; + network = list("ss13","monastery") + }, +/obj/structure/rack/skeletal, +/turf/open/floor/iron/dark, +/area/shuttle/escape) "Jv" = ( /obj/structure/flora/bush/flowers_yw/style_random, /obj/structure/flora/bush/sparsegrass/style_random, @@ -2480,6 +2498,16 @@ }, /turf/open/floor/iron/grimy, /area/shuttle/escape) +"JU" = ( +/obj/machinery/power/shuttle_engine/propulsion, +/obj/structure/window/reinforced/spawner/directional/east{ + layer = 2.9 + }, +/obj/structure/window/reinforced/spawner/directional/west{ + layer = 2.9 + }, +/turf/open/floor/plating, +/area/shuttle/escape) "JW" = ( /obj/machinery/door/airlock/grunge{ name = "Art Storage" @@ -2494,14 +2522,6 @@ /obj/structure/sink/directional/west, /turf/open/floor/iron, /area/shuttle/escape) -"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 - }, -/turf/closed/mineral, -/area/shuttle/escape) "Kd" = ( /obj/machinery/light/small/directional/west, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, @@ -2608,6 +2628,18 @@ "LK" = ( /turf/closed/wall/r_wall, /area/shuttle/escape) +"LL" = ( +/obj/structure/table, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_x = 3; + pixel_y = 4 + }, +/obj/item/reagent_containers/condiment/peppermill, +/obj/item/storage/box/ingredients/wildcard{ + layer = 3.1 + }, +/turf/open/floor/iron, +/area/shuttle/escape) "LN" = ( /obj/item/paper{ text = "Lord, today let our dreams runneth on prayer. Amen." @@ -2655,12 +2687,6 @@ }, /turf/open/floor/iron/dark, /area/shuttle/escape) -"Ms" = ( -/obj/structure/window/reinforced/spawner/directional/west{ - layer = 2.9 - }, -/turf/open/space, -/area/shuttle/escape) "Mt" = ( /obj/structure/lattice, /turf/open/space, @@ -2701,16 +2727,6 @@ }, /turf/open/floor/carpet, /area/shuttle/escape) -"Nb" = ( -/obj/machinery/power/shuttle_engine/propulsion, -/obj/structure/window/reinforced/spawner/directional/east{ - layer = 2.9 - }, -/obj/structure/window/reinforced/spawner/directional/west{ - layer = 2.9 - }, -/turf/open/floor/plating, -/area/shuttle/escape) "Nf" = ( /obj/structure/table, /obj/item/reagent_containers/condiment/flour, @@ -2734,6 +2750,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/carpet, /area/shuttle/escape) +"Ns" = ( +/obj/machinery/power/shuttle_engine/heater, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/window/reinforced/spawner/directional/west{ + layer = 2.9 + }, +/turf/open/floor/plating, +/area/shuttle/escape) "Nt" = ( /obj/structure/sign/painting/library_private{ pixel_x = -32 @@ -2864,6 +2888,13 @@ /obj/item/cultivator, /turf/open/floor/grass, /area/shuttle/escape) +"OO" = ( +/obj/structure/window/reinforced/spawner/directional/south, +/obj/structure/window/reinforced/spawner/directional/east{ + layer = 2.9 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/shuttle/escape/brig) "OW" = ( /obj/item/seeds/banana, /obj/item/seeds/grass, @@ -2874,14 +2905,6 @@ /obj/structure/window/reinforced/spawner/directional/south, /turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) -"Pb" = ( -/obj/machinery/power/shuttle_engine/heater, -/obj/structure/window/reinforced/spawner/directional/north, -/obj/structure/window/reinforced/spawner/directional/east{ - layer = 2.9 - }, -/turf/open/floor/plating, -/area/shuttle/escape) "Pe" = ( /obj/structure/flora/bush/ferny/style_random, /turf/open/misc/asteroid, @@ -2962,14 +2985,19 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/shuttle/escape) -"Qj" = ( -/obj/structure/table/wood, -/obj/item/paper_bin{ - layer = 2.9; - pixel_x = -2; - pixel_y = 4 +"Qi" = ( +/obj/structure/window/reinforced/spawner/directional/south, +/obj/structure/window/reinforced/spawner/directional/east{ + layer = 2.9 }, -/obj/item/pen, +/turf/open/space/basic, +/area/shuttle/escape) +"Ql" = ( +/obj/machinery/mass_driver/chapelgun, +/obj/structure/window/reinforced/spawner/directional/east{ + layer = 2.9 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/shuttle/escape) "Qq" = ( @@ -3042,6 +3070,12 @@ /obj/item/seeds/poppy, /turf/open/floor/grass, /area/shuttle/escape) +"Re" = ( +/obj/structure/window/reinforced/spawner/directional/east{ + layer = 2.9 + }, +/turf/open/space/basic, +/area/shuttle/escape) "Rg" = ( /obj/structure/bed, /obj/item/bedsheet/yellow, @@ -3244,12 +3278,6 @@ }, /turf/open/floor/iron/dark, /area/shuttle/escape) -"SU" = ( -/obj/structure/window/reinforced/spawner/directional/east{ - layer = 2.9 - }, -/turf/open/floor/mineral/plastitanium/red, -/area/shuttle/escape/brig) "SV" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 @@ -3424,6 +3452,16 @@ }, /turf/open/floor/iron/dark, /area/shuttle/escape) +"UP" = ( +/obj/structure/window/reinforced/spawner/directional/south, +/obj/structure/window/reinforced/spawner/directional/west{ + layer = 2.9 + }, +/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer2{ + name = "Outlet Injector" + }, +/turf/open/floor/plating/airless, +/area/shuttle/escape) "UQ" = ( /obj/machinery/door/airlock/external/ruin{ name = "Pod Docking Bay" @@ -3433,6 +3471,19 @@ }, /turf/open/floor/plating, /area/shuttle/escape) +"UV" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/condiment/saltshaker{ + layer = 3.1; + pixel_x = -2; + pixel_y = 2 + }, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_x = 5; + pixel_y = 6 + }, +/turf/open/floor/iron/dark, +/area/shuttle/escape) "Ve" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -3487,24 +3538,6 @@ /obj/machinery/power/shuttle_engine/propulsion, /turf/open/floor/plating, /area/shuttle/escape) -"VF" = ( -/obj/structure/window/reinforced/spawner/directional/south, -/obj/structure/window/reinforced/spawner/directional/west{ - layer = 2.9 - }, -/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer2{ - name = "Outlet Injector" - }, -/turf/open/floor/plating/airless, -/area/shuttle/escape) -"VM" = ( -/obj/machinery/mass_driver/chapelgun, -/obj/structure/window/reinforced/spawner/directional/east{ - layer = 2.9 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/dark, -/area/shuttle/escape) "VN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 6 @@ -3520,15 +3553,6 @@ }, /turf/open/floor/iron, /area/shuttle/escape) -"Wd" = ( -/obj/item/book/codex_gigas, -/obj/machinery/camera/directional/south{ - c_tag = "Monastery Archives Aft"; - network = list("ss13","monastery") - }, -/obj/structure/rack/skeletal, -/turf/open/floor/iron/dark, -/area/shuttle/escape) "We" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, @@ -3631,15 +3655,6 @@ }, /turf/open/floor/iron/dark, /area/shuttle/escape) -"Xx" = ( -/obj/structure/window/reinforced/spawner/directional/east{ - layer = 2.9 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/shuttle/escape) "XF" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -3746,15 +3761,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/carpet, /area/shuttle/escape) -"YU" = ( -/obj/structure/window/reinforced/spawner/directional/north{ - pixel_y = 1 - }, -/obj/structure/window/reinforced/spawner/directional/east{ - layer = 2.9 - }, -/turf/open/space/basic, -/area/shuttle/escape) "YZ" = ( /obj/structure/table/wood, /obj/item/storage/bag/books, @@ -3795,13 +3801,6 @@ /obj/machinery/newscaster/directional/south, /turf/open/floor/iron/dark, /area/shuttle/escape) -"Zn" = ( -/obj/structure/window/reinforced/spawner/directional/south, -/obj/structure/window/reinforced/spawner/directional/east{ - layer = 2.9 - }, -/turf/open/floor/mineral/plastitanium/red, -/area/shuttle/escape/brig) "Zr" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, @@ -3881,7 +3880,7 @@ JG JG JG Ho -JZ +Jj zE lc zE @@ -4115,7 +4114,7 @@ nr pv Kf Fm -qi +Er ux nr nr @@ -4380,8 +4379,8 @@ nr nr nr nr -om -nQ +hl +Re JG JG JG @@ -4453,7 +4452,7 @@ Ac CA Dr Ex -Fx +LL nr nr nr @@ -4546,7 +4545,7 @@ jx YC Km zE -YU +qo JG JG JG @@ -4790,8 +4789,8 @@ oa QY Sq Tp -VM -Xx +Ql +zA jn JG JG @@ -4924,11 +4923,11 @@ iw iw gl zE -SU +EC Zh -SU -SU -Zn +EC +EC +OO jc jc Pe @@ -4956,7 +4955,7 @@ jx nl Km zE -hV +tn JG JG JG @@ -5027,7 +5026,7 @@ zP CM BX Gv -yP +UV nr nr nr @@ -5118,8 +5117,8 @@ nr nr nr nr -aT -aT +ao +ao JG JG JG @@ -5197,7 +5196,7 @@ JA yc yc yc -cb +Jf sf nr VN @@ -5279,7 +5278,7 @@ Tk bI vj yc -cb +Jf sf Tt dn @@ -5309,8 +5308,8 @@ Ho Ho Ho Ho -bC -Nb +lb +JU JG JG JG @@ -5483,10 +5482,10 @@ JG (21,1,1) = {" af af -nQ -aW -nQ -bl +Re +yY +Re +Qi zE jc jc @@ -5771,7 +5770,7 @@ Kg oc ZM yc -zh +mI SQ yh Wo @@ -5809,7 +5808,7 @@ JG JG "} (25,1,1) = {" -VF +UP Sg ow WG @@ -6056,7 +6055,7 @@ JG "} (28,1,1) = {" JG -aN +Dg zE wt Mf @@ -6126,7 +6125,7 @@ ID fY pD Iw -Wd +Ju zE JG JG @@ -6215,8 +6214,8 @@ JG Ho Ho Ho -jt -bx +Ns +cN "} (30,1,1) = {" JG @@ -6282,7 +6281,7 @@ Am WM jx cZ -hZ +zR Vt YZ Xu @@ -6379,18 +6378,18 @@ PB Ho Ho Ho -Pb -hC +kR +oF "} (32,1,1) = {" JG JG -aT -aT -Ms -Ms -Ms -aT +ao +ao +tM +tM +tM +ao JG JG JG @@ -6441,7 +6440,7 @@ JG JG JG nr -Qj +km Am WM jx 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" = (