From fdfe685de545cffc9ff1bb30186488ca998f1bbb Mon Sep 17 00:00:00 2001 From: Corvid Date: Fri, 28 Jul 2023 12:09:33 -0400 Subject: [PATCH] Makes latejoins wake up from cryostasis instead of arriving on a shuttle (#2466) --- _maps/atlas.json | 1 - _maps/map_files/Aetherwhisp/Aetherwhisp1.dmm | 22 +- _maps/map_files/Atlas/atlas2.dmm | 31 +- _maps/map_files/Eclipse/Eclipse1.dmm | 345 +++++++++---------- _maps/map_files/Galactica/Galactica1.dmm | 30 +- _maps/map_files/Galactica/Galactica2.dmm | 282 ++++++--------- _maps/map_files/Gladius/Gladius2.dmm | 36 +- _maps/map_files/Hammerhead/Hammerhead.dmm | 31 +- _maps/map_files/Serendipity/Serendipity1.dmm | 42 ++- _maps/map_files/Shrike/Shrike2.dmm | 76 +++- _maps/map_files/Snake/snake_lower.dmm | 25 +- _maps/map_files/Tycoon/Tycoon2.dmm | 41 ++- _maps/map_files/Vago/vagodeck1.dmm | 14 +- _maps/map_files/Vago/vagodeck2.dmm | 12 +- _maps/serendipity.json | 1 - nsv13/code/datums/shuttles.dm | 4 - 16 files changed, 498 insertions(+), 495 deletions(-) diff --git a/_maps/atlas.json b/_maps/atlas.json index 90c14ca0756..d48389e0ec0 100644 --- a/_maps/atlas.json +++ b/_maps/atlas.json @@ -21,7 +21,6 @@ "shuttles": { "cargo": "cargo_atlas", "ferry": "ferry_fancy", - "arrival": "arrival_atlas", "emergency": "emergency_atlas" }, "mine_disable": 1, diff --git a/_maps/map_files/Aetherwhisp/Aetherwhisp1.dmm b/_maps/map_files/Aetherwhisp/Aetherwhisp1.dmm index 79bd410f527..e1f85fe0fa4 100644 --- a/_maps/map_files/Aetherwhisp/Aetherwhisp1.dmm +++ b/_maps/map_files/Aetherwhisp/Aetherwhisp1.dmm @@ -1627,18 +1627,6 @@ }, /turf/open/floor/engine, /area/engine/engineering/reactor_core) -"aTc" = ( -/obj/docking_port/stationary{ - dir = 8; - dwidth = 3; - height = 15; - id = "arrivals_stationary"; - name = "Deck 2 Arrivals Port"; - roundstart_template = /datum/map_template/shuttle/arrival/aetherwhisp; - width = 7 - }, -/turf/open/space/basic, -/area/space/nearstation) "aTh" = ( /obj/machinery/status_display/evac, /turf/closed/wall/ship, @@ -10818,6 +10806,7 @@ /turf/open/floor/carpet/blue, /area/medical/medbay/lobby) "hba" = ( +/obj/effect/landmark/latejoin, /turf/open/floor/carpet/ship, /area/crew_quarters/cryopods) "hbl" = ( @@ -18593,6 +18582,7 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, +/obj/effect/landmark/latejoin, /turf/open/floor/carpet/ship, /area/crew_quarters/cryopods) "mnZ" = ( @@ -21720,6 +21710,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, +/obj/effect/landmark/latejoin, /turf/open/floor/carpet/ship, /area/crew_quarters/cryopods) "ond" = ( @@ -29999,6 +29990,7 @@ /area/medical/medbay/lobby) "tDB" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/landmark/latejoin, /turf/open/floor/carpet/ship, /area/crew_quarters/cryopods) "tEQ" = ( @@ -32622,6 +32614,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/landmark/latejoin, /turf/open/floor/carpet/ship, /area/crew_quarters/cryopods) "vzU" = ( @@ -34382,6 +34375,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/landmark/latejoin, /turf/open/floor/carpet/ship, /area/crew_quarters/cryopods) "wQb" = ( @@ -34760,6 +34754,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/landmark/latejoin, /turf/open/floor/carpet/ship, /area/crew_quarters/cryopods) "xeT" = ( @@ -36036,6 +36031,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, +/obj/effect/landmark/latejoin, /turf/open/floor/carpet/ship, /area/crew_quarters/cryopods) "xWT" = ( @@ -69507,7 +69503,7 @@ baX baX baX baX -aTc +baX baX baX baX diff --git a/_maps/map_files/Atlas/atlas2.dmm b/_maps/map_files/Atlas/atlas2.dmm index 2254431c648..52d2c585435 100644 --- a/_maps/map_files/Atlas/atlas2.dmm +++ b/_maps/map_files/Atlas/atlas2.dmm @@ -2267,6 +2267,16 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/bridge/cic) +"kc" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/effect/landmark/latejoin, +/turf/open/floor/monotile/steel, +/area/hallway/nsv/deck1/hallway) "ke" = ( /obj/effect/turf_decal/tile/ship/brown{ dir = 1 @@ -3516,18 +3526,6 @@ "pT" = ( /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/ai) -"pU" = ( -/obj/docking_port/stationary{ - dir = 4; - dwidth = 3; - height = 15; - id = "arrivals_stationary"; - name = "Atlas Arrivals"; - roundstart_template = /datum/map_template/shuttle/arrival/atlas; - width = 7 - }, -/turf/open/floor/engine/airless, -/area/space/nearstation) "pW" = ( /turf/open/floor/plating/airless, /area/space/nearstation) @@ -3957,6 +3955,7 @@ dir = 8 }, /obj/effect/turf_decal/tile/ship/green, +/obj/effect/landmark/latejoin, /turf/open/floor/durasteel/alt, /area/hallway/nsv/deck1/hallway) "sd" = ( @@ -5345,6 +5344,7 @@ pixel_y = 26 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/effect/landmark/latejoin, /turf/open/floor/carpet/green, /area/hallway/nsv/deck1/hallway) "ys" = ( @@ -5907,6 +5907,7 @@ dir = 8 }, /obj/effect/turf_decal/tile/ship/green, +/obj/effect/landmark/latejoin, /turf/open/floor/durasteel/alt, /area/hallway/nsv/deck1/hallway) "Bl" = ( @@ -7214,6 +7215,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/landmark/latejoin, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck1/hallway) "Hh" = ( @@ -9683,6 +9685,7 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 1 }, +/obj/effect/landmark/latejoin, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck1/hallway) "RC" = ( @@ -48517,7 +48520,7 @@ mK Am Am PT -ST +kc sc cH xT @@ -50577,7 +50580,7 @@ KN cx cx cx -pU +cx cx cx cx diff --git a/_maps/map_files/Eclipse/Eclipse1.dmm b/_maps/map_files/Eclipse/Eclipse1.dmm index 488f39f9c04..1a731eb322c 100644 --- a/_maps/map_files/Eclipse/Eclipse1.dmm +++ b/_maps/map_files/Eclipse/Eclipse1.dmm @@ -153,6 +153,7 @@ /obj/structure/cable{ icon_state = "0-8" }, +/obj/effect/landmark/latejoin, /turf/open/floor/plasteel/dark/side{ dir = 4 }, @@ -1366,6 +1367,7 @@ /obj/machinery/camera/autoname{ dir = 4 }, +/obj/effect/landmark/latejoin, /turf/open/floor/plasteel/dark/side{ dir = 8 }, @@ -2166,6 +2168,7 @@ /area/maintenance/aft) "jh" = ( /obj/machinery/firealarm/directional/west, +/obj/effect/landmark/latejoin, /turf/open/floor/plasteel/dark/side{ dir = 8 }, @@ -3498,6 +3501,7 @@ /turf/open/floor/monotile/dark, /area/hallway/primary/fore) "of" = ( +/obj/effect/landmark/latejoin, /turf/open/floor/plasteel/dark/side{ dir = 8 }, @@ -3857,18 +3861,6 @@ }, /turf/open/floor/monotile/dark, /area/hallway/primary/fore) -"pB" = ( -/obj/docking_port/stationary{ - dir = 8; - dwidth = 3; - height = 15; - id = "arrivals_stationary"; - name = "arrivals"; - roundstart_template = /datum/map_template/shuttle/arrival/box; - width = 7 - }, -/turf/open/space/basic, -/area/space/nearstation) "pC" = ( /obj/machinery/door/airlock/ship/hatch, /obj/machinery/door/firedoor/border_only/directional/south, @@ -3965,6 +3957,7 @@ pixel_y = -22; req_one_access = null }, +/obj/effect/landmark/latejoin, /turf/open/floor/monotile/dark, /area/crew_quarters/cryopods) "qa" = ( @@ -4469,12 +4462,6 @@ "sx" = ( /turf/open/floor/plasteel/dark/side, /area/construction) -"sy" = ( -/obj/effect/turf_decal/stripes/full, -/obj/structure/window/spawner, -/obj/structure/window/spawner/north, -/turf/open/floor/plating, -/area/space/nearstation) "sz" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable{ @@ -5663,6 +5650,7 @@ /obj/machinery/light{ dir = 4 }, +/obj/effect/landmark/latejoin, /turf/open/floor/plasteel/dark/side{ dir = 4 }, @@ -6389,6 +6377,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/landmark/latejoin, /turf/open/floor/plasteel/dark/side{ dir = 8 }, @@ -7439,6 +7428,7 @@ /obj/structure/cable{ icon_state = "1-8" }, +/obj/effect/landmark/latejoin, /turf/open/floor/monotile/dark, /area/crew_quarters/cryopods) "EY" = ( @@ -9046,6 +9036,7 @@ /turf/open/floor/monotile/steel, /area/engine/gravity_generator) "LK" = ( +/obj/effect/landmark/latejoin, /turf/open/floor/plasteel/dark/side{ dir = 4 }, @@ -10113,6 +10104,7 @@ }, /area/hallway/primary/fore) "PK" = ( +/obj/effect/landmark/latejoin, /turf/open/floor/monotile/dark, /area/crew_quarters/cryopods) "PN" = ( @@ -11105,6 +11097,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/landmark/latejoin, /turf/open/floor/monotile/dark, /area/crew_quarters/cryopods) "TI" = ( @@ -36407,16 +36400,16 @@ gX gX gX gX -le -Ti -Ti -Ti -Ti -Ti -Ti -Ti -Ti -Ti +gX +gX +gX +gX +gX +gX +gX +gX +gX +gX rK kU Ea @@ -36664,16 +36657,16 @@ gX gX gX gX -kw -Lm -Lm -Lm -Lm -Lm -Lm -Lm -Lm -Lm +gX +gX +gX +gX +gX +gX +gX +gX +gX +gX VY VY KA @@ -36921,16 +36914,16 @@ gX gX gX gX -le -Lm -Lm -Lm -Lm -Lm -Lm -Lm -Lm -Lm +gX +gX +gX +gX +gX +gX +gX +gX +gX +gX VY Pi jp @@ -37178,16 +37171,16 @@ gX gX gX gX -le -Lm -Lm -Lm -Lm -Lm -Lm -Lm -Lm -Lm +gX +gX +gX +gX +mj +gX +gX +gX +gX +gX VY mL jp @@ -37435,16 +37428,16 @@ gX gX gX gX -kw -Lm -Lm -Lm -Lm -Lm -Lm -Lm -Lm -Lm +gX +gX +gX +gX +zZ +gX +gX +gX +gX +gX VY Pi jp @@ -37692,14 +37685,14 @@ gX gX gX gX -sy -Lm -Lm -Lm -Lm -Lm -Lm -Lm +gX +gX +gX +gX +zZ +gX +gX +gX VY VY VY @@ -37949,14 +37942,14 @@ gX gX gX gX -sy -Lm -Lm -Lm -Lm -Lm -Lm -Lm +gX +gX +gX +gX +zZ +gX +gX +gX Ug vr bC @@ -38206,14 +38199,14 @@ gX gX gX gX -sy -Lm -Lm -Lm -Lm -Lm -Lm -Lm +gX +gX +gX +gX +zZ +Gs +Gs +Gs VY VY VY @@ -38463,16 +38456,16 @@ gX gX gX gX -kw -Lm -Lm -Lm -Lm -Lm -Lm -Lm -Lm -Lm +gX +gX +gX +gX +zZ +gX +gX +gX +gX +gX jr VB ob @@ -38720,16 +38713,16 @@ gX gX gX gX -le -Lm -Lm -Lm -Lm -Lm -Lm -Lm -Lm -Lm +gX +gX +gX +gX +zZ +gX +gX +gX +gX +gX jr Pi jp @@ -38977,16 +38970,16 @@ gX gX gX gX -le -Lm -Lm -Lm -Lm -Lm -Lm -Lm -Lm -Lm +gX +gX +gX +gX +mj +gX +gX +gX +gX +gX jr Pi Qr @@ -39234,16 +39227,16 @@ gX gX gX gX -kw -Lm -Lm -Lm -Lm -Lm -Lm -Lm -Lm -Lm +gX +gX +gX +gX +zZ +gX +gX +gX +gX +gX jr Pi jp @@ -39491,14 +39484,14 @@ gX gX gX gX -sy -Lm -Lm -Lm -Lm -Lm -Lm -Lm +gX +gX +gX +gX +zZ +gX +gX +gX VY VY VY @@ -39748,14 +39741,14 @@ gX gX gX gX -sy -Lm -Lm -Lm -Lm -Lm -Lm -Lm +gX +gX +gX +gX +zZ +Gs +Gs +Gs Ug vr bC @@ -40005,14 +39998,14 @@ gX gX gX gX -sy -Lm -Lm -Lm -Lm -Lm -Lm -Lm +gX +gX +gX +gX +zZ +gX +gX +gX VY VY VY @@ -40262,16 +40255,16 @@ gX gX gX gX -kw -Lm -Lm -Lm -pB -Lm -Lm -Lm -Lm -Lm +gX +gX +gX +gX +zZ +gX +gX +gX +gX +gX VY Pi jp @@ -40519,16 +40512,16 @@ gX gX gX gX -le -Ti -Ti -Ti -Ti -Ti -Ti -Ti -Ti -Ti +gX +gX +gX +gX +mj +gX +gX +gX +gX +gX VY wN jp diff --git a/_maps/map_files/Galactica/Galactica1.dmm b/_maps/map_files/Galactica/Galactica1.dmm index 0cc8182c59e..6101a9cafea 100644 --- a/_maps/map_files/Galactica/Galactica1.dmm +++ b/_maps/map_files/Galactica/Galactica1.dmm @@ -2406,6 +2406,7 @@ /obj/effect/turf_decal/tile/ship/half/green{ dir = 1 }, +/obj/effect/landmark/latejoin, /turf/open/floor/monotile/steel, /area/crew_quarters/dorms) "gv" = ( @@ -4227,6 +4228,7 @@ /obj/effect/turf_decal/tile/ship/green{ dir = 8 }, +/obj/effect/landmark/latejoin, /turf/open/floor/monotile/steel, /area/crew_quarters/dorms) "kZ" = ( @@ -7484,6 +7486,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/ship/half/green, +/obj/effect/landmark/latejoin, /turf/open/floor/monotile/steel, /area/crew_quarters/dorms) "tk" = ( @@ -11980,6 +11983,13 @@ }, /turf/open/floor/monotile/steel, /area/bridge/cic) +"Fd" = ( +/obj/effect/turf_decal/tile/ship/half/neutral{ + dir = 4 + }, +/obj/effect/landmark/latejoin, +/turf/open/floor/monotile/steel, +/area/crew_quarters/dorms) "Fe" = ( /obj/machinery/door/airlock/ship/maintenance{ req_access_txt = "12" @@ -13932,6 +13942,7 @@ /obj/effect/turf_decal/tile/ship/green{ dir = 1 }, +/obj/effect/landmark/latejoin, /turf/open/floor/monotile/steel, /area/crew_quarters/dorms) "JP" = ( @@ -14919,6 +14930,10 @@ /obj/effect/landmark/zebra_interlock_point, /turf/open/floor/durasteel, /area/storage/tech) +"Mi" = ( +/obj/effect/landmark/latejoin, +/turf/open/floor/monotile/steel, +/area/crew_quarters/dorms) "Mj" = ( /obj/effect/turf_decal/tile/ship/yellow{ dir = 4 @@ -16289,6 +16304,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, +/obj/effect/landmark/latejoin, /turf/open/floor/monotile/steel, /area/crew_quarters/dorms) "PM" = ( @@ -50239,8 +50255,8 @@ Uu QS dx YI -Tu -Tu +Mi +Mi IW dx Mu @@ -50496,8 +50512,8 @@ Tu tV dx gu -Tu -Tu +Mi +Mi tj dx MD @@ -50753,8 +50769,8 @@ Tu BC dx xB -Tu -Tu +Mi +Mi zP kc MD @@ -51011,7 +51027,7 @@ Tf dx JO PK -aZ +Fd kY jp MD diff --git a/_maps/map_files/Galactica/Galactica2.dmm b/_maps/map_files/Galactica/Galactica2.dmm index fd5092ac60c..cd872131666 100644 --- a/_maps/map_files/Galactica/Galactica2.dmm +++ b/_maps/map_files/Galactica/Galactica2.dmm @@ -12182,14 +12182,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/plating, /area/medical/chemistry) -"gyh" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 - }, -/turf/open/floor/monotile/dark/airless, -/area/space/nearstation) "gyr" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -12735,15 +12727,6 @@ }, /turf/open/floor/monotile/steel, /area/shuttle/turbolift/secondary) -"gHI" = ( -/obj/structure/lattice, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 - }, -/turf/open/space/basic, -/area/space/nearstation) "gHN" = ( /obj/effect/turf_decal/tile/ship/half/purple{ dir = 8 @@ -18620,18 +18603,6 @@ }, /turf/open/floor/monotile/steel, /area/nsv/weapons/gauss/battery) -"jSQ" = ( -/obj/docking_port/stationary{ - dir = 8; - dwidth = 3; - height = 15; - id = "arrivals_stationary"; - name = "arrivals"; - roundstart_template = /datum/map_template/shuttle/arrival/box; - width = 7 - }, -/turf/open/floor/plating/airless, -/area/space/nearstation) "jTc" = ( /obj/structure/chair/office/light{ dir = 1 @@ -28215,15 +28186,6 @@ /obj/machinery/atmospherics/miner/oxygen, /turf/open/floor/engine/o2, /area/engine/atmos) -"pay" = ( -/obj/structure/lattice, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/turf/open/space/basic, -/area/space/nearstation) "paE" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible, /obj/effect/turf_decal/tile/yellow{ @@ -33700,14 +33662,6 @@ }, /turf/open/floor/eighties, /area/crew_quarters/theatre) -"sfd" = ( -/obj/structure/lattice, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/open/space/basic, -/area/space/nearstation) "sfq" = ( /turf/open/floor/wood, /area/crew_quarters/theatre) @@ -41498,18 +41452,6 @@ /obj/machinery/lazylift_button, /turf/closed/wall/r_wall, /area/shuttle/turbolift/secondary) -"wjt" = ( -/obj/structure/lattice, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 - }, -/turf/open/space/basic, -/area/space/nearstation) "wjA" = ( /turf/closed/wall/steel, /area/hallway/nsv/deck2/primary) @@ -94410,9 +94352,9 @@ huS kCL kCL kCL -kCL -kCL -qYd +krf +tuN +usq kCL kCL kCL @@ -94667,16 +94609,16 @@ huS kCL kCL kCL +udK kCL -kCL -qYd +jKD kCL kCL kCL dyN -krf -tuN -usq +dyN +dyN +dyN dyN dyN dyN @@ -94924,16 +94866,16 @@ qif kCL kCL kCL +pmN kCL -kCL -qYd -kCL +riV kCL kCL -gyh -udK kCL -jKD +dyN +dyN +dyN +dyN dyN dyN dyN @@ -95181,16 +95123,16 @@ qif kCL kCL kCL +pmN kCL -kCL -qYd -kCL +jKD kCL kCL -gyh -pmN kCL -riV +dyN +dyN +dyN +dyN dyN dyN dyN @@ -95438,16 +95380,16 @@ lju kCL kCL kCL +udK kCL -kCL -qYd -kCL +bPu kCL kCL -gHI -pmN kCL -jKD +dyN +dyN +dyN +dyN dyN dyN dyN @@ -95695,16 +95637,16 @@ lju kCL kCL kCL +pmN kCL -kCL -qYd -kCL +jKD kCL kCL -gHI -udK kCL -bPu +dyN +dyN +dyN +dyN dyN dyN dyN @@ -95952,16 +95894,16 @@ lju lju lju kCL +pmN kCL -kCL -qYd +riV kCL kCL kCL -gHI -pmN -kCL -jKD +dyN +dyN +dyN +dyN dyN dyN dyN @@ -96209,16 +96151,16 @@ aCk fsv iZn qYd +udK +kCL +jKD qYd qYd qYd -qYd -qYd -qYd -gHI -pmN -kCL -riV +dyN +dyN +dyN +dyN dyN dyN dyN @@ -96466,16 +96408,16 @@ lju qif lju kCL +pmN kCL -kCL -qYd -kCL +qFr kCL kCL -gHI -udK kCL -jKD +dyN +dyN +dyN +dyN dyN dyN dyN @@ -96723,16 +96665,16 @@ bYC bOQ qif kCL +pmN kCL -kCL -qYd -kCL +jKD kCL kCL -gHI -pmN kCL -qFr +dyN +dyN +dyN +dyN dyN dyN dyN @@ -96980,16 +96922,16 @@ lfn lfn qif kCL +udK kCL -kCL -qYd -kCL +qZh kCL kCL -gHI -pmN kCL -jKD +dyN +dyN +dyN +dyN dyN dyN dyN @@ -97237,16 +97179,16 @@ lfn lfn qif kCL +pmN kCL -kCL -qYd -kCL +jKD kCL kCL -gHI -udK kCL -qZh +dyN +dyN +dyN +dyN dyN dyN dyN @@ -97494,16 +97436,16 @@ rvV rvV qif kCL +pmN kCL -kCL -qYd -kCL +oxp kCL kCL -gHI -pmN kCL -jKD +dyN +dyN +dyN +dyN dyN dyN dyN @@ -97751,16 +97693,16 @@ lju qif lju kCL +udK kCL -kCL -qYd -kCL +jKD kCL kCL -gHI -pmN kCL -oxp +dyN +dyN +dyN +dyN dyN dyN dyN @@ -98008,16 +97950,16 @@ aCk hZb iZn qYd +pmN +kCL +xGc qYd qYd qYd -qYd -qYd -qYd -gHI -udK -kCL -jKD +dyN +dyN +dyN +dyN dyN dyN dyN @@ -98265,16 +98207,16 @@ lju lju lju kCL +pmN kCL -kCL -qYd +jKD kCL kCL kCL dyN -pmN -kCL -xGc +dyN +dyN +dyN dyN dyN dyN @@ -98522,16 +98464,16 @@ lju kCL kCL kCL +udK kCL -kCL -jSQ +riV kCL kCL kCL dyN -pmN -kCL -jKD +dyN +dyN +dyN dyN dyN dyN @@ -98777,18 +98719,18 @@ fxX rDk lju dyN -pay dyN dyN -sfd -sfd -sfd +pmN +kCL +jKD +dyN +dyN +dyN +dyN +dyN dyN dyN -wjt -udK -kCL -riV dyN dyN dyN @@ -99036,6 +98978,9 @@ lju dyN dyN dyN +qiV +uWX +bZt dyN dyN dyN @@ -99043,9 +98988,6 @@ dyN dyN dyN dyN -pmN -kCL -jKD dyN dyN dyN @@ -99300,9 +99242,9 @@ dyN dyN dyN dyN -qiV -uWX -bZt +dyN +dyN +dyN dyN dyN dyN diff --git a/_maps/map_files/Gladius/Gladius2.dmm b/_maps/map_files/Gladius/Gladius2.dmm index 136939f9a1d..f73194c193d 100644 --- a/_maps/map_files/Gladius/Gladius2.dmm +++ b/_maps/map_files/Gladius/Gladius2.dmm @@ -784,6 +784,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, +/obj/effect/landmark/latejoin, /turf/open/floor/monotile/light, /area/crew_quarters/cryopods) "aBd" = ( @@ -3633,6 +3634,7 @@ dir = 8 }, /obj/structure/disposalpipe/segment, +/obj/effect/landmark/latejoin, /turf/open/floor/monotile/light, /area/crew_quarters/cryopods) "ctg" = ( @@ -4267,6 +4269,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/landmark/latejoin, /turf/open/floor/monotile/light, /area/crew_quarters/cryopods) "cKf" = ( @@ -9513,6 +9516,7 @@ dir = 8 }, /obj/structure/disposalpipe/segment, +/obj/effect/landmark/latejoin, /turf/open/floor/monotile/light, /area/crew_quarters/cryopods) "fJl" = ( @@ -10135,6 +10139,7 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, +/obj/effect/landmark/latejoin, /turf/open/floor/monotile/light, /area/crew_quarters/cryopods) "gam" = ( @@ -10244,6 +10249,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/effect/landmark/latejoin, /turf/open/floor/monotile/light, /area/crew_quarters/cryopods) "gcr" = ( @@ -12458,6 +12464,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/landmark/latejoin, /turf/open/floor/monotile/light, /area/crew_quarters/cryopods) "hpA" = ( @@ -13034,6 +13041,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/effect/landmark/latejoin, /turf/open/floor/monotile/light, /area/crew_quarters/cryopods) "hGN" = ( @@ -15645,6 +15653,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/landmark/latejoin, /turf/open/floor/monotile/light, /area/crew_quarters/cryopods) "jcf" = ( @@ -16294,6 +16303,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/effect/landmark/latejoin, /turf/open/floor/monotile/light, /area/crew_quarters/cryopods) "jwZ" = ( @@ -21379,6 +21389,7 @@ /obj/structure/cable{ icon_state = "1-8" }, +/obj/effect/landmark/latejoin, /turf/open/floor/monotile/light, /area/crew_quarters/cryopods) "msH" = ( @@ -24521,6 +24532,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, +/obj/effect/landmark/latejoin, /turf/open/floor/monotile/light, /area/crew_quarters/cryopods) "oeL" = ( @@ -28963,6 +28975,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, +/obj/effect/landmark/latejoin, /turf/open/floor/monotile/light, /area/crew_quarters/cryopods) "qDC" = ( @@ -30699,6 +30712,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, +/obj/effect/landmark/latejoin, /turf/open/floor/monotile/light, /area/crew_quarters/cryopods) "rxc" = ( @@ -36362,6 +36376,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/landmark/latejoin, /turf/open/floor/monotile/light, /area/crew_quarters/cryopods) "uJJ" = ( @@ -36493,6 +36508,7 @@ /obj/machinery/computer/lore_terminal{ pixel_x = 6 }, +/obj/effect/landmark/latejoin, /turf/open/floor/monotile/light, /area/crew_quarters/cryopods) "uOv" = ( @@ -37704,6 +37720,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/landmark/latejoin, /turf/open/floor/monotile/light, /area/crew_quarters/cryopods) "vCU" = ( @@ -38403,6 +38420,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/effect/landmark/latejoin, /turf/open/floor/monotile/light, /area/crew_quarters/cryopods) "vXY" = ( @@ -38914,6 +38932,7 @@ /obj/structure/cable{ icon_state = "0-2" }, +/obj/effect/landmark/latejoin, /turf/open/floor/monotile/light, /area/crew_quarters/cryopods) "wnO" = ( @@ -39367,6 +39386,7 @@ /area/chapel/main) "wAC" = ( /obj/effect/turf_decal/stripes/line, +/obj/effect/landmark/latejoin, /turf/open/floor/monotile/light, /area/crew_quarters/cryopods) "wAT" = ( @@ -40509,18 +40529,6 @@ /obj/machinery/field/generator, /turf/open/floor/plating, /area/engine/storage) -"xlz" = ( -/obj/docking_port/stationary{ - dir = 2; - dwidth = 3; - height = 14; - id = "arrivals_stationary"; - name = "gladius arrivals"; - roundstart_template = /datum/map_template/shuttle/arrival/gladius; - width = 7 - }, -/turf/open/space/basic, -/area/space/nearstation) "xlA" = ( /obj/structure/closet/secure_closet/brig{ id = "engcell"; @@ -40911,6 +40919,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/landmark/latejoin, /turf/open/floor/monotile/light, /area/crew_quarters/cryopods) "xwF" = ( @@ -42037,6 +42046,7 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, +/obj/effect/landmark/latejoin, /turf/open/floor/monotile/light, /area/crew_quarters/cryopods) "yfJ" = ( @@ -75777,7 +75787,7 @@ oYR gJw iCo qQs -xlz +fiL fiL fiL fiL diff --git a/_maps/map_files/Hammerhead/Hammerhead.dmm b/_maps/map_files/Hammerhead/Hammerhead.dmm index 5970ed0aacb..9d710ca83be 100644 --- a/_maps/map_files/Hammerhead/Hammerhead.dmm +++ b/_maps/map_files/Hammerhead/Hammerhead.dmm @@ -18049,17 +18049,9 @@ /turf/open/floor/plating/airless, /area/space/nearstation) "bfN" = ( -/obj/docking_port/stationary{ - dir = 8; - dwidth = 3; - height = 15; - id = "arrivals_stationary"; - name = "arrivals"; - roundstart_template = /datum/map_template/shuttle/arrival/box; - width = 7 - }, -/turf/open/space/basic, -/area/space/nearstation) +/obj/effect/landmark/latejoin, +/turf/open/floor/durasteel/eris_techfloor_alt, +/area/hallway/primary/central) "bfO" = ( /obj/structure/hull_plate, /obj/effect/turf_decal/stripes/line{ @@ -50984,6 +50976,7 @@ /turf/open/floor/plasteel, /area/engine/engineering) "uOc" = ( +/obj/effect/landmark/latejoin, /turf/open/floor/durasteel/eris_techfloor_alt, /area/maintenance/department/crew_quarters/dorms) "uOp" = ( @@ -81035,7 +81028,7 @@ aaa aaa aaa aaa -bfN +fkN aaa aaa aaa @@ -89506,7 +89499,7 @@ aLW dQn aVo sbf -abO +bfN abP aXP ayy @@ -89763,7 +89756,7 @@ aLW aiM aLW oeJ -abO +bfN aBN auq ayy @@ -90020,7 +90013,7 @@ aLW aiM aLW wGc -abO +bfN abP hZb aws @@ -90277,7 +90270,7 @@ aLW aiM aLW uOc -abO +bfN abP aMP anS @@ -90534,7 +90527,7 @@ wHc aiM aLW oeJ -abO +bfN gln aXK ayy @@ -90791,7 +90784,7 @@ wHc aiM aLW wGc -abO +bfN abP eAd ayy @@ -91048,7 +91041,7 @@ pRc aiM aVo jfD -abO +bfN abP eAd ayy diff --git a/_maps/map_files/Serendipity/Serendipity1.dmm b/_maps/map_files/Serendipity/Serendipity1.dmm index bc808e6d5d9..12fbc140913 100644 --- a/_maps/map_files/Serendipity/Serendipity1.dmm +++ b/_maps/map_files/Serendipity/Serendipity1.dmm @@ -3769,6 +3769,10 @@ }, /turf/closed/wall/ship, /area/maintenance/department/medical) +"mk" = ( +/obj/effect/landmark/latejoin, +/turf/open/floor/wood, +/area/crew_quarters/cryopods) "mm" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -7360,6 +7364,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, +/obj/effect/landmark/latejoin, /turf/open/floor/wood, /area/crew_quarters/cryopods) "yp" = ( @@ -7400,6 +7405,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, +/obj/effect/landmark/latejoin, /turf/open/floor/wood, /area/crew_quarters/cryopods) "yx" = ( @@ -10488,17 +10494,11 @@ /turf/open/floor/plasteel/tiled/light, /area/bridge/cic) "IQ" = ( -/obj/docking_port/stationary{ - dir = 8; - dwidth = 7; - height = 8; - id = "arrivals_stationary"; - name = "Serendipity Arrivals"; - roundstart_template = /datum/map_template/shuttle/arrival/serendipity; - width = 15 - }, -/turf/open/space/basic, -/area/space/nearstation) +/obj/machinery/recharge_station, +/obj/effect/landmark/start/cyborg, +/obj/effect/landmark/latejoin, +/turf/open/floor/wood, +/area/crew_quarters/cryopods) "IT" = ( /obj/structure/table/glass/plasma, /obj/item/paper_bin, @@ -11646,6 +11646,13 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/carpet, /area/crew_quarters/heads/xo) +"Mh" = ( +/obj/structure/bed, +/obj/item/bedsheet/random, +/obj/effect/landmark/start/assistant, +/obj/effect/landmark/latejoin, +/turf/open/floor/wood, +/area/crew_quarters/cryopods) "Mi" = ( /obj/machinery/stasis, /obj/effect/turf_decal/tile/ship/blue{ @@ -14625,6 +14632,7 @@ pixel_y = -30 }, /obj/effect/landmark/start/assistant, +/obj/effect/landmark/latejoin, /turf/open/floor/wood, /area/crew_quarters/cryopods) "Wk" = ( @@ -36974,7 +36982,7 @@ zP zP zP zP -IQ +zP zP zP zP @@ -44690,8 +44698,8 @@ Gu Tc yw yo -Kf -Kf +mk +mk wF Vp Lr @@ -44945,9 +44953,9 @@ kG SB Fe mm -zw -Kf -zA +IQ +mk +Mh Wj vP Sf diff --git a/_maps/map_files/Shrike/Shrike2.dmm b/_maps/map_files/Shrike/Shrike2.dmm index b03f000fd40..e4598daf2d4 100644 --- a/_maps/map_files/Shrike/Shrike2.dmm +++ b/_maps/map_files/Shrike/Shrike2.dmm @@ -894,6 +894,22 @@ }, /turf/open/floor/plasteel/dark, /area/science/lab) +"cP" = ( +/obj/effect/turf_decal/guideline/guideline_out/blue{ + dir = 6 + }, +/obj/effect/turf_decal/guideline/guideline_in/red{ + dir = 6 + }, +/obj/effect/landmark/latejoin, +/turf/open/floor/monofloor/corner{ + dir = 1 + }, +/area/hallway/nsv/deck2/frame1/starboard{ + lighting_colour_bulb = "#c1e1ff"; + lighting_colour_night = "#c1e1ff"; + lighting_colour_tube = "#c1e1ff" + }) "cQ" = ( /obj/machinery/firealarm/directional/west, /obj/machinery/vending/cola/random, @@ -1366,6 +1382,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/effect/landmark/latejoin, /turf/open/floor/plating/rusty_techgrid, /area/hallway/nsv/deck2/frame1/starboard{ lighting_colour_bulb = "#c1e1ff"; @@ -2097,6 +2114,22 @@ }, /turf/open/floor/plating/rusty_techgrid, /area/crew_quarters/bar/mess_hall) +"gB" = ( +/obj/effect/turf_decal/guideline/guideline_out/blue{ + dir = 8 + }, +/obj/effect/turf_decal/guideline/guideline_in/red{ + dir = 8 + }, +/obj/effect/landmark/latejoin, +/turf/open/floor/monofloor{ + dir = 4 + }, +/area/hallway/nsv/deck2/frame1/starboard{ + lighting_colour_bulb = "#c1e1ff"; + lighting_colour_night = "#c1e1ff"; + lighting_colour_tube = "#c1e1ff" + }) "gC" = ( /turf/open/floor/plating, /area/nsv/weapons/gauss/battery/deck2/port{ @@ -4628,17 +4661,26 @@ /turf/open/floor/plating/rusty_techgrid, /area/quartermaster/storage) "pX" = ( -/obj/docking_port/stationary{ - dir = 4; - dwidth = 3; - height = 12; - id = "arrivals_stationary"; - name = "Deck 2 Arrivals Port"; - roundstart_template = /datum/map_template/shuttle/arrival/shrike; - width = 7 +/obj/structure/cable/green{ + icon_state = "4-8" }, -/turf/open/space/basic, -/area/space) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/lattice/catwalk/over/ship, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/effect/landmark/latejoin, +/turf/open/floor/plating/rusty_techgrid, +/area/hallway/nsv/deck2/frame1/starboard{ + lighting_colour_bulb = "#c1e1ff"; + lighting_colour_night = "#c1e1ff"; + lighting_colour_tube = "#c1e1ff" + }) "pY" = ( /obj/structure/fluff/support_beam, /turf/open/floor/plating, @@ -6196,6 +6238,7 @@ /obj/structure/cable/green{ icon_state = "2-8" }, +/obj/effect/landmark/latejoin, /turf/open/floor/plating/rusty_techgrid, /area/crew_quarters/cryopods) "uS" = ( @@ -9289,6 +9332,7 @@ /obj/machinery/camera/autoname, /obj/effect/turf_decal/guideline/guideline_out/blue, /obj/effect/turf_decal/guideline/guideline_in/red, +/obj/effect/landmark/latejoin, /turf/open/floor/monofloor{ dir = 1 }, @@ -9432,6 +9476,7 @@ /obj/effect/turf_decal/guideline/guideline_in_arrow_con_alt/red{ dir = 5 }, +/obj/effect/landmark/latejoin, /turf/open/floor/monofloor{ dir = 1 }, @@ -16313,6 +16358,7 @@ icon_state = "1-2" }, /obj/structure/lattice/catwalk/over/ship, +/obj/effect/landmark/latejoin, /turf/open/floor/plating/rusty_techgrid, /area/hallway/nsv/deck2/frame1/starboard{ lighting_colour_bulb = "#c1e1ff"; @@ -52105,7 +52151,7 @@ KI KI KI gi -pX +gi gi gi gi @@ -52857,7 +52903,7 @@ qo qo qo Eh -YT +pX HE eP eP @@ -53114,7 +53160,7 @@ qo RD IG Ey -YT +pX bs LA Vt @@ -53627,8 +53673,8 @@ KI qo Bo IG -yY -rk +cP +gB rk cY yI diff --git a/_maps/map_files/Snake/snake_lower.dmm b/_maps/map_files/Snake/snake_lower.dmm index ed77b25244c..015a2db29e6 100644 --- a/_maps/map_files/Snake/snake_lower.dmm +++ b/_maps/map_files/Snake/snake_lower.dmm @@ -2152,6 +2152,7 @@ /area/lawoffice) "hM" = ( /obj/machinery/airalarm/directional/south, +/obj/effect/landmark/latejoin, /turf/open/floor/plasteel, /area/crew_quarters/cryopods) "hO" = ( @@ -8279,17 +8280,12 @@ /turf/open/floor/plasteel/chapel, /area/chapel/main) "Dn" = ( -/obj/docking_port/stationary{ - dir = 4; - dwidth = 3; - height = 15; - id = "arrivals_stationary"; - name = "arrivals"; - roundstart_template = /datum/map_template/shuttle/arrival/box; - width = 7 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 }, -/turf/open/space/basic, -/area/space/nearstation) +/obj/effect/landmark/latejoin, +/turf/open/floor/plasteel, +/area/crew_quarters/cryopods) "Dp" = ( /turf/open/floor/engine/n2o, /area/engine/atmos) @@ -8853,6 +8849,7 @@ /obj/machinery/computer/cryopod{ pixel_y = 32 }, +/obj/effect/landmark/latejoin, /turf/open/floor/plasteel, /area/crew_quarters/cryopods) "Fz" = ( @@ -10929,6 +10926,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, +/obj/effect/landmark/latejoin, /turf/open/floor/plasteel, /area/crew_quarters/cryopods) "Mu" = ( @@ -14213,6 +14211,7 @@ /obj/machinery/light/small{ dir = 8 }, +/obj/effect/landmark/latejoin, /turf/open/floor/plasteel, /area/crew_quarters/cryopods) "Xj" = ( @@ -41299,7 +41298,7 @@ ge aJ aJ aJ -Dn +aJ aJ aJ aJ @@ -43609,7 +43608,7 @@ xW Ur jy kJ -gb +aJ aJ aJ aJ @@ -62354,7 +62353,7 @@ ee vc PH Fv -ww +Dn hM ih eE diff --git a/_maps/map_files/Tycoon/Tycoon2.dmm b/_maps/map_files/Tycoon/Tycoon2.dmm index 2e4bdab3640..7565d61ffe5 100644 --- a/_maps/map_files/Tycoon/Tycoon2.dmm +++ b/_maps/map_files/Tycoon/Tycoon2.dmm @@ -671,17 +671,10 @@ /turf/open/floor/monotile/dark, /area/nsv/weapons/fore) "abW" = ( -/obj/docking_port/stationary{ - dir = 8; - dwidth = 3; - height = 15; - id = "arrivals_stationary"; - name = "arrivals"; - roundstart_template = /datum/map_template/shuttle/arrival/box; - width = 7 - }, -/turf/open/space/basic, -/area/space/nearstation) +/obj/structure/disposalpipe/segment, +/obj/effect/landmark/latejoin, +/turf/open/floor/carpet/ship, +/area/crew_quarters/dorms) "abX" = ( /obj/structure/rack, /obj/item/storage/box/teargas, @@ -3484,6 +3477,7 @@ "aiJ" = ( /obj/machinery/camera/autoname, /obj/structure/disposalpipe/segment, +/obj/effect/landmark/latejoin, /turf/open/floor/carpet/ship, /area/crew_quarters/dorms) "aiK" = ( @@ -14253,6 +14247,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, +/obj/effect/landmark/latejoin, /turf/open/floor/carpet/ship, /area/crew_quarters/dorms) "aMC" = ( @@ -45282,6 +45277,16 @@ /area/maintenance/starboard/secondary{ name = "Munitions Projects" }) +"keK" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/segment, +/obj/effect/landmark/latejoin, +/turf/open/floor/carpet/ship, +/area/crew_quarters/dorms) "keO" = ( /turf/open/floor/plating, /area/maintenance/nsv/hangar) @@ -87279,7 +87284,7 @@ aaa aaa aaa aaa -abW +aaa aaa aaa aaa @@ -95454,9 +95459,9 @@ mXe ahe eot aiJ -aln -aln -aln +abW +abW +abW eot ayG azW @@ -95710,10 +95715,10 @@ auR bAN aLZ jZR -afT -afT +keK +keK aMB -afT +keK fTr aZo aZw diff --git a/_maps/map_files/Vago/vagodeck1.dmm b/_maps/map_files/Vago/vagodeck1.dmm index 71b48b2adda..e3d3b1ce0ef 100644 --- a/_maps/map_files/Vago/vagodeck1.dmm +++ b/_maps/map_files/Vago/vagodeck1.dmm @@ -10236,18 +10236,6 @@ }, /turf/closed/wall/steel, /area/maintenance/department/cargo) -"yk" = ( -/obj/docking_port/stationary{ - dir = 4; - dwidth = 3; - height = 15; - id = "arrivals_stationary"; - name = "arrivals"; - roundstart_template = /datum/map_template/shuttle/arrival/box; - width = 7 - }, -/turf/open/space/basic, -/area/space) "ym" = ( /obj/structure/ladder, /obj/item/radio/intercom{ @@ -35170,7 +35158,7 @@ aa aa aa aa -yk +aa aa aa aa diff --git a/_maps/map_files/Vago/vagodeck2.dmm b/_maps/map_files/Vago/vagodeck2.dmm index 612f1560ff4..1047ef6bd51 100644 --- a/_maps/map_files/Vago/vagodeck2.dmm +++ b/_maps/map_files/Vago/vagodeck2.dmm @@ -146,6 +146,12 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/plating, /area/maintenance/nsv/deck2/airlock/forward/port) +"aV" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/landmark/latejoin, +/turf/open/floor/plating/foam, +/area/hallway/nsv/deck2/frame2/port) "aX" = ( /obj/machinery/hydroponics/constructable, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ @@ -2095,6 +2101,7 @@ "gT" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/landmark/latejoin, /turf/open/floor/plating/foam, /area/crew_quarters/dorms) "gU" = ( @@ -8542,6 +8549,7 @@ dir = 1; pixel_y = -22 }, +/obj/effect/landmark/latejoin, /turf/open/floor/plating/foam, /area/crew_quarters/dorms) "xM" = ( @@ -8983,6 +8991,7 @@ /obj/machinery/light/small/broken{ dir = 8 }, +/obj/effect/landmark/latejoin, /turf/open/floor/plating/foam, /area/crew_quarters/dorms) "zL" = ( @@ -13736,6 +13745,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, +/obj/effect/landmark/latejoin, /turf/open/floor/plating/foam, /area/crew_quarters/dorms) "WV" = ( @@ -42582,7 +42592,7 @@ aa My XW Ql -QD +aV gT WS zK diff --git a/_maps/serendipity.json b/_maps/serendipity.json index c89ca7e18e3..fe928dbb3d2 100644 --- a/_maps/serendipity.json +++ b/_maps/serendipity.json @@ -7,7 +7,6 @@ "space_ruin_levels": -1, "space_empty_levels": 0, "shuttles": { - "arrival": "arrival_serendipity", "cargo": "cargo_serendipity", "ferry": "ferry_fancy", "emergency": "emergency_celerity" diff --git a/nsv13/code/datums/shuttles.dm b/nsv13/code/datums/shuttles.dm index fa21c03cd71..e8e1fc6b175 100644 --- a/nsv13/code/datums/shuttles.dm +++ b/nsv13/code/datums/shuttles.dm @@ -34,10 +34,6 @@ suffix = "aetherwhisp" name = "arrival shuttle (Aetherwhisp)" -/datum/map_template/shuttle/arrival/atlas - suffix = "atlas" - name = "arrival shuttle (Atlas)" - /datum/map_template/shuttle/arrival/gladius suffix = "gladius" name = "arrival shuttle (Gladius)"