From 253613c1c31cb586a44f239cceeb803edb83f652 Mon Sep 17 00:00:00 2001 From: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> Date: Wed, 7 Sep 2022 11:43:54 -0400 Subject: [PATCH] [MDB IGNORE] Shuttle engine code improvement and fixes (#69516) * A lot of shuttle code improvements * Makes use of ``as anything`` in many places * Adds mapload to connect_to_shuttle() * Renames many vars, including shuttle 'id' var to 'shuttle_id' and engine 'state' to 'engine_state'. * Engines now weakref their attached ship, and disconnect when unwrenched from it. * Removes check for force when deleting a mobile docking port, being deleted should still clear your stuff, regardless of being forced. Because of all the above, I was able to remove a few pointless checks scattered around, like engine's alter_engine_power() * better comment for port_id * Fixes Cargo, Arrivals, and Pirate ships. * Merge branch 'master' into shuttlecode-oh-no * last few * fixes the CI * fixes * Fixes infinite engines * Revert "Merge branch 'master' into shuttlecode-oh-no" This reverts commit 94eba37de9fe3f4a01dc40bb064771b764f379e3. * trammies * whiteship tram * Makes use of ?. instead apparently this is what weakrefs use, so :shrug: * i hate supernovaa41 Co-authored-by: Seth Scherer * removes lateinit that I never implemented * adds _ref to weakref var name * small change to weld time define Co-authored-by: Seth Scherer --- _maps/RandomRuins/SpaceRuins/TheDerelict.dmm | 58 +- .../RandomRuins/SpaceRuins/caravanambush.dmm | 8 +- .../SpaceRuins/listeningstation.dmm | 2 +- _maps/RandomZLevels/snowdin.dmm | 184 +- .../map_files/Deltastation/DeltaStation2.dmm | 476 +- .../map_files/IceBoxStation/IceBoxStation.dmm | 910 ++-- _maps/map_files/KiloStation/KiloStation.dmm | 1176 ++--- _maps/map_files/MetaStation/MetaStation.dmm | 4004 ++++++++--------- _maps/map_files/Mining/Lavaland.dmm | 8 +- _maps/map_files/debug/runtimestation.dmm | 12 +- _maps/map_files/generic/CentCom.dmm | 268 +- _maps/map_files/tramstation/tramstation.dmm | 528 +-- _maps/shuttles/ferry_base.dmm | 2 +- _maps/shuttles/ferry_fancy.dmm | 2 +- _maps/shuttles/ferry_kilo.dmm | 2 +- _maps/shuttles/ferry_lighthouse.dmm | 2 +- _maps/shuttles/ferry_meat.dmm | 2 +- _maps/shuttles/hunter_bounty.dmm | 4 +- _maps/shuttles/hunter_russian.dmm | 4 +- _maps/shuttles/hunter_space_cop.dmm | 4 +- _maps/shuttles/labour_box.dmm | 2 +- _maps/shuttles/labour_delta.dmm | 2 +- _maps/shuttles/labour_generic.dmm | 2 +- _maps/shuttles/labour_kilo.dmm | 2 +- _maps/shuttles/mining_box.dmm | 2 +- _maps/shuttles/mining_common_kilo.dmm | 2 +- _maps/shuttles/mining_common_meta.dmm | 2 +- _maps/shuttles/mining_delta.dmm | 2 +- _maps/shuttles/mining_freight.dmm | 2 +- _maps/shuttles/mining_kilo.dmm | 2 +- _maps/shuttles/mining_large.dmm | 2 +- _maps/shuttles/pirate_default.dmm | 94 +- _maps/shuttles/pirate_dutchman.dmm | 70 +- _maps/shuttles/pirate_silverscale.dmm | 76 +- _maps/shuttles/ruin_caravan_victim.dmm | 2 +- _maps/shuttles/ruin_pirate_cutter.dmm | 2 +- _maps/shuttles/ruin_syndicate_dropship.dmm | 78 +- .../shuttles/ruin_syndicate_fighter_shiv.dmm | 38 +- _maps/shuttles/snowdin_excavation.dmm | 2 +- _maps/shuttles/snowdin_mining.dmm | 2 +- _maps/shuttles/whiteship_box.dmm | 2 +- _maps/shuttles/whiteship_cere.dmm | 2 +- _maps/shuttles/whiteship_delta.dmm | 2 +- _maps/shuttles/whiteship_donut.dmm | 2 +- _maps/shuttles/whiteship_kilo.dmm | 2 +- _maps/shuttles/whiteship_meta.dmm | 2 +- _maps/shuttles/whiteship_pubby.dmm | 2 +- _maps/shuttles/whiteship_tram.dmm | 2 +- code/controllers/subsystem/shuttle.dm | 16 +- code/datums/shuttles.dm | 6 + code/game/atoms.dm | 2 +- code/game/machinery/buttons.dm | 4 +- code/game/machinery/camera/camera.dm | 4 +- code/game/machinery/computer/camera.dm | 4 +- .../machinery/computer/camera_advanced.dm | 6 +- code/game/machinery/doors/airlock.dm | 4 +- code/game/machinery/doors/poddoor.dm | 4 +- code/game/machinery/flasher.dm | 4 +- code/game/machinery/igniter.dm | 4 +- code/game/machinery/mass_driver.dm | 4 +- code/game/machinery/status_display.dm | 4 +- code/game/objects/structures/morgue.dm | 4 +- code/game/objects/structures/watercloset.dm | 4 +- code/game/shuttle_engines.dm | 83 +- code/modules/admin/fun_balloon.dm | 2 +- code/modules/admin/verbs/shuttlepanel.dm | 10 +- code/modules/cargo/orderconsole.dm | 8 +- code/modules/events/pirates.dm | 2 +- code/modules/events/shuttle_loan.dm | 2 +- code/modules/mining/aux_base.dm | 21 +- code/modules/mining/laborcamp/laborshuttle.dm | 2 +- code/modules/mining/mine_items.dm | 4 +- .../file_system/programs/budgetordering.dm | 8 +- code/modules/shuttle/arrivals.dm | 4 +- code/modules/shuttle/assault_pod.dm | 6 +- .../modules/shuttle/battlecruiser_starfury.dm | 20 +- code/modules/shuttle/computer.dm | 26 +- code/modules/shuttle/elevator.dm | 2 +- code/modules/shuttle/emergency.dm | 24 +- code/modules/shuttle/infiltrator.dm | 2 +- code/modules/shuttle/navigation_computer.dm | 29 +- code/modules/shuttle/on_move.dm | 2 +- code/modules/shuttle/shuttle.dm | 247 +- code/modules/shuttle/supply.dm | 6 +- 84 files changed, 4332 insertions(+), 4310 deletions(-) diff --git a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm index a527e92db32..54a335b23b0 100644 --- a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm +++ b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm @@ -240,6 +240,22 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/space/ks13/security/court) +"cR" = ( +/obj/machinery/computer/monitor{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/power/apc/unlocked{ + dir = 8; + environ = 0; + equipment = 0; + lighting = 0; + name = "Aft Solar APC"; + pixel_x = -25; + start_charge = 0 + }, +/turf/open/floor/iron, +/area/ruin/space/ks13/engineering/sb_bow_solars_control) "de" = ( /obj/structure/girder/reinforced, /turf/open/floor/plating/airless, @@ -431,22 +447,6 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/plating/airless, /area/ruin/space/ks13/ai/vault) -"gx" = ( -/obj/machinery/computer/monitor{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/power/apc/unlocked{ - dir = 8; - environ = 0; - equipment = 0; - lighting = 0; - name = "Aft Solar APC"; - pixel_x = -25; - start_charge = 0 - }, -/turf/open/floor/iron, -/area/ruin/space/ks13/engineering/sb_bow_solars_control) "gy" = ( /obj/structure/chair{ dir = 1 @@ -1252,17 +1252,6 @@ /obj/structure/cable, /turf/open/floor/iron/airless, /area/ruin/space/ks13/hallway/central) -"pU" = ( -/obj/docking_port/stationary{ - dir = 2; - dwidth = 11; - height = 22; - id = "whiteship_z4"; - name = "KSS13: Derelict"; - width = 35 - }, -/turf/template_noop, -/area/space/nearstation) "pW" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -2496,6 +2485,17 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/iron, /area/ruin/space/ks13/command/bridge) +"wV" = ( +/obj/docking_port/stationary{ + dir = 2; + dwidth = 11; + height = 22; + shuttle_id = "whiteship_z4"; + name = "KSS13: Derelict"; + width = 35 + }, +/turf/template_noop, +/area/space/nearstation) "wX" = ( /obj/machinery/light/directional/north, /obj/structure/closet/crate, @@ -11672,7 +11672,7 @@ NW aa aa aa -pU +wV aa aa aa @@ -15770,7 +15770,7 @@ pR pR xS VB -gx +cR DU yz yz diff --git a/_maps/RandomRuins/SpaceRuins/caravanambush.dmm b/_maps/RandomRuins/SpaceRuins/caravanambush.dmm index 0b5cb5a09cb..c2b1d47e7d5 100644 --- a/_maps/RandomRuins/SpaceRuins/caravanambush.dmm +++ b/_maps/RandomRuins/SpaceRuins/caravanambush.dmm @@ -50,7 +50,7 @@ dir = 2; dwidth = 14; height = 13; - id = "caravanpirate_ambush"; + shuttle_id = "caravanpirate_ambush"; name = "Trade Route"; roundstart_template = /datum/map_template/shuttle/ruin/pirate_cutter; width = 22 @@ -1148,7 +1148,7 @@ dir = 2; dwidth = 6; height = 7; - id = "caravansyndicate3_ambush"; + shuttle_id = "caravansyndicate3_ambush"; name = "Trade Route"; roundstart_template = /datum/map_template/shuttle/ruin/syndicate_dropship; width = 15 @@ -1160,7 +1160,7 @@ dir = 4; dwidth = 4; height = 5; - id = "caravansyndicate1_ambush"; + shuttle_id = "caravansyndicate1_ambush"; name = "Trade Route"; roundstart_template = /datum/map_template/shuttle/ruin/syndicate_fighter_shiv; width = 9 @@ -1172,7 +1172,7 @@ dir = 2; dwidth = 11; height = 11; - id = "caravantrade1_ambush"; + shuttle_id = "caravantrade1_ambush"; name = "Trade Route"; roundstart_template = /datum/map_template/shuttle/ruin/caravan_victim; width = 27 diff --git a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm index 9c14e0ca5c6..1ae8ba173c3 100644 --- a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm @@ -695,7 +695,7 @@ dir = 8; dwidth = 4; height = 5; - id = "caravansyndicate1_listeningpost"; + shuttle_id = "caravansyndicate1_listeningpost"; name = "Syndicate Listening Post"; width = 9 }, diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm index a7312884ada..a8c30b7eeea 100644 --- a/_maps/RandomZLevels/snowdin.dmm +++ b/_maps/RandomZLevels/snowdin.dmm @@ -620,6 +620,10 @@ /obj/machinery/door/firedoor, /turf/open/floor/plating, /area/awaymission/snowdin/post/research) +"ca" = ( +/obj/machinery/computer/monitor, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/minipost) "cb" = ( /obj/structure/spider/stickyweb, /turf/open/floor/iron/freezer, @@ -2208,6 +2212,13 @@ }, /turf/open/floor/iron/white, /area/awaymission/snowdin/post) +"gs" = ( +/obj/machinery/computer/monitor{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/mining_main) "gu" = ( /obj/structure/grille, /turf/open/floor/plating, @@ -4959,11 +4970,6 @@ /obj/structure/flora/bush/snow/style_random, /turf/open/misc/asteroid/snow, /area/awaymission/snowdin/cave) -"ns" = ( -/obj/machinery/computer/monitor, -/obj/structure/cable, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/engineering) "nt" = ( /turf/closed/wall/rust, /area/awaymission/snowdin/post/engineering) @@ -6482,6 +6488,11 @@ }, /turf/open/floor/plating, /area/awaymission/snowdin/post/cavern2) +"sf" = ( +/obj/machinery/computer/monitor, +/obj/structure/cable, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/cavern1) "sg" = ( /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/glass{ @@ -6568,13 +6579,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/awaymission/snowdin/post/cavern2) -"sv" = ( -/obj/machinery/computer/monitor{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/cavern2) "sz" = ( /obj/machinery/door/poddoor{ id = "snowdinturbinegas"; @@ -6838,11 +6842,6 @@ }, /turf/open/misc/asteroid/snow/ice, /area/awaymission/snowdin/cave/cavern) -"uj" = ( -/obj/machinery/computer/monitor, -/obj/structure/cable, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/cavern1) "uk" = ( /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/wood, @@ -6985,6 +6984,17 @@ }, /turf/open/floor/iron, /area/awaymission/snowdin/post/cavern1) +"uY" = ( +/obj/docking_port/stationary{ + dir = 4; + dwidth = 3; + height = 6; + shuttle_id = "snowdin_excavation_down"; + name = "snowdin excavation down"; + width = 6 + }, +/turf/open/floor/plating/elevatorshaft, +/area/awaymission/snowdin/post/mining_dock) "uZ" = ( /obj/machinery/door/airlock/external/glass/ruin, /obj/structure/fans/tiny, @@ -7196,6 +7206,11 @@ /obj/item/chair, /turf/open/floor/mineral/titanium/blue, /area/awaymission/snowdin/post/broken_shuttle) +"vW" = ( +/obj/machinery/computer/monitor, +/obj/structure/cable, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/mining_dock) "vX" = ( /obj/machinery/door/airlock/shuttle, /turf/open/floor/mineral/titanium/blue, @@ -7256,11 +7271,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_dock) -"wJ" = ( -/obj/machinery/computer/monitor, -/obj/structure/cable, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/mining_dock) "wK" = ( /obj/machinery/power/terminal{ dir = 1 @@ -7552,20 +7562,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_dock) -"xK" = ( -/obj/docking_port/stationary{ - dir = 4; - dwidth = 3; - height = 6; - id = "snowdin_excavation_top"; - name = "snowdin excavation top"; - roundstart_template = /datum/map_template/shuttle/snowdin/excavation; - width = 6 - }, -/turf/open/floor/plating/elevatorshaft{ - initial_gas_mix = "o2=22;n2=82;TEMP=180" - }, -/area/awaymission/snowdin/cave) "xL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible{ dir = 8 @@ -7594,17 +7590,6 @@ }, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_dock) -"xP" = ( -/obj/docking_port/stationary{ - dir = 4; - dwidth = 3; - height = 6; - id = "snowdin_excavation_down"; - name = "snowdin excavation down"; - width = 6 - }, -/turf/open/floor/plating/elevatorshaft, -/area/awaymission/snowdin/post/mining_dock) "xQ" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -8562,10 +8547,6 @@ slowdown = 1 }, /area/awaymission/snowdin/cave) -"Br" = ( -/obj/machinery/computer/monitor, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/minipost) "Bs" = ( /obj/structure/table, /obj/effect/turf_decal/tile/blue{ @@ -9477,6 +9458,13 @@ /obj/structure/cable, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_dock) +"FO" = ( +/obj/machinery/computer/monitor{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/cavern2) "FP" = ( /obj/machinery/light/small/directional/north, /turf/open/floor/plating/snowed, @@ -10764,18 +10752,6 @@ }, /turf/open/floor/iron, /area/awaymission/snowdin/post/mining_main) -"Kn" = ( -/obj/docking_port/stationary{ - dir = 4; - dwidth = 2; - height = 5; - id = "snowdin_mining_top"; - name = "snowdin mining top"; - roundstart_template = /datum/map_template/shuttle/snowdin/mining; - width = 5 - }, -/turf/open/floor/plating/elevatorshaft, -/area/awaymission/snowdin/post/mining_main) "Ko" = ( /obj/machinery/light/directional/east, /obj/effect/turf_decal/stripes/line{ @@ -10819,17 +10795,6 @@ }, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_dock) -"Kt" = ( -/obj/docking_port/stationary{ - dir = 4; - dwidth = 2; - height = 5; - id = "snowdin_mining_down"; - name = "snowdin mining bottom"; - width = 5 - }, -/turf/open/floor/plating/elevatorshaft, -/area/awaymission/snowdin/post/mining_dock) "Ku" = ( /obj/machinery/light/directional/east, /obj/effect/turf_decal/stripes/line{ @@ -10915,13 +10880,6 @@ /obj/structure/sign/warning/docking/directional/east, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_dock) -"KH" = ( -/obj/machinery/computer/monitor{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/mining_main) "KI" = ( /obj/structure/table, /obj/item/storage/toolbox/mechanical, @@ -11887,6 +11845,20 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/mineral/titanium/blue, /area/awaymission/snowdin/post/broken_shuttle) +"PM" = ( +/obj/docking_port/stationary{ + dir = 4; + dwidth = 3; + height = 6; + shuttle_id = "snowdin_excavation_top"; + name = "snowdin excavation top"; + roundstart_template = /datum/map_template/shuttle/snowdin/excavation; + width = 6 + }, +/turf/open/floor/plating/elevatorshaft{ + initial_gas_mix = "o2=22;n2=82;TEMP=180" + }, +/area/awaymission/snowdin/cave) "PQ" = ( /obj/item/reagent_containers/cup/glass/bottle/beer{ list_reagents = null @@ -12514,6 +12486,11 @@ }, /turf/open/misc/asteroid/snow, /area/awaymission/snowdin/outside) +"ST" = ( +/obj/machinery/computer/monitor, +/obj/structure/cable, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/engineering) "SU" = ( /obj/effect/decal/cleanable/blood/old, /turf/open/misc/asteroid/snow, @@ -12915,6 +12892,18 @@ /obj/machinery/light/broken/directional/south, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_dock) +"Vt" = ( +/obj/docking_port/stationary{ + dir = 4; + dwidth = 2; + height = 5; + shuttle_id = "snowdin_mining_top"; + name = "snowdin mining top"; + roundstart_template = /datum/map_template/shuttle/snowdin/mining; + width = 5 + }, +/turf/open/floor/plating/elevatorshaft, +/area/awaymission/snowdin/post/mining_main) "Vu" = ( /obj/machinery/light/broken/directional/north, /turf/open/floor/plating, @@ -13472,6 +13461,17 @@ /obj/structure/sign/warning/fire/directional/south, /turf/open/floor/engine, /area/awaymission/snowdin/post/engineering) +"YH" = ( +/obj/docking_port/stationary{ + dir = 4; + dwidth = 2; + height = 5; + shuttle_id = "snowdin_mining_down"; + name = "snowdin mining bottom"; + width = 5 + }, +/turf/open/floor/plating/elevatorshaft, +/area/awaymission/snowdin/post/mining_dock) "YK" = ( /obj/machinery/light/small/directional/north, /turf/open/floor/iron/grimy, @@ -23683,7 +23683,7 @@ ae Go Kj Gq -KH +gs GP ae ac @@ -25646,7 +25646,7 @@ AN Aj Bf yY -Br +ca BC yX ae @@ -27328,7 +27328,7 @@ gA lB ZU dO -ns +ST nU oq oQ @@ -27793,7 +27793,7 @@ Go Jx JQ JQ -Kn +Vt JQ JQ KT @@ -29741,7 +29741,7 @@ xa xl xl xl -xK +PM xl xl an @@ -58371,7 +58371,7 @@ HK HL IA GU -wJ +vW Uf wL wO @@ -61813,7 +61813,7 @@ fr fr fr tY -uj +sf um um uB @@ -61974,7 +61974,7 @@ wE JH Ys Ys -Kt +YH Ys Ys KX @@ -64950,7 +64950,7 @@ xg Ys Ys Ys -xP +uY Ys Ys yz @@ -66483,7 +66483,7 @@ eJ eJ eJ wE -wJ +vW wL Wa wP @@ -68458,7 +68458,7 @@ eJ ox Te sc -sv +FO ow eJ eJ diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 41c8c516a42..a716d394c91 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -35,13 +35,6 @@ /obj/structure/disposalpipe/trunk, /turf/open/floor/iron, /area/station/security/checkpoint/medical/medsci) -"aat" = ( -/obj/docking_port/stationary/random{ - id = "pod_2_lavaland"; - name = "lavaland" - }, -/turf/open/space, -/area/space) "aaz" = ( /obj/effect/landmark/start/hangover, /obj/structure/chair/stool/directional/east, @@ -258,18 +251,6 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/station/science/xenobiology) -"acF" = ( -/obj/docking_port/stationary{ - dir = 2; - dwidth = 4; - height = 17; - id = "arrivals_stationary"; - name = "delta arrivals"; - roundstart_template = /datum/map_template/shuttle/arrival/delta; - width = 9 - }, -/turf/open/space/basic, -/area/space) "acG" = ( /obj/structure/table/reinforced, /obj/item/storage/belt/utility, @@ -701,29 +682,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/security/warden) -"agO" = ( -/obj/docking_port/stationary{ - dheight = 1; - dir = 8; - dwidth = 12; - height = 17; - id = "syndicate_ne"; - name = "northeast of station"; - width = 23 - }, -/turf/open/space, -/area/space/nearstation) -"agS" = ( -/obj/docking_port/stationary{ - dir = 8; - dwidth = 11; - height = 22; - id = "whiteship_home"; - name = "SS13: Auxiliary Dock, Station-Fore"; - width = 35 - }, -/turf/open/space/basic, -/area/space) "agZ" = ( /obj/machinery/ntnet_relay, /turf/open/floor/circuit/green/telecomms/mainframe, @@ -813,16 +771,6 @@ }, /turf/open/floor/iron, /area/station/commons/locker) -"aid" = ( -/obj/docking_port/stationary{ - dwidth = 2; - height = 13; - id = "ferry_home"; - name = "port bay 2"; - width = 5 - }, -/turf/open/space/basic, -/area/space) "aii" = ( /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/wood, @@ -2673,17 +2621,6 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) -"aDi" = ( -/obj/docking_port/stationary{ - dir = 4; - dwidth = 4; - height = 7; - id = "supply_home"; - name = "Cargo Bay"; - width = 12 - }, -/turf/open/space/basic, -/area/space) "aDt" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -3218,6 +3155,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/science/robotics/mechbay) +"aJC" = ( +/obj/docking_port/stationary/random{ + dir = 4; + shuttle_id = "pod_3_lavaland"; + name = "lavaland" + }, +/turf/open/space, +/area/space) "aJD" = ( /turf/closed/wall, /area/space/nearstation) @@ -6386,17 +6331,6 @@ /obj/item/radio/intercom/directional/south, /turf/open/floor/iron/dark, /area/station/service/bar) -"bwj" = ( -/obj/docking_port/stationary{ - dir = 2; - dwidth = 11; - height = 18; - id = "emergency_home"; - name = "DeltaStation emergency evac bay"; - width = 30 - }, -/turf/open/space/basic, -/area/space) "bwl" = ( /obj/effect/turf_decal/trimline/blue/filled/corner, /obj/machinery/power/apc/auto_name/directional/east, @@ -15099,34 +15033,6 @@ "dzw" = ( /turf/closed/wall/r_wall, /area/station/security/brig) -"dzy" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin{ - pixel_x = -6 - }, -/obj/item/pen{ - pixel_x = -6 - }, -/obj/machinery/door/firedoor, -/obj/structure/desk_bell{ - pixel_x = 7; - pixel_y = 6 - }, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 1; - id = "chemisttop"; - name = "Pharmacy Shutters" - }, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/door/window/left/directional/south{ - name = "Pharmacy Desk"; - req_access = list("pharmacy") - }, -/turf/open/floor/iron/dark, -/area/station/medical/pharmacy) "dzF" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -17068,6 +16974,34 @@ /obj/effect/mapping_helpers/airlock/access/any/science/maintenance, /turf/open/floor/iron, /area/station/maintenance/port) +"eaI" = ( +/obj/structure/table/reinforced, +/obj/item/paper_bin{ + pixel_x = -6 + }, +/obj/item/pen{ + pixel_x = -6 + }, +/obj/machinery/door/firedoor, +/obj/structure/desk_bell{ + pixel_x = 7; + pixel_y = 6 + }, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 1; + id = "chemisttop"; + name = "Pharmacy Shutters" + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/door/window/left/directional/south{ + name = "Pharmacy Desk"; + req_access = list("pharmacy") + }, +/turf/open/floor/iron/dark, +/area/station/medical/pharmacy) "eaK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -22297,6 +22231,16 @@ /obj/machinery/light/directional/north, /turf/open/floor/wood/large, /area/station/service/library) +"foI" = ( +/obj/docking_port/stationary{ + dwidth = 2; + height = 13; + shuttle_id = "ferry_home"; + name = "port bay 2"; + width = 5 + }, +/turf/open/space/basic, +/area/space) "foL" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/table/reinforced, @@ -22918,6 +22862,31 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood/tile, /area/station/service/library/artgallery) +"fwg" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 1; + id = "rndlab1"; + name = "Research and Development Shutter" + }, +/obj/item/assembly/voice{ + pixel_x = 4; + pixel_y = 5 + }, +/obj/structure/desk_bell{ + pixel_x = -6 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/door/window/left/directional/south{ + name = "Research Lab Desk"; + req_access = list("science") + }, +/turf/open/floor/iron/dark, +/area/station/science/lab) "fwi" = ( /obj/structure/dresser, /obj/effect/turf_decal/siding/wood, @@ -29266,6 +29235,17 @@ /obj/effect/decal/cleanable/blood/old, /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) +"gZv" = ( +/obj/docking_port/stationary{ + dir = 4; + dwidth = 4; + height = 7; + shuttle_id = "cargo_home"; + name = "Cargo Bay"; + width = 12 + }, +/turf/open/space/basic, +/area/space) "gZx" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -30016,38 +29996,6 @@ dir = 4 }, /area/station/hallway/secondary/entry) -"hjk" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/firedoor, -/obj/structure/desk_bell{ - pixel_x = 7; - pixel_y = 6 - }, -/obj/item/folder/yellow{ - pixel_x = -3; - pixel_y = -6 - }, -/obj/item/pen{ - pixel_x = -3; - pixel_y = -2 - }, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 4; - id = "chemisttop"; - name = "Pharmacy Shutters" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/door/window/left/directional/west{ - name = "Pharmacy Desk"; - req_access = list("pharmacy") - }, -/turf/open/floor/iron/dark, -/area/station/medical/pharmacy) "hjm" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -30324,13 +30272,6 @@ }, /turf/open/floor/plating, /area/station/security/execution/transfer) -"hmx" = ( -/obj/docking_port/stationary/random{ - id = "pod_lavaland"; - name = "lavaland" - }, -/turf/open/space/basic, -/area/space) "hmy" = ( /obj/effect/turf_decal/siding/white{ dir = 1 @@ -31418,6 +31359,14 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +"hBu" = ( +/obj/docking_port/stationary/random{ + dir = 4; + shuttle_id = "pod_4_lavaland"; + name = "lavaland" + }, +/turf/open/space, +/area/space) "hBF" = ( /obj/structure/kitchenspike, /obj/effect/turf_decal/bot/left, @@ -34851,6 +34800,17 @@ }, /turf/open/floor/iron/dark/corner, /area/station/engineering/atmos/pumproom) +"itK" = ( +/obj/docking_port/stationary{ + dir = 8; + dwidth = 11; + height = 22; + shuttle_id = "whiteship_home"; + name = "SS13: Auxiliary Dock, Station-Fore"; + width = 35 + }, +/turf/open/space/basic, +/area/space) "itO" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 6 @@ -37021,6 +36981,18 @@ /obj/machinery/duct, /turf/open/floor/iron/large, /area/station/medical/virology) +"iXn" = ( +/obj/docking_port/stationary{ + dir = 2; + dwidth = 4; + height = 17; + shuttle_id = "arrival_stationary"; + name = "delta arrivals"; + roundstart_template = /datum/map_template/shuttle/arrival/delta; + width = 9 + }, +/turf/open/space/basic, +/area/space) "iXp" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -38437,14 +38409,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/iron, /area/station/maintenance/department/engine/atmos) -"jmn" = ( -/obj/docking_port/stationary/random{ - dir = 4; - id = "pod_4_lavaland"; - name = "lavaland" - }, -/turf/open/space, -/area/space) "jmp" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -49421,19 +49385,6 @@ }, /turf/open/floor/iron/checker, /area/station/security/interrogation) -"lTo" = ( -/obj/docking_port/stationary{ - dheight = 4; - dir = 4; - dwidth = 4; - height = 9; - id = "aux_base_zone"; - name = "Aux Base Zone"; - roundstart_template = /datum/map_template/shuttle/aux_base/default; - width = 9 - }, -/turf/open/floor/plating, -/area/station/construction/mining/aux_base) "lTp" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -49519,6 +49470,13 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/maintenance/port/aft) +"lUo" = ( +/obj/docking_port/stationary/random{ + shuttle_id = "pod_lavaland"; + name = "lavaland" + }, +/turf/open/space/basic, +/area/space) "lUy" = ( /obj/structure/table/wood, /obj/effect/spawner/random/entertainment/wallet_storage, @@ -51379,6 +51337,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/treatment_center) +"mvj" = ( +/obj/docking_port/stationary{ + dir = 2; + dwidth = 11; + height = 18; + shuttle_id = "emergency_home"; + name = "DeltaStation emergency evac bay"; + width = 30 + }, +/turf/open/space/basic, +/area/space) "mvk" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -58171,6 +58140,13 @@ /obj/structure/closet/emcloset, /turf/open/floor/plating, /area/station/hallway/secondary/entry) +"odd" = ( +/obj/docking_port/stationary/random{ + shuttle_id = "pod_2_lavaland"; + name = "lavaland" + }, +/turf/open/space, +/area/space) "odk" = ( /obj/structure/table/reinforced, /obj/effect/spawner/random/entertainment/cigarette_pack, @@ -60197,6 +60173,18 @@ /obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron/dark, /area/station/command/bridge) +"oFv" = ( +/obj/docking_port/stationary{ + dheight = 1; + dir = 8; + dwidth = 12; + height = 17; + shuttle_id = "syndicate_ne"; + name = "northeast of station"; + width = 23 + }, +/turf/open/space, +/area/space/nearstation) "oFC" = ( /obj/machinery/airalarm/directional/west, /obj/structure/tank_dispenser, @@ -65315,6 +65303,38 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/dark, /area/station/science/circuits) +"pTz" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/structure/desk_bell{ + pixel_x = 7; + pixel_y = 6 + }, +/obj/item/folder/yellow{ + pixel_x = -3; + pixel_y = -6 + }, +/obj/item/pen{ + pixel_x = -3; + pixel_y = -2 + }, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 4; + id = "chemisttop"; + name = "Pharmacy Shutters" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/door/window/left/directional/west{ + name = "Pharmacy Desk"; + req_access = list("pharmacy") + }, +/turf/open/floor/iron/dark, +/area/station/medical/pharmacy) "pTB" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -70930,6 +70950,19 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/wood, /area/station/maintenance/starboard/aft) +"rno" = ( +/obj/docking_port/stationary{ + dheight = 4; + dir = 4; + dwidth = 4; + height = 9; + shuttle_id = "aux_base_zone"; + name = "Aux Base Zone"; + roundstart_template = /datum/map_template/shuttle/aux_base/default; + width = 9 + }, +/turf/open/floor/plating, +/area/station/construction/mining/aux_base) "rnp" = ( /obj/structure/table/wood, /obj/item/camera_film{ @@ -75020,14 +75053,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central/aft) -"sqh" = ( -/obj/docking_port/stationary/random{ - dir = 4; - id = "pod_3_lavaland"; - name = "lavaland" - }, -/turf/open/space, -/area/space) "sqj" = ( /obj/structure/closet/crate/freezer/surplus_limbs, /obj/machinery/camera/directional/north{ @@ -80493,34 +80518,6 @@ /obj/effect/turf_decal/tile/neutral/full, /turf/open/floor/iron/dark/smooth_large, /area/station/security/checkpoint/customs/aft) -"tFJ" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 1; - id = "genetics_shutters"; - name = "Genetics Shutters" - }, -/obj/machinery/door/firedoor, -/obj/structure/desk_bell{ - pixel_x = -6; - pixel_y = 7 - }, -/obj/item/pen{ - pixel_x = 3 - }, -/obj/item/folder{ - pixel_x = 6 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/door/window/left/directional/south{ - name = "Genetics Desk"; - req_access = list("genetics") - }, -/turf/open/floor/iron/dark, -/area/station/science/genetics) "tFM" = ( /obj/structure/extinguisher_cabinet/directional/east, /obj/structure/closet/firecloset, @@ -84736,31 +84733,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/station/cargo/storage) -"uHv" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 1; - id = "rndlab1"; - name = "Research and Development Shutter" - }, -/obj/item/assembly/voice{ - pixel_x = 4; - pixel_y = 5 - }, -/obj/structure/desk_bell{ - pixel_x = -6 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/door/window/left/directional/south{ - name = "Research Lab Desk"; - req_access = list("science") - }, -/turf/open/floor/iron/dark, -/area/station/science/lab) "uHC" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -95885,6 +95857,34 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/command/heads_quarters/rd) +"xsn" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 1; + id = "genetics_shutters"; + name = "Genetics Shutters" + }, +/obj/machinery/door/firedoor, +/obj/structure/desk_bell{ + pixel_x = -6; + pixel_y = 7 + }, +/obj/item/pen{ + pixel_x = 3 + }, +/obj/item/folder{ + pixel_x = 6 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/door/window/left/directional/south{ + name = "Genetics Desk"; + req_access = list("genetics") + }, +/turf/open/floor/iron/dark, +/area/station/science/genetics) "xso" = ( /obj/structure/bed/double, /obj/item/bedsheet/random/double, @@ -130162,7 +130162,7 @@ aaa aaa aaa aaa -agS +itK aaa aaa aaa @@ -131426,7 +131426,7 @@ aaa aaa aaa aaa -aat +odd aaa aaa aaa @@ -133749,7 +133749,7 @@ abj aad aad aaa -acF +iXn aaa aaa aaa @@ -134121,7 +134121,7 @@ uwi uLl uGB jwy -uHv +fwg cYu wBe aEz @@ -136052,7 +136052,7 @@ aaa aaa aaa aaa -hmx +lUo aaa aaa aaa @@ -136687,7 +136687,7 @@ dMA whK rcW tXO -tFJ +xsn jPY jKb vdA @@ -137715,7 +137715,7 @@ eBY whK hiV bSa -dzy +eaI hff ued awG @@ -138133,7 +138133,7 @@ aaa aaa aaa aaa -aid +foI jUS sUC seE @@ -139518,7 +139518,7 @@ squ pEU cwh kgq -hjk +pTz pLw cwh udd @@ -142656,7 +142656,7 @@ cPj etI ikx bmU -bwj +mvj aaa aaa aaa @@ -143268,7 +143268,7 @@ aeF aeF aeF aeF -lTo +rno aeF aeF aeF @@ -146124,7 +146124,7 @@ aaa aaa aaa aaa -aDi +gZv aaa aaa aaa @@ -155091,7 +155091,7 @@ aaa aaa aaa aaa -agO +oFv aaa aaa aaa @@ -156978,7 +156978,7 @@ xTK aaa aad aaa -sqh +aJC aaa mfC aaa @@ -158990,7 +158990,7 @@ aaa aaa aaa aaa -jmn +hBu aaa aaa aaa diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 10905a76038..c3e40f133a6 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -308,26 +308,6 @@ /obj/structure/cable, /turf/open/floor/wood, /area/station/hallway/secondary/service) -"agH" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 1; - id = "robotics"; - name = "Robotics Lab Shutters" - }, -/obj/machinery/door/firedoor, -/obj/structure/desk_bell{ - pixel_x = 7 - }, -/obj/machinery/door/window/right/directional/east{ - base_state = "left"; - dir = 2; - icon_state = "left"; - name = "Robotics Desk"; - req_access = list("robotics") - }, -/turf/open/floor/plating, -/area/station/science/robotics/lab) "agI" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -721,6 +701,17 @@ }, /turf/open/floor/plating/icemoon, /area/station/science/ordnance/bomb) +"anP" = ( +/obj/structure/table, +/obj/machinery/light_switch/directional/north, +/obj/machinery/fax{ + fax_name = "Research Director's Office"; + name = "Research Director's Fax Machine" + }, +/turf/open/floor/iron/white/side{ + dir = 1 + }, +/area/station/command/heads_quarters/rd) "anY" = ( /obj/structure/sign/warning/no_smoking/directional/south, /obj/machinery/light/directional/south, @@ -1601,6 +1592,26 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/engine_equipment, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"azU" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 1; + id = "robotics"; + name = "Robotics Lab Shutters" + }, +/obj/machinery/door/firedoor, +/obj/structure/desk_bell{ + pixel_x = 7 + }, +/obj/machinery/door/window/right/directional/east{ + base_state = "left"; + dir = 2; + icon_state = "left"; + name = "Robotics Desk"; + req_access = list("robotics") + }, +/turf/open/floor/plating, +/area/station/science/robotics/lab) "aAc" = ( /obj/effect/turf_decal/siding/wood{ dir = 6 @@ -1754,17 +1765,6 @@ /obj/effect/landmark/start/prisoner, /turf/open/floor/iron/dark/side, /area/station/security/prison) -"aDK" = ( -/obj/docking_port/stationary{ - dir = 4; - dwidth = 12; - height = 18; - id = "emergency_home"; - name = "BoxStation emergency evac bay"; - width = 32 - }, -/turf/open/floor/plating/snowed/icemoon, -/area/icemoon/surface/outdoors/nospawn) "aDN" = ( /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -2568,17 +2568,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/science/ordnance) -"aQF" = ( -/obj/docking_port/stationary{ - dir = 8; - dwidth = 2; - height = 13; - id = "ferry_home"; - name = "port bay 2"; - width = 5 - }, -/turf/open/floor/plating/snowed/icemoon, -/area/icemoon/surface/outdoors/nospawn) "aQJ" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, @@ -3245,6 +3234,22 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +"baw" = ( +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/item/radio/intercom/directional/south, +/obj/structure/table/wood, +/obj/machinery/fax{ + fax_name = "Psychology Office"; + name = "Psychology Office Fax Machine" + }, +/turf/open/floor/iron/white, +/area/station/medical/psychology) "bax" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -3609,6 +3614,17 @@ }, /turf/open/floor/iron/white, /area/station/science/xenobiology) +"bfP" = ( +/obj/docking_port/stationary{ + dir = 8; + dwidth = 5; + height = 7; + shuttle_id = "cargo_home"; + name = "Cargo Bay"; + width = 12 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) "bfU" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -5657,14 +5673,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/smooth, /area/mine/eva) -"bJg" = ( -/obj/structure/table/wood, -/obj/machinery/fax{ - fax_name = "Captain's Office"; - name = "Captain's Fax Machine" - }, -/turf/open/floor/wood, -/area/station/command/heads_quarters/captain) "bJp" = ( /obj/machinery/camera/directional/east{ c_tag = "Security - Permabrig Workout"; @@ -5679,14 +5687,6 @@ }, /turf/open/floor/iron/dark/textured, /area/station/security/range) -"bJq" = ( -/obj/docking_port/stationary/random/icemoon{ - dir = 4; - id = "pod_4_lavaland"; - name = "lavaland" - }, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/surface/outdoors/nospawn) "bJx" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/directional/south, @@ -5858,6 +5858,18 @@ /obj/structure/janitorialcart, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"bMz" = ( +/obj/docking_port/stationary{ + dir = 8; + dwidth = 2; + height = 5; + shuttle_id = "laborcamp_home"; + name = "fore bay 1"; + roundstart_template = /datum/map_template/shuttle/labour/box; + width = 9 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) "bMC" = ( /obj/machinery/cell_charger, /obj/item/stock_parts/cell/high, @@ -6383,14 +6395,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/science/breakroom) -"bUb" = ( -/obj/docking_port/stationary/random/icemoon{ - dir = 8; - id = "pod_2_lavaland"; - name = "lavaland" - }, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/surface/outdoors/unexplored/rivers/no_monsters) "bUp" = ( /obj/structure/sign/warning/electric_shock, /turf/closed/wall/r_wall, @@ -7748,6 +7752,17 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"cnB" = ( +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, +/obj/structure/table, +/obj/machinery/fax{ + fax_name = "Cargo Office"; + name = "Cargo Office Fax Machine" + }, +/turf/open/floor/iron, +/area/station/cargo/office) "cnM" = ( /obj/machinery/airalarm/directional/west, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -9880,17 +9895,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/department/chapel) -"cTc" = ( -/obj/docking_port/stationary{ - dir = 8; - dwidth = 5; - height = 7; - id = "supply_home"; - name = "Cargo Bay"; - width = 12 - }, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/surface/outdoors/nospawn) "cTs" = ( /obj/machinery/door/firedoor, /obj/structure/cable, @@ -11019,18 +11023,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/station/medical/morgue) -"dld" = ( -/obj/docking_port/stationary{ - dir = 8; - dwidth = 2; - height = 5; - id = "laborcamp_home"; - name = "fore bay 1"; - roundstart_template = /datum/map_template/shuttle/labour/box; - width = 9 - }, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/surface/outdoors/nospawn) "dlr" = ( /obj/machinery/light/directional/west, /obj/effect/turf_decal/tile/neutral, @@ -11885,20 +11877,6 @@ /obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron, /area/station/command/bridge) -"dyV" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/extinguisher_cabinet/directional/east, -/obj/machinery/light/directional/east, -/obj/structure/table, -/obj/machinery/fax{ - fax_name = "Research Division"; - name = "Research Division Fax Machine"; - pixel_x = 1 - }, -/turf/open/floor/iron/white/side{ - dir = 10 - }, -/area/station/science/research) "dzg" = ( /obj/machinery/door/firedoor/heavy, /obj/machinery/door/poddoor/preopen{ @@ -12749,6 +12727,18 @@ /obj/machinery/status_display/evac/directional/east, /turf/open/floor/iron, /area/station/hallway/primary/fore) +"dLv" = ( +/obj/docking_port/stationary{ + dir = 8; + dwidth = 3; + height = 15; + shuttle_id = "arrival_stationary"; + name = "arrivals"; + roundstart_template = /datum/map_template/shuttle/arrival/box; + width = 7 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) "dLH" = ( /obj/structure/fence{ dir = 1 @@ -13606,6 +13596,32 @@ dir = 4 }, /area/station/science/research) +"eab" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/window/left/directional/north{ + dir = 8; + name = "Reception Window" + }, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "hop"; + name = "Privacy Shutters" + }, +/obj/machinery/flasher/directional/north{ + id = "hopflash" + }, +/obj/structure/desk_bell{ + pixel_x = 7 + }, +/obj/machinery/door/window/brigdoor{ + base_state = "rightsecure"; + dir = 4; + icon_state = "rightsecure"; + name = "Head of Personnel's Desk"; + req_access = list("hop") + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/hop) "ead" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -14923,25 +14939,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/freezer, /area/station/commons/toilet) -"ewm" = ( -/obj/structure/sign/warning/no_smoking/circle/directional/west, -/obj/machinery/light/directional/west, -/obj/machinery/camera{ - c_tag = "Medbay Mid-South"; - dir = 5; - network = list("ss13","medbay") - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 10 - }, -/obj/structure/extinguisher_cabinet/directional/south, -/obj/structure/table/glass, -/obj/machinery/fax{ - fax_name = "Medical"; - name = "Medical Fax Machine" - }, -/turf/open/floor/iron/white, -/area/station/medical/medbay/aft) "ewq" = ( /obj/machinery/light_switch/directional/north, /obj/machinery/light/directional/north, @@ -15451,6 +15448,14 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/service/bar/atrium) +"eEC" = ( +/obj/structure/table/wood, +/obj/machinery/fax{ + fax_name = "Captain's Office"; + name = "Captain's Fax Machine" + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) "eEN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -17649,6 +17654,17 @@ /obj/item/stack/rods/fifty, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/eva) +"fmq" = ( +/obj/docking_port/stationary{ + dir = 4; + dwidth = 12; + height = 18; + shuttle_id = "emergency_home"; + name = "BoxStation emergency evac bay"; + width = 32 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) "fmr" = ( /obj/effect/turf_decal/siding/yellow/end{ dir = 4 @@ -18038,6 +18054,21 @@ /obj/item/storage/box/prisoner, /turf/open/floor/iron/showroomfloor, /area/station/security/processing) +"ftJ" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "gene_desk_shutters"; + name = "Genetics Shutters" + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/window/right/directional/south{ + dir = 4; + name = "Genetics Desk"; + req_access = list("genetics") + }, +/turf/open/floor/plating, +/area/station/science/genetics) "ftM" = ( /obj/machinery/button/door/directional/north{ id = "kitchencounter"; @@ -18526,17 +18557,6 @@ /obj/machinery/light/directional/north, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) -"fBC" = ( -/obj/structure/table/wood, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/fax{ - fax_name = "Head of Security's Office"; - name = "Head of Security's Fax Machine" - }, -/turf/open/floor/wood/large, -/area/station/command/heads_quarters/hos) "fBM" = ( /obj/structure/chair{ dir = 4 @@ -19369,6 +19389,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /turf/open/floor/iron/freezer, /area/station/science/xenobiology) +"fPx" = ( +/obj/docking_port/stationary/random/icemoon{ + dir = 8; + shuttle_id = "pod_lavaland"; + name = "lavaland" + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/unexplored/rivers/no_monsters) "fPA" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -20686,19 +20714,6 @@ /obj/effect/spawner/random/engineering/tracking_beacon, /turf/open/floor/iron, /area/station/science/robotics/mechbay) -"gkE" = ( -/obj/docking_port/stationary{ - dheight = 4; - dir = 8; - dwidth = 4; - height = 9; - id = "aux_base_zone"; - name = "Aux Base Zone"; - roundstart_template = /datum/map_template/shuttle/aux_base/default; - width = 9 - }, -/turf/open/floor/plating, -/area/station/construction/mining/aux_base) "gkK" = ( /obj/machinery/atmospherics/pipe/multiz/supply/visible/layer4{ color = "#0000ff"; @@ -21037,17 +21052,6 @@ }, /turf/open/floor/iron/grimy, /area/station/security/detectives_office) -"gpH" = ( -/obj/effect/turf_decal/tile/brown{ - dir = 1 - }, -/obj/structure/table, -/obj/machinery/fax{ - fax_name = "Cargo Office"; - name = "Cargo Office Fax Machine" - }, -/turf/open/floor/iron, -/area/station/cargo/office) "gpK" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -25024,6 +25028,14 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) +"hDG" = ( +/obj/docking_port/stationary/random/icemoon{ + dir = 4; + shuttle_id = "pod_4_lavaland"; + name = "lavaland" + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) "hDK" = ( /turf/open/floor/iron, /area/mine/laborcamp) @@ -26114,17 +26126,6 @@ /obj/structure/cable, /turf/open/floor/carpet/red, /area/station/security/prison/work) -"hXI" = ( -/obj/effect/turf_decal/trimline/blue/filled/line, -/obj/machinery/light/directional/south, -/obj/machinery/firealarm/directional/south, -/obj/structure/table/glass, -/obj/machinery/fax{ - fax_name = "Chief Medical Officer's Office"; - name = "Chief Medical Officer's Fax Machine" - }, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/cmo) "hXU" = ( /obj/machinery/newscaster/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, @@ -26457,6 +26458,17 @@ }, /turf/open/floor/plating, /area/station/service/chapel) +"ibR" = ( +/obj/docking_port/stationary{ + dir = 8; + dwidth = 2; + height = 13; + shuttle_id = "ferry_home"; + name = "port bay 2"; + width = 5 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) "ica" = ( /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, @@ -26916,6 +26928,12 @@ /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron/white, /area/station/medical/pharmacy) +"ijn" = ( +/obj/structure/cable, +/obj/item/reagent_containers/cup/glass/bottle/hooch, +/obj/machinery/power/apc/highcap/five_k/directional/north, +/turf/open/floor/plating, +/area/mine/storage) "ijp" = ( /obj/effect/turf_decal/siding/yellow, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -28082,6 +28100,25 @@ /obj/item/stack/rods/ten, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) +"iCz" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 4; + id = "robotics2"; + name = "Robotics Lab Shutters" + }, +/obj/item/folder/white, +/obj/item/pen, +/obj/machinery/door/firedoor, +/obj/machinery/door/window/right/directional/east{ + base_state = "left"; + dir = 8; + icon_state = "left"; + name = "Robotics Desk"; + req_access = list("robotics") + }, +/turf/open/floor/plating, +/area/station/science/robotics/lab) "iCC" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -28343,6 +28380,19 @@ }, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) +"iIw" = ( +/obj/docking_port/stationary{ + dheight = 4; + dir = 8; + dwidth = 4; + height = 9; + shuttle_id = "aux_base_zone"; + name = "Aux Base Zone"; + roundstart_template = /datum/map_template/shuttle/aux_base/default; + width = 9 + }, +/turf/open/floor/plating, +/area/station/construction/mining/aux_base) "iIx" = ( /obj/item/radio/intercom/directional/west, /obj/structure/closet/wardrobe/white, @@ -30093,14 +30143,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) -"jhM" = ( -/obj/docking_port/stationary/random/icemoon{ - dir = 8; - id = "pod_lavaland"; - name = "lavaland" - }, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/surface/outdoors/unexplored/rivers/no_monsters) "jhQ" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -31183,6 +31225,17 @@ }, /turf/open/floor/plating, /area/station/science/xenobiology) +"jBn" = ( +/obj/docking_port/stationary{ + dir = 4; + dwidth = 2; + height = 5; + shuttle_id = "laborcamp_away"; + name = "labor camp"; + width = 9 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "jBq" = ( /obj/structure/flora/tree/jungle/style_random, /obj/structure/flora/bush/jungle/a/style_random, @@ -31245,6 +31298,16 @@ }, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/underground/explored) +"jCD" = ( +/obj/structure/table/wood, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/fax{ + name = "Detective's Fax Machine"; + fax_name = "Detective's Office" + }, +/turf/open/floor/carpet, +/area/station/security/detectives_office) "jCF" = ( /obj/effect/turf_decal/siding/wood, /obj/structure/chair/wood{ @@ -32570,6 +32633,17 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/iron, /area/station/service/hydroponics) +"jVD" = ( +/obj/docking_port/stationary{ + dir = 2; + dwidth = 11; + height = 22; + shuttle_id = "whiteship_home"; + name = "SS13: Auxiliary Dock, Station-Port"; + width = 35 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) "jVE" = ( /obj/effect/turf_decal/box/white, /turf/open/floor/engine, @@ -34774,6 +34848,20 @@ /obj/machinery/light/dim/directional/north, /turf/open/floor/plating, /area/station/maintenance/department/crew_quarters/bar) +"kDz" = ( +/obj/structure/toilet{ + pixel_y = 8 + }, +/obj/effect/landmark/start/hangover, +/obj/machinery/button/door/directional/west{ + id = "Toilet1"; + name = "Lock Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet) "kDJ" = ( /obj/item/wrench, /obj/item/clothing/glasses/monocle, @@ -38426,6 +38514,21 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/engine/o2, /area/station/engineering/atmos) +"lMi" = ( +/obj/structure/table/wood, +/obj/machinery/computer/security/telescreen/prison{ + pixel_y = 32 + }, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/fax{ + fax_name = "Law Office"; + name = "Law Office Fax Machine" + }, +/turf/open/floor/wood, +/area/station/service/lawoffice) "lMu" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -41856,21 +41959,6 @@ /obj/effect/mapping_helpers/airlock/access/any/science/maintenance, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) -"mUC" = ( -/obj/structure/table/wood, -/obj/machinery/computer/security/telescreen/prison{ - pixel_y = 32 - }, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/machinery/fax{ - fax_name = "Law Office"; - name = "Law Office Fax Machine" - }, -/turf/open/floor/wood, -/area/station/service/lawoffice) "mUM" = ( /obj/effect/turf_decal/tile/red/anticorner{ dir = 8 @@ -44219,20 +44307,6 @@ /obj/machinery/light/directional/east, /turf/open/floor/iron, /area/station/security/brig/upper) -"nCm" = ( -/obj/structure/toilet{ - pixel_y = 8 - }, -/obj/effect/landmark/start/hangover, -/obj/machinery/button/door/directional/west{ - id = "Toilet1"; - name = "Lock Control"; - normaldoorcontrol = 1; - specialfunctions = 4 - }, -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron/freezer, -/area/station/commons/toilet) "nCs" = ( /obj/structure/chair/stool/directional/north, /obj/structure/cable, @@ -46091,12 +46165,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/station/science/xenobiology) -"odf" = ( -/obj/structure/cable, -/obj/item/reagent_containers/cup/glass/bottle/hooch, -/obj/machinery/power/apc/highcap/five_k/directional/north, -/turf/open/floor/plating, -/area/mine/storage) "odi" = ( /obj/item/toy/snowball{ pixel_x = 5; @@ -48756,6 +48824,21 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/dark/textured, /area/station/security/prison/mess) +"oUO" = ( +/obj/structure/toilet{ + pixel_y = 8 + }, +/obj/effect/landmark/blobstart, +/obj/effect/landmark/start/hangover, +/obj/machinery/button/door/directional/west{ + id = "Toilet2"; + name = "Lock Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet) "oVf" = ( /obj/effect/landmark/start/shaft_miner, /obj/structure/cable, @@ -49736,16 +49819,17 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, /area/station/maintenance/port/greater) -"plN" = ( +"plu" = ( /obj/structure/table/wood, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/fax{ - name = "Detective's Fax Machine"; - fax_name = "Detective's Office" + fax_name = "Head of Security's Office"; + name = "Head of Security's Fax Machine" }, -/turf/open/floor/carpet, -/area/station/security/detectives_office) +/turf/open/floor/wood/large, +/area/station/command/heads_quarters/hos) "plS" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 @@ -51627,18 +51711,6 @@ }, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/surface/outdoors/nospawn) -"pPz" = ( -/obj/docking_port/stationary{ - dheight = 1; - dir = 8; - dwidth = 12; - height = 17; - id = "syndicate_ne"; - name = "northeast of station"; - width = 23 - }, -/turf/open/genturf, -/area/icemoon/surface/outdoors/unexplored/rivers/no_monsters) "pPB" = ( /obj/machinery/seed_extractor, /obj/effect/turf_decal/trimline/green/filled/line{ @@ -51968,19 +52040,6 @@ }, /turf/open/floor/iron, /area/mine/laborcamp) -"pUQ" = ( -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/table, -/obj/machinery/fax{ - fax_name = "Head of Personnel's Office"; - name = "Head of Personnel's Fax Machine" - }, -/turf/open/floor/iron, -/area/station/command/heads_quarters/hop) "pVi" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, @@ -52037,6 +52096,18 @@ /obj/machinery/photocopier, /turf/open/floor/iron/dark/textured, /area/station/security/office) +"pWu" = ( +/obj/docking_port/stationary{ + dheight = 1; + dir = 8; + dwidth = 12; + height = 17; + shuttle_id = "syndicate_ne"; + name = "northeast of station"; + width = 23 + }, +/turf/open/genturf, +/area/icemoon/surface/outdoors/unexplored/rivers/no_monsters) "pXe" = ( /obj/item/stack/sheet/animalhide/monkey, /obj/effect/decal/cleanable/blood, @@ -57081,21 +57152,6 @@ }, /turf/open/floor/iron/textured_half, /area/station/service/hydroponics) -"rCo" = ( -/obj/structure/toilet{ - pixel_y = 8 - }, -/obj/effect/landmark/blobstart, -/obj/effect/landmark/start/hangover, -/obj/machinery/button/door/directional/west{ - id = "Toilet2"; - name = "Lock Control"; - normaldoorcontrol = 1; - specialfunctions = 4 - }, -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron/freezer, -/area/station/commons/toilet) "rCu" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/effect/landmark/start/hangover, @@ -57300,23 +57356,6 @@ /obj/effect/turf_decal/bot_white, /turf/open/floor/iron/dark, /area/station/engineering/atmos/project) -"rEz" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 1 - }, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable, -/obj/structure/table, -/obj/machinery/fax{ - fax_name = "Quartermaster's Office"; - name = "Quartermaster's Fax Machine" - }, -/turf/open/floor/iron, -/area/station/command/heads_quarters/qm) "rEB" = ( /obj/structure/closet, /obj/effect/spawner/random/maintenance, @@ -57472,6 +57511,16 @@ /obj/structure/sign/poster/contraband/random/directional/north, /turf/open/floor/iron, /area/station/maintenance/department/electrical) +"rGR" = ( +/obj/machinery/light/directional/east, +/obj/machinery/airalarm/directional/north, +/obj/structure/table, +/obj/machinery/fax{ + fax_name = "Security Office"; + name = "Security Office Fax Machine" + }, +/turf/open/floor/iron/dark/textured, +/area/station/security/office) "rHc" = ( /obj/effect/turf_decal/tile/red{ dir = 8 @@ -58098,6 +58147,14 @@ }, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) +"rSY" = ( +/obj/docking_port/stationary/random/icemoon{ + dir = 8; + shuttle_id = "pod_2_lavaland"; + name = "lavaland" + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/unexplored/rivers/no_monsters) "rTv" = ( /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -58708,18 +58765,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/service/bar) -"scJ" = ( -/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/misc/asteroid/snow/icemoon, -/area/icemoon/surface/outdoors/nospawn) "scQ" = ( /obj/structure/tank_holder/oxygen, /obj/effect/decal/cleanable/wrapping, @@ -62836,22 +62881,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/break_room) -"tsZ" = ( -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/item/radio/intercom/directional/south, -/obj/structure/table/wood, -/obj/machinery/fax{ - fax_name = "Psychology Office"; - name = "Psychology Office Fax Machine" - }, -/turf/open/floor/iron/white, -/area/station/medical/psychology) "tta" = ( /obj/structure/table, /obj/item/paper_bin{ @@ -64412,6 +64441,25 @@ dir = 8 }, /area/mine/eva) +"tOO" = ( +/obj/structure/sign/warning/no_smoking/circle/directional/west, +/obj/machinery/light/directional/west, +/obj/machinery/camera{ + c_tag = "Medbay Mid-South"; + dir = 5; + network = list("ss13","medbay") + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 10 + }, +/obj/structure/extinguisher_cabinet/directional/south, +/obj/structure/table/glass, +/obj/machinery/fax{ + fax_name = "Medical"; + name = "Medical Fax Machine" + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) "tOX" = ( /obj/machinery/light/small/broken/directional/south, /obj/item/trash/energybar, @@ -65348,21 +65396,6 @@ /obj/effect/turf_decal/tile/red, /turf/open/floor/iron, /area/station/security/prison/mess) -"ueQ" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 8; - id = "gene_desk_shutters"; - name = "Genetics Shutters" - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/window/right/directional/south{ - dir = 4; - name = "Genetics Desk"; - req_access = list("genetics") - }, -/turf/open/floor/plating, -/area/station/science/genetics) "ueS" = ( /obj/effect/turf_decal/trimline/neutral/warning{ dir = 8 @@ -66094,13 +66127,6 @@ /obj/structure/tank_holder/extinguisher, /turf/open/floor/iron/white, /area/station/medical/treatment_center) -"uqa" = ( -/obj/docking_port/stationary/random/icemoon{ - id = "pod_3_lavaland"; - name = "lavaland" - }, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/surface/outdoors/nospawn) "uqg" = ( /obj/machinery/conveyor_switch/oneway{ dir = 8; @@ -67528,32 +67554,6 @@ /obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) -"uOU" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/window/left/directional/north{ - dir = 8; - name = "Reception Window" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 8; - id = "hop"; - name = "Privacy Shutters" - }, -/obj/machinery/flasher/directional/north{ - id = "hopflash" - }, -/obj/structure/desk_bell{ - pixel_x = 7 - }, -/obj/machinery/door/window/brigdoor{ - base_state = "rightsecure"; - dir = 4; - icon_state = "rightsecure"; - name = "Head of Personnel's Desk"; - req_access = list("hop") - }, -/turf/open/floor/iron, -/area/station/command/heads_quarters/hop) "uPh" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -69079,25 +69079,6 @@ dir = 1 }, /area/mine/living_quarters) -"vnG" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 4; - id = "robotics2"; - name = "Robotics Lab Shutters" - }, -/obj/item/folder/white, -/obj/item/pen, -/obj/machinery/door/firedoor, -/obj/machinery/door/window/right/directional/east{ - base_state = "left"; - dir = 8; - icon_state = "left"; - name = "Robotics Desk"; - req_access = list("robotics") - }, -/turf/open/floor/plating, -/area/station/science/robotics/lab) "vnN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -70487,6 +70468,15 @@ }, /turf/open/floor/iron, /area/station/command/heads_quarters/rd) +"vKn" = ( +/obj/item/radio/intercom/directional/north, +/obj/structure/table/wood, +/obj/machinery/fax{ + fax_name = "Service Hallway"; + name = "Service Fax Machine" + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/service) "vKp" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -71156,15 +71146,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/command/gateway) -"vVk" = ( -/obj/item/radio/intercom/directional/north, -/obj/structure/table/wood, -/obj/machinery/fax{ - fax_name = "Service Hallway"; - name = "Service Fax Machine" - }, -/turf/open/floor/iron, -/area/station/hallway/secondary/service) "vVw" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -71383,6 +71364,19 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"vYm" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/table, +/obj/machinery/fax{ + fax_name = "Head of Personnel's Office"; + name = "Head of Personnel's Fax Machine" + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/hop) "vYq" = ( /obj/structure/barricade/wooden/snowed, /turf/open/misc/asteroid/snow/icemoon, @@ -72450,6 +72444,20 @@ /obj/item/food/fried_chicken, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/station/maintenance/fore/lesser) +"wol" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/light/directional/east, +/obj/structure/table, +/obj/machinery/fax{ + fax_name = "Research Division"; + name = "Research Division Fax Machine"; + pixel_x = 1 + }, +/turf/open/floor/iron/white/side{ + dir = 10 + }, +/area/station/science/research) "wor" = ( /turf/open/openspace, /area/station/medical/medbay/aft) @@ -74708,17 +74716,6 @@ /obj/item/trash/raisins, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"wWs" = ( -/obj/docking_port/stationary{ - dir = 2; - dwidth = 11; - height = 22; - id = "whiteship_home"; - name = "SS13: Auxiliary Dock, Station-Port"; - width = 35 - }, -/turf/open/floor/plating/snowed/icemoon, -/area/icemoon/surface/outdoors/nospawn) "wWt" = ( /obj/machinery/light/directional/west, /obj/machinery/camera/directional/west{ @@ -75570,6 +75567,13 @@ /obj/effect/spawner/random/food_or_drink/snack, /turf/open/floor/iron/dark, /area/station/science/breakroom) +"xiI" = ( +/obj/docking_port/stationary/random/icemoon{ + shuttle_id = "pod_3_lavaland"; + name = "lavaland" + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) "xiO" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 1 @@ -75593,6 +75597,23 @@ "xiW" = ( /turf/open/floor/iron, /area/station/maintenance/port/fore) +"xiX" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/obj/structure/table, +/obj/machinery/fax{ + fax_name = "Quartermaster's Office"; + name = "Quartermaster's Fax Machine" + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/qm) "xjg" = ( /obj/structure/sign/departments/medbay/alt, /turf/closed/wall, @@ -76852,6 +76873,17 @@ /obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/iron/dark/smooth_large, /area/station/medical/virology) +"xEs" = ( +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/machinery/light/directional/south, +/obj/machinery/firealarm/directional/south, +/obj/structure/table/glass, +/obj/machinery/fax{ + fax_name = "Chief Medical Officer's Office"; + name = "Chief Medical Officer's Fax Machine" + }, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/cmo) "xEx" = ( /obj/effect/turf_decal/tile/bar{ dir = 1 @@ -77108,16 +77140,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/upper) -"xIp" = ( -/obj/machinery/light/directional/east, -/obj/machinery/airalarm/directional/north, -/obj/structure/table, -/obj/machinery/fax{ - fax_name = "Security Office"; - name = "Security Office Fax Machine" - }, -/turf/open/floor/iron/dark/textured, -/area/station/security/office) "xIz" = ( /obj/effect/turf_decal/trimline/neutral/mid_joiner{ dir = 4 @@ -77266,17 +77288,6 @@ "xKJ" = ( /turf/closed/wall, /area/station/command/meeting_room) -"xKO" = ( -/obj/structure/table, -/obj/machinery/light_switch/directional/north, -/obj/machinery/fax{ - fax_name = "Research Director's Office"; - name = "Research Director's Fax Machine" - }, -/turf/open/floor/iron/white/side{ - dir = 1 - }, -/area/station/command/heads_quarters/rd) "xKX" = ( /obj/effect/turf_decal/trimline/dark_green/arrow_ccw{ dir = 6 @@ -77865,17 +77876,6 @@ "xVG" = ( /turf/open/floor/plating, /area/station/hallway/secondary/exit/departure_lounge) -"xVJ" = ( -/obj/docking_port/stationary{ - dir = 4; - dwidth = 2; - height = 5; - id = "laborcamp_away"; - name = "labor camp"; - width = 9 - }, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/underground/explored) "xVK" = ( /turf/closed/wall, /area/station/service/janitor) @@ -110270,7 +110270,7 @@ scw iDt scw scw -xVJ +jBn iDt iDt scw @@ -167371,7 +167371,7 @@ gjq ucN scV jIv -plN +jCD mgb ucN iDt @@ -167876,7 +167876,7 @@ iDt ijY pfw wUj -mUC +lMi jeJ aFg vwl @@ -173064,7 +173064,7 @@ udC udC iDt vcj -odf +ijn vWz vWz beo @@ -183833,7 +183833,7 @@ udC udC xMq mdZ -vVk +vKn tGZ tGZ gVn @@ -217242,7 +217242,7 @@ wNO wNO wNO wNO -bUb +rSY wNO wNO wNO @@ -217256,7 +217256,7 @@ wNO wNO wNO wNO -jhM +fPx wNO wNO wNO @@ -219583,7 +219583,7 @@ uVf uQS cJt dBj -wWs +jVD bln bln bln @@ -220062,7 +220062,7 @@ qNk qNk qNk qNk -gkE +iIw qNk qNk qNk @@ -221373,7 +221373,7 @@ kYQ uhx bln sEB -aQF +ibR sEB bln uhx @@ -221875,7 +221875,7 @@ bln bln bln bln -scJ +dLv bln bln bln @@ -227301,7 +227301,7 @@ bln sEB bln bln -cTc +bfP sEB bln bln @@ -230631,7 +230631,7 @@ nNs dXR hCu vAT -rEz +xiX wHl ikO bji @@ -231666,7 +231666,7 @@ kaw vkF eHq cdu -gpH +cnB bvr xNu mWe @@ -235778,7 +235778,7 @@ msb hll iYb gfb -uOU +eab gtq cLT cpm @@ -236805,7 +236805,7 @@ wzk sKz jle jfc -pUQ +vYm qBt cqQ jRC @@ -238280,7 +238280,7 @@ wNO wNO lbc nbp -xIp +rGR pVX dlK pbI @@ -239059,7 +239059,7 @@ bln rhf vyd ePr -fBC +plu kWh qVJ mgU @@ -241367,7 +241367,7 @@ wNO wNO bln bln -uqa +xiI bln bln bln @@ -242192,7 +242192,7 @@ biL sUi oqf lpM -bJg +eEC aTw lmo hpe @@ -242691,7 +242691,7 @@ uja oiz ehm uja -nCm +kDz chB twU uja @@ -243205,7 +243205,7 @@ vmp vmp kxN uja -rCo +oUO oUG hsB uja @@ -244821,7 +244821,7 @@ sMg qwF bln bln -bJq +hDG bln czY bln @@ -246515,7 +246515,7 @@ bln bln bln bln -dld +bMz bln bln bln @@ -248642,7 +248642,7 @@ qjF pPO wbN iyK -ewm +tOO qQp qQp mMl @@ -249941,7 +249941,7 @@ hRA sHD dnc sfM -tsZ +baw sZF sKf mlo @@ -250684,7 +250684,7 @@ oeM vBG nLd wLY -hXI +xEs vBG oEF bZb @@ -255047,7 +255047,7 @@ lso cYE lso kKF -agH +azU wew rIU abM @@ -255321,7 +255321,7 @@ raE pJv iMF jbU -xKO +anP cRK uMK udQ @@ -255568,7 +255568,7 @@ ult ult mtI lsa -vnG +iCz mtI mtI kaX @@ -256608,7 +256608,7 @@ fLU vjj vjj wLl -dyV +wol hnP gPE bpD @@ -258392,7 +258392,7 @@ elw elw elw pqo -ueQ +ftJ mEJ jTG mEJ @@ -260881,7 +260881,7 @@ wNO wNO wNO wNO -pPz +pWu wNO wNO wNO @@ -262489,7 +262489,7 @@ bln vsI sEB sEB -aDK +fmq vsI bln bln diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 3497030f7b2..0848b495fab 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -62,6 +62,30 @@ }, /turf/open/floor/iron/dark, /area/station/security/execution/transfer) +"aau" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/light/directional/east, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/table, +/obj/effect/turf_decal/bot, +/obj/machinery/camera/directional/east{ + c_tag = "Cargo Office"; + name = "cargo camera"; + network = list("ss13","qm") + }, +/obj/machinery/fax{ + fax_name = "Cargo Office"; + name = "Cargo Office Fax Machine" + }, +/turf/open/floor/iron/dark, +/area/station/cargo/office) "aaw" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -1192,13 +1216,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/starboard) -"anZ" = ( -/obj/docking_port/stationary/random{ - id = "pod_3_lavaland"; - name = "lavaland" - }, -/turf/open/space, -/area/space/nearstation) "aoe" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating/airless, @@ -1611,17 +1628,6 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/plating, /area/station/maintenance/department/crew_quarters/bar) -"ave" = ( -/obj/docking_port/stationary{ - dir = 2; - dwidth = 11; - height = 22; - id = "whiteship_home"; - name = "SS13: Auxiliary Dock, Station-Fore"; - width = 35 - }, -/turf/open/space/basic, -/area/space) "avo" = ( /obj/structure/sign/warning/biohazard, /turf/closed/wall/rust, @@ -4303,17 +4309,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark/corner, /area/station/hallway/primary/central/fore) -"bpm" = ( -/obj/docking_port/stationary{ - dir = 8; - dwidth = 2; - height = 11; - id = "ferry_home"; - name = "port bay 2"; - width = 5 - }, -/turf/open/space/basic, -/area/space/nearstation) "bpn" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining/glass{ @@ -4692,24 +4687,6 @@ }, /turf/open/floor/engine/o2, /area/station/engineering/atmos) -"bul" = ( -/obj/structure/table/wood, -/obj/item/flashlight/lamp/green{ - pixel_x = -7; - pixel_y = 5 - }, -/obj/machinery/status_display/evac/directional/north, -/obj/item/radio/intercom/directional/west, -/obj/item/folder/white{ - pixel_x = 7; - pixel_y = 5 - }, -/obj/item/pen{ - pixel_x = 6; - pixel_y = 1 - }, -/turf/open/floor/carpet, -/area/station/medical/psychology) "bum" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -5999,17 +5976,6 @@ }, /turf/open/floor/iron/dark, /area/station/medical/chemistry) -"bRQ" = ( -/obj/docking_port/stationary{ - dir = 4; - dwidth = 11; - height = 18; - id = "emergency_home"; - name = "KiloStation emergency evac bay"; - width = 30 - }, -/turf/open/space/basic, -/area/space/nearstation) "bRV" = ( /obj/structure/chair/sofa/left{ color = "#c45c57"; @@ -6714,6 +6680,23 @@ /obj/structure/lattice, /turf/open/space/basic, /area/space/nearstation) +"cdd" = ( +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/siding/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/status_display/evac/directional/east, +/obj/structure/disposalpipe/segment, +/obj/structure/table, +/obj/machinery/fax{ + fax_name = "Medical"; + name = "Medical Fax Machine" + }, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/medbay/central) "cdf" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -7115,6 +7098,43 @@ "chD" = ( /turf/closed/wall, /area/station/ai_monitored/turret_protected/aisat/foyer) +"chH" = ( +/obj/structure/table/reinforced, +/obj/item/paper_bin{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/pen, +/obj/machinery/button/door/directional/west{ + id = "atmos"; + name = "Atmospherics Lockdown"; + pixel_y = 6; + req_access = list("atmospherics") + }, +/obj/machinery/button/door/directional/west{ + id = "Engineering"; + name = "Engineering Lockdown"; + pixel_y = -6; + req_access = list("engineering") + }, +/obj/item/computer_hardware/hard_drive/portable/atmos{ + pixel_x = 10; + pixel_y = -4 + }, +/obj/item/toy/figure/ce{ + pixel_x = 8; + pixel_y = 6 + }, +/obj/item/computer_hardware/hard_drive/portable/engineering{ + pixel_x = 10; + pixel_y = -8 + }, +/obj/item/computer_hardware/hard_drive/portable/engineering{ + pixel_x = 10; + pixel_y = -8 + }, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/ce) "chI" = ( /turf/closed/wall/r_wall, /area/station/ai_monitored/turret_protected/aisat/foyer) @@ -7447,18 +7467,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/construction/mining/aux_base) -"cll" = ( -/obj/docking_port/stationary{ - dir = 4; - dwidth = 3; - height = 14; - id = "arrivals_stationary"; - name = "kilo arrivals"; - roundstart_template = /datum/map_template/shuttle/arrival/kilo; - width = 7 - }, -/turf/open/floor/plating/airless, -/area/space) "clm" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/hatch{ @@ -8244,25 +8252,6 @@ /obj/structure/girder, /turf/open/floor/plating, /area/station/maintenance/department/security) -"cwR" = ( -/obj/effect/turf_decal/bot, -/obj/structure/table, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/machinery/recharger, -/obj/machinery/status_display/evac/directional/west, -/obj/item/toy/figure/cmo{ - pixel_x = 9; - pixel_y = 12 - }, -/obj/item/reagent_containers/spray/cleaner{ - pixel_x = -9; - pixel_y = 10 - }, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/cmo) "cxO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -8458,18 +8447,6 @@ /obj/machinery/light/directional/west, /turf/open/floor/iron, /area/station/hallway/primary/port) -"cAY" = ( -/obj/docking_port/stationary{ - dheight = 1; - dir = 8; - dwidth = 12; - height = 17; - id = "syndicate_nw"; - name = "northwest of station"; - width = 23 - }, -/turf/open/space/basic, -/area/space) "cBc" = ( /obj/effect/turf_decal/bot, /obj/machinery/computer/security/labor, @@ -8569,14 +8546,6 @@ }, /turf/open/floor/carpet/red, /area/station/service/chapel) -"cCX" = ( -/obj/docking_port/stationary/random{ - dir = 2; - id = "pod_lavaland"; - name = "lavaland" - }, -/turf/open/space, -/area/space/nearstation) "cDf" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral, @@ -8723,14 +8692,6 @@ /obj/machinery/air_sensor/ordnance_freezer_chamber, /turf/open/floor/iron/dark/airless, /area/station/science/ordnance/freezerchamber) -"cGA" = ( -/obj/docking_port/stationary/random{ - dir = 8; - id = "pod_2_lavaland"; - name = "lavaland" - }, -/turf/open/space, -/area/space/nearstation) "cGF" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -8984,20 +8945,6 @@ }, /turf/open/floor/iron/dark, /area/station/construction/mining/aux_base) -"cJo" = ( -/obj/docking_port/stationary{ - area_type = /area/station/construction/mining/aux_base; - dheight = 4; - dir = 8; - dwidth = 4; - height = 9; - id = "aux_base_zone"; - name = "Aux Base Zone"; - roundstart_template = /datum/map_template/shuttle/aux_base/default; - width = 9 - }, -/turf/open/floor/plating, -/area/station/construction/mining/aux_base) "cJv" = ( /obj/effect/turf_decal/tile/brown{ dir = 4 @@ -10164,13 +10111,6 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/iron, /area/station/service/hydroponics) -"dcJ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/sign/warning/electric_shock/directional/west, -/obj/effect/mapping_helpers/burnt_floor, -/obj/effect/spawner/structure/electrified_grille, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) "ddb" = ( /obj/machinery/camera/directional/north{ c_tag = "Atmospherics Tank - N2"; @@ -10488,6 +10428,17 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard) +"dhL" = ( +/obj/docking_port/stationary{ + dir = 4; + dwidth = 4; + height = 7; + shuttle_id = "cargo_home"; + name = "Cargo Bay"; + width = 12 + }, +/turf/open/space/basic, +/area/space) "dhT" = ( /obj/structure/cable, /obj/structure/table, @@ -11759,12 +11710,6 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/engine, /area/station/science/xenobiology) -"dxz" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/broken_floor, -/obj/effect/spawner/structure/electrified_grille, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) "dxB" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -14387,6 +14332,18 @@ }, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) +"enj" = ( +/obj/structure/barricade/wooden, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/effect/spawner/structure/electrified_grille, +/turf/open/floor/iron/dark, +/area/station/maintenance/fore) "enr" = ( /obj/structure/table, /obj/item/storage/box/lights/mixed{ @@ -18080,6 +18037,17 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/port/lesser) +"fol" = ( +/obj/docking_port/stationary{ + dir = 4; + dwidth = 11; + height = 18; + shuttle_id = "emergency_home"; + name = "KiloStation emergency evac bay"; + width = 30 + }, +/turf/open/space/basic, +/area/space/nearstation) "fov" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 4 @@ -19764,6 +19732,18 @@ /obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/iron/dark, /area/station/security/processing) +"fJv" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/structure/table/wood, +/obj/machinery/airalarm/directional/south, +/obj/machinery/fax{ + fax_name = "Captain's Office"; + name = "Captain's Fax Machine" + }, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/captain) "fJz" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -20485,6 +20465,20 @@ /obj/structure/grille, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"fSa" = ( +/obj/docking_port/stationary{ + area_type = /area/station/construction/mining/aux_base; + dheight = 4; + dir = 8; + dwidth = 4; + height = 9; + shuttle_id = "aux_base_zone"; + name = "Aux Base Zone"; + roundstart_template = /datum/map_template/shuttle/aux_base/default; + width = 9 + }, +/turf/open/floor/plating, +/area/station/construction/mining/aux_base) "fSt" = ( /turf/closed/wall/r_wall/rust, /area/station/engineering/storage_shared) @@ -21453,6 +21447,22 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +"ghX" = ( +/obj/effect/turf_decal/tile/blue, +/obj/item/clipboard, +/obj/item/folder/white{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/folder/blue, +/obj/structure/table/reinforced/rglass, +/obj/item/folder/white{ + pixel_x = -8; + pixel_y = 3 + }, +/obj/item/clothing/glasses/hud/health, +/turf/open/floor/iron/showroomfloor, +/area/station/command/heads_quarters/cmo) "gii" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -22128,6 +22138,23 @@ /obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/iron, /area/station/command/teleporter) +"grs" = ( +/obj/machinery/light_switch/directional/west, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/obj/structure/table, +/obj/machinery/fax{ + fax_name = "Security Office"; + name = "Security Office Fax Machine" + }, +/turf/open/floor/iron, +/area/station/security/office) "gry" = ( /obj/structure/sign/warning/fire, /turf/closed/wall/r_wall, @@ -22702,43 +22729,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/solars/port/aft) -"gAq" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/pen, -/obj/machinery/button/door/directional/west{ - id = "atmos"; - name = "Atmospherics Lockdown"; - pixel_y = 6; - req_access = list("atmospherics") - }, -/obj/machinery/button/door/directional/west{ - id = "Engineering"; - name = "Engineering Lockdown"; - pixel_y = -6; - req_access = list("engineering") - }, -/obj/item/computer_hardware/hard_drive/portable/atmos{ - pixel_x = 10; - pixel_y = -4 - }, -/obj/item/toy/figure/ce{ - pixel_x = 8; - pixel_y = 6 - }, -/obj/item/computer_hardware/hard_drive/portable/engineering{ - pixel_x = 10; - pixel_y = -8 - }, -/obj/item/computer_hardware/hard_drive/portable/engineering{ - pixel_x = 10; - pixel_y = -8 - }, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/ce) "gAO" = ( /obj/effect/mapping_helpers/airlock/unres{ dir = 8 @@ -25889,6 +25879,27 @@ /obj/structure/dresser, /turf/open/floor/wood, /area/station/commons/locker) +"hrN" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/structure/table, +/obj/machinery/fax{ + fax_name = "Head of Personnel's Office"; + name = "Head of Personnel's Fax Machine" + }, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/hop) "hrY" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -27310,6 +27321,17 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/plating, /area/station/maintenance/department/security) +"hMC" = ( +/obj/docking_port/stationary{ + dir = 8; + dwidth = 2; + height = 11; + shuttle_id = "ferry_home"; + name = "port bay 2"; + width = 5 + }, +/turf/open/space/basic, +/area/space/nearstation) "hMN" = ( /turf/closed/wall, /area/station/service/chapel/funeral) @@ -27353,23 +27375,6 @@ /obj/structure/cable, /turf/open/floor/engine, /area/station/engineering/supermatter/room) -"hNk" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/structure/table/reinforced, -/obj/machinery/fax{ - fax_name = "Research Director's Office"; - name = "Research Director's Fax Machine" - }, -/turf/open/floor/iron/showroomfloor, -/area/station/command/heads_quarters/rd) "hNy" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, @@ -28365,6 +28370,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/station/service/hydroponics/garden) +"iak" = ( +/obj/docking_port/stationary/random{ + shuttle_id = "pod_3_lavaland"; + name = "lavaland" + }, +/turf/open/space, +/area/space/nearstation) "ias" = ( /obj/structure/table/wood, /obj/item/vending_refill/cigarette, @@ -32929,6 +32941,25 @@ /obj/effect/turf_decal/box/corners, /turf/open/floor/iron/dark, /area/station/hallway/primary/central/fore) +"jiN" = ( +/obj/effect/turf_decal/bot, +/obj/structure/table, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/recharger, +/obj/machinery/status_display/evac/directional/west, +/obj/item/toy/figure/cmo{ + pixel_x = 9; + pixel_y = 12 + }, +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = -9; + pixel_y = 10 + }, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/cmo) "jiO" = ( /obj/effect/turf_decal/tile/purple/half/contrasted, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -33841,22 +33872,6 @@ "jBs" = ( /turf/closed/wall/r_wall, /area/station/security/checkpoint/engineering) -"jBx" = ( -/obj/effect/turf_decal/tile/blue, -/obj/item/clipboard, -/obj/item/folder/white{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/folder/blue, -/obj/structure/table/reinforced/rglass, -/obj/item/folder/white{ - pixel_x = -8; - pixel_y = 3 - }, -/obj/item/clothing/glasses/hud/health, -/turf/open/floor/iron/showroomfloor, -/area/station/command/heads_quarters/cmo) "jBy" = ( /obj/structure/bookcase/random/nonfiction, /obj/effect/decal/cleanable/cobweb/cobweb2, @@ -34729,6 +34744,27 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +"jNM" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/item/folder/blue{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/folder/yellow, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/item/folder{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/lighter, +/obj/item/clothing/mask/cigarette/cigar/cohiba, +/obj/item/stamp/ce, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/ce) "jNR" = ( /obj/structure/girder, /obj/effect/decal/cleanable/dirt, @@ -34886,6 +34922,20 @@ /obj/structure/chair/office, /turf/open/floor/iron/dark, /area/station/command/bridge) +"jRm" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/structure/table/wood, +/obj/machinery/fax{ + fax_name = "Detective's Office"; + name = "Detective's Fax Machine" + }, +/turf/open/floor/iron/dark, +/area/station/security/detectives_office) "jRv" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/dirt, @@ -38625,6 +38675,15 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/iron/dark, /area/station/maintenance/fore) +"kWW" = ( +/obj/structure/barricade/wooden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/effect/spawner/structure/electrified_grille, +/obj/effect/mapping_helpers/airlock/access/any/security/maintenance, +/turf/open/floor/iron/dark, +/area/station/maintenance/port/aft) "kXp" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/neutral{ @@ -39199,6 +39258,23 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/fore) +"lfd" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/structure/table/reinforced, +/obj/machinery/fax{ + fax_name = "Research Director's Office"; + name = "Research Director's Fax Machine" + }, +/turf/open/floor/iron/showroomfloor, +/area/station/command/heads_quarters/rd) "lfl" = ( /obj/structure/table/wood, /obj/effect/turf_decal/tile/neutral{ @@ -39337,6 +39413,16 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/station/cargo/storage) +"lgQ" = ( +/obj/structure/transit_tube/horizontal{ + dir = 1 + }, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/fore) "lhf" = ( /obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/dirt, @@ -39459,30 +39545,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/aft) -"liS" = ( -/obj/structure/table/wood, -/obj/item/flashlight/lamp/green{ - pixel_x = -6; - pixel_y = 14 - }, -/obj/item/book/manual/wiki/security_space_law{ - pixel_x = 6; - pixel_y = -2 - }, -/obj/item/toy/figure/lawyer{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/pen{ - pixel_x = -8; - pixel_y = -4 - }, -/obj/item/pen/red{ - pixel_x = -6; - pixel_y = -1 - }, -/turf/open/floor/carpet/green, -/area/station/service/lawoffice) "liY" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -41184,6 +41246,14 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/iron/dark, /area/station/medical/morgue) +"lHD" = ( +/obj/docking_port/stationary/random{ + dir = 8; + shuttle_id = "pod_2_lavaland"; + name = "lavaland" + }, +/turf/open/space, +/area/space/nearstation) "lHE" = ( /obj/structure/table/wood, /obj/structure/displaycase/forsale/kitchen{ @@ -41588,6 +41658,18 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +"lOt" = ( +/obj/docking_port/stationary{ + dir = 4; + dwidth = 3; + height = 14; + shuttle_id = "arrival_stationary"; + name = "kilo arrivals"; + roundstart_template = /datum/map_template/shuttle/arrival/kilo; + width = 7 + }, +/turf/open/floor/plating/airless, +/area/space) "lOG" = ( /turf/closed/wall/rust, /area/station/service/chapel/monastery) @@ -41813,27 +41895,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/iron/dark, /area/station/maintenance/starboard/fore) -"lSl" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/structure/table, -/obj/machinery/fax{ - fax_name = "Head of Personnel's Office"; - name = "Head of Personnel's Fax Machine" - }, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/hop) "lSt" = ( /obj/structure/cable, /obj/structure/bed/dogbed/ian, @@ -42093,6 +42154,18 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/iron/dark, /area/station/maintenance/solars/starboard/fore) +"lWr" = ( +/obj/structure/table/glass, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/fax{ + fax_name = "Chief Medical Officer's Office"; + name = "Chief Medical Officer's Fax Machine" + }, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/cmo) "lWw" = ( /obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple{ @@ -42134,41 +42207,6 @@ /obj/machinery/power/apc/auto_name/directional/west, /turf/open/floor/engine, /area/station/engineering/storage/tech) -"lWW" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/delivery, -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/pen, -/obj/item/stamp{ - pixel_x = 8; - pixel_y = 2 - }, -/obj/item/stamp/denied{ - pixel_x = 8; - pixel_y = 6 - }, -/obj/item/pen/red{ - pixel_x = -5; - pixel_y = -5 - }, -/obj/item/multitool, -/obj/item/toy/figure/cargotech{ - pixel_x = 9; - pixel_y = 15 - }, -/obj/item/toy/figure/miner{ - pixel_x = 6; - pixel_y = 14 - }, -/turf/open/floor/iron/dark, -/area/station/cargo/office) "lXe" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -47975,19 +48013,6 @@ /obj/item/food/grown/poppy, /turf/open/floor/iron/dark, /area/station/service/chapel) -"nGF" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/table/wood, -/obj/machinery/fax{ - fax_name = "Head of Security's Office"; - name = "Head of Security's Fax Machine" - }, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/hos) "nGH" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -49499,21 +49524,6 @@ /mob/living/carbon/human/species/monkey, /turf/open/floor/grass, /area/station/medical/virology) -"ofM" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/machinery/light/directional/east, -/obj/machinery/newscaster/directional/north, -/obj/structure/table, -/obj/machinery/fax{ - fax_name = "Research Division"; - name = "Research Division Fax Machine"; - pixel_x = 1 - }, -/turf/open/floor/iron/dark, -/area/station/science/research) "ogg" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, @@ -49849,6 +49859,21 @@ "okN" = ( /turf/closed/wall/rust, /area/station/service/bar/backroom) +"okQ" = ( +/obj/machinery/airalarm/directional/east, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue, +/obj/machinery/light/directional/east, +/obj/structure/table/wood, +/obj/machinery/fax{ + fax_name = "Psychology Office"; + name = "Psychology Office Fax Machine" + }, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/psychology) "olv" = ( /obj/structure/flora/bush/grassy/style_random, /obj/structure/flora/bush/sparsegrass/style_random, @@ -51526,6 +51551,18 @@ }, /turf/open/floor/grass, /area/station/medical/virology) +"oJU" = ( +/obj/docking_port/stationary{ + dheight = 1; + dir = 8; + dwidth = 12; + height = 17; + shuttle_id = "syndicate_nw"; + name = "northwest of station"; + width = 23 + }, +/turf/open/space/basic, +/area/space) "oJV" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -51757,23 +51794,6 @@ }, /turf/open/floor/iron, /area/station/cargo/sorting) -"oOU" = ( -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/siding/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/machinery/status_display/evac/directional/east, -/obj/structure/disposalpipe/segment, -/obj/structure/table, -/obj/machinery/fax{ - fax_name = "Medical"; - name = "Medical Fax Machine" - }, -/turf/open/floor/iron/showroomfloor, -/area/station/medical/medbay/central) "oOW" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -53405,6 +53425,41 @@ /obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron/dark, /area/station/maintenance/starboard/fore) +"plT" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/delivery, +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/pen, +/obj/item/stamp{ + pixel_x = 8; + pixel_y = 2 + }, +/obj/item/stamp/denied{ + pixel_x = 8; + pixel_y = 6 + }, +/obj/item/pen/red{ + pixel_x = -5; + pixel_y = -5 + }, +/obj/item/multitool, +/obj/item/toy/figure/cargotech{ + pixel_x = 9; + pixel_y = 15 + }, +/obj/item/toy/figure/miner{ + pixel_x = 6; + pixel_y = 14 + }, +/turf/open/floor/iron/dark, +/area/station/cargo/office) "plX" = ( /turf/closed/wall, /area/station/commons/storage/art) @@ -54287,20 +54342,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) -"pzA" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/structure/table, -/obj/effect/turf_decal/bot, -/obj/structure/mirror/directional/north, -/obj/machinery/fax{ - fax_name = "Law Office"; - name = "Law Office Fax Machine" - }, -/turf/open/floor/iron/dark, -/area/station/service/lawoffice) "pzC" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -54398,18 +54439,6 @@ }, /turf/open/space/basic, /area/space) -"pBy" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/structure/table/wood, -/obj/machinery/airalarm/directional/south, -/obj/machinery/fax{ - fax_name = "Captain's Office"; - name = "Captain's Fax Machine" - }, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/captain) "pBR" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -54943,6 +54972,19 @@ "pIO" = ( /turf/closed/wall/r_wall/rust, /area/station/command/heads_quarters/ce) +"pIS" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/table/wood, +/obj/machinery/fax{ + fax_name = "Head of Security's Office"; + name = "Head of Security's Fax Machine" + }, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/hos) "pIT" = ( /obj/machinery/vending/wardrobe/chem_wardrobe, /obj/effect/turf_decal/tile/neutral, @@ -57415,16 +57457,6 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/lobby) -"qsF" = ( -/obj/structure/transit_tube/horizontal{ - dir = 1 - }, -/obj/effect/spawner/structure/window/hollow/reinforced/middle, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/maintenance/fore) "qth" = ( /obj/structure/closet/secure_closet/security/science, /obj/item/crowbar, @@ -57639,6 +57671,30 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) +"qwe" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green{ + pixel_x = -6; + pixel_y = 14 + }, +/obj/item/book/manual/wiki/security_space_law{ + pixel_x = 6; + pixel_y = -2 + }, +/obj/item/toy/figure/lawyer{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/pen{ + pixel_x = -8; + pixel_y = -4 + }, +/obj/item/pen/red{ + pixel_x = -6; + pixel_y = -1 + }, +/turf/open/floor/carpet/green, +/area/station/service/lawoffice) "qwi" = ( /obj/effect/turf_decal/tile/red, /obj/machinery/airalarm/directional/east, @@ -57667,6 +57723,12 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/plating, /area/station/maintenance/port/greater) +"qwH" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/broken_floor, +/obj/effect/spawner/structure/electrified_grille, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) "qwR" = ( /obj/machinery/door/airlock/maintenance{ name = "Research Lab Maintenance" @@ -59608,6 +59670,16 @@ /obj/structure/cable/layer3, /turf/open/floor/engine, /area/station/ai_monitored/turret_protected/ai) +"raN" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/burnt_floor, +/obj/effect/spawner/structure/electrified_grille, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) "raS" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -60513,16 +60585,6 @@ luminosity = 2 }, /area/station/ai_monitored/turret_protected/ai) -"rph" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/burnt_floor, -/obj/effect/spawner/structure/electrified_grille, -/turf/open/floor/plating, -/area/station/maintenance/port/greater) "rpl" = ( /turf/closed/wall, /area/station/maintenance/department/electrical) @@ -61214,21 +61276,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"rxa" = ( -/obj/machinery/airalarm/directional/east, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue, -/obj/machinery/light/directional/east, -/obj/structure/table/wood, -/obj/machinery/fax{ - fax_name = "Psychology Office"; - name = "Psychology Office Fax Machine" - }, -/turf/open/floor/iron/showroomfloor, -/area/station/medical/psychology) "rxe" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -63371,17 +63418,6 @@ dir = 4 }, /area/station/hallway/primary/central/fore) -"scQ" = ( -/obj/docking_port/stationary{ - dir = 4; - dwidth = 4; - height = 7; - id = "supply_home"; - name = "Cargo Bay"; - width = 12 - }, -/turf/open/space/basic, -/area/space) "scR" = ( /obj/item/storage/box/teargas{ pixel_x = 3; @@ -65841,18 +65877,6 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/fore) -"sMI" = ( -/obj/structure/table/glass, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/machinery/fax{ - fax_name = "Chief Medical Officer's Office"; - name = "Chief Medical Officer's Fax Machine" - }, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/cmo) "sMO" = ( /obj/machinery/telecomms/processor/preset_four, /obj/structure/cable, @@ -67383,6 +67407,17 @@ /obj/structure/cable, /turf/open/floor/iron/showroomfloor, /area/station/security/office) +"thC" = ( +/obj/docking_port/stationary{ + dir = 2; + dwidth = 11; + height = 22; + shuttle_id = "whiteship_home"; + name = "SS13: Auxiliary Dock, Station-Fore"; + width = 35 + }, +/turf/open/space/basic, +/area/space) "thG" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -67740,15 +67775,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/disposal) -"tmU" = ( -/obj/structure/barricade/wooden, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/door/airlock/maintenance, -/obj/effect/mapping_helpers/airlock/abandoned, -/obj/effect/spawner/structure/electrified_grille, -/obj/effect/mapping_helpers/airlock/access/any/security/maintenance, -/turf/open/floor/iron/dark, -/area/station/maintenance/port/aft) "tmV" = ( /obj/structure/reagent_dispensers/beerkeg{ pixel_y = 5 @@ -69263,6 +69289,21 @@ /obj/effect/spawner/random/maintenance/two, /turf/open/floor/iron/dark, /area/station/maintenance/port/lesser) +"tIA" = ( +/obj/structure/table/wood/fancy/black, +/obj/item/food/grown/poppy/lily{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/food/grown/poppy/lily{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/food/grown/poppy/lily, +/obj/machinery/power/apc/highcap/five_k/directional/north, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/service/chapel/monastery) "tJa" = ( /obj/machinery/camera/directional/west{ c_tag = "Atmospherics Tank - N2O"; @@ -69612,27 +69653,6 @@ }, /turf/open/floor/iron, /area/station/security/processing) -"tOF" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/item/folder/blue{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/folder/yellow, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/item/folder{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/lighter, -/obj/item/clothing/mask/cigarette/cigar/cohiba, -/obj/item/stamp/ce, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/ce) "tOH" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -72487,6 +72507,13 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"uFN" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/warning/electric_shock/directional/west, +/obj/effect/mapping_helpers/burnt_floor, +/obj/effect/spawner/structure/electrified_grille, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) "uGm" = ( /obj/effect/decal/cleanable/blood/old, /obj/structure/grille/broken, @@ -74063,20 +74090,6 @@ }, /turf/open/space/basic, /area/space/nearstation) -"vdT" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/structure/table/wood, -/obj/machinery/fax{ - fax_name = "Detective's Office"; - name = "Detective's Fax Machine" - }, -/turf/open/floor/iron/dark, -/area/station/security/detectives_office) "vea" = ( /obj/structure/closet/secure_closet/personal/cabinet, /obj/machinery/newscaster/directional/west, @@ -74372,6 +74385,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) +"vhZ" = ( +/obj/effect/spawner/structure/electrified_grille, +/turf/open/floor/plating/rust, +/area/station/security/prison) "vim" = ( /obj/effect/turf_decal/siding/thinplating/light/corner{ dir = 4 @@ -75084,6 +75101,14 @@ }, /turf/open/floor/iron/dark, /area/station/medical/medbay/lobby) +"vsx" = ( +/obj/docking_port/stationary/random{ + dir = 2; + shuttle_id = "pod_lavaland"; + name = "lavaland" + }, +/turf/open/space, +/area/space/nearstation) "vsJ" = ( /obj/structure/flora/bush/jungle/b/style_random, /obj/structure/flora/bush/flowers_pp/style_random, @@ -75116,18 +75141,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/security/brig) -"vtl" = ( -/obj/structure/barricade/wooden, -/obj/machinery/door/airlock/maintenance, -/obj/effect/mapping_helpers/airlock/abandoned, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 1 - }, -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/obj/effect/spawner/structure/electrified_grille, -/turf/open/floor/iron/dark, -/area/station/maintenance/fore) "vto" = ( /obj/structure/railing/corner, /obj/effect/turf_decal/tile/neutral, @@ -75945,21 +75958,6 @@ }, /turf/open/floor/iron/dark, /area/station/maintenance/disposal/incinerator) -"vDf" = ( -/obj/structure/table/wood/fancy/black, -/obj/item/food/grown/poppy/lily{ - pixel_x = -6; - pixel_y = 6 - }, -/obj/item/food/grown/poppy/lily{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/item/food/grown/poppy/lily, -/obj/machinery/power/apc/highcap/five_k/directional/north, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/service/chapel/monastery) "vDk" = ( /turf/closed/wall, /area/station/engineering/supermatter/room) @@ -76192,6 +76190,21 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/primary/aft) +"vGY" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/light/directional/east, +/obj/machinery/newscaster/directional/north, +/obj/structure/table, +/obj/machinery/fax{ + fax_name = "Research Division"; + name = "Research Division Fax Machine"; + pixel_x = 1 + }, +/turf/open/floor/iron/dark, +/area/station/science/research) "vHa" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -78659,6 +78672,24 @@ /obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible, /turf/open/floor/iron, /area/station/engineering/atmos) +"wog" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green{ + pixel_x = -7; + pixel_y = 5 + }, +/obj/machinery/status_display/evac/directional/north, +/obj/item/radio/intercom/directional/west, +/obj/item/folder/white{ + pixel_x = 7; + pixel_y = 5 + }, +/obj/item/pen{ + pixel_x = 6; + pixel_y = 1 + }, +/turf/open/floor/carpet, +/area/station/medical/psychology) "woj" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -79321,6 +79352,15 @@ luminosity = 2 }, /area/station/engineering/supermatter) +"wxy" = ( +/obj/docking_port/stationary/random{ + dir = 4; + shuttle_id = "pod_4_lavaland"; + name = "lavaland" + }, +/obj/structure/lattice, +/turf/open/space, +/area/space/nearstation) "wxF" = ( /obj/structure/table/wood, /obj/effect/spawner/random/maintenance, @@ -80134,15 +80174,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/security/checkpoint/engineering) -"wIb" = ( -/obj/docking_port/stationary/random{ - dir = 4; - id = "pod_4_lavaland"; - name = "lavaland" - }, -/obj/structure/lattice, -/turf/open/space, -/area/space/nearstation) "wIo" = ( /obj/machinery/atmospherics/components/unary/passive_vent{ dir = 1; @@ -81527,6 +81558,20 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/wood, /area/station/commons/locker) +"xdv" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/table, +/obj/effect/turf_decal/bot, +/obj/structure/mirror/directional/north, +/obj/machinery/fax{ + fax_name = "Law Office"; + name = "Law Office Fax Machine" + }, +/turf/open/floor/iron/dark, +/area/station/service/lawoffice) "xef" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -81672,23 +81717,6 @@ dir = 1 }, /area/station/hallway/primary/central/fore) -"xgM" = ( -/obj/machinery/light_switch/directional/west, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/obj/structure/table, -/obj/machinery/fax{ - fax_name = "Security Office"; - name = "Security Office Fax Machine" - }, -/turf/open/floor/iron, -/area/station/security/office) "xgV" = ( /obj/item/trash/candy, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -84638,30 +84666,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/hallway/secondary/service) -"xXx" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/machinery/light/directional/east, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/table, -/obj/effect/turf_decal/bot, -/obj/machinery/camera/directional/east{ - c_tag = "Cargo Office"; - name = "cargo camera"; - network = list("ss13","qm") - }, -/obj/machinery/fax{ - fax_name = "Cargo Office"; - name = "Cargo Office Fax Machine" - }, -/turf/open/floor/iron/dark, -/area/station/cargo/office) "xXz" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -85259,10 +85263,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/hallway/primary/central/fore) -"yfP" = ( -/obj/effect/spawner/structure/electrified_grille, -/turf/open/floor/plating/rust, -/area/station/security/prison) "yfS" = ( /obj/machinery/light/small/directional/west, /mob/living/simple_animal/chicken, @@ -91484,7 +91484,7 @@ aaa aaa aaa aaa -cAY +oJU aaa aaa aaa @@ -93340,7 +93340,7 @@ sAv woG bMw xlA -yfP +vhZ mqC ezC iQg @@ -96151,7 +96151,7 @@ oTP kZI ybH iqU -rph +raN pqD iza pqD @@ -96160,7 +96160,7 @@ iza acm aaa aaa -bpm +hMC aaa aaa dWG @@ -96655,7 +96655,7 @@ aeu aeu aDT beK -cGA +lHD beK sRm aeu @@ -101476,7 +101476,7 @@ fty tOH eqD ebU -vDf +tIA yhr csL gPC @@ -101774,7 +101774,7 @@ aeu aeu pVz kyU -dcJ +uFN tGV dRc ikX @@ -101831,7 +101831,7 @@ cuR eEh nMD tCU -tmU +kWW tCU tCU cuR @@ -102031,7 +102031,7 @@ pVz pVz pVz maN -dxz +qwH aRS sNx hBm @@ -102288,7 +102288,7 @@ jUa aTg xBI rfD -dxz +qwH dIQ dnz pmA @@ -102859,7 +102859,7 @@ oCr nuz rdb kio -xgM +grs hpW tzL tCU @@ -102872,7 +102872,7 @@ gKV aaa aaa cry -cCX +vsx acm aaa aaa @@ -103320,7 +103320,7 @@ eWP esG acD sKm -cwR +jiN aHQ qGK tzN @@ -104091,7 +104091,7 @@ gHC buJ kAR gbB -jBx +ghX lUM qGK jiE @@ -104345,7 +104345,7 @@ ugc jVZ xmI gHC -sMI +lWr khj pYZ wKa @@ -105367,7 +105367,7 @@ iQN mCk liY pVz -bul +wog lFN lBU hpQ @@ -105433,7 +105433,7 @@ mVf pSG gpM cFO -nGF +pIS pUH wYW tZf @@ -105898,7 +105898,7 @@ utF wFm dzQ qrS -oOU +cdd xev cHz cvF @@ -106140,7 +106140,7 @@ iTZ pVz hOY eWH -rxa +okQ xzA eUN ugq @@ -110544,7 +110544,7 @@ dgW jCm qpx lwW -liS +qwe snW hEw rxJ @@ -110758,7 +110758,7 @@ qlC gbU emo bpp -vtl +enj gYV cKW ydV @@ -110799,7 +110799,7 @@ jCm wbo jCm cXT -pzA +xdv tKB foU gFO @@ -111076,7 +111076,7 @@ kqs ikT glX nlA -vdT +jRm taU ayY oBq @@ -113890,7 +113890,7 @@ wbT dod dki vvC -lSl +hrN axt fBI lcS @@ -114357,9 +114357,9 @@ awb awb axk awb -qsF +lgQ vza -qsF +lgQ yfq kZX yfq @@ -118464,7 +118464,7 @@ cIX cIX cIX cIX -cJo +fSa cIX cIX cIX @@ -119027,7 +119027,7 @@ fiQ jfV rxt vrf -pBy +fJv jlh aVx vKp @@ -121615,7 +121615,7 @@ sXJ ipO qZX kDg -gAq +chH ctg dUY cYk @@ -121873,7 +121873,7 @@ vHF jjs cwj cLx -tOF +jNM ueJ tav snU @@ -123129,7 +123129,7 @@ vOX vOO gsO nVc -lWW +plT iVO mlx hJa @@ -123621,7 +123621,7 @@ dJm bUx cKY mDj -ofM +vGY eHI eHI eHI @@ -123900,7 +123900,7 @@ rZV erl pnl idM -xXx +aau aEC vWA dyj @@ -124392,7 +124392,7 @@ lVL gSW nzz gVt -hNk +lfd dlc hhc imS @@ -124453,7 +124453,7 @@ bPP bUN bUN bUN -cll +lOt bUN bUN bUN @@ -126419,7 +126419,7 @@ aaa aaa aaa cmJ -anZ +iak cry aaa aaa @@ -127762,7 +127762,7 @@ aaa aaa aaa aaa -scQ +dhL aaa aaa aaa @@ -129743,7 +129743,7 @@ tZh mdB nOL suj -ave +thC aaa aaa aaa @@ -129832,7 +129832,7 @@ aaa aaa aaa aaa -bRQ +fol aaa aaa aaa @@ -131078,7 +131078,7 @@ aeU aof qJs acK -wIb +wxy acK qJs aeu diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index f83a1bd76ec..7a1947210f0 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -171,6 +171,10 @@ /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/station/solars/port/aft) +"aej" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/engineering/atmos/pumproom) "aek" = ( /obj/machinery/camera/directional/west{ c_tag = "Medbay Main Hallway- South"; @@ -824,6 +828,10 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/cargo/miningoffice) +"aqG" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/cargo/sorting) "aqN" = ( /obj/structure/window/reinforced, /obj/machinery/computer/cargo/request{ @@ -1048,6 +1056,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, /area/station/commons/dorms) +"auy" = ( +/obj/structure/window{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/carpet, +/area/station/service/theater) "auH" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 @@ -1132,6 +1148,15 @@ }, /turf/open/floor/carpet, /area/station/commons/dorms) +"awt" = ( +/obj/structure/window, +/obj/effect/turf_decal/tile/red/fourcorners, +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "aww" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 5 @@ -1395,6 +1420,11 @@ /obj/structure/disposalpipe/trunk, /turf/open/floor/iron, /area/station/science/lab) +"aBL" = ( +/obj/effect/spawner/structure/window, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/execution/transfer) "aBM" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -1598,6 +1628,14 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +"aEC" = ( +/obj/machinery/door/firedoor, +/obj/structure/window, +/obj/machinery/computer/cargo/request{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/sorting) "aEH" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -1764,6 +1802,20 @@ "aIw" = ( /turf/open/floor/plating/airless, /area/station/solars/port/fore) +"aIz" = ( +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/structure/window, +/obj/structure/window{ + dir = 8 + }, +/obj/machinery/atmospherics/components/trinary/filter/atmos/n2o{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow/fourcorners, +/turf/open/floor/iron, +/area/station/engineering/atmos) "aIA" = ( /obj/machinery/door/airlock/maintenance{ name = "Medbay Maintenance" @@ -2334,10 +2386,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/science/server) -"aQt" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/station/cargo/sorting) "aQE" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -2439,6 +2487,18 @@ /obj/structure/window/reinforced, /turf/open/space, /area/space/nearstation) +"aSK" = ( +/obj/structure/window{ + dir = 4 + }, +/obj/structure/window{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) "aST" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -2602,15 +2662,6 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai) -"aVC" = ( -/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ - dir = 4 - }, -/obj/structure/window{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "aVX" = ( /obj/machinery/door/airlock/hatch{ name = "Telecomms Server Room" @@ -3276,6 +3327,14 @@ }, /turf/open/floor/iron, /area/station/security/checkpoint/engineering) +"bhb" = ( +/obj/structure/window{ + dir = 1 + }, +/obj/machinery/light/no_nightlight/directional/east, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) "bhc" = ( /obj/machinery/door/airlock/highsecurity{ name = "AI Chamber" @@ -3302,6 +3361,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/brig) +"bhI" = ( +/obj/structure/window{ + dir = 1 + }, +/obj/structure/bodycontainer/morgue, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/security/medical) "bhM" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -3468,6 +3537,14 @@ }, /turf/open/floor/iron/white, /area/station/medical/virology) +"bkQ" = ( +/obj/effect/spawner/structure/window, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 4; + id = "main_surgery" + }, +/turf/open/floor/plating, +/area/station/medical/treatment_center) "bkT" = ( /obj/structure/chair/office/light, /obj/structure/cable, @@ -3537,15 +3614,6 @@ /obj/machinery/power/apc/auto_name/directional/west, /turf/open/floor/iron, /area/station/engineering/main) -"blT" = ( -/obj/structure/window, -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, -/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "bmb" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -3814,32 +3882,6 @@ /obj/structure/table/wood, /turf/open/floor/carpet, /area/station/service/chapel/funeral) -"bpm" = ( -/obj/machinery/door/window/right/directional/south{ - dir = 1; - name = "First Aid Supplies"; - req_access = list("medical") - }, -/obj/structure/window{ - dir = 8 - }, -/obj/item/storage/medkit/regular{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/item/storage/medkit/toxin{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/medkit/toxin, -/obj/item/storage/medkit/toxin{ - pixel_x = -3; - pixel_y = -3 - }, -/obj/structure/table/reinforced, -/obj/machinery/light/directional/south, -/turf/open/floor/iron/dark, -/area/station/medical/storage) "bpu" = ( /obj/machinery/airalarm/directional/north, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, @@ -4021,6 +4063,29 @@ }, /turf/open/floor/iron, /area/station/commons/locker) +"bsW" = ( +/obj/machinery/door/window/left/directional/north{ + dir = 8; + name = "Magboot Storage"; + pixel_x = -1; + req_access = list("eva") + }, +/obj/structure/window{ + dir = 1 + }, +/obj/structure/rack, +/obj/item/clothing/shoes/magboots{ + pixel_x = -4; + pixel_y = 3 + }, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/shoes/magboots{ + pixel_x = 4; + pixel_y = -3 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/storage/eva) "bsZ" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -4039,20 +4104,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) -"btz" = ( -/obj/structure/table/reinforced, -/obj/structure/window{ - dir = 8 - }, -/obj/item/roller, -/obj/item/roller{ - pixel_y = 3 - }, -/obj/item/roller{ - pixel_y = 6 - }, -/turf/open/floor/iron/dark, -/area/station/medical/office) "btB" = ( /obj/machinery/power/terminal, /obj/machinery/light/small/directional/east, @@ -4180,6 +4231,10 @@ }, /turf/open/floor/iron, /area/station/commons/locker) +"bvJ" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/commons/lounge) "bvN" = ( /obj/structure/cable, /turf/open/floor/iron, @@ -4271,6 +4326,14 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted, /turf/open/floor/iron/white, /area/station/medical/chemistry) +"bxX" = ( +/obj/structure/flora/bush/ferny/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/flowers_br/style_random, +/obj/structure/flora/bush/sunny/style_random, +/obj/effect/spawner/structure/window, +/turf/open/floor/grass, +/area/station/hallway/secondary/exit/departure_lounge) "byf" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/delivery, @@ -4441,6 +4504,19 @@ }, /turf/open/floor/iron/white, /area/station/science/research) +"bBI" = ( +/obj/structure/window{ + dir = 4 + }, +/obj/structure/window{ + dir = 1 + }, +/obj/structure/flora/bush/pale/style_random, +/obj/structure/flora/bush/ferny/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/flowers_br/style_random, +/turf/open/floor/grass, +/area/station/science/research) "bBK" = ( /obj/structure/table, /obj/item/storage/dice, @@ -4547,6 +4623,14 @@ /obj/machinery/power/apc/auto_name/directional/west, /turf/open/floor/iron/white, /area/station/medical/abandoned) +"bER" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/south, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) "bEU" = ( /obj/structure/table, /obj/item/hand_labeler, @@ -4689,10 +4773,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/carpet, /area/station/command/bridge) -"bIK" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/station/construction/mining/aux_base) "bIO" = ( /obj/item/kirbyplants/random, /turf/open/floor/wood, @@ -4953,21 +5033,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/cargo/warehouse) -"bOc" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 10 - }, -/obj/machinery/disposal/bin{ - name = "Jim Norton's Quebecois Coffee disposal unit" - }, -/obj/structure/window{ - dir = 8 - }, -/obj/structure/window, -/obj/effect/turf_decal/bot, -/obj/structure/disposalpipe/trunk, -/turf/open/floor/wood, -/area/station/service/cafeteria) "bOk" = ( /obj/machinery/light/directional/west, /obj/item/radio/intercom/directional/west, @@ -5084,31 +5149,6 @@ /obj/effect/landmark/start/scientist, /turf/open/floor/engine, /area/station/science/explab) -"bRw" = ( -/obj/machinery/door/window/right/directional/south{ - name = "First Aid Supplies"; - req_access = list("medical") - }, -/obj/structure/window{ - dir = 8 - }, -/obj/item/storage/medkit/regular{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/item/storage/medkit/brute{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/medkit/brute, -/obj/item/storage/medkit/brute{ - pixel_x = -3; - pixel_y = -3 - }, -/obj/structure/table/reinforced, -/obj/machinery/light/directional/north, -/turf/open/floor/iron/dark, -/area/station/medical/storage) "bRG" = ( /obj/machinery/shower/directional/west, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -5179,6 +5219,31 @@ /obj/machinery/light/directional/west, /turf/open/floor/iron/white, /area/station/science/xenobiology) +"bSA" = ( +/obj/machinery/door/window/right/directional/south{ + name = "First Aid Supplies"; + req_access = list("medical") + }, +/obj/structure/window{ + dir = 8 + }, +/obj/item/storage/medkit/regular{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/storage/medkit/brute{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/medkit/brute, +/obj/item/storage/medkit/brute{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/structure/table/reinforced, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/dark, +/area/station/medical/storage) "bSY" = ( /obj/structure/rack, /obj/effect/spawner/random/maintenance, @@ -5225,18 +5290,6 @@ /obj/machinery/power/apc/auto_name/directional/south, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai_upload) -"bTr" = ( -/obj/machinery/mineral/stacking_machine{ - input_dir = 2 - }, -/obj/structure/window{ - dir = 4 - }, -/obj/structure/window{ - dir = 1 - }, -/turf/open/floor/plating, -/area/station/maintenance/disposal) "bTP" = ( /obj/machinery/modular_computer/console/preset/research{ dir = 8 @@ -5802,6 +5855,20 @@ /obj/effect/spawner/random/food_or_drink/donkpockets, /turf/open/floor/iron/dark, /area/station/medical/break_room) +"cho" = ( +/obj/structure/table/reinforced, +/obj/structure/window{ + dir = 8 + }, +/obj/item/defibrillator/loaded{ + pixel_y = 6 + }, +/obj/item/defibrillator/loaded{ + pixel_y = 3 + }, +/obj/item/defibrillator/loaded, +/turf/open/floor/iron/dark, +/area/station/medical/storage) "chH" = ( /obj/structure/chair/stool/directional/west, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -5981,6 +6048,12 @@ }, /turf/open/floor/carpet, /area/station/medical/psychology) +"cnd" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/cargo/sorting) "cnk" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 6 @@ -6272,6 +6345,12 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) +"crA" = ( +/obj/structure/window{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) "crL" = ( /obj/machinery/washing_machine, /obj/effect/turf_decal/tile/blue{ @@ -6423,11 +6502,6 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) -"cuC" = ( -/obj/structure/cable, -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/station/security/office) "cuO" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -7392,6 +7466,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"cOm" = ( +/obj/effect/spawner/structure/window, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/engineering/main) "cOq" = ( /obj/structure/sink/kitchen/directional/south{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; @@ -7441,6 +7520,15 @@ "cOQ" = ( /turf/open/floor/iron/white, /area/station/science/research) +"cOR" = ( +/obj/effect/spawner/structure/window, +/obj/machinery/door/poddoor/preopen{ + id = "cmoprivacy"; + name = "Privacy Shutter" + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/command/heads_quarters/cmo) "cOT" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/ordnance_burn_chamber_input{ dir = 1 @@ -7614,18 +7702,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) -"cSz" = ( -/obj/structure/table/reinforced, -/obj/structure/window{ - dir = 8 - }, -/obj/item/storage/box/syringes{ - pixel_y = 4 - }, -/obj/item/storage/box/syringes, -/obj/item/gun/syringe, -/turf/open/floor/iron/dark, -/area/station/medical/storage) "cSF" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -7762,17 +7838,6 @@ /obj/machinery/power/apc/auto_name/directional/west, /turf/open/floor/wood, /area/station/command/heads_quarters/captain/private) -"cUZ" = ( -/obj/docking_port/stationary{ - dir = 8; - dwidth = 5; - height = 7; - id = "supply_home"; - name = "Cargo Bay"; - width = 12 - }, -/turf/open/space/basic, -/area/space) "cVj" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -7789,17 +7854,6 @@ }, /turf/open/floor/iron/white, /area/station/science/research) -"cVx" = ( -/obj/docking_port/stationary{ - dir = 8; - dwidth = 2; - height = 13; - id = "ferry_home"; - name = "port bay 2"; - width = 5 - }, -/turf/open/space/basic, -/area/space) "cVJ" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 @@ -7932,17 +7986,6 @@ }, /turf/open/floor/iron, /area/station/medical/medbay/lobby) -"cYJ" = ( -/obj/docking_port/stationary{ - dir = 2; - dwidth = 9; - height = 25; - id = "emergency_home"; - name = "MetaStation emergency evac bay"; - width = 29 - }, -/turf/open/space/basic, -/area/space) "cYL" = ( /obj/machinery/door/poddoor/shutters{ id = "aux_base_shutters"; @@ -8655,18 +8698,6 @@ }, /turf/open/floor/iron, /area/station/cargo/sorting) -"djM" = ( -/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) "dka" = ( /obj/effect/turf_decal/arrows/red{ dir = 4 @@ -8865,6 +8896,23 @@ }, /turf/open/floor/iron, /area/station/engineering/break_room) +"dpg" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "roboticsprivacy2"; + name = "Robotics Shutters" + }, +/obj/item/paper_bin, +/obj/item/pen, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/window/left/directional/west{ + dir = 1; + name = "Robotics Desk"; + req_access = list("robotics") + }, +/turf/open/floor/iron/white, +/area/station/science/robotics/lab) "dpn" = ( /obj/effect/spawner/random/food_or_drink/donkpockets, /obj/structure/table/glass, @@ -8961,6 +9009,17 @@ "dqN" = ( /turf/open/floor/plating, /area/station/maintenance/port/aft) +"dra" = ( +/obj/structure/window{ + dir = 8 + }, +/obj/structure/window, +/mob/living/simple_animal/chicken{ + name = "Kentucky"; + real_name = "Kentucky" + }, +/turf/open/floor/grass, +/area/station/service/hydroponics/garden) "dri" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -9099,26 +9158,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos/pumproom) -"dtf" = ( -/obj/structure/window{ - dir = 4 - }, -/obj/structure/window{ - dir = 8 - }, -/obj/machinery/door/window/left/directional/north{ - name = "Inner Pipe Access"; - req_access = list("atmospherics") - }, -/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1; - name = "N2 to Pure" - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "dtg" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock{ @@ -9168,6 +9207,10 @@ dir = 1 }, /area/station/engineering/atmos/pumproom) +"duu" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/medical/medbay/central) "duw" = ( /obj/effect/spawner/random/vending/colavend, /obj/effect/turf_decal/tile/neutral{ @@ -9414,23 +9457,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) -"dzR" = ( -/obj/structure/plasticflaps, -/obj/structure/window{ - dir = 4 - }, -/obj/structure/window{ - dir = 8 - }, -/obj/machinery/disposal/delivery_chute, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/turf/open/floor/plating, -/area/station/cargo/sorting) "dzY" = ( /obj/machinery/light/small/directional/south, /turf/open/floor/engine/n2o, @@ -10155,33 +10181,6 @@ /obj/machinery/newscaster/directional/east, /turf/open/floor/iron/white, /area/station/medical/medbay/central) -"dNQ" = ( -/obj/structure/table/reinforced, -/obj/item/folder/white{ - pixel_x = 4; - pixel_y = -3 - }, -/obj/machinery/door/firedoor, -/obj/item/folder/white{ - pixel_x = 4; - pixel_y = -3 - }, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 1; - id = "pharmacy_shutters"; - name = "Pharmacy Shutters" - }, -/obj/effect/turf_decal/tile/yellow/fourcorners, -/obj/structure/desk_bell{ - pixel_x = -8 - }, -/obj/machinery/door/window/left/directional/north{ - dir = 2; - name = "Pharmacy Desk"; - req_access = list("pharmacy") - }, -/turf/open/floor/iron/white, -/area/station/medical/pharmacy) "dNX" = ( /obj/effect/turf_decal/tile/red{ dir = 8 @@ -10853,6 +10852,31 @@ }, /turf/open/floor/iron/dark, /area/station/science/lab) +"dZb" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/item/folder{ + pixel_x = -6 + }, +/obj/item/pen{ + pixel_x = -5 + }, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "roboticsprivacy"; + name = "Robotics Shutters" + }, +/obj/effect/turf_decal/tile/purple/fourcorners, +/obj/structure/desk_bell{ + pixel_x = 6 + }, +/obj/machinery/door/window/left/directional/west{ + dir = 4; + name = "Robotics Desk"; + req_access = list("robotics") + }, +/turf/open/floor/iron, +/area/station/science/robotics/lab) "dZm" = ( /turf/closed/wall, /area/station/commons/storage/tools) @@ -11078,10 +11102,6 @@ "ecO" = ( /turf/open/floor/carpet, /area/station/service/library) -"ecU" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/station/commons/fitness/recreation) "edo" = ( /obj/structure/table/glass, /obj/item/paper_bin, @@ -11598,6 +11618,17 @@ /obj/effect/spawner/random/structure/closet_private, /turf/open/floor/wood, /area/station/commons/dorms) +"elW" = ( +/obj/structure/window, +/obj/machinery/computer/atmos_control/air_tank{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/engineering/atmos) "eme" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 6 @@ -11762,15 +11793,6 @@ /obj/machinery/power/energy_accumulator/tesla_coil/anchored, /turf/open/floor/engine, /area/station/engineering/supermatter) -"epo" = ( -/obj/machinery/power/shieldwallgen, -/obj/structure/window{ - dir = 1 - }, -/obj/structure/extinguisher_cabinet/directional/west, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/command/teleporter) "epv" = ( /obj/structure/table, /obj/item/hand_labeler{ @@ -12278,31 +12300,6 @@ }, /turf/open/floor/iron, /area/station/security/warden) -"ewK" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/firedoor, -/obj/item/folder{ - pixel_x = -6 - }, -/obj/item/pen{ - pixel_x = -5 - }, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 8; - id = "roboticsprivacy"; - name = "Robotics Shutters" - }, -/obj/effect/turf_decal/tile/purple/fourcorners, -/obj/structure/desk_bell{ - pixel_x = 6 - }, -/obj/machinery/door/window/left/directional/west{ - dir = 4; - name = "Robotics Desk"; - req_access = list("robotics") - }, -/turf/open/floor/iron, -/area/station/science/robotics/lab) "ewR" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering{ @@ -12431,6 +12428,10 @@ /obj/item/radio/intercom/directional/west, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) +"eAi" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/service/bar) "eAL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, @@ -12724,21 +12725,6 @@ /obj/machinery/photocopier, /turf/open/floor/carpet, /area/station/command/heads_quarters/hop) -"eIN" = ( -/obj/structure/window, -/obj/structure/window{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1; - name = "CO2 to Pure" - }, -/obj/effect/turf_decal/tile/dark/fourcorners, -/turf/open/floor/iron, -/area/station/engineering/atmos) "eIO" = ( /turf/closed/wall, /area/station/maintenance/department/medical/central) @@ -12995,6 +12981,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/ai_monitored/aisat/exterior) +"eNi" = ( +/obj/structure/window, +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/engineering/atmos) "eNk" = ( /obj/machinery/door/airlock/maintenance{ name = "Medbay Maintenance" @@ -13020,22 +13015,6 @@ /obj/machinery/power/apc/auto_name/directional/east, /turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) -"eNG" = ( -/obj/structure/table/wood/fancy/royalblue, -/obj/structure/window, -/obj/machinery/door/window{ - dir = 8; - name = "Secure Art Exhibition"; - req_access = list("library") - }, -/obj/structure/sign/painting/library_secure{ - pixel_x = 32 - }, -/obj/effect/spawner/random/decoration/statue{ - spawn_loot_chance = 50 - }, -/turf/open/floor/carpet/royalblue, -/area/station/service/library) "eNR" = ( /turf/closed/wall, /area/station/ai_monitored/aisat/exterior) @@ -13311,6 +13290,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) +"eTx" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) "eTU" = ( /obj/machinery/airalarm/directional/west, /obj/effect/turf_decal/stripes/line{ @@ -13613,6 +13603,19 @@ /obj/effect/mapping_helpers/airlock/access/all/science/genetics, /turf/open/floor/iron/white, /area/station/science/genetics) +"eZH" = ( +/obj/machinery/conveyor{ + dir = 1; + id = "packageSort2" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/window{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/cargo/sorting) "eZI" = ( /obj/structure/table, /obj/item/clothing/glasses/sunglasses{ @@ -13660,21 +13663,6 @@ dir = 1 }, /area/station/science/lobby) -"far" = ( -/obj/machinery/camera/directional/east{ - c_tag = "Teleporter Room" - }, -/obj/structure/rack, -/obj/structure/window{ - dir = 1 - }, -/obj/item/clothing/suit/hazardvest, -/obj/item/clothing/suit/hazardvest, -/obj/item/clothing/mask/breath, -/obj/item/clothing/mask/breath, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/command/teleporter) "fat" = ( /obj/structure/sign/plaques/kiddie/perfect_man{ pixel_y = 32 @@ -13853,6 +13841,14 @@ }, /turf/open/floor/iron/white, /area/station/medical/chemistry) +"ffk" = ( +/obj/structure/window, +/obj/effect/turf_decal/tile/red/fourcorners, +/obj/machinery/atmospherics/components/trinary/filter/atmos/n2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "ffH" = ( /turf/closed/wall, /area/station/hallway/primary/fore) @@ -14244,16 +14240,6 @@ dir = 8 }, /area/station/service/chapel) -"fkY" = ( -/obj/structure/window, -/obj/machinery/door/window/right/directional/east{ - base_state = "left"; - dir = 8; - icon_state = "left"; - name = "Fitness Ring" - }, -/turf/open/floor/iron/dark, -/area/station/commons/fitness/recreation) "flb" = ( /obj/structure/railing, /turf/open/space/basic, @@ -14284,10 +14270,6 @@ }, /turf/open/floor/iron, /area/station/engineering/main) -"flq" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/station/medical/surgery/aft) "flu" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -14431,14 +14413,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/security/holding_cell) -"fom" = ( -/obj/effect/spawner/structure/window, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 4; - id = "main_surgery" - }, -/turf/open/floor/plating, -/area/station/medical/treatment_center) "foP" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -14866,10 +14840,6 @@ /obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron, /area/station/security/checkpoint/engineering) -"fAD" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/station/medical/office) "fAI" = ( /obj/effect/spawner/random/structure/crate, /obj/effect/decal/cleanable/dirt, @@ -14973,15 +14943,10 @@ /obj/effect/turf_decal/tile/green/fourcorners, /turf/open/floor/iron, /area/station/hallway/primary/central) -"fCI" = ( -/obj/effect/spawner/structure/window, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 1; - id = "pharmacy_shutters"; - name = "Pharmacy Shutters" - }, -/turf/open/floor/plating, -/area/station/medical/pharmacy) +"fDa" = ( +/obj/structure/window, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) "fDc" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/neutral, @@ -15032,6 +14997,20 @@ /obj/effect/turf_decal/trimline/neutral/line, /turf/open/floor/iron/dark, /area/station/service/cafeteria) +"fEA" = ( +/obj/structure/window, +/obj/machinery/computer/atmos_control/nitrogen_tank{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red/fourcorners, +/obj/machinery/atmospherics/pipe/bridge_pipe/dark/visible{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "fEK" = ( /turf/closed/wall, /area/station/medical/medbay/central) @@ -15678,6 +15657,21 @@ }, /turf/open/floor/grass, /area/station/medical/virology) +"fPg" = ( +/obj/structure/window, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1; + name = "Air to Pure" + }, +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ + dir = 4 + }, +/obj/structure/window{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/engineering/atmos) "fPh" = ( /obj/machinery/gateway/centerstation, /turf/open/floor/iron/dark, @@ -15705,6 +15699,17 @@ /obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden, /turf/open/floor/iron/white, /area/station/medical/virology) +"fQj" = ( +/obj/docking_port/stationary{ + dir = 2; + dwidth = 11; + height = 22; + shuttle_id = "whiteship_home"; + name = "SS13: Auxiliary Dock, Station-Port"; + width = 35 + }, +/turf/open/space/basic, +/area/space) "fQo" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/trimline/purple/corner{ @@ -15720,14 +15725,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"fQA" = ( -/obj/effect/spawner/random/structure/musician/piano/random_piano, -/obj/structure/window{ - dir = 8 - }, -/obj/machinery/light_switch/directional/south, -/turf/open/floor/wood, -/area/station/service/theater) "fQD" = ( /obj/structure/chair/stool/directional/north, /obj/effect/mapping_helpers/broken_floor, @@ -15809,37 +15806,6 @@ /obj/effect/spawner/random/structure/grille, /turf/open/floor/plating, /area/station/maintenance/fore) -"fRY" = ( -/obj/structure/window{ - dir = 8 - }, -/obj/machinery/conveyor{ - dir = 8; - id = "packageExternal" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/machinery/camera/directional/south{ - c_tag = "Cargo Bay - Aft"; - pixel_x = 14 - }, -/obj/machinery/disposal/delivery_chute{ - dir = 4 - }, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/machinery/door/window/right/directional/west{ - dir = 4; - name = "Crate to Shuttle"; - req_access = list("shipping") - }, -/obj/structure/plasticflaps/opaque{ - name = "Service Deliveries" - }, -/turf/open/floor/iron, -/area/station/cargo/storage) "fRZ" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/west, @@ -15970,6 +15936,31 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/carpet, /area/station/service/theater) +"fVz" = ( +/obj/structure/window{ + dir = 4 + }, +/obj/structure/rack, +/obj/machinery/camera/directional/south{ + c_tag = "Brig - Infirmary" + }, +/obj/item/clothing/under/rank/medical/scrubs/purple, +/obj/item/storage/medkit/regular, +/obj/item/healthanalyzer{ + pixel_y = -2 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 6 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/security/medical) "fVA" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 @@ -16164,21 +16155,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/wood, /area/station/service/library) -"fZo" = ( -/obj/structure/table, -/obj/structure/window{ - dir = 4 - }, -/obj/item/paper_bin{ - pixel_x = -3; - pixel_y = 7 - }, -/obj/item/pen, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 5 - }, -/turf/open/floor/iron/white, -/area/station/security/medical) "fZG" = ( /obj/item/radio/intercom/directional/north, /obj/machinery/computer/security, @@ -16446,11 +16422,6 @@ }, /turf/open/floor/iron/dark, /area/station/command/bridge) -"gen" = ( -/obj/structure/table/wood, -/obj/machinery/keycard_auth/directional/south, -/turf/open/floor/wood, -/area/station/command/heads_quarters/qm) "gev" = ( /obj/effect/turf_decal/delivery, /turf/open/floor/iron, @@ -16975,15 +16946,6 @@ }, /turf/open/floor/iron, /area/station/security/execution/transfer) -"gnD" = ( -/obj/effect/spawner/structure/window, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 1; - id = "rdgene"; - name = "Genetics Lab Shutters" - }, -/turf/open/floor/plating, -/area/station/science/genetics) "gnL" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/line{ @@ -17003,31 +16965,6 @@ /obj/machinery/vending/wardrobe/atmos_wardrobe, /turf/open/floor/iron/dark, /area/station/engineering/atmos) -"goc" = ( -/obj/machinery/disposal/delivery_chute{ - dir = 4 - }, -/obj/structure/window, -/obj/structure/window{ - dir = 8 - }, -/obj/structure/window{ - dir = 1 - }, -/obj/machinery/door/window{ - base_state = "right"; - dir = 4; - icon_state = "right"; - layer = 3 - }, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/plating, -/area/station/maintenance/disposal) "gog" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -17102,23 +17039,6 @@ }, /turf/open/floor/iron, /area/station/service/hydroponics/garden) -"gpo" = ( -/obj/structure/table/reinforced, -/obj/structure/window{ - dir = 8 - }, -/obj/structure/window{ - dir = 1 - }, -/obj/item/wheelchair{ - pixel_y = -3 - }, -/obj/item/wheelchair, -/obj/item/wheelchair{ - pixel_y = 3 - }, -/turf/open/floor/iron/dark, -/area/station/medical/office) "gpB" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, @@ -17146,6 +17066,29 @@ }, /turf/open/floor/iron/white, /area/station/medical/virology) +"gqm" = ( +/obj/effect/spawner/structure/window, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 1; + id = "rdgene"; + name = "Genetics Lab Shutters" + }, +/turf/open/floor/plating, +/area/station/science/genetics) +"gqr" = ( +/obj/machinery/conveyor{ + dir = 1; + id = "packageExternal" + }, +/obj/structure/window{ + dir = 4 + }, +/obj/structure/window{ + dir = 8 + }, +/obj/structure/plasticflaps/opaque, +/turf/open/floor/plating, +/area/station/cargo/sorting) "gqA" = ( /obj/machinery/suit_storage_unit/standard_unit, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -17437,14 +17380,6 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/wood, /area/station/commons/lounge) -"gvC" = ( -/obj/effect/spawner/structure/window, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "lawyer_shutters"; - name = "Law Office Shutters" - }, -/turf/open/floor/plating, -/area/station/service/lawoffice) "gvG" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/unres, @@ -17723,10 +17658,6 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/plating, /area/station/commons/fitness/recreation) -"gCa" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/station/science/robotics/lab) "gCn" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -17786,15 +17717,6 @@ /obj/machinery/atmospherics/components/unary/portables_connector/visible, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) -"gDP" = ( -/obj/structure/window, -/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, -/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/engineering/atmos) "gDT" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -17905,14 +17827,6 @@ /obj/structure/table/wood, /turf/open/floor/carpet, /area/station/service/chapel/funeral) -"gFa" = ( -/obj/docking_port/stationary/random{ - dir = 4; - id = "pod_4_lavaland"; - name = "lavaland" - }, -/turf/open/space/basic, -/area/space) "gFb" = ( /obj/structure/railing{ dir = 1 @@ -18430,17 +18344,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) -"gOt" = ( -/obj/structure/window, -/obj/structure/window{ - dir = 8 - }, -/obj/machinery/atmospherics/components/trinary/filter/atmos/co2{ - dir = 4 - }, -/obj/effect/turf_decal/tile/dark/fourcorners, -/turf/open/floor/iron, -/area/station/engineering/atmos) "gOz" = ( /obj/structure/window/reinforced{ dir = 8 @@ -18579,20 +18482,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/hallway/secondary/exit/departure_lounge) -"gRo" = ( -/obj/structure/table/reinforced, -/obj/structure/window{ - dir = 8 - }, -/obj/item/defibrillator/loaded{ - pixel_y = 6 - }, -/obj/item/defibrillator/loaded{ - pixel_y = 3 - }, -/obj/item/defibrillator/loaded, -/turf/open/floor/iron/dark, -/area/station/medical/storage) "gRp" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -18600,11 +18489,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"gRF" = ( -/obj/effect/spawner/structure/window, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/security/prison/garden) "gSn" = ( /obj/item/wrench, /turf/open/floor/iron, @@ -19421,15 +19305,6 @@ /obj/machinery/light/directional/west, /turf/open/floor/plating, /area/station/cargo/sorting) -"hfz" = ( -/obj/effect/spawner/structure/window, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 4; - id = "pharmacy_shutters_2"; - name = "Pharmacy Shutters" - }, -/turf/open/floor/plating, -/area/station/medical/pharmacy) "hfA" = ( /obj/machinery/door/airlock/grunge{ name = "Cell 1" @@ -19438,6 +19313,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/security/prison/safe) +"hfZ" = ( +/obj/structure/window, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/atmospherics/components/trinary/filter/atmos/o2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "hgt" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -19987,21 +19870,6 @@ /obj/machinery/telecomms/bus/preset_four, /turf/open/floor/circuit/telecomms/mainframe, /area/station/tcommsat/server) -"hqJ" = ( -/obj/effect/turf_decal/tile/purple/fourcorners, -/obj/structure/window, -/obj/structure/window{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1; - name = "Plasma to Pure" - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "hqL" = ( /obj/machinery/light_switch/directional/east, /obj/machinery/shower/directional/west{ @@ -20227,6 +20095,17 @@ /obj/machinery/light/floor, /turf/open/floor/iron, /area/station/engineering/atmos) +"huv" = ( +/obj/structure/window, +/obj/structure/window{ + dir = 8 + }, +/obj/machinery/atmospherics/components/trinary/filter/atmos/co2{ + dir = 4 + }, +/obj/effect/turf_decal/tile/dark/fourcorners, +/turf/open/floor/iron, +/area/station/engineering/atmos) "hux" = ( /obj/structure/sign/warning/secure_area, /turf/closed/wall/r_wall, @@ -20506,12 +20385,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/station/medical/break_room) -"hyo" = ( -/obj/structure/window{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/commons/fitness/recreation) "hyN" = ( /obj/structure/sign/warning/secure_area, /turf/closed/wall/r_wall, @@ -20725,24 +20598,20 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/medbay/central) -"hDu" = ( -/obj/structure/closet/secure_closet/freezer/meat, -/obj/machinery/light/small/directional/west, -/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, -/obj/machinery/camera/autoname/directional/west, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/obj/structure/window{ - dir = 1 - }, -/turf/open/floor/iron/kitchen_coldroom/freezerfloor, -/area/station/service/kitchen/coldroom) "hDX" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, /turf/open/floor/plating, /area/station/security/checkpoint/supply) +"hEc" = ( +/obj/effect/spawner/structure/window, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 1; + id = "pharmacy_shutters"; + name = "Pharmacy Shutters" + }, +/turf/open/floor/plating, +/area/station/medical/pharmacy) "hEA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -20808,6 +20677,11 @@ /obj/effect/turf_decal/tile/yellow, /turf/open/floor/iron/white, /area/station/medical/chemistry) +"hFE" = ( +/obj/structure/window, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) "hGi" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -20982,6 +20856,16 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/tcommsat/server) +"hJM" = ( +/obj/structure/disposaloutlet{ + desc = "An outlet for the pneumatic disposal system. This one seems designed for rapid corpse disposal."; + dir = 8; + name = "rapid corpse mover 9000" + }, +/obj/structure/window, +/obj/structure/disposalpipe/trunk, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "hKg" = ( /turf/closed/wall, /area/station/cargo/miningoffice) @@ -21188,6 +21072,11 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/iron, /area/station/commons/fitness/recreation) +"hNb" = ( +/obj/structure/cable, +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/security/office) "hNw" = ( /obj/machinery/light/small/directional/south, /obj/machinery/airalarm/directional/south, @@ -21805,6 +21694,20 @@ }, /turf/open/floor/iron/white, /area/station/security/prison/mess) +"hXR" = ( +/obj/structure/table/reinforced, +/obj/structure/window{ + dir = 8 + }, +/obj/item/roller, +/obj/item/roller{ + pixel_y = 3 + }, +/obj/item/roller{ + pixel_y = 6 + }, +/turf/open/floor/iron/dark, +/area/station/medical/office) "hYa" = ( /obj/structure/plasticflaps/opaque{ name = "Service Deliveries" @@ -21937,10 +21840,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/primary/central) -"iaj" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/station/engineering/atmos/pumproom) "iar" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -21953,17 +21852,6 @@ /obj/machinery/seed_extractor, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) -"iaN" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/starboard) "iaO" = ( /obj/effect/turf_decal/siding/purple, /obj/item/kirbyplants/random, @@ -22071,6 +21959,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"idr" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/commons/fitness/recreation) "idA" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -22946,18 +22838,6 @@ /obj/effect/mapping_helpers/airlock/access/any/command/general, /turf/open/floor/iron/dark, /area/station/command/bridge) -"iqO" = ( -/obj/structure/window, -/obj/structure/window{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1; - name = "Mix Outlet Pump" - }, -/obj/effect/turf_decal/tile/brown/fourcorners, -/turf/open/floor/iron, -/area/station/engineering/atmos) "iqU" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -23021,6 +22901,13 @@ }, /turf/open/floor/iron, /area/station/cargo/sorting) +"isc" = ( +/obj/docking_port/stationary/random{ + shuttle_id = "pod_2_lavaland"; + name = "lavaland" + }, +/turf/open/space, +/area/space) "ise" = ( /obj/effect/turf_decal/bot, /obj/item/robot_suit, @@ -24007,10 +23894,6 @@ /obj/machinery/airalarm/directional/east, /turf/open/floor/iron/dark/corner, /area/station/engineering/storage_shared) -"iHA" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/station/medical/treatment_center) "iHD" = ( /turf/closed/wall/r_wall, /area/station/security/courtroom) @@ -24247,15 +24130,6 @@ }, /turf/open/space, /area/space/nearstation) -"iLh" = ( -/obj/effect/spawner/structure/window, -/obj/machinery/door/poddoor/preopen{ - id = "cmoprivacy"; - name = "Privacy Shutter" - }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/command/heads_quarters/cmo) "iLk" = ( /obj/effect/turf_decal/plaque{ icon_state = "L12" @@ -24271,12 +24145,6 @@ /obj/effect/turf_decal/siding, /turf/open/floor/iron, /area/station/science/lab) -"iLu" = ( -/obj/structure/window{ - dir = 8 - }, -/turf/open/floor/carpet, -/area/station/service/theater) "iLw" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -24599,11 +24467,6 @@ }, /turf/closed/wall/r_wall, /area/station/medical/virology) -"iPA" = ( -/obj/effect/spawner/structure/window, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/security/prison/mess) "iPB" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -24623,18 +24486,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/office) -"iPO" = ( -/obj/effect/turf_decal/delivery/white{ - color = "#52B4E9" - }, -/obj/structure/window{ - dir = 4 - }, -/obj/machinery/door/window/right/directional/south{ - name = "Corpse Arrivals" - }, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "iPX" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/secure_closet/brig{ @@ -25220,6 +25071,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/grimy, /area/station/tcommsat/computer) +"iYU" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/construction/mining/aux_base) "iZi" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -25390,6 +25245,14 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/wood, /area/station/commons/dorms) +"jdg" = ( +/obj/structure/flora/bush/ferny/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/structure/flora/bush/pale/style_random, +/obj/effect/spawner/structure/window, +/turf/open/floor/grass, +/area/station/hallway/secondary/exit/departure_lounge) "jdn" = ( /obj/effect/turf_decal/trimline/brown/filled/line, /obj/structure/disposalpipe/segment{ @@ -25417,6 +25280,25 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/fore) +"jdZ" = ( +/obj/docking_port/stationary/random{ + dir = 4; + shuttle_id = "pod_3_lavaland"; + name = "lavaland" + }, +/turf/open/space, +/area/space) +"jea" = ( +/obj/structure/window, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/computer/atmos_control/oxygen_tank{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "jef" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -26030,6 +25912,27 @@ /obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron/white, /area/station/medical/surgery/theatre) +"jpe" = ( +/obj/structure/window, +/obj/item/reagent_containers/cup/glass/mug/coco{ + pixel_x = -2; + pixel_y = 4 + }, +/obj/item/reagent_containers/cup/glass/mug/tea{ + pixel_x = 4; + pixel_y = 2 + }, +/obj/item/reagent_containers/cup/glass/coffee{ + pixel_x = -3 + }, +/obj/structure/table/reinforced{ + name = "Jim Norton's Quebecois Coffee table" + }, +/obj/effect/turf_decal/trimline/neutral/line{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/service/cafeteria) "jpr" = ( /obj/structure/rack, /obj/effect/spawner/random/techstorage/command_all, @@ -26078,6 +25981,32 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"jpQ" = ( +/obj/machinery/door/window/right/directional/south{ + dir = 1; + name = "First Aid Supplies"; + req_access = list("medical") + }, +/obj/structure/window{ + dir = 8 + }, +/obj/item/storage/medkit/regular{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/storage/medkit/toxin{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/medkit/toxin, +/obj/item/storage/medkit/toxin{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/structure/table/reinforced, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/dark, +/area/station/medical/storage) "jpU" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, @@ -26112,19 +26041,6 @@ }, /turf/open/floor/iron/dark, /area/station/science/ordnance/freezerchamber) -"jqJ" = ( -/obj/structure/disposaloutlet{ - dir = 1 - }, -/obj/structure/window{ - dir = 4 - }, -/obj/structure/window{ - dir = 8 - }, -/obj/structure/disposalpipe/trunk, -/turf/open/floor/plating, -/area/station/cargo/sorting) "jqQ" = ( /obj/effect/turf_decal/tile/blue/fourcorners, /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, @@ -26411,6 +26327,15 @@ }, /turf/open/floor/iron, /area/station/engineering/break_room) +"juS" = ( +/obj/structure/window{ + dir = 1 + }, +/obj/structure/window{ + dir = 8 + }, +/turf/open/floor/grass, +/area/station/service/hydroponics/garden) "juV" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -26606,6 +26531,10 @@ /obj/effect/mapping_helpers/airlock/access/any/command/general, /turf/open/floor/wood, /area/station/command/corporate_showroom) +"jxc" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/medical/treatment_center) "jxf" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2, /obj/machinery/air_sensor/ordnance_freezer_chamber, @@ -27438,6 +27367,16 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, /area/station/science/ordnance/testlab) +"jNK" = ( +/obj/structure/window{ + dir = 1 + }, +/obj/machinery/door/window/right/directional/east{ + dir = 8; + name = "Fitness Ring" + }, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) "jNP" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -27993,13 +27932,6 @@ }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/ce) -"jWp" = ( -/obj/structure/window{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/neutral/filled/corner, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "jWR" = ( /obj/item/radio/intercom/directional/east, /obj/effect/turf_decal/siding/wood{ @@ -28184,6 +28116,23 @@ /obj/structure/sign/warning/vacuum/external, /turf/closed/wall, /area/station/cargo/miningoffice) +"kav" = ( +/obj/structure/plasticflaps, +/obj/structure/window{ + dir = 4 + }, +/obj/structure/window{ + dir = 8 + }, +/obj/machinery/disposal/delivery_chute, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/cargo/sorting) "kaC" = ( /obj/machinery/light_switch/directional/east, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -28306,10 +28255,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, /area/station/service/cafeteria) -"kcN" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/station/science/lab) "kcV" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 4; @@ -28382,13 +28327,6 @@ /obj/structure/disposalpipe/junction, /turf/open/floor/iron, /area/station/security/brig) -"keP" = ( -/obj/docking_port/stationary/random{ - id = "pod_2_lavaland"; - name = "lavaland" - }, -/turf/open/space, -/area/space) "keR" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -28467,14 +28405,6 @@ /obj/structure/lattice, /turf/open/space/basic, /area/space/nearstation) -"kgm" = ( -/obj/structure/table/wood, -/obj/machinery/fax{ - name = "Quartermaster's Fax Machine"; - fax_name = "Quartermaster's Office" - }, -/turf/open/floor/wood, -/area/station/command/heads_quarters/qm) "kgr" = ( /obj/effect/turf_decal/bot_white, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -28782,27 +28712,6 @@ /mob/living/simple_animal/hostile/retaliate/bat/sgt_araneus, /turf/open/floor/carpet, /area/station/command/heads_quarters/hos) -"kmM" = ( -/obj/structure/window, -/obj/item/reagent_containers/cup/glass/mug/coco{ - pixel_x = -2; - pixel_y = 4 - }, -/obj/item/reagent_containers/cup/glass/mug/tea{ - pixel_x = 4; - pixel_y = 2 - }, -/obj/item/reagent_containers/cup/glass/coffee{ - pixel_x = -3 - }, -/obj/structure/table/reinforced{ - name = "Jim Norton's Quebecois Coffee table" - }, -/obj/effect/turf_decal/trimline/neutral/line{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/service/cafeteria) "kmN" = ( /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) @@ -29060,6 +28969,10 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/security/range) +"ksk" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/commons/storage/tools) "ksl" = ( /obj/machinery/chem_heater/withbuffer{ pixel_x = 4 @@ -29176,14 +29089,6 @@ /obj/machinery/power/apc/auto_name/directional/south, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai_upload_foyer) -"ktx" = ( -/obj/structure/window{ - dir = 1 - }, -/obj/machinery/light/no_nightlight/directional/east, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "ktz" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -29274,6 +29179,12 @@ }, /turf/open/floor/carpet, /area/station/service/theater) +"kuB" = ( +/obj/structure/window{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) "kuD" = ( /obj/structure/lattice, /obj/machinery/atmospherics/components/unary/passive_vent{ @@ -29768,6 +29679,15 @@ }, /turf/open/floor/iron, /area/station/construction/mining/aux_base) +"kFC" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "rdrnd"; + name = "Research and Development Shutters" + }, +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/science/lab) "kFK" = ( /obj/effect/turf_decal/tile/purple, /turf/open/floor/iron, @@ -29894,6 +29814,18 @@ /obj/structure/sign/poster/contraband/random/directional/north, /turf/open/floor/plating, /area/station/maintenance/port) +"kIL" = ( +/obj/effect/turf_decal/delivery/white{ + color = "#52B4E9" + }, +/obj/structure/window{ + dir = 4 + }, +/obj/machinery/door/window/right/directional/south{ + name = "Corpse Arrivals" + }, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "kIR" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -29963,17 +29895,6 @@ /obj/machinery/power/apc/auto_name/directional/west, /turf/open/floor/iron/white, /area/station/security/prison) -"kKO" = ( -/obj/structure/window{ - dir = 8 - }, -/obj/structure/window, -/mob/living/simple_animal/chicken{ - name = "Kentucky"; - real_name = "Kentucky" - }, -/turf/open/floor/grass, -/area/station/service/hydroponics/garden) "kKT" = ( /obj/item/reagent_containers/cup/bottle/multiver{ pixel_x = 7; @@ -29995,6 +29916,11 @@ }, /turf/open/floor/iron/white, /area/station/medical/chemistry) +"kKZ" = ( +/obj/effect/spawner/structure/window, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/prison/mess) "kLg" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -30060,6 +29986,13 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/aisat/exterior) +"kLJ" = ( +/obj/structure/closet/crate/coffin, +/obj/structure/window{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/service/chapel/funeral) "kLZ" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 @@ -30770,14 +30703,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/chemistry) -"kXs" = ( -/obj/structure/window{ - dir = 4 - }, -/obj/structure/table/reinforced, -/obj/item/storage/backpack/duffelbag/med/surgery, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "kXt" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -31221,14 +31146,6 @@ /obj/machinery/computer/department_orders/engineering, /turf/open/floor/iron, /area/station/engineering/break_room) -"lfh" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "roboticsprivacy2"; - name = "Robotics Shutters" - }, -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/station/science/robotics/lab) "lfk" = ( /obj/structure/rack, /obj/item/reagent_containers/cup/bottle/phosphorus{ @@ -31255,14 +31172,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/carpet, /area/station/command/heads_quarters/hos) -"lfx" = ( -/obj/structure/window{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/carpet, -/area/station/service/theater) "lfG" = ( /obj/effect/turf_decal/trimline/purple/corner{ dir = 1 @@ -31682,6 +31591,17 @@ }, /turf/open/floor/iron/white, /area/station/command/heads_quarters/rd) +"lnE" = ( +/obj/structure/window{ + dir = 8 + }, +/obj/structure/window, +/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown/fourcorners, +/turf/open/floor/iron, +/area/station/engineering/atmos) "lnG" = ( /obj/structure/table/wood, /obj/item/paper_bin/carbon{ @@ -31920,6 +31840,21 @@ "lqQ" = ( /turf/closed/wall, /area/station/service/hydroponics/garden) +"lqS" = ( +/obj/effect/turf_decal/tile/purple/fourcorners, +/obj/structure/window, +/obj/structure/window{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1; + name = "Plasma to Pure" + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "lqT" = ( /obj/structure/table, /obj/item/razor{ @@ -32002,16 +31937,6 @@ dir = 1 }, /area/station/engineering/atmos) -"lst" = ( -/obj/structure/window{ - dir = 1 - }, -/obj/structure/bodycontainer/morgue, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/station/security/medical) "lsu" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate/freezer, @@ -32184,6 +32109,21 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/security/medical) +"lvG" = ( +/obj/machinery/light/directional/north, +/obj/machinery/door/window{ + name = "Secure Art Exhibition"; + req_access = list("library") + }, +/obj/structure/window{ + dir = 8 + }, +/obj/structure/table/wood/fancy/royalblue, +/obj/structure/sign/painting/large/library{ + dir = 1 + }, +/turf/open/floor/wood, +/area/station/service/library) "lvU" = ( /obj/machinery/door/airlock{ id_tag = "Toilet4"; @@ -32576,6 +32516,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood, /area/station/commons/vacant_room/office) +"lFU" = ( +/obj/structure/window{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) "lFV" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -33206,6 +33152,17 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) +"lRA" = ( +/obj/effect/turf_decal/tile/purple/fourcorners, +/obj/structure/window, +/obj/structure/window{ + dir = 8 + }, +/obj/machinery/atmospherics/components/trinary/filter/atmos/plasma{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "lRS" = ( /obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/effect/spawner/structure/window/reinforced, @@ -33351,20 +33308,6 @@ /obj/effect/spawner/random/trash/mess, /turf/open/floor/iron/showroomfloor, /area/station/maintenance/starboard/lesser) -"lUq" = ( -/obj/machinery/conveyor{ - dir = 1; - id = "packageExternal" - }, -/obj/structure/window{ - dir = 4 - }, -/obj/structure/window{ - dir = 8 - }, -/obj/structure/plasticflaps/opaque, -/turf/open/floor/plating, -/area/station/cargo/sorting) "lUz" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -33903,6 +33846,22 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/main) +"mfj" = ( +/obj/structure/table/wood/fancy/royalblue, +/obj/structure/window, +/obj/machinery/door/window{ + dir = 8; + name = "Secure Art Exhibition"; + req_access = list("library") + }, +/obj/structure/sign/painting/library_secure{ + pixel_x = 32 + }, +/obj/effect/spawner/random/decoration/statue{ + spawn_loot_chance = 50 + }, +/turf/open/floor/carpet/royalblue, +/area/station/service/library) "mfp" = ( /obj/structure/chair/office{ dir = 4 @@ -34006,10 +33965,6 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/plating, /area/station/maintenance/department/engine) -"mib" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/station/command/heads_quarters/qm) "mif" = ( /obj/structure/disposalpipe/sorting/mail/flip{ dir = 4; @@ -34043,6 +33998,34 @@ }, /turf/open/floor/iron/white, /area/station/science/xenobiology) +"mit" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposaloutlet{ + dir = 4; + name = "Cargo Deliveries" + }, +/obj/structure/window{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/brown/warning{ + dir = 10 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/brown/warning{ + dir = 10 + }, +/obj/effect/turf_decal/siding/yellow, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) "mix" = ( /obj/structure/frame/machine, /obj/item/circuitboard/machine/chem_master, @@ -34146,13 +34129,6 @@ /obj/effect/mapping_helpers/airlock/access/all/medical/pharmacy, /turf/open/floor/iron/textured, /area/station/medical/medbay/central) -"mkU" = ( -/obj/structure/closet/crate/coffin, -/obj/structure/window{ - dir = 4 - }, -/turf/open/floor/plating, -/area/station/service/chapel/funeral) "mkZ" = ( /obj/structure/window/reinforced{ dir = 4 @@ -34502,14 +34478,6 @@ }, /turf/open/floor/iron, /area/station/security/execution/transfer) -"mre" = ( -/obj/structure/flora/bush/ferny/style_random, -/obj/structure/flora/bush/fullgrass/style_random, -/obj/structure/flora/bush/flowers_br/style_random, -/obj/structure/flora/bush/sunny/style_random, -/obj/effect/spawner/structure/window, -/turf/open/floor/grass, -/area/station/hallway/secondary/exit/departure_lounge) "mrC" = ( /obj/machinery/door/airlock/maintenance{ name = "Hydroponics Maintenance" @@ -34623,10 +34591,6 @@ dir = 1 }, /area/station/medical/treatment_center) -"mtl" = ( -/obj/structure/window, -/turf/open/floor/grass, -/area/station/service/hydroponics/garden) "mtm" = ( /obj/machinery/chem_master, /obj/structure/noticeboard/directional/south, @@ -34801,6 +34765,17 @@ }, /turf/open/floor/iron/dark, /area/station/command/bridge) +"mwc" = ( +/obj/structure/window, +/obj/structure/window{ + dir = 8 + }, +/obj/structure/flora/bush/pale/style_random, +/obj/structure/flora/bush/ferny/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/flowers_br/style_random, +/turf/open/floor/grass, +/area/station/science/research) "mww" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -34832,21 +34807,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood, /area/station/commons/lounge) -"mwX" = ( -/obj/structure/window, -/obj/effect/turf_decal/delivery, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/hallway/secondary/service) "mxg" = ( /obj/machinery/shower/directional/west, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, @@ -34943,6 +34903,26 @@ }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/cmo) +"myV" = ( +/obj/structure/window{ + dir = 1 + }, +/obj/item/storage/medkit/regular{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/storage/medkit/o2{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/medkit/o2, +/obj/item/storage/medkit/o2{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/structure/table/reinforced, +/turf/open/floor/iron/dark, +/area/station/medical/storage) "myY" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -34965,6 +34945,12 @@ /obj/effect/landmark/start/depsec/science, /turf/open/floor/iron, /area/station/security/checkpoint/science) +"mzn" = ( +/obj/structure/window{ + dir = 8 + }, +/turf/open/floor/carpet, +/area/station/service/theater) "mzs" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -35176,6 +35162,15 @@ /obj/effect/spawner/random/maintenance/two, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"mCt" = ( +/obj/effect/spawner/structure/window, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 4; + id = "rdrnd"; + name = "Research and Development Shutters" + }, +/turf/open/floor/plating, +/area/station/science/lab) "mCL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, @@ -35404,6 +35399,26 @@ /obj/structure/window/reinforced, /turf/open/floor/iron/dark, /area/station/ai_monitored/aisat/exterior) +"mGl" = ( +/obj/structure/window{ + dir = 4 + }, +/obj/structure/window{ + dir = 8 + }, +/obj/machinery/door/window/left/directional/north{ + name = "Inner Pipe Access"; + req_access = list("atmospherics") + }, +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1; + name = "N2 to Pure" + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) "mGy" = ( /obj/structure/sign/warning/vacuum/directional/west, /obj/effect/turf_decal/delivery, @@ -35624,11 +35639,6 @@ }, /turf/open/floor/iron/white, /area/station/science/lab) -"mKe" = ( -/obj/effect/spawner/structure/window, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/engineering/main) "mKp" = ( /obj/machinery/door/airlock/maintenance{ name = "Morgue Maintenance" @@ -35671,6 +35681,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/main) +"mLg" = ( +/obj/structure/window{ + dir = 4 + }, +/obj/structure/window, +/obj/structure/flora/bush/pale/style_random, +/obj/structure/flora/bush/ferny/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/flowers_br/style_random, +/turf/open/floor/grass, +/area/station/science/research) "mLu" = ( /obj/machinery/camera/directional/south{ c_tag = "Science Hallway - Admin"; @@ -35694,6 +35715,11 @@ }, /turf/open/floor/iron, /area/station/security/office) +"mLL" = ( +/obj/effect/spawner/structure/window, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/office) "mLQ" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock{ @@ -35991,14 +36017,6 @@ /obj/machinery/rnd/server, /turf/open/floor/circuit/telecomms/server, /area/station/science/server) -"mRu" = ( -/obj/structure/flora/bush/ferny/style_random, -/obj/structure/flora/bush/fullgrass/style_random, -/obj/structure/flora/bush/flowers_pp/style_random, -/obj/structure/flora/bush/pale/style_random, -/obj/effect/spawner/structure/window, -/turf/open/floor/grass, -/area/station/hallway/secondary/exit/departure_lounge) "mRv" = ( /obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{ dir = 4 @@ -36294,16 +36312,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) -"mWD" = ( -/obj/structure/disposaloutlet{ - desc = "An outlet for the pneumatic disposal system. This one seems designed for rapid corpse disposal."; - dir = 8; - name = "rapid corpse mover 9000" - }, -/obj/structure/window, -/obj/structure/disposalpipe/trunk, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "mWE" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -36515,6 +36523,24 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) +"mZD" = ( +/obj/structure/window, +/obj/item/storage/medkit/regular{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/storage/medkit/fire{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/medkit/fire, +/obj/item/storage/medkit/fire{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/structure/table/reinforced, +/turf/open/floor/iron/dark, +/area/station/medical/storage) "mZF" = ( /obj/effect/turf_decal/tile/neutral, /obj/structure/disposalpipe/segment{ @@ -36567,14 +36593,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/central) -"naJ" = ( -/obj/structure/window, -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/atmospherics/components/trinary/filter/atmos/o2{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "naM" = ( /obj/item/radio/intercom/directional/west{ pixel_y = -10 @@ -36666,23 +36684,6 @@ }, /turf/open/floor/iron, /area/station/engineering/break_room) -"ncl" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "roboticsprivacy2"; - name = "Robotics Shutters" - }, -/obj/item/paper_bin, -/obj/item/pen, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/window/left/directional/west{ - dir = 1; - name = "Robotics Desk"; - req_access = list("robotics") - }, -/turf/open/floor/iron/white, -/area/station/science/robotics/lab) "ncq" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -36726,14 +36727,6 @@ /obj/effect/spawner/random/structure/closet_maintenance, /turf/open/floor/plating, /area/station/maintenance/port) -"ncU" = ( -/obj/machinery/door/firedoor, -/obj/structure/window, -/obj/machinery/computer/cargo/request{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/cargo/sorting) "ndb" = ( /obj/machinery/light/small/directional/east, /obj/machinery/door/window{ @@ -36871,6 +36864,10 @@ }, /turf/open/floor/iron, /area/station/command/gateway) +"ngl" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/medical/break_room) "ngO" = ( /obj/structure/table, /obj/structure/disposalpipe/segment, @@ -36986,6 +36983,15 @@ /obj/effect/spawner/random/structure/steam_vent, /turf/open/floor/plating, /area/station/maintenance/fore) +"njb" = ( +/obj/machinery/power/shieldwallgen, +/obj/structure/window{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/teleporter) "njc" = ( /obj/structure/rack, /obj/item/stack/sheet/cloth/five, @@ -37165,18 +37171,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) -"nlN" = ( -/obj/structure/window{ - dir = 4 - }, -/obj/structure/window{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "nlP" = ( /obj/structure/table, /obj/item/stock_parts/subspace/treatment, @@ -37232,21 +37226,6 @@ /obj/machinery/light_switch/directional/north, /turf/open/floor/iron/dark, /area/station/command/teleporter) -"nmv" = ( -/obj/structure/window, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1; - name = "Air to Pure" - }, -/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ - dir = 4 - }, -/obj/structure/window{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/engineering/atmos) "nmx" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -38127,21 +38106,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/security/prison/safe) -"nAP" = ( -/obj/machinery/light/directional/north, -/obj/machinery/door/window{ - name = "Secure Art Exhibition"; - req_access = list("library") - }, -/obj/structure/window{ - dir = 8 - }, -/obj/structure/table/wood/fancy/royalblue, -/obj/structure/sign/painting/large/library{ - dir = 1 - }, -/turf/open/floor/wood, -/area/station/service/library) "nAQ" = ( /obj/effect/landmark/start/atmospheric_technician, /turf/open/floor/iron/dark, @@ -38511,24 +38475,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/command) -"nIX" = ( -/obj/structure/window, -/obj/item/storage/medkit/regular{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/item/storage/medkit/fire{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/medkit/fire, -/obj/item/storage/medkit/fire{ - pixel_x = -3; - pixel_y = -3 - }, -/obj/structure/table/reinforced, -/turf/open/floor/iron/dark, -/area/station/medical/storage) "nJn" = ( /obj/machinery/chem_dispenser{ layer = 2.7 @@ -38584,6 +38530,18 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/carpet, /area/station/service/theater) +"nKr" = ( +/obj/docking_port/stationary{ + dir = 8; + dwidth = 3; + height = 15; + shuttle_id = "arrival_stationary"; + name = "arrivals"; + roundstart_template = /datum/map_template/shuttle/arrival/box; + width = 7 + }, +/turf/open/space/basic, +/area/space) "nKE" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /turf/open/floor/iron/white, @@ -38650,6 +38608,17 @@ /obj/item/toy/beach_ball/branded, /turf/open/space/basic, /area/space) +"nMe" = ( +/obj/structure/window, +/obj/machinery/computer/atmos_control/nitrous_tank{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow/fourcorners, +/turf/open/floor/iron, +/area/station/engineering/atmos) "nMf" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -38887,9 +38856,45 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +"nPK" = ( +/obj/effect/spawner/structure/window, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/prison/garden) "nQg" = ( /turf/closed/wall, /area/station/maintenance/solars/port/fore) +"nQh" = ( +/obj/structure/window{ + dir = 8 + }, +/obj/machinery/conveyor{ + dir = 8; + id = "packageExternal" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/machinery/camera/directional/south{ + c_tag = "Cargo Bay - Aft"; + pixel_x = 14 + }, +/obj/machinery/disposal/delivery_chute{ + dir = 4 + }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/door/window/right/directional/west{ + dir = 4; + name = "Crate to Shuttle"; + req_access = list("shipping") + }, +/obj/structure/plasticflaps/opaque{ + name = "Service Deliveries" + }, +/turf/open/floor/iron, +/area/station/cargo/storage) "nQw" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 1 @@ -39024,6 +39029,13 @@ /obj/item/food/grown/mushroom/glowshroom, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +"nTm" = ( +/obj/structure/window{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/neutral/filled/corner, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "nTs" = ( /obj/machinery/light/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -39116,6 +39128,10 @@ }, /turf/open/floor/iron, /area/station/security/office) +"nVm" = ( +/obj/structure/window, +/turf/open/floor/grass, +/area/station/service/hydroponics/garden) "nVq" = ( /obj/structure/disposalpipe/segment, /obj/effect/spawner/random/maintenance, @@ -39236,6 +39252,14 @@ }, /turf/open/floor/iron/dark, /area/station/command/bridge) +"nXK" = ( +/obj/docking_port/stationary/random{ + dir = 4; + shuttle_id = "pod_4_lavaland"; + name = "lavaland" + }, +/turf/open/space/basic, +/area/space) "nXM" = ( /obj/structure/table/wood/poker, /obj/effect/spawner/random/entertainment/deck, @@ -39484,19 +39508,6 @@ "obG" = ( /turf/closed/wall, /area/station/service/theater) -"obI" = ( -/obj/structure/closet/crate, -/obj/item/stack/sheet/rglass{ - amount = 50 - }, -/obj/item/stack/sheet/iron/fifty, -/obj/item/storage/toolbox/emergency, -/obj/structure/window, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/cable, -/obj/effect/spawner/random/engineering/flashlight, -/turf/open/floor/iron/dark, -/area/station/command/teleporter) "obN" = ( /obj/effect/turf_decal/trimline/purple/line{ dir = 1 @@ -39515,18 +39526,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) -"obX" = ( -/obj/docking_port/stationary{ - dheight = 4; - dwidth = 4; - height = 9; - id = "aux_base_zone"; - name = "Aux Base Zone"; - roundstart_template = /datum/map_template/shuttle/aux_base/default; - width = 9 - }, -/turf/open/floor/plating, -/area/station/construction/mining/aux_base) "oca" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/random/structure/closet_maintenance, @@ -39571,6 +39570,18 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/service) +"ocE" = ( +/obj/structure/table/reinforced, +/obj/structure/window{ + dir = 8 + }, +/obj/item/storage/box/syringes{ + pixel_y = 4 + }, +/obj/item/storage/box/syringes, +/obj/item/gun/syringe, +/turf/open/floor/iron/dark, +/area/station/medical/storage) "ocG" = ( /obj/structure/disposaloutlet{ dir = 8; @@ -39721,6 +39732,19 @@ }, /turf/open/floor/iron/dark, /area/station/medical/morgue) +"ofi" = ( +/obj/structure/closet/crate, +/obj/item/stack/sheet/rglass{ + amount = 50 + }, +/obj/item/stack/sheet/iron/fifty, +/obj/item/storage/toolbox/emergency, +/obj/structure/window, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/cable, +/obj/effect/spawner/random/engineering/flashlight, +/turf/open/floor/iron/dark, +/area/station/command/teleporter) "ofk" = ( /obj/machinery/light_switch/directional/west, /obj/machinery/power/smes/engineering, @@ -39998,6 +40022,17 @@ /obj/effect/turf_decal/siding/red, /turf/open/floor/iron, /area/station/security/checkpoint/science) +"olN" = ( +/obj/docking_port/stationary{ + dir = 8; + dwidth = 2; + height = 13; + shuttle_id = "ferry_home"; + name = "port bay 2"; + width = 5 + }, +/turf/open/space/basic, +/area/space) "olP" = ( /obj/structure/cable, /obj/machinery/duct, @@ -40241,11 +40276,6 @@ dir = 1 }, /area/station/engineering/atmos/storage/gas) -"opY" = ( -/obj/effect/spawner/structure/window, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/security/office) "opZ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/nitrogen_output{ dir = 1 @@ -41001,6 +41031,33 @@ /obj/structure/window/reinforced, /turf/open/floor/iron/dark, /area/station/ai_monitored/aisat/exterior) +"oDH" = ( +/obj/structure/table/reinforced, +/obj/item/folder/white{ + pixel_x = 4; + pixel_y = -3 + }, +/obj/machinery/door/firedoor, +/obj/item/folder/white{ + pixel_x = 4; + pixel_y = -3 + }, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 1; + id = "pharmacy_shutters"; + name = "Pharmacy Shutters" + }, +/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/structure/desk_bell{ + pixel_x = -8 + }, +/obj/machinery/door/window/left/directional/north{ + dir = 2; + name = "Pharmacy Desk"; + req_access = list("pharmacy") + }, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) "oDJ" = ( /obj/structure/sign/warning/vacuum/external, /turf/closed/wall, @@ -41276,11 +41333,6 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) -"oHQ" = ( -/obj/effect/spawner/structure/window, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/security/execution/transfer) "oIa" = ( /turf/closed/wall, /area/station/commons/vacant_room/commissary) @@ -41341,14 +41393,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/treatment_center) -"oJQ" = ( -/obj/structure/window, -/obj/machinery/computer/atmos_control/mix_tank{ - dir = 1 - }, -/obj/effect/turf_decal/tile/brown/fourcorners, -/turf/open/floor/iron, -/area/station/engineering/atmos) "oJY" = ( /obj/machinery/door/airlock/maintenance{ name = "Incinerator Access" @@ -41502,17 +41546,6 @@ "oNs" = ( /turf/open/floor/engine, /area/station/engineering/supermatter) -"oNB" = ( -/obj/effect/turf_decal/tile/purple/fourcorners, -/obj/structure/window, -/obj/structure/window{ - dir = 8 - }, -/obj/machinery/atmospherics/components/trinary/filter/atmos/plasma{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "oND" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -41522,6 +41555,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/primary/aft) +"oNP" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/medical/office) "oOl" = ( /obj/machinery/flasher/directional/north{ id = "AI" @@ -41617,19 +41654,6 @@ /obj/structure/chair/stool/directional/west, /turf/open/floor/wood, /area/station/commons/lounge) -"oPz" = ( -/obj/machinery/conveyor{ - dir = 1; - id = "packageExternal" - }, -/obj/structure/window{ - dir = 4 - }, -/obj/structure/window{ - dir = 8 - }, -/turf/open/floor/plating, -/area/station/cargo/sorting) "oPD" = ( /obj/machinery/firealarm/directional/south, /obj/structure/cable, @@ -41711,17 +41735,6 @@ }, /turf/open/floor/wood, /area/station/command/heads_quarters/captain/private) -"oRL" = ( -/obj/docking_port/stationary{ - dir = 2; - dwidth = 11; - height = 22; - id = "whiteship_home"; - name = "SS13: Auxiliary Dock, Station-Port"; - width = 35 - }, -/turf/open/space/basic, -/area/space) "oRM" = ( /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 @@ -41745,19 +41758,6 @@ /mob/living/simple_animal/pet/fox/renault, /turf/open/floor/carpet, /area/station/command/heads_quarters/captain/private) -"oRU" = ( -/obj/structure/window{ - dir = 4 - }, -/obj/structure/window{ - dir = 1 - }, -/obj/structure/flora/bush/pale/style_random, -/obj/structure/flora/bush/ferny/style_random, -/obj/structure/flora/bush/fullgrass/style_random, -/obj/structure/flora/bush/flowers_br/style_random, -/turf/open/floor/grass, -/area/station/science/research) "oSc" = ( /obj/structure/closet/toolcloset, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -41780,6 +41780,25 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/hallway/primary/central) +"oSm" = ( +/obj/structure/window{ + dir = 8 + }, +/obj/item/stack/spacecash/c1{ + pixel_y = 9 + }, +/obj/item/reagent_containers/cup/rag, +/obj/structure/table/reinforced{ + name = "Jim Norton's Quebecois Coffee table" + }, +/obj/effect/turf_decal/trimline/neutral/line{ + dir = 1 + }, +/obj/structure/desk_bell{ + pixel_x = 7 + }, +/turf/open/floor/iron/dark, +/area/station/service/cafeteria) "oSo" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -41795,6 +41814,13 @@ /obj/effect/spawner/random/structure/grille, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"oSR" = ( +/obj/item/radio/intercom/directional/east, +/obj/structure/window{ + dir = 1 + }, +/turf/open/floor/grass, +/area/station/service/hydroponics/garden) "oTa" = ( /obj/machinery/vending/cart{ req_access = list("hop") @@ -41825,29 +41851,6 @@ /obj/item/bedsheet, /turf/open/floor/iron, /area/station/security/brig) -"oTM" = ( -/obj/machinery/door/window/left/directional/north{ - dir = 8; - name = "Magboot Storage"; - pixel_x = -1; - req_access = list("eva") - }, -/obj/structure/window{ - dir = 1 - }, -/obj/structure/rack, -/obj/item/clothing/shoes/magboots{ - pixel_x = -4; - pixel_y = 3 - }, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/shoes/magboots{ - pixel_x = 4; - pixel_y = -3 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/command/storage/eva) "oTR" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/line{ @@ -41856,6 +41859,19 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/gravity_generator) +"oTT" = ( +/obj/structure/window{ + dir = 8 + }, +/obj/machinery/vending/coffee{ + default_price = 0; + extra_price = 0; + fair_market_price = 0; + name = "\improper Jim Norton's Quebecois Coffee" + }, +/obj/machinery/light_switch/directional/north, +/turf/open/floor/iron/dark, +/area/station/service/cafeteria) "oUh" = ( /obj/structure/reagent_dispensers/watertank, /obj/effect/turf_decal/stripes/corner{ @@ -42113,17 +42129,6 @@ }, /turf/open/floor/iron/white/smooth_large, /area/station/medical/office) -"oYI" = ( -/obj/structure/window, -/obj/structure/window{ - dir = 8 - }, -/obj/structure/flora/bush/pale/style_random, -/obj/structure/flora/bush/ferny/style_random, -/obj/structure/flora/bush/fullgrass/style_random, -/obj/structure/flora/bush/flowers_br/style_random, -/turf/open/floor/grass, -/area/station/science/research) "oYM" = ( /obj/structure/reagent_dispensers/fueltank, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -42388,11 +42393,37 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/maintenance/starboard/greater) +"pdR" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Teleporter Room" + }, +/obj/structure/rack, +/obj/structure/window{ + dir = 1 + }, +/obj/item/clothing/suit/hazardvest, +/obj/item/clothing/suit/hazardvest, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/teleporter) "pdT" = ( /obj/effect/spawner/random/vending/colavend, /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"pdX" = ( +/obj/docking_port/stationary{ + dir = 8; + dwidth = 5; + height = 7; + shuttle_id = "cargo_home"; + name = "Cargo Bay"; + width = 12 + }, +/turf/open/space/basic, +/area/space) "pdY" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -42482,10 +42513,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) -"pgu" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/station/medical/break_room) "pgD" = ( /obj/machinery/door/airlock/maintenance{ name = "Chapel Maintenance" @@ -42796,12 +42823,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/command) -"plz" = ( -/obj/structure/window{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/commons/fitness/recreation) "plD" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 4; @@ -42839,6 +42860,16 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) +"pnc" = ( +/obj/structure/window, +/obj/machinery/door/window/right/directional/east{ + base_state = "left"; + dir = 8; + icon_state = "left"; + name = "Fitness Ring" + }, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) "pnk" = ( /obj/structure/chair{ dir = 4 @@ -43264,6 +43295,31 @@ /obj/machinery/vending/assist, /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) +"pud" = ( +/obj/machinery/disposal/delivery_chute{ + dir = 4 + }, +/obj/structure/window, +/obj/structure/window{ + dir = 8 + }, +/obj/structure/window{ + dir = 1 + }, +/obj/machinery/door/window{ + base_state = "right"; + dir = 4; + icon_state = "right"; + layer = 3 + }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/disposal) "pui" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -43616,17 +43672,6 @@ /obj/item/kirbyplants/dead, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/rd) -"pBv" = ( -/obj/structure/window, -/obj/machinery/computer/atmos_control/air_tank{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/engineering/atmos) "pBG" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -43736,6 +43781,20 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/iron, /area/station/maintenance/department/engine) +"pDJ" = ( +/obj/machinery/door/window/right/directional/south{ + dir = 1; + name = "Medical Deliveries"; + req_access = list("medical") + }, +/obj/effect/turf_decal/delivery/white{ + color = "#52B4E9" + }, +/obj/structure/window{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/medical/storage) "pDQ" = ( /obj/effect/turf_decal/tile/blue/fourcorners, /obj/machinery/smartfridge/organ, @@ -44046,31 +44105,6 @@ /obj/machinery/research/anomaly_refinery, /turf/open/floor/iron/dark, /area/station/science/ordnance/testlab) -"pIY" = ( -/obj/structure/window{ - dir = 4 - }, -/obj/structure/rack, -/obj/machinery/camera/directional/south{ - c_tag = "Brig - Infirmary" - }, -/obj/item/clothing/under/rank/medical/scrubs/purple, -/obj/item/storage/medkit/regular, -/obj/item/healthanalyzer{ - pixel_y = -2 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 6 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/security/medical) "pJf" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -44396,10 +44430,6 @@ }, /turf/open/floor/circuit/green/off, /area/station/science/research) -"pOz" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/station/commons/lounge) "pOF" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/line, @@ -44653,6 +44683,21 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +"pTN" = ( +/obj/structure/window, +/obj/effect/turf_decal/delivery, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/service) "pTS" = ( /turf/closed/wall, /area/station/service/bar) @@ -45389,12 +45434,6 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos) -"qhg" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/station/cargo/sorting) "qhx" = ( /obj/item/radio/intercom/directional/east, /obj/effect/turf_decal/tile/purple, @@ -45568,10 +45607,6 @@ /obj/item/clothing/suit/hooded/wintercoat/science, /turf/open/floor/iron, /area/station/science/xenobiology) -"qkp" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/station/service/library) "qkq" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -45659,14 +45694,6 @@ }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hos) -"qmt" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/south, -/turf/open/floor/iron, -/area/station/hallway/primary/starboard) "qmu" = ( /obj/machinery/modular_computer/console/preset/id{ dir = 8 @@ -45712,6 +45739,12 @@ }, /turf/open/floor/iron, /area/station/security/checkpoint/supply) +"qnj" = ( +/obj/structure/window{ + dir = 8 + }, +/turf/open/floor/grass, +/area/station/service/hydroponics/garden) "qno" = ( /obj/structure/table, /obj/machinery/microwave{ @@ -45884,31 +45917,6 @@ }, /turf/open/floor/iron/dark, /area/station/command/bridge) -"qps" = ( -/obj/structure/table/reinforced, -/obj/item/folder/white{ - pixel_x = 4; - pixel_y = -3 - }, -/obj/machinery/door/firedoor, -/obj/item/folder/white{ - pixel_x = 4; - pixel_y = -3 - }, -/obj/item/pen, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 4; - id = "pharmacy_shutters_2"; - name = "Pharmacy Shutters" - }, -/obj/effect/turf_decal/tile/yellow/fourcorners, -/obj/machinery/door/window/right/directional/east{ - dir = 8; - name = "Pharmacy Desk"; - req_access = list("pharmacy") - }, -/turf/open/floor/iron/white, -/area/station/medical/pharmacy) "qpD" = ( /obj/structure/sign/warning/secure_area, /turf/closed/wall/r_wall, @@ -46043,6 +46051,10 @@ }, /turf/open/floor/plating, /area/station/maintenance/port) +"qsv" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/engineering/storage_shared) "qsx" = ( /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=9.1-Escape-1"; @@ -46173,10 +46185,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/maintenance/disposal) -"qvK" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/station/cargo/warehouse) "qvQ" = ( /obj/machinery/door/window/left/directional/north{ dir = 8; @@ -46185,15 +46193,6 @@ }, /turf/open/floor/engine, /area/station/science/xenobiology) -"qvT" = ( -/obj/machinery/power/shieldwallgen, -/obj/structure/window{ - dir = 1 - }, -/obj/machinery/light/directional/east, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/command/teleporter) "qvY" = ( /obj/structure/closet/secure_closet/miner, /obj/effect/turf_decal/tile/brown/half/contrasted, @@ -46379,6 +46378,19 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/station/hallway/primary/port) +"qyZ" = ( +/obj/effect/turf_decal/trimline/brown/warning{ + dir = 6 + }, +/obj/effect/turf_decal/trimline/brown/warning{ + dir = 6 + }, +/obj/structure/window{ + dir = 4 + }, +/obj/effect/turf_decal/siding/purple, +/turf/open/floor/iron/white, +/area/station/science/lobby) "qzg" = ( /obj/structure/closet/emcloset, /obj/structure/sign/warning/vacuum/external/directional/east, @@ -46484,6 +46496,19 @@ /obj/effect/spawner/random/trash/janitor_supplies, /turf/open/floor/plating, /area/station/maintenance/fore) +"qBr" = ( +/obj/structure/window{ + dir = 8 + }, +/obj/structure/table, +/obj/item/surgical_drapes, +/obj/item/cautery, +/obj/effect/turf_decal/tile/purple/half/contrasted, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/iron/white, +/area/station/science/robotics/lab) "qBy" = ( /turf/closed/wall, /area/station/command/heads_quarters/hop) @@ -46879,6 +46904,10 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"qIK" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/command/heads_quarters/qm) "qIP" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -46980,10 +47009,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/carpet/green, /area/station/maintenance/port/aft) -"qKI" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/station/engineering/storage_shared) "qKR" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, @@ -47619,6 +47644,17 @@ /obj/machinery/meter, /turf/open/floor/iron, /area/station/engineering/atmos) +"qVo" = ( +/obj/docking_port/stationary{ + dir = 2; + dwidth = 9; + height = 25; + shuttle_id = "emergency_home"; + name = "MetaStation emergency evac bay"; + width = 29 + }, +/turf/open/space/basic, +/area/space) "qVt" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -47646,10 +47682,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/service) -"qVS" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/station/medical/medbay/central) "qWw" = ( /obj/structure/closet/boxinggloves, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -47787,6 +47819,14 @@ /obj/machinery/duct, /turf/open/floor/iron/freezer, /area/station/commons/toilet/restrooms) +"qXV" = ( +/obj/effect/spawner/structure/window, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "lawyer_shutters"; + name = "Law Office Shutters" + }, +/turf/open/floor/plating, +/area/station/service/lawoffice) "qXW" = ( /obj/effect/spawner/random/structure/chair_maintenance{ dir = 1 @@ -48538,20 +48578,6 @@ }, /turf/open/floor/iron, /area/station/science/explab) -"rox" = ( -/obj/machinery/door/window/right/directional/south{ - dir = 1; - name = "Medical Deliveries"; - req_access = list("medical") - }, -/obj/effect/turf_decal/delivery/white{ - color = "#52B4E9" - }, -/obj/structure/window{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/medical/storage) "roL" = ( /obj/effect/landmark/event_spawn, /obj/structure/disposalpipe/segment, @@ -48600,15 +48626,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/science/ordnance/storage) -"rpP" = ( -/obj/structure/window{ - dir = 1 - }, -/obj/structure/window{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/commons/fitness/recreation) "rpR" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box/white{ @@ -48628,6 +48645,14 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"rqb" = ( +/obj/structure/window{ + dir = 8 + }, +/obj/structure/cable, +/obj/effect/landmark/start/hangover, +/turf/open/floor/carpet, +/area/station/service/theater) "rrf" = ( /obj/structure/bodycontainer/morgue{ dir = 1 @@ -48923,6 +48948,10 @@ /obj/effect/mapping_helpers/airlock/unres, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) +"rvb" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/medical/storage) "rvj" = ( /obj/structure/chair/stool/directional/south, /obj/machinery/light/small/directional/west, @@ -49965,6 +49994,21 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/security/brig) +"rLl" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/obj/machinery/disposal/bin{ + name = "Jim Norton's Quebecois Coffee disposal unit" + }, +/obj/structure/window{ + dir = 8 + }, +/obj/structure/window, +/obj/effect/turf_decal/bot, +/obj/structure/disposalpipe/trunk, +/turf/open/floor/wood, +/area/station/service/cafeteria) "rLm" = ( /obj/machinery/light/small/directional/west, /obj/machinery/firealarm/directional/west, @@ -49978,6 +50022,19 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/station/maintenance/port) +"rLt" = ( +/obj/machinery/conveyor{ + dir = 1; + id = "packageExternal" + }, +/obj/structure/window{ + dir = 4 + }, +/obj/structure/window{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/cargo/sorting) "rLu" = ( /obj/machinery/light/small/directional/west, /obj/machinery/power/port_gen/pacman/pre_loaded, @@ -50007,17 +50064,6 @@ }, /turf/open/floor/engine, /area/station/engineering/supermatter) -"rMi" = ( -/obj/structure/window, -/obj/machinery/computer/atmos_control/nitrous_tank{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow/fourcorners, -/turf/open/floor/iron, -/area/station/engineering/atmos) "rMl" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -50094,10 +50140,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/carpet, /area/station/service/library) -"rMW" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/station/security/courtroom) "rMZ" = ( /obj/structure/table, /obj/item/folder/blue{ @@ -50174,6 +50216,33 @@ "rOF" = ( /turf/closed/wall, /area/station/medical/psychology) +"rOG" = ( +/obj/structure/window, +/obj/item/food/cakeslice/pound_cake_slice{ + pixel_x = 8; + pixel_y = -2 + }, +/obj/machinery/airalarm/directional/east, +/obj/structure/table/reinforced{ + name = "Jim Norton's Quebecois Coffee table" + }, +/obj/item/food/poppypretzel{ + pixel_x = -8; + pixel_y = -3 + }, +/obj/item/food/muffin/berry{ + pixel_x = -4; + pixel_y = 9 + }, +/obj/item/food/hotcrossbun{ + pixel_x = 3; + pixel_y = 5 + }, +/obj/effect/turf_decal/trimline/neutral/line{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/service/cafeteria) "rOK" = ( /obj/machinery/atmospherics/pipe/smart/simple/orange/hidden, /turf/open/floor/plating, @@ -50395,17 +50464,6 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/transit_tube) -"rRW" = ( -/obj/structure/window{ - dir = 8 - }, -/obj/structure/window, -/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ - dir = 4 - }, -/obj/effect/turf_decal/tile/brown/fourcorners, -/turf/open/floor/iron, -/area/station/engineering/atmos) "rRZ" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -50777,15 +50835,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/fore) -"rXY" = ( -/obj/structure/window{ - dir = 1 - }, -/obj/structure/window{ - dir = 8 - }, -/turf/open/floor/grass, -/area/station/service/hydroponics/garden) "rYc" = ( /obj/machinery/power/port_gen/pacman, /obj/structure/cable, @@ -50821,16 +50870,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/primary/fore) -"rYs" = ( -/obj/structure/window{ - dir = 8 - }, -/turf/open/floor/grass, -/area/station/service/hydroponics/garden) -"rYx" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/station/science/robotics/mechbay) "rYy" = ( /obj/machinery/power/smes, /turf/open/floor/plating, @@ -50934,25 +50973,6 @@ }, /turf/open/floor/wood, /area/station/command/heads_quarters/captain/private) -"rZP" = ( -/obj/structure/window{ - dir = 8 - }, -/obj/item/stack/spacecash/c1{ - pixel_y = 9 - }, -/obj/item/reagent_containers/cup/rag, -/obj/structure/table/reinforced{ - name = "Jim Norton's Quebecois Coffee table" - }, -/obj/effect/turf_decal/trimline/neutral/line{ - dir = 1 - }, -/obj/structure/desk_bell{ - pixel_x = 7 - }, -/turf/open/floor/iron/dark, -/area/station/service/cafeteria) "rZT" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -50963,6 +50983,21 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/port) +"rZV" = ( +/obj/structure/window, +/obj/structure/window{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1; + name = "CO2 to Pure" + }, +/obj/effect/turf_decal/tile/dark/fourcorners, +/turf/open/floor/iron, +/area/station/engineering/atmos) "rZY" = ( /obj/machinery/door/airlock/medical/glass{ name = "Medbay Storage" @@ -51497,27 +51532,6 @@ }, /turf/open/floor/wood/parquet, /area/station/medical/psychology) -"sjJ" = ( -/obj/machinery/door/window/left/directional/north{ - dir = 8; - name = "Jetpack Storage"; - pixel_x = -1; - req_access = list("eva") - }, -/obj/structure/window, -/obj/structure/rack, -/obj/item/tank/jetpack/carbondioxide{ - pixel_x = 4; - pixel_y = -1 - }, -/obj/item/tank/jetpack/carbondioxide, -/obj/item/tank/jetpack/carbondioxide{ - pixel_x = -4; - pixel_y = 1 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/command/storage/eva) "sjM" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -52062,19 +52076,6 @@ }, /turf/open/floor/carpet, /area/station/commons/vacant_room/office) -"sug" = ( -/obj/structure/window{ - dir = 8 - }, -/obj/structure/table, -/obj/item/surgical_drapes, -/obj/item/cautery, -/obj/effect/turf_decal/tile/purple/half/contrasted, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/turf/open/floor/iron/white, -/area/station/science/robotics/lab) "suj" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/components/binary/pump{ @@ -52756,6 +52757,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/carpet, /area/station/commons/dorms) +"sGm" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/science/robotics/mechbay) "sGn" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -52854,6 +52859,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/primary/aft) +"sIG" = ( +/obj/effect/spawner/structure/window, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 4; + id = "pharmacy_shutters"; + name = "Pharmacy Shutters" + }, +/turf/open/floor/plating, +/area/station/medical/pharmacy) "sIO" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/cable, @@ -52950,6 +52964,18 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/fore) +"sKr" = ( +/obj/structure/window, +/obj/structure/window{ + dir = 4 + }, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1; + name = "Mix Outlet Pump" + }, +/obj/effect/turf_decal/tile/brown/fourcorners, +/turf/open/floor/iron, +/area/station/engineering/atmos) "sKt" = ( /obj/machinery/smartfridge/chemistry/preloaded, /turf/closed/wall, @@ -53153,12 +53179,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/port) -"sNQ" = ( -/obj/structure/window{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/commons/fitness/recreation) "sNS" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -53169,6 +53189,15 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/science/genetics) +"sNT" = ( +/obj/machinery/power/shieldwallgen, +/obj/structure/window{ + dir = 1 + }, +/obj/machinery/light/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/teleporter) "sOi" = ( /obj/structure/table/wood, /obj/item/folder/red, @@ -53407,24 +53436,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/commons/fitness/recreation) -"sSt" = ( -/obj/item/folder/white{ - pixel_x = 4; - pixel_y = -3 - }, -/obj/structure/table/reinforced, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "chem_lockdown"; - name = "Chemistry Shutters" - }, -/obj/effect/turf_decal/tile/yellow/fourcorners, -/obj/machinery/door/window/left/directional/north{ - name = "Chemistry Desk"; - req_access = list("plumbing") - }, -/turf/open/floor/iron/white, -/area/station/medical/chemistry) "sSx" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command{ @@ -53878,14 +53889,6 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/wood, /area/station/command/heads_quarters/captain/private) -"sZF" = ( -/obj/structure/window, -/obj/effect/turf_decal/tile/red/fourcorners, -/obj/machinery/atmospherics/components/trinary/filter/atmos/n2{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "sZH" = ( /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 1 @@ -54040,33 +54043,6 @@ /obj/structure/bookcase/random/nonfiction, /turf/open/floor/wood, /area/station/service/library) -"tci" = ( -/obj/structure/window, -/obj/item/food/cakeslice/pound_cake_slice{ - pixel_x = 8; - pixel_y = -2 - }, -/obj/machinery/airalarm/directional/east, -/obj/structure/table/reinforced{ - name = "Jim Norton's Quebecois Coffee table" - }, -/obj/item/food/poppypretzel{ - pixel_x = -8; - pixel_y = -3 - }, -/obj/item/food/muffin/berry{ - pixel_x = -4; - pixel_y = 9 - }, -/obj/item/food/hotcrossbun{ - pixel_x = 3; - pixel_y = 5 - }, -/obj/effect/turf_decal/trimline/neutral/line{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/service/cafeteria) "tck" = ( /obj/structure/extinguisher_cabinet/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -54101,6 +54077,14 @@ }, /turf/open/floor/iron/white, /area/station/command/heads_quarters/rd) +"tcA" = ( +/obj/structure/window, +/obj/machinery/computer/atmos_control/mix_tank{ + dir = 1 + }, +/obj/effect/turf_decal/tile/brown/fourcorners, +/turf/open/floor/iron, +/area/station/engineering/atmos) "tcB" = ( /obj/structure/cable, /obj/effect/landmark/xeno_spawn, @@ -54116,17 +54100,6 @@ }, /turf/open/floor/iron/dark, /area/station/medical/morgue) -"tcE" = ( -/obj/structure/window{ - dir = 4 - }, -/obj/structure/window, -/obj/structure/flora/bush/pale/style_random, -/obj/structure/flora/bush/ferny/style_random, -/obj/structure/flora/bush/fullgrass/style_random, -/obj/structure/flora/bush/flowers_br/style_random, -/turf/open/floor/grass, -/area/station/science/research) "tcN" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -54149,6 +54122,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/security/prison) +"tdb" = ( +/obj/structure/window, +/obj/structure/table, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, +/obj/item/hand_labeler, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/teleporter) "tdf" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -54583,6 +54567,13 @@ /obj/effect/spawner/random/maintenance/two, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"tkr" = ( +/obj/docking_port/stationary/random{ + shuttle_id = "pod_lavaland"; + name = "lavaland" + }, +/turf/open/space, +/area/space) "tkP" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/white/line{ @@ -54645,6 +54636,19 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +"tme" = ( +/obj/structure/disposaloutlet{ + dir = 1 + }, +/obj/structure/window{ + dir = 4 + }, +/obj/structure/window{ + dir = 8 + }, +/obj/structure/disposalpipe/trunk, +/turf/open/floor/plating, +/area/station/cargo/sorting) "tml" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/cable, @@ -54815,6 +54819,22 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/iron, /area/station/science/research) +"toe" = ( +/obj/machinery/conveyor{ + dir = 1; + id = "QMLoad" + }, +/obj/structure/window, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/light/directional/west, +/obj/structure/disposaloutlet{ + dir = 1 + }, +/obj/structure/disposalpipe/trunk, +/turf/open/floor/iron, +/area/station/cargo/storage) "tok" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/camera/directional/south{ @@ -55143,6 +55163,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/security/prison/mess) +"tuf" = ( +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 4 + }, +/obj/structure/window{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) "tug" = ( /obj/structure/extinguisher_cabinet/directional/west, /obj/effect/turf_decal/tile/neutral{ @@ -55392,20 +55421,6 @@ }, /turf/open/floor/iron/textured, /area/station/medical/medbay/central) -"tyV" = ( -/obj/machinery/conveyor{ - dir = 1; - id = "packageExternal" - }, -/obj/structure/plasticflaps/opaque, -/obj/structure/window{ - dir = 4 - }, -/obj/structure/window{ - dir = 8 - }, -/turf/open/floor/plating, -/area/station/cargo/sorting) "tyY" = ( /turf/closed/wall, /area/station/command/heads_quarters/captain/private) @@ -55620,6 +55635,15 @@ /obj/effect/spawner/random/techstorage/engineering_all, /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) +"tDt" = ( +/obj/structure/window, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "tDz" = ( /obj/machinery/light/directional/south, /obj/machinery/status_display/door_timer{ @@ -55629,23 +55653,6 @@ }, /turf/open/floor/iron, /area/station/security/brig) -"tDA" = ( -/obj/structure/window{ - dir = 8 - }, -/obj/structure/window{ - dir = 1 - }, -/obj/structure/rack, -/obj/item/storage/box/gloves{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/box/bodybags, -/obj/item/healthanalyzer, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/white, -/area/station/science/robotics/lab) "tDN" = ( /obj/structure/chair{ dir = 8 @@ -56129,6 +56136,14 @@ }, /turf/open/floor/wood, /area/station/command/heads_quarters/hos) +"tLU" = ( +/obj/effect/spawner/random/structure/musician/piano/random_piano, +/obj/structure/window{ + dir = 8 + }, +/obj/machinery/light_switch/directional/south, +/turf/open/floor/wood, +/area/station/service/theater) "tMe" = ( /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /obj/machinery/light/small/directional/east, @@ -56408,13 +56423,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) -"tSr" = ( -/obj/item/radio/intercom/directional/east, -/obj/structure/window{ - dir = 1 - }, -/turf/open/floor/grass, -/area/station/service/hydroponics/garden) "tSw" = ( /turf/closed/wall, /area/station/maintenance/aft/greater) @@ -56839,6 +56847,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, /area/station/command/heads_quarters/captain/private) +"tZJ" = ( +/obj/effect/spawner/structure/window, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 4; + id = "pharmacy_shutters_2"; + name = "Pharmacy Shutters" + }, +/turf/open/floor/plating, +/area/station/medical/pharmacy) "tZS" = ( /obj/structure/flora/bush/jungle/b/style_random, /obj/structure/flora/bush/flowers_pp/style_random, @@ -56941,6 +56958,18 @@ /obj/effect/spawner/random/structure/grille, /turf/open/floor/plating, /area/station/maintenance/port) +"ubw" = ( +/obj/machinery/mineral/stacking_machine{ + input_dir = 2 + }, +/obj/structure/window{ + dir = 4 + }, +/obj/structure/window{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/disposal) "ubB" = ( /obj/structure/table/reinforced, /obj/item/folder/blue{ @@ -57030,17 +57059,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/starboard) -"udd" = ( -/obj/effect/turf_decal/tile/purple/fourcorners, -/obj/structure/window, -/obj/machinery/computer/atmos_control/plasma_tank{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "ude" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box/white{ @@ -57073,15 +57091,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) -"udq" = ( -/obj/effect/spawner/structure/window, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 4; - id = "rdrnd"; - name = "Research and Development Shutters" - }, -/turf/open/floor/plating, -/area/station/science/lab) "udC" = ( /obj/machinery/door/airlock/maintenance{ name = "Storage Room" @@ -57697,15 +57706,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/station/cargo/storage) -"uoB" = ( -/obj/effect/spawner/structure/window, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 4; - id = "pharmacy_shutters"; - name = "Pharmacy Shutters" - }, -/turf/open/floor/plating, -/area/station/medical/pharmacy) "uoM" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/secure_closet/brig{ @@ -57961,34 +57961,6 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/medical/storage) -"usI" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposaloutlet{ - dir = 4; - name = "Cargo Deliveries" - }, -/obj/structure/window{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/brown/warning{ - dir = 10 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/brown/warning{ - dir = 10 - }, -/obj/effect/turf_decal/siding/yellow, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/starboard) "usK" = ( /obj/structure/table, /obj/item/storage/toolbox/emergency, @@ -58403,6 +58375,10 @@ /obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +"uAp" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/cargo/warehouse) "uAu" = ( /obj/machinery/conveyor{ dir = 1; @@ -58437,6 +58413,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/port) +"uBg" = ( +/obj/structure/window, +/obj/machinery/computer/atmos_control/carbon_tank{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 4 + }, +/obj/effect/turf_decal/tile/dark/fourcorners, +/turf/open/floor/iron, +/area/station/engineering/atmos) "uBp" = ( /obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 8 @@ -58968,15 +58955,6 @@ }, /turf/open/floor/iron, /area/station/science/robotics/lab) -"uJj" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 8; - id = "rdrnd"; - name = "Research and Development Shutters" - }, -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/station/science/lab) "uJm" = ( /obj/structure/bookcase{ name = "Forbidden Knowledge" @@ -59104,10 +59082,6 @@ /obj/effect/spawner/random/maintenance/two, /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) -"uLd" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/station/medical/storage) "uLp" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -59142,6 +59116,23 @@ /obj/machinery/firealarm/directional/north, /turf/open/floor/iron/white, /area/station/science/research) +"uLW" = ( +/obj/structure/table/reinforced, +/obj/structure/window{ + dir = 8 + }, +/obj/structure/window{ + dir = 1 + }, +/obj/item/wheelchair{ + pixel_y = -3 + }, +/obj/item/wheelchair, +/obj/item/wheelchair{ + pixel_y = 3 + }, +/turf/open/floor/iron/dark, +/area/station/medical/office) "uMb" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -59653,6 +59644,18 @@ "uXd" = ( /turf/closed/wall/r_wall, /area/station/engineering/main) +"uXt" = ( +/obj/docking_port/stationary{ + dheight = 1; + dir = 8; + dwidth = 12; + height = 17; + shuttle_id = "syndicate_nw"; + name = "northwest of station"; + width = 23 + }, +/turf/open/space/basic, +/area/space) "uXG" = ( /obj/machinery/door/airlock/maintenance{ name = "Psychology Maintenance" @@ -59839,13 +59842,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/security/medical) -"vbn" = ( -/obj/structure/window{ - dir = 4 - }, -/obj/structure/window, -/turf/open/floor/iron/dark, -/area/station/commons/fitness/recreation) "vbq" = ( /obj/structure/sign/map/right{ desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; @@ -59910,6 +59906,17 @@ }, /turf/open/floor/plating, /area/station/service/chapel/funeral) +"vdf" = ( +/obj/effect/turf_decal/tile/purple/fourcorners, +/obj/structure/window, +/obj/machinery/computer/atmos_control/plasma_tank{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "vdi" = ( /obj/machinery/camera/directional/west{ c_tag = "Security - Office - Port" @@ -60116,20 +60123,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/command/gateway) -"vgw" = ( -/obj/structure/window, -/obj/machinery/computer/atmos_control/nitrogen_tank{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red/fourcorners, -/obj/machinery/atmospherics/pipe/bridge_pipe/dark/visible{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "vgZ" = ( /obj/structure/table/glass, /obj/structure/cable, @@ -60267,6 +60260,23 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +"vjq" = ( +/obj/structure/window{ + dir = 8 + }, +/obj/structure/window{ + dir = 1 + }, +/obj/structure/rack, +/obj/item/storage/box/gloves{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/box/bodybags, +/obj/item/healthanalyzer, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/station/science/robotics/lab) "vjv" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -60276,6 +60286,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, /area/station/service/library) +"vjw" = ( +/obj/structure/table/wood, +/obj/machinery/fax{ + name = "Quartermaster's Fax Machine"; + fax_name = "Quartermaster's Office" + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/qm) "vjA" = ( /obj/structure/cable, /obj/machinery/holopad/secure, @@ -60803,15 +60821,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) -"vrg" = ( -/obj/structure/window, -/obj/effect/turf_decal/tile/red/fourcorners, -/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, -/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "vro" = ( /obj/structure/sink/directional/west, /turf/open/floor/iron/white, @@ -61392,6 +61401,10 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/fore) +"vDc" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/medical/surgery/aft) "vDh" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 1 @@ -61428,6 +61441,14 @@ /obj/item/disk/nuclear, /turf/open/floor/carpet, /area/station/command/heads_quarters/captain/private) +"vDM" = ( +/obj/structure/window{ + dir = 4 + }, +/obj/structure/table/reinforced, +/obj/item/storage/backpack/duffelbag/med/surgery, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "vDV" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -61480,6 +61501,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/atmos/storage/gas) +"vEw" = ( +/obj/structure/window{ + dir = 4 + }, +/obj/structure/window, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) "vEH" = ( /obj/machinery/door/window/right/directional/east{ name = "Danger: Conveyor Access"; @@ -61649,6 +61677,20 @@ dir = 1 }, /area/station/engineering/main) +"vHu" = ( +/obj/structure/window{ + dir = 1 + }, +/obj/structure/window{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) +"vHG" = ( +/obj/structure/table/wood, +/obj/machinery/keycard_auth/directional/south, +/turf/open/floor/wood, +/area/station/command/heads_quarters/qm) "vHO" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, @@ -61956,19 +61998,6 @@ }, /turf/open/space, /area/space/nearstation) -"vNX" = ( -/obj/machinery/conveyor{ - dir = 1; - id = "packageSort2" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/window{ - dir = 4 - }, -/turf/open/floor/plating, -/area/station/cargo/sorting) "vOh" = ( /obj/effect/turf_decal/stripes/end, /turf/open/floor/plating/airless, @@ -62063,6 +62092,20 @@ }, /turf/open/floor/iron/white, /area/station/command/heads_quarters/cmo) +"vPV" = ( +/obj/machinery/conveyor{ + dir = 1; + id = "packageExternal" + }, +/obj/structure/plasticflaps/opaque, +/obj/structure/window{ + dir = 4 + }, +/obj/structure/window{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/cargo/sorting) "vPW" = ( /obj/item/extinguisher, /turf/open/floor/plating, @@ -62099,10 +62142,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/closed/wall/r_wall, /area/station/maintenance/disposal/incinerator) -"vQp" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/station/commons/storage/tools) "vQs" = ( /turf/closed/wall, /area/station/cargo/warehouse) @@ -62122,26 +62161,6 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) -"vQy" = ( -/obj/structure/window{ - dir = 8 - }, -/obj/structure/window{ - dir = 4 - }, -/obj/machinery/door/window/left/directional/north{ - name = "Inner Pipe Access"; - req_access = list("atmospherics") - }, -/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/pump/off{ - dir = 1; - name = "O2 To Pure" - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "vQI" = ( /obj/structure/sign/warning/pods, /turf/closed/wall/r_wall, @@ -62540,6 +62559,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood, /area/station/service/library) +"vWI" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/security/courtroom) "vWT" = ( /obj/structure/frame/machine{ anchored = 1 @@ -62868,21 +62891,6 @@ /obj/effect/landmark/start/scientist, /turf/open/floor/iron/white, /area/station/science/ordnance/office) -"wdz" = ( -/obj/structure/window, -/obj/structure/window{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1; - name = "N2O to Pure" - }, -/obj/effect/turf_decal/tile/yellow/fourcorners, -/turf/open/floor/iron, -/area/station/engineering/atmos) "wdB" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -62910,6 +62918,10 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/engineering/gravity_generator) +"wdM" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/construction/storage_wing) "wdQ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/camera/directional/east{ @@ -62998,6 +63010,10 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/station/service/hydroponics/garden) +"wfm" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/science/robotics/lab) "wfn" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -63164,6 +63180,18 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/security/execution/education) +"whN" = ( +/obj/docking_port/stationary{ + dheight = 4; + dwidth = 4; + height = 9; + shuttle_id = "aux_base_zone"; + name = "Aux Base Zone"; + roundstart_template = /datum/map_template/shuttle/aux_base/default; + width = 9 + }, +/turf/open/floor/plating, +/area/station/construction/mining/aux_base) "wih" = ( /obj/machinery/newscaster/directional/south, /turf/open/floor/wood, @@ -63294,6 +63322,19 @@ /obj/structure/sign/poster/random/directional/north, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +"wkI" = ( +/obj/structure/closet/secure_closet/freezer/meat, +/obj/machinery/light/small/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, +/obj/machinery/camera/autoname/directional/west, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/structure/window{ + dir = 1 + }, +/turf/open/floor/iron/kitchen_coldroom/freezerfloor, +/area/station/service/kitchen/coldroom) "wkL" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -63336,10 +63377,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white/smooth_large, /area/station/medical/medbay/central) -"wlL" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/station/service/bar) "wmc" = ( /obj/structure/closet/secure_closet/evidence, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -63365,22 +63402,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) -"wmo" = ( -/obj/machinery/conveyor{ - dir = 1; - id = "QMLoad" - }, -/obj/structure/window, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/machinery/light/directional/west, -/obj/structure/disposaloutlet{ - dir = 1 - }, -/obj/structure/disposalpipe/trunk, -/turf/open/floor/iron, -/area/station/cargo/storage) "wmz" = ( /obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /turf/open/floor/iron, @@ -64618,6 +64639,21 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/aisat/exterior) +"wLH" = ( +/obj/structure/table, +/obj/structure/window{ + dir = 4 + }, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/pen, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 5 + }, +/turf/open/floor/iron/white, +/area/station/security/medical) "wMk" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -64709,6 +64745,16 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/science/cytology) +"wOg" = ( +/obj/structure/window{ + dir = 8 + }, +/obj/structure/bodycontainer/morgue{ + dir = 2 + }, +/obj/effect/turf_decal/stripes/white/full, +/turf/open/floor/iron/white, +/area/station/science/robotics/lab) "wOl" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -64776,14 +64822,6 @@ /obj/effect/mapping_helpers/airlock/access/all/science/robotics, /turf/open/floor/plating, /area/station/science/robotics/lab) -"wOY" = ( -/obj/docking_port/stationary/random{ - dir = 4; - id = "pod_3_lavaland"; - name = "lavaland" - }, -/turf/open/space, -/area/space) "wPi" = ( /obj/machinery/vending/wardrobe/det_wardrobe, /turf/open/floor/iron/grimy, @@ -64876,6 +64914,10 @@ }, /turf/open/floor/engine/n2, /area/station/engineering/atmos) +"wQa" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/science/lab) "wQj" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4{ dir = 8 @@ -65082,6 +65124,19 @@ /obj/item/radio/intercom/directional/east, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"wUd" = ( +/obj/structure/window{ + dir = 8 + }, +/obj/structure/window{ + dir = 1 + }, +/obj/structure/flora/bush/pale/style_random, +/obj/structure/flora/bush/ferny/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/structure/flora/bush/flowers_br/style_random, +/turf/open/floor/grass, +/area/station/science/research) "wUj" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/white, @@ -65119,6 +65174,31 @@ /obj/machinery/duct, /turf/open/floor/iron/white, /area/station/medical/treatment_center) +"wVc" = ( +/obj/structure/table/reinforced, +/obj/item/folder/white{ + pixel_x = 4; + pixel_y = -3 + }, +/obj/machinery/door/firedoor, +/obj/item/folder/white{ + pixel_x = 4; + pixel_y = -3 + }, +/obj/item/pen, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 4; + id = "pharmacy_shutters_2"; + name = "Pharmacy Shutters" + }, +/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/machinery/door/window/right/directional/east{ + dir = 8; + name = "Pharmacy Desk"; + req_access = list("pharmacy") + }, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) "wVd" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt, @@ -65204,26 +65284,6 @@ /obj/structure/window/reinforced, /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/ai_upload) -"wWi" = ( -/obj/structure/window{ - dir = 1 - }, -/obj/item/storage/medkit/regular{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/item/storage/medkit/o2{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/medkit/o2, -/obj/item/storage/medkit/o2{ - pixel_x = -3; - pixel_y = -3 - }, -/obj/structure/table/reinforced, -/turf/open/floor/iron/dark, -/area/station/medical/storage) "wWk" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -65336,17 +65396,6 @@ /obj/effect/spawner/random/trash/mess, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) -"wYm" = ( -/obj/structure/window, -/obj/structure/table, -/obj/item/stack/package_wrap, -/obj/item/stack/package_wrap, -/obj/item/stack/package_wrap, -/obj/item/stack/package_wrap, -/obj/item/hand_labeler, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/command/teleporter) "wYn" = ( /obj/machinery/chem_dispenser/drinks/beer{ dir = 1 @@ -65459,17 +65508,6 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"xaE" = ( -/obj/structure/window, -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/computer/atmos_control/oxygen_tank{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "xaL" = ( /obj/effect/turf_decal/trimline/red/filled/corner, /obj/item/kirbyplants/random, @@ -65491,23 +65529,6 @@ }, /turf/open/floor/iron/white, /area/station/science/research) -"xaP" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/station/construction/storage_wing) -"xaU" = ( -/obj/structure/window{ - dir = 8 - }, -/obj/machinery/vending/coffee{ - default_price = 0; - extra_price = 0; - fair_market_price = 0; - name = "\improper Jim Norton's Quebecois Coffee" - }, -/obj/machinery/light_switch/directional/north, -/turf/open/floor/iron/dark, -/area/station/service/cafeteria) "xba" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/bot{ @@ -65530,14 +65551,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) -"xbL" = ( -/obj/structure/window{ - dir = 8 - }, -/obj/structure/cable, -/obj/effect/landmark/start/hangover, -/turf/open/floor/carpet, -/area/station/service/theater) "xbT" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -65575,13 +65588,6 @@ /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating, /area/station/maintenance/department/engine) -"xcN" = ( -/obj/docking_port/stationary/random{ - id = "pod_lavaland"; - name = "lavaland" - }, -/turf/open/space, -/area/space) "xdm" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -65890,19 +65896,6 @@ "xhh" = ( /turf/open/floor/plating/airless, /area/station/science/ordnance/bomb) -"xhI" = ( -/obj/effect/turf_decal/trimline/brown/warning{ - dir = 6 - }, -/obj/effect/turf_decal/trimline/brown/warning{ - dir = 6 - }, -/obj/structure/window{ - dir = 4 - }, -/obj/effect/turf_decal/siding/purple, -/turf/open/floor/iron/white, -/area/station/science/lobby) "xip" = ( /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /obj/effect/turf_decal/bot, @@ -66100,20 +66093,6 @@ "xlF" = ( /turf/open/floor/iron, /area/station/service/hydroponics) -"xlR" = ( -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/structure/window, -/obj/structure/window{ - dir = 8 - }, -/obj/machinery/atmospherics/components/trinary/filter/atmos/n2o{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow/fourcorners, -/turf/open/floor/iron, -/area/station/engineering/atmos) "xlU" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -66268,6 +66247,26 @@ }, /turf/open/floor/iron/white, /area/station/science/explab) +"xoB" = ( +/obj/structure/window{ + dir = 8 + }, +/obj/structure/window{ + dir = 4 + }, +/obj/machinery/door/window/left/directional/north{ + name = "Inner Pipe Access"; + req_access = list("atmospherics") + }, +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/components/binary/pump/off{ + dir = 1; + name = "O2 To Pure" + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) "xoK" = ( /obj/effect/landmark/start/botanist, /obj/effect/turf_decal/tile/green{ @@ -66370,6 +66369,11 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/commons/fitness/recreation) +"xrm" = ( +/obj/structure/window, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) "xrq" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -66433,17 +66437,6 @@ /obj/machinery/light_switch/directional/south, /turf/open/floor/iron/white, /area/station/security/prison) -"xsx" = ( -/obj/structure/window, -/obj/machinery/computer/atmos_control/carbon_tank{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ - dir = 4 - }, -/obj/effect/turf_decal/tile/dark/fourcorners, -/turf/open/floor/iron, -/area/station/engineering/atmos) "xsy" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/yellow{ @@ -66630,6 +66623,14 @@ dir = 4 }, /area/station/security/prison) +"xwl" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + id = "roboticsprivacy2"; + name = "Robotics Shutters" + }, +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/science/robotics/lab) "xww" = ( /turf/closed/wall/r_wall, /area/station/engineering/storage/tech) @@ -66736,6 +66737,10 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai) +"xyq" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/service/library) "xyt" = ( /obj/machinery/door/poddoor/preopen{ id = "Prison Gate"; @@ -66820,19 +66825,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/primary/aft) -"xzh" = ( -/obj/structure/window{ - dir = 8 - }, -/obj/structure/window{ - dir = 1 - }, -/obj/structure/flora/bush/pale/style_random, -/obj/structure/flora/bush/ferny/style_random, -/obj/structure/flora/bush/fullgrass/style_random, -/obj/structure/flora/bush/flowers_br/style_random, -/turf/open/floor/grass, -/area/station/science/research) "xzj" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -67036,6 +67028,24 @@ }, /turf/open/floor/engine, /area/station/science/cytology) +"xCR" = ( +/obj/item/folder/white{ + pixel_x = 4; + pixel_y = -3 + }, +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "chem_lockdown"; + name = "Chemistry Shutters" + }, +/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/machinery/door/window/left/directional/north{ + name = "Chemistry Desk"; + req_access = list("plumbing") + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) "xCS" = ( /obj/structure/table/wood, /obj/item/book/manual/wiki/tcomms, @@ -67181,6 +67191,27 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) +"xFs" = ( +/obj/machinery/door/window/left/directional/north{ + dir = 8; + name = "Jetpack Storage"; + pixel_x = -1; + req_access = list("eva") + }, +/obj/structure/window, +/obj/structure/rack, +/obj/item/tank/jetpack/carbondioxide{ + pixel_x = 4; + pixel_y = -1 + }, +/obj/item/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide{ + pixel_x = -4; + pixel_y = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/storage/eva) "xFx" = ( /obj/structure/sign/map/right{ desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; @@ -67280,16 +67311,6 @@ /obj/machinery/atmospherics/components/trinary/filter/flipped/critical, /turf/open/floor/engine, /area/station/engineering/supermatter/room) -"xHQ" = ( -/obj/structure/window{ - dir = 8 - }, -/obj/structure/bodycontainer/morgue{ - dir = 2 - }, -/obj/effect/turf_decal/stripes/white/full, -/turf/open/floor/iron/white, -/area/station/science/robotics/lab) "xIx" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, @@ -67698,6 +67719,21 @@ }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/rd) +"xPn" = ( +/obj/structure/window, +/obj/structure/window{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1; + name = "N2O to Pure" + }, +/obj/effect/turf_decal/tile/yellow/fourcorners, +/turf/open/floor/iron, +/area/station/engineering/atmos) "xPy" = ( /obj/machinery/camera/directional/north{ c_tag = "Atmospherics - Hypertorus Fusion Reactor Chamber Fore" @@ -67979,11 +68015,6 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/science/research) -"xVO" = ( -/obj/structure/window, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/dark, -/area/station/commons/fitness/recreation) "xVY" = ( /obj/structure/table/wood, /obj/machinery/button/door/directional/south{ @@ -68142,18 +68173,6 @@ /obj/effect/mapping_helpers/airlock/access/any/command/captain, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/captain/private) -"xXW" = ( -/obj/docking_port/stationary{ - dheight = 1; - dir = 8; - dwidth = 12; - height = 17; - id = "syndicate_nw"; - name = "northwest of station"; - width = 23 - }, -/turf/open/space/basic, -/area/space) "xYl" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -68266,11 +68285,6 @@ }, /turf/open/floor/iron/checker, /area/station/science/research) -"yam" = ( -/obj/structure/window, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, -/area/station/commons/fitness/recreation) "yaD" = ( /obj/structure/table, /obj/item/stack/rods/fifty, @@ -68375,10 +68389,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) -"ybo" = ( -/obj/structure/window, -/turf/open/floor/iron/dark, -/area/station/commons/fitness/recreation) "ybs" = ( /obj/machinery/light/directional/south, /turf/open/floor/iron/freezer, @@ -68539,16 +68549,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/execution/transfer) -"yeL" = ( -/obj/structure/window{ - dir = 1 - }, -/obj/machinery/door/window/right/directional/east{ - dir = 8; - name = "Fitness Ring" - }, -/turf/open/floor/iron/dark, -/area/station/commons/fitness/recreation) "yeS" = ( /obj/item/retractor, /obj/item/hemostat{ @@ -74868,7 +74868,7 @@ aaa aaa aaa aaa -xXW +uXt aaa aaa aaa @@ -78518,7 +78518,7 @@ aaa aaa aaa aaa -xcN +tkr aaa aaa aaa @@ -78812,7 +78812,7 @@ lGL bfk hBD bfk -oRL +fQj aaa aaa aaa @@ -79807,7 +79807,7 @@ aDa aDa aDa aDa -bIK +iYU knP dCx aDb @@ -80064,7 +80064,7 @@ aDa aDa aDa aDa -bIK +iYU kFg eVm cYL @@ -80321,7 +80321,7 @@ aDa aDa aDa aDa -bIK +iYU kFg eVm cYL @@ -80578,7 +80578,7 @@ aDa aDa aDa aDa -bIK +iYU jmc hkJ aDb @@ -80830,7 +80830,7 @@ aDa aDa aDa aDa -obX +whN aDa aDa aDa @@ -80859,7 +80859,7 @@ sVA qEt aaa aaa -cVx +olN aaa aaa qEt @@ -81092,7 +81092,7 @@ aDa aDa aDa aDa -bIK +iYU oSc oQc aDb @@ -81349,7 +81349,7 @@ aDa aDa aDa aDa -bIK +iYU oYM paf aDb @@ -81606,7 +81606,7 @@ aDa aDa aDa aDa -bIK +iYU ttX ueB aDb @@ -81863,7 +81863,7 @@ aDa aDa aDa aDa -bIK +iYU wYc dhb aDb @@ -81875,7 +81875,7 @@ lMJ aaa aaa aaa -djM +nKr aaa aaa aaa @@ -84946,7 +84946,7 @@ aaa aaa aaa aaa -cUZ +pdX aaa aaa aaa @@ -85729,7 +85729,7 @@ jLb tTa kQP fSw -kgm +vjw kQP dHc dHc @@ -85979,7 +85979,7 @@ jYB vsO vsO uAu -wmo +toe rbL mmR mmR @@ -85987,7 +85987,7 @@ kQP kQP apZ lnG -mib +qIK ikJ kKr hyW @@ -86208,7 +86208,7 @@ qvJ nxi rvj hTn -goc +pud iPE vfv cTQ @@ -86244,7 +86244,7 @@ kQP mxO qkD ksM -mib +qIK xWV kKr hyW @@ -86496,11 +86496,11 @@ jRM uKm thQ lme -mib +qIK sRD nre uXZ -gen +vHG kQP kQP tiD @@ -86722,7 +86722,7 @@ qvJ kVR jCM teg -bTr +ubw pQu vEH jXu @@ -87010,7 +87010,7 @@ jRM bgx mmR wRj -mib +qIK cjJ cjJ cjJ @@ -87267,7 +87267,7 @@ dka bgx mmR nyk -mib +qIK suJ bor iLV @@ -87523,12 +87523,12 @@ aok aok bgx mmR -fRY +nQh kQP kQP kQP -mib -mib +qIK +qIK kQP kQP kQP @@ -87782,13 +87782,13 @@ bgx mmR pyZ pOb -oPz +rLt hfv sVp sVp sVp -tyV -lUq +vPV +gqr hKw xOw piC @@ -88040,11 +88040,11 @@ hod dfk dfk edN -dzR -vNX +kav +eZH yhL -vNX -jqJ +eZH +tme iev mkb sly @@ -88095,7 +88095,7 @@ jUb tfn oBO ieH -flq +vDc miX bfg gND @@ -88548,7 +88548,7 @@ ilY cSq yis vQs -xaP +wdM sai mJo bzH @@ -88592,11 +88592,11 @@ hfi jUb jUb sSp -fom +bkQ xzu pDQ vRR -fom +bkQ sSp jUb jUb @@ -88609,7 +88609,7 @@ jUb tck tFr nMf -flq +vDc amb nCc xGk @@ -88861,12 +88861,12 @@ pMs uLs wFa iov -rox +pDJ vun rtX wGk ukN -flq +vDc jtZ pFg jXQ @@ -89020,7 +89020,7 @@ tub eJp bmB aXa -gRF +nPK bKT wZz sjP @@ -89065,7 +89065,7 @@ vQs aUk uwx aXq -ncU +aEC qMA piB epv @@ -89144,9 +89144,9 @@ lUP vhS qrD vQg -mkU +kLJ aGD -mkU +kLJ gYU ppJ gYU @@ -89276,7 +89276,7 @@ bVF fGP aJK liL -iPA +kKZ ngT kQm wZz @@ -89370,17 +89370,17 @@ oJD oPv nKE xtu -uLd +rvb pri elb sja elb hlX -uLd +rvb nTs tFr pDU -pgu +ngl duw hyn hNN @@ -89526,7 +89526,7 @@ iFz fhP aXa aXa -iPA +kKZ aXa aXa xdR @@ -89617,7 +89617,7 @@ aez vpB aSe jeL -iHA +jxc tuC iMv nKE @@ -89831,12 +89831,12 @@ mxh gUX kod oQx -qvK +uAp dhy rVn fhB jdn -aQt +aqG hlb piB bnv @@ -89884,17 +89884,17 @@ lTR wUQ jGG agZ -uLd +rvb tnN eih foP sRm hdF -uLd +rvb myc tFr ieH -pgu +ngl nGr aST aWb @@ -90093,7 +90093,7 @@ cyR rVn uwx mgJ -aQt +aqG isa bGt uRu @@ -90101,7 +90101,7 @@ piB gBN haq nkD -aQt +aqG nQw tEr iOc @@ -90131,7 +90131,7 @@ jkT eKr eRc qNi -iHA +jxc gNT oah nKE @@ -90363,7 +90363,7 @@ sXr ybn fLp sVY -nAP +lvG mjr mjr mjr @@ -90398,13 +90398,13 @@ sxf iMv nKE xtu -uLd +rvb uod wWs fOu fBJ twF -uLd +rvb nsD tFr nMf @@ -90615,13 +90615,13 @@ wew gBN udI eYL -aQt +aqG oKy xOw iOc sVY vKt -eNG +mfj mjr mjr cWr @@ -90641,9 +90641,9 @@ qZn pOa pOa bMY -fAD +oNP odu -fAD +oNP bMY sSp pgP @@ -90656,11 +90656,11 @@ qXh ehg aPe vun -bRw +bSA uTj usC ehX -bpm +jpQ vun gQG tFr @@ -90867,12 +90867,12 @@ uLE kPX moQ bzH -qhg -aQt +cnd +aqG tjN -aQt -aQt -aQt +aqG +aqG +aqG pvL mFo npY @@ -90880,10 +90880,10 @@ qwR sVY sVY sVY -qkp +xyq flx ntX -qkp +xyq sVY jPo apB @@ -90913,20 +90913,20 @@ bJk ppG ppG vun -nIX -gRo +mZD +cho hwe -cSz -wWi +ocE +myV vun uzJ aUt cKd ajI uYp -pgu -pgu -pgu +ngl +ngl +ngl uYp ikS cnc @@ -91114,12 +91114,12 @@ cFp vvH cFp guX -xaU +oTT bUn -rZP +oSm tHu hSg -bOc +rLl uVm sSV wRP @@ -91162,18 +91162,18 @@ bnr sSp sSp sSp -iHA +jxc jfn -iHA +jxc stD -iHA +jxc sSp sSp vun vun -uLd -uLd -uLd +rvb +rvb +rvb vun vun taI @@ -91416,7 +91416,7 @@ jfr mBb pYw irL -fAD +oNP sgS ccV nor @@ -91630,7 +91630,7 @@ kzb guX imK aZD -kmM +jpe euo feA kcM @@ -91667,7 +91667,7 @@ vVV htd tAG gDv -fAD +oNP iPM eRX oYp @@ -91887,7 +91887,7 @@ orC guX udh fHk -tci +rOG jWR iHf pAk @@ -91930,7 +91930,7 @@ tPb bax ghc cxt -fAD +oNP auH tFr nmQ @@ -92181,12 +92181,12 @@ iun htd xAb nvI -fAD +oNP aww rlw -gpo +uLW ylf -btz +hXR bMY dAx iZF @@ -92194,8 +92194,8 @@ qyr pKP pKP nsc -iLh -iLh +cOR +cOR pKP pKP bqX @@ -92447,7 +92447,7 @@ qPJ fEK ePX svQ -qVS +duu pKP lTP rQd @@ -92636,7 +92636,7 @@ qWT nRZ vkO gMg -lst +bhI vaH nRZ cGu @@ -92705,7 +92705,7 @@ bgS taO dlH jsP -iLh +cOR jvr xbY scB @@ -92725,7 +92725,7 @@ dVN uqL jgT vZF -sSt +xCR dIL vjS rAA @@ -92879,7 +92879,7 @@ tdW cTl lgj mWZ -oHQ +aBL rUG cWI gYi @@ -92962,7 +92962,7 @@ eqc kyQ kHg jhk -iLh +cOR vgZ ijZ bkT @@ -93199,9 +93199,9 @@ tYW tOh euj rnX -oTM +bsW yfL -sjJ +xFs dYb gqA tOh @@ -93219,7 +93219,7 @@ lsJ gQG tFr tar -iLh +cOR jgs uyw pcM @@ -93393,7 +93393,7 @@ jTZ jRh qbr ouj -oHQ +aBL yey cWI hSd @@ -93405,10 +93405,10 @@ wsX wsX kDk sch -fZo +wLH lvu iom -pIY +fVz sch pHb guS @@ -93647,10 +93647,10 @@ mzD pQx yey jTZ -oHQ -oHQ -oHQ -oHQ +aBL +aBL +aBL +aBL uFK cWI gYi @@ -93712,11 +93712,11 @@ dhX nIR gBD twl -wYm +tdb rhK rKJ wFe -epo +njb fHd gBD iun @@ -94150,7 +94150,7 @@ aaa aaa aaa aaa -keP +isc aaa aaa aaa @@ -94267,8 +94267,8 @@ dVN iqz sLD hZV -kXs -jWp +vDM +nTm tcB cuR asV @@ -94483,11 +94483,11 @@ ebx aks hux bbT -obI +ofi kAp -far +pdR ghK -qvT +sNT fHd gBD eMH @@ -94756,7 +94756,7 @@ mum qTR pWD sTQ -fCI +hEc hGF inQ gtb @@ -95038,7 +95038,7 @@ bCo iqz jtl hZV -iPO +kIL rGK ooV rGK @@ -95270,7 +95270,7 @@ bKB eAL xQY kcF -dNQ +oDH oar keK lXA @@ -95295,7 +95295,7 @@ joj afE qIR hZV -mWD +hJM vSP gUl rGK @@ -95308,9 +95308,9 @@ dWd gmp meu iUm -mRu +jdg iUm -mre +bxX iUm qfK dDo @@ -95527,15 +95527,15 @@ aNQ nxy nxy aYJ -fCI +hEc bFN opa hYA jsh rvE -hfz -qps -hfz +tZJ +wVc +tZJ eIO wKC fvE @@ -95785,9 +95785,9 @@ uBI uBI mTk rvE -uoB +sIG rvE -uoB +sIG rvE rvE sgc @@ -96089,7 +96089,7 @@ ltx iBp hQu cSv -cYJ +qVo aaa aaa aaa @@ -97025,7 +97025,7 @@ xEt xEt jcR cBJ -rMW +vWI txH urs oaj @@ -97077,7 +97077,7 @@ tBB usg fma ebV -ewK +dZb ebV fma xgi @@ -97282,7 +97282,7 @@ alE alE amc wyz -rMW +vWI wwY wwY rGC @@ -97539,7 +97539,7 @@ rvY uVQ fRr brc -rMW +vWI wwY wwY pXh @@ -97579,7 +97579,7 @@ htd tHR udN ghk -xhI +qyZ fak jUh wUj @@ -97603,7 +97603,7 @@ eut gle mOx syC -gnD +gqm iCi lOr sNS @@ -97778,7 +97778,7 @@ vZm ahj vZm kYg -opY +mLL kYg ueG jVv @@ -97796,7 +97796,7 @@ nOU alE alE dCo -rMW +vWI wwY wwY nTK @@ -97856,7 +97856,7 @@ liD iAk nSB xMu -lfh +xwl sNn ouZ tbm @@ -98113,11 +98113,11 @@ lhT reL lhT iMG -ncl +dpg bBo gwf gfZ -gnD +gqm jZP cDA jrb @@ -98293,7 +98293,7 @@ dOg uao lPl prY -opY +mLL jxV tCG pHb @@ -98310,7 +98310,7 @@ oeR qNG alE tqV -rMW +vWI wwY wwY cao @@ -98355,14 +98355,14 @@ fak jUh wXr cZK -rYx +sGm ola ePu ola ePu eut eut -gCa +wfm eut eut uBy @@ -98567,7 +98567,7 @@ lpo mxs fTn ciG -rMW +vWI wwY wwY xCg @@ -98625,8 +98625,8 @@ gcU noN bCc bCc -tDA -sug +vjq +qBr eut dEV gwf @@ -98824,7 +98824,7 @@ nvh alE oVY amo -rMW +vWI wwY wwY rGC @@ -98879,7 +98879,7 @@ obN gwf dMz tga -xHQ +wOg nJH gso nQX @@ -99064,7 +99064,7 @@ dth ipz nOv dgS -opY +mLL eWO rKZ aPj @@ -99081,7 +99081,7 @@ dFz alE alE gSD -rMW +vWI vfC rGC rGC @@ -99383,7 +99383,7 @@ mJT dyw dyw mvR -uJj +kFC kZx wQI kZx @@ -99578,7 +99578,7 @@ tJL ipz hIQ oEm -cuC +hNb pBG iWH uWo @@ -99645,7 +99645,7 @@ vPm sQB sxB ipM -kcN +wQa hkH gwf mpQ @@ -99835,7 +99835,7 @@ nDk ipz rum atN -cuC +hNb hgt aMW syK @@ -99852,7 +99852,7 @@ exr lWg byw glv -gvC +qXV puZ cBy bsz @@ -100169,8 +100169,8 @@ sPU ulv qWX fke -xzh -oYI +wUd +mwc wwW lrp rYI @@ -100349,7 +100349,7 @@ rzO pyY sNB xWm -opY +mLL dZY vkb cLl @@ -100366,7 +100366,7 @@ jAO vtX jAO ejX -gvC +qXV eVz pJE sNJ @@ -100426,8 +100426,8 @@ xKK xKK euQ fke -oRU -tcE +bBI +mLg wwW lrp rYI @@ -101441,9 +101441,9 @@ hKV wXF kZx jKa -udq -udq -udq +mCt +mCt +mCt kZx olG ohH @@ -101668,15 +101668,15 @@ xZW uOX myG rac -pOz -pOz +bvJ +bvJ qFo cNA -pOz -pOz +bvJ +bvJ pTS pTS -wlL +eAi pTS pTS eQE @@ -102176,7 +102176,7 @@ qXB iEk fmw ddl -vQp +ksk aEr fRS twN @@ -102197,7 +102197,7 @@ nxH mVY pQC eQE -mwX +pTN pcc wYB ebC @@ -102437,7 +102437,7 @@ rEr vFB fRS twN -pOz +bvJ ogs wCL gPh @@ -102690,11 +102690,11 @@ qXB wiQ myP mbC -vQp +ksk vFB fRS twN -pOz +bvJ eZe kSw oPx @@ -103465,7 +103465,7 @@ dAn vFB fRS twN -pOz +bvJ lWm gvm vLM @@ -103722,7 +103722,7 @@ mSD vFB fRS twN -pOz +bvJ pIz kdN wSs @@ -104708,11 +104708,11 @@ szp szp nVH ewf -yeL -hyo -hyo -hyo -fkY +jNK +lFU +lFU +lFU +pnc iYG lOU eMG @@ -104965,11 +104965,11 @@ nvn iVO eZN sqz -sNQ +crA dYl dYl try -yam +hFE fNS lOU ewk @@ -105222,11 +105222,11 @@ nvn qli clE byz -sNQ +crA dYl gYA dYl -ybo +fDa epH aJO oew @@ -105479,11 +105479,11 @@ nvn qWw xrf mnl -sNQ +crA cxU cUH toK -xVO +xrm lJr wVW xvt @@ -105537,7 +105537,7 @@ mlu ded huG gUM -hDu +wkI phS huG iNQ @@ -105736,11 +105736,11 @@ szp szp vjd sqH -rpP -plz -plz -plz -vbn +vHu +kuB +kuB +kuB +vEw kZq gNh kOY @@ -105783,11 +105783,11 @@ ydq vmE unL gcW -lfx -iLu -iLu -xbL -fQA +auy +mzn +mzn +rqb +tLU obG sfD ebK @@ -106273,13 +106273,13 @@ lnc lyD dqs lqQ -rYs +qnj jzC -kKO +dra xUE -rXY +juS xyI -rYs +qnj qXB kbo qXB @@ -106532,9 +106532,9 @@ mil lqQ lbH lJa -mtl +nVm ozi -tSr +oSR jYu lJa qXB @@ -106762,15 +106762,15 @@ waq aaa szp szp -ecU -ecU +idr +idr dTi -ecU -ecU +idr +idr dTi -ecU -ecU -ecU +idr +idr +idr qXB qXB qXB @@ -107786,7 +107786,7 @@ aaa aaa lMJ aaa -wOY +jdZ aaa nvn afD @@ -108090,7 +108090,7 @@ rSb sqE rKS gnS -qmt +bER esk fmJ ycz @@ -108345,7 +108345,7 @@ rSi pCt aRS sqE -iaN +eTx gnS ucU esk @@ -108602,7 +108602,7 @@ bfO pCt vYK sqE -usI +mit kyB rlm tTg @@ -109094,9 +109094,9 @@ igz tCS tCS cnK -mKe +cOm uQG -mKe +cOm cnK cnK jPe @@ -109335,8 +109335,8 @@ szp szp szp dTi -ecU -ecU +idr +idr dTi qXB qXB @@ -109915,7 +109915,7 @@ axx scL fhG xRc -nlN +aSK pxC gAT vNT @@ -110172,7 +110172,7 @@ lrK heV eJX eJX -sZF +ffk hHt lRS cxl @@ -110429,7 +110429,7 @@ fVA jAV wmz wmz -vgw +fEA gyg lAh aaf @@ -110656,7 +110656,7 @@ rdU qPT jRb gaw -qKI +qsv rQL lUz sWs @@ -110686,7 +110686,7 @@ apg vuU sBV mei -vrg +awt fyY qSc xmT @@ -110943,7 +110943,7 @@ nau vuU jvj vmx -dtf +mGl hGk tfs aaf @@ -111170,7 +111170,7 @@ lOg pom pom uUL -qKI +qsv bjH bbi lwm @@ -111200,7 +111200,7 @@ nau cBd jvj nnD -naJ +hfZ sbl lRS cxl @@ -111427,7 +111427,7 @@ iHy xgR nmb rtP -qKI +qsv lfd eup lwm @@ -111457,7 +111457,7 @@ gMt vuU jvj nnD -xaE +jea aTN lAh aaf @@ -111714,7 +111714,7 @@ nzo vuU lxm smt -blT +tDt juC qSc xmT @@ -111971,7 +111971,7 @@ nzo mTI jvj qua -vQy +xoB hGk tfs aaf @@ -112214,7 +112214,7 @@ xRZ xRZ fdH gto -iaj +aej ahV ruP eJX @@ -112228,7 +112228,7 @@ nzo vuU iTC smt -gDP +eNi fPw okV oId @@ -112471,7 +112471,7 @@ xVA ago nud gto -iaj +aej qDt ruP eJX @@ -112485,7 +112485,7 @@ nzo vuU dwf nnD -pBv +elW smZ lAh aaf @@ -112728,7 +112728,7 @@ xRZ lIc nud gto -iaj +aej ahV ugP ruP @@ -112742,7 +112742,7 @@ nzo vuU eJX kEe -nmv +fPg jie okV oId @@ -112999,7 +112999,7 @@ swy cFa kLi sEI -aVC +tuf oLV uwQ aaf @@ -113513,7 +113513,7 @@ ydb xpi kUb dfj -aVC +tuf oFn uwQ lMJ @@ -113770,7 +113770,7 @@ gSn fzM qOW nnD -gOt +huv xXG oqT xtZ @@ -114027,7 +114027,7 @@ sCW lNY sCW nnD -xsx +uBg oIM lAh lMJ @@ -114284,7 +114284,7 @@ rVJ fzM sCW qua -eIN +rZV kBh qKR gQf @@ -114798,7 +114798,7 @@ hur uel eJX nnD -oNB +lRA xXG oqT xtZ @@ -115055,7 +115055,7 @@ vlq gTC eJX qzK -udd +vdf eSZ lAh lMJ @@ -115312,7 +115312,7 @@ rZt jZz eJX ccK -hqJ +lqS kBh qKR gQf @@ -115798,7 +115798,7 @@ aaa aaa cpH aaa -gFa +nXK aaa cpH twf @@ -115826,7 +115826,7 @@ uhx psl eJX nnD -xlR +aIz xXG oqT xtZ @@ -116083,7 +116083,7 @@ jZz nnD eJX nnD -rMi +nMe oIM lAh lMJ @@ -116340,7 +116340,7 @@ jZz jaq daT hTq -wdz +xPn kBh qKR gQf @@ -116854,7 +116854,7 @@ xEN mei cjl nkG -rRW +lnE wFi oqT xtZ @@ -117111,7 +117111,7 @@ pul eJX eJX ewU -oJQ +tcA oIM lAh lMJ @@ -117368,7 +117368,7 @@ nzP xkV dtB dWN -iqO +sKr rcq mVG hwg @@ -117882,7 +117882,7 @@ tmQ tmQ nkj kaS -ktx +bhb wez gAT kuD diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm index ac68d734985..e0331b4c465 100644 --- a/_maps/map_files/Mining/Lavaland.dmm +++ b/_maps/map_files/Mining/Lavaland.dmm @@ -2232,7 +2232,7 @@ /obj/docking_port/stationary{ dwidth = 2; height = 5; - id = "laborcamp_away"; + shuttle_id = "laborcamp_away"; name = "labor camp"; width = 9 }, @@ -4111,7 +4111,7 @@ dir = 2; dwidth = 11; height = 22; - id = "whiteship_lavaland"; + shuttle_id = "whiteship_lavaland"; name = "lavaland wastes"; width = 35 }, @@ -4945,7 +4945,7 @@ dir = 2; dwidth = 3; height = 10; - id = "mining_away"; + shuttle_id = "mining_away"; name = "lavaland mine"; width = 7 }, @@ -5164,7 +5164,7 @@ dir = 4; dwidth = 3; height = 7; - id = "lavaland_common_away"; + shuttle_id = "lavaland_common_away"; name = "Mining base public dock"; width = 7 }, diff --git a/_maps/map_files/debug/runtimestation.dmm b/_maps/map_files/debug/runtimestation.dmm index ab950628cdf..bd216ca8154 100644 --- a/_maps/map_files/debug/runtimestation.dmm +++ b/_maps/map_files/debug/runtimestation.dmm @@ -1123,7 +1123,7 @@ dir = 8; dwidth = 3; height = 15; - id = "arrivals_stationary"; + shuttle_id = "arrival_stationary"; name = "arrivals"; roundstart_template = /datum/map_template/shuttle/arrival/box; width = 7 @@ -1247,7 +1247,7 @@ dir = 8; dwidth = 2; height = 13; - id = "ferry_home"; + shuttle_id = "ferry_home"; name = "port bay 2"; width = 5 }, @@ -1278,7 +1278,7 @@ dir = 4; dwidth = 4; height = 7; - id = "supply_home"; + shuttle_id = "cargo_home"; name = "Cargo Bay"; width = 12 }, @@ -1428,7 +1428,7 @@ dir = 2; dwidth = 11; height = 15; - id = "whiteship_home"; + shuttle_id = "whiteship_home"; name = "SS13: Auxiliary Dock, Station-Port"; width = 28 }, @@ -1485,7 +1485,7 @@ dir = 2; dwidth = 9; height = 25; - id = "emergency_home"; + shuttle_id = "emergency_home"; name = "Runtimestation emergency evac bay"; width = 29 }, @@ -2098,7 +2098,7 @@ /area/station/construction) "tG" = ( /obj/docking_port/stationary/random{ - id = "pod_lavaland"; + shuttle_id = "pod_lavaland"; name = "lavaland" }, /turf/open/space/basic, diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 176142d17dd..6482135ae51 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -152,6 +152,21 @@ }, /turf/open/floor/iron, /area/centcom/syndicate_mothership/control) +"aD" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/obj/machinery/computer/monitor{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/status_display/evac/directional/south, +/turf/open/floor/iron, +/area/centcom/central_command_areas/admin/storage) "aE" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -3405,18 +3420,6 @@ /obj/machinery/light/directional/east, /turf/open/floor/iron, /area/centcom/central_command_areas/prison) -"jC" = ( -/obj/docking_port/stationary{ - dir = 8; - dwidth = 8; - height = 7; - id = "supply_away"; - json_key = "cargo"; - name = "CentCom"; - width = 20 - }, -/turf/open/space, -/area/space) "jD" = ( /obj/effect/turf_decal/loading_area{ dir = 8 @@ -5038,6 +5041,18 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/centcom/tdome/arena) +"on" = ( +/obj/docking_port/stationary{ + dir = 4; + dwidth = 2; + height = 8; + shuttle_id = "backup_away"; + name = "Backup Shuttle Dock"; + roundstart_template = /datum/map_template/shuttle/emergency/backup; + width = 8 + }, +/turf/open/space/basic, +/area/space) "oo" = ( /obj/structure/table/wood, /obj/item/taperecorder, @@ -5487,14 +5502,13 @@ /obj/item/storage/box/donkpockets, /turf/open/floor/iron, /area/centcom/syndicate_mothership/control) -"pA" = ( +"pz" = ( /obj/docking_port/stationary{ - dir = 8; + dir = 4; dwidth = 2; - height = 13; - id = "ferry_away"; - json_key = "ferry"; - name = "CentCom Ferry Dock"; + height = 7; + shuttle_id = "pod_away"; + name = "recovery ship"; width = 5 }, /turf/open/space, @@ -6312,6 +6326,16 @@ }, /turf/open/floor/plating/abductor, /area/centcom/abductor_ship) +"sj" = ( +/obj/docking_port/stationary{ + dwidth = 1; + height = 4; + shuttle_id = "pod_4_away"; + name = "recovery ship"; + width = 3 + }, +/turf/open/space, +/area/space) "sk" = ( /turf/open/floor/plating/icemoon, /area/centcom/syndicate_mothership/control) @@ -7043,6 +7067,18 @@ }, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/control) +"uz" = ( +/obj/docking_port/stationary{ + dir = 4; + dwidth = 25; + height = 50; + shuttle_id = "emergency_away"; + json_key = "emergency"; + name = "CentCom Emergency Shuttle Dock"; + width = 50 + }, +/turf/open/space, +/area/space) "uA" = ( /obj/structure/chair{ dir = 4 @@ -7233,18 +7269,6 @@ "vh" = ( /turf/open/floor/iron, /area/centcom/central_command_areas/evacuation) -"vi" = ( -/obj/docking_port/stationary{ - dir = 4; - dwidth = 25; - height = 50; - id = "emergency_away"; - json_key = "emergency"; - name = "CentCom Emergency Shuttle Dock"; - width = 50 - }, -/turf/open/space, -/area/space) "vj" = ( /turf/open/floor/wood, /area/centcom/wizard_station) @@ -8127,16 +8151,6 @@ }, /turf/open/floor/plating/abductor, /area/centcom/abductor_ship) -"xP" = ( -/obj/docking_port/stationary{ - dwidth = 25; - height = 50; - id = "emergency_syndicate"; - name = "Syndicate Auxiliary Shuttle Dock"; - width = 50 - }, -/turf/open/misc/asteroid/snow/airless, -/area/centcom/syndicate_mothership) "xQ" = ( /obj/effect/turf_decal/delivery, /obj/machinery/light/directional/south, @@ -8284,6 +8298,20 @@ /obj/effect/mapping_helpers/airlock/access/all/admin/general, /turf/open/floor/iron, /area/centcom/central_command_areas/control) +"ym" = ( +/obj/docking_port/stationary{ + area_type = /area/centcom/syndicate_mothership; + dheight = 1; + dir = 4; + dwidth = 12; + height = 17; + shuttle_id = "syndicate_away"; + name = "syndicate recon outpost"; + roundstart_template = /datum/map_template/shuttle/infiltrator/basic; + width = 23 + }, +/turf/open/misc/asteroid/snow/airless, +/area/centcom/syndicate_mothership) "yn" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/sign/warning/vacuum, @@ -8504,6 +8532,18 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/control) +"yV" = ( +/obj/docking_port/stationary{ + dir = 8; + dwidth = 8; + height = 7; + shuttle_id = "cargo_away"; + json_key = "cargo"; + name = "CentCom"; + width = 20 + }, +/turf/open/space, +/area/space) "yY" = ( /obj/structure/chair, /obj/effect/landmark/thunderdome/observe, @@ -8912,39 +8952,10 @@ /obj/effect/turf_decal/tile/brown, /turf/open/floor/iron, /area/centcom/central_command_areas/supplypod/loading/three) -"Aa" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 - }, -/obj/machinery/computer/monitor{ - dir = 1 - }, -/obj/structure/cable, -/obj/machinery/status_display/evac/directional/south, -/turf/open/floor/iron, -/area/centcom/central_command_areas/admin/storage) "Ab" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/centcom/central_command_areas/control) -"Ac" = ( -/obj/docking_port/stationary{ - area_type = /area/centcom/syndicate_mothership; - dheight = 1; - dir = 4; - dwidth = 12; - height = 17; - id = "syndicate_away"; - name = "syndicate recon outpost"; - roundstart_template = /datum/map_template/shuttle/infiltrator/basic; - width = 23 - }, -/turf/open/misc/asteroid/snow/airless, -/area/centcom/syndicate_mothership) "Ad" = ( /obj/effect/turf_decal/tile/green, /obj/effect/turf_decal/tile/green{ @@ -11839,6 +11850,18 @@ }, /turf/open/misc/asteroid/snow/icemoon, /area/centcom/syndicate_mothership/control) +"Io" = ( +/obj/docking_port/stationary{ + dir = 8; + dwidth = 2; + height = 13; + shuttle_id = "ferry_away"; + json_key = "ferry"; + name = "CentCom Ferry Dock"; + width = 5 + }, +/turf/open/space, +/area/space) "Ip" = ( /turf/closed/indestructible/fakedoor{ name = "BUNKER 4337" @@ -12432,18 +12455,6 @@ "Ki" = ( /turf/open/lava/plasma/ice_moon, /area/centcom/syndicate_mothership/control) -"Kk" = ( -/obj/docking_port/stationary{ - dir = 4; - dwidth = 2; - height = 8; - id = "backup_away"; - name = "Backup Shuttle Dock"; - roundstart_template = /datum/map_template/shuttle/emergency/backup; - width = 8 - }, -/turf/open/space/basic, -/area/space) "Kl" = ( /obj/machinery/camera/autoname/directional/south{ network = list("nukie") @@ -12592,26 +12603,6 @@ }, /turf/open/floor/plating/airless, /area/centcom/central_command_areas/evacuation/ship) -"KL" = ( -/obj/docking_port/stationary{ - dwidth = 1; - height = 4; - id = "pod_4_away"; - name = "recovery ship"; - width = 3 - }, -/turf/open/space, -/area/space) -"KM" = ( -/obj/docking_port/stationary{ - dwidth = 1; - height = 4; - id = "pod_3_away"; - name = "recovery ship"; - width = 3 - }, -/turf/open/space, -/area/space) "KN" = ( /obj/structure/window/reinforced, /obj/structure/shuttle/engine/heater{ @@ -12795,17 +12786,6 @@ /obj/machinery/light/cold/directional/east, /turf/open/floor/mineral/plastitanium, /area/centcom/syndicate_mothership/expansion_bioterrorism) -"Ls" = ( -/obj/docking_port/stationary{ - dir = 4; - dwidth = 1; - height = 4; - id = "pod_2_away"; - name = "recovery ship"; - width = 3 - }, -/turf/open/space, -/area/space) "Lt" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/centcom/central_command_areas/evacuation/ship) @@ -12825,17 +12805,6 @@ /obj/machinery/door/airlock/titanium, /turf/open/floor/mineral/titanium, /area/centcom/central_command_areas/evacuation/ship) -"Lz" = ( -/obj/docking_port/stationary{ - dir = 4; - dwidth = 2; - height = 7; - id = "pod_away"; - name = "recovery ship"; - width = 5 - }, -/turf/open/space, -/area/space) "LA" = ( /obj/structure/table, /obj/structure/bedsheetbin, @@ -14220,6 +14189,16 @@ /obj/item/paper/pamphlet/centcom/visitor_info, /turf/open/floor/iron, /area/centcom/central_command_areas/supplypod) +"PA" = ( +/obj/docking_port/stationary{ + dwidth = 25; + height = 50; + shuttle_id = "emergency_syndicate"; + name = "Syndicate Auxiliary Shuttle Dock"; + width = 50 + }, +/turf/open/misc/asteroid/snow/airless, +/area/centcom/syndicate_mothership) "PC" = ( /obj/structure/table/wood, /obj/effect/turf_decal/siding/wood, @@ -14519,6 +14498,16 @@ /obj/structure/flora/grass/both/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/centcom/syndicate_mothership/control) +"Qt" = ( +/obj/docking_port/stationary{ + dwidth = 1; + height = 4; + shuttle_id = "pod_3_away"; + name = "recovery ship"; + width = 3 + }, +/turf/open/space, +/area/space) "Qu" = ( /obj/structure/window/paperframe{ can_atmos_pass = 0 @@ -17680,6 +17669,17 @@ dir = 8 }, /area/centcom/syndicate_mothership/control) +"YS" = ( +/obj/docking_port/stationary{ + dir = 4; + dwidth = 1; + height = 4; + shuttle_id = "pod_2_away"; + name = "recovery ship"; + width = 3 + }, +/turf/open/space, +/area/space) "YT" = ( /obj/structure/table/wood, /obj/structure/plaque/static_plaque/thunderdome{ @@ -34964,7 +34964,7 @@ Ff Ff Ff Ff -xP +PA Zb ll ll @@ -39090,7 +39090,7 @@ Ff Ff Ff Ff -Ac +ym Ff Ff Ff @@ -44293,7 +44293,7 @@ aa aa aa aa -KL +sj KO KV KV @@ -45321,7 +45321,7 @@ aa aa aa aa -KM +Qt KO KV KV @@ -46357,11 +46357,11 @@ KQ KH aa aa -Ls +YS aa aa aa -Lz +pz aa aa aa @@ -52461,7 +52461,7 @@ ZN oe aa aa -pA +Io aa aa aa @@ -57061,7 +57061,7 @@ aa aa aa aa -jC +yV aa aa aa @@ -57596,7 +57596,7 @@ Mo Sx Gs Ow -Aa +aD YU uZ oe @@ -67407,7 +67407,7 @@ aa aa aa aa -Kk +on aa aa aa @@ -70962,7 +70962,7 @@ aa aa aa aa -vi +uz aa aa aa diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index f5bda3da2c7..af3e2990b5e 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -244,6 +244,16 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/iron/white, /area/station/medical/virology) +"age" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 9 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/vending/wardrobe/robo_wardrobe, +/turf/open/floor/iron, +/area/station/science/robotics/lab) "agt" = ( /obj/effect/turf_decal/trimline/blue/filled/corner, /obj/effect/turf_decal/trimline/neutral/corner, @@ -3467,6 +3477,19 @@ /obj/item/radio/intercom/prison/directional/south, /turf/open/floor/iron, /area/station/security/prison) +"bvb" = ( +/obj/docking_port/stationary{ + dheight = 4; + dir = 2; + dwidth = 4; + height = 9; + shuttle_id = "aux_base_zone"; + name = "Aux Base Zone"; + roundstart_template = /datum/map_template/shuttle/aux_base/default; + width = 9 + }, +/turf/open/floor/plating, +/area/station/construction/mining/aux_base) "bvk" = ( /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ @@ -4874,14 +4897,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) -"bQr" = ( -/obj/docking_port/stationary/random{ - dir = 8; - id = "pod_lavaland"; - name = "lavaland" - }, -/turf/open/space/openspace, -/area/space) "bQt" = ( /obj/machinery/button/door/directional/west{ id = "private_q"; @@ -6146,16 +6161,6 @@ /mob/living/carbon/human/species/monkey/punpun, /turf/open/floor/iron/dark, /area/station/service/bar) -"cjd" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 9 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/vending/wardrobe/robo_wardrobe, -/turf/open/floor/iron, -/area/station/science/robotics/lab) "cjq" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -8571,19 +8576,6 @@ }, /turf/open/floor/iron, /area/station/ai_monitored/command/storage/eva) -"cYA" = ( -/obj/docking_port/stationary{ - dheight = 4; - dir = 2; - dwidth = 4; - height = 9; - id = "aux_base_zone"; - name = "Aux Base Zone"; - roundstart_template = /datum/map_template/shuttle/aux_base/default; - width = 9 - }, -/turf/open/floor/plating, -/area/station/construction/mining/aux_base) "cYE" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/white, @@ -9548,6 +9540,17 @@ }, /turf/open/floor/iron, /area/station/commons/dorms) +"dql" = ( +/obj/docking_port/stationary{ + dir = 2; + dwidth = 11; + height = 22; + shuttle_id = "whiteship_home"; + name = "SS13: Auxiliary Dock, Station-Port"; + width = 35 + }, +/turf/open/space/openspace, +/area/space) "dqm" = ( /obj/machinery/teleport/station, /turf/open/floor/plating, @@ -12467,6 +12470,34 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /turf/open/floor/iron/dark, /area/station/science/xenobiology) +"emM" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 8 + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 1; + id = "rndlab1"; + name = "Research and Development Shutter" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/item/folder{ + pixel_x = 5 + }, +/obj/structure/desk_bell{ + pixel_x = -7 + }, +/obj/machinery/door/window/left/directional/south{ + name = "Research Lab Desk"; + req_access = list("science") + }, +/turf/open/floor/iron/white, +/area/station/science/lab) "emT" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -14290,13 +14321,6 @@ "eVz" = ( /turf/open/floor/grass, /area/station/service/hydroponics) -"eVQ" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 1 - }, -/obj/machinery/computer/camera_advanced/base_construction/aux, -/turf/open/floor/iron, -/area/station/construction/mining/aux_base) "eVY" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -14386,18 +14410,6 @@ dir = 5 }, /area/station/command/heads_quarters/rd) -"eYn" = ( -/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/openspace, -/area/space) "eYq" = ( /obj/effect/turf_decal/trimline/neutral/filled/arrow_cw{ dir = 1 @@ -16060,34 +16072,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/science/research) -"fCE" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 8 - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 1; - id = "rndlab1"; - name = "Research and Development Shutter" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/item/folder{ - pixel_x = 5 - }, -/obj/structure/desk_bell{ - pixel_x = -7 - }, -/obj/machinery/door/window/left/directional/south{ - name = "Research Lab Desk"; - req_access = list("science") - }, -/turf/open/floor/iron/white, -/area/station/science/lab) "fCK" = ( /obj/machinery/door/firedoor, /obj/structure/cable, @@ -17906,6 +17890,17 @@ }, /turf/open/floor/iron/dark, /area/station/security/office) +"glG" = ( +/obj/docking_port/stationary{ + dwidth = 2; + height = 5; + shuttle_id = "laborcamp_home"; + name = "fore bay 1"; + roundstart_template = /datum/map_template/shuttle/labour/generic; + width = 9 + }, +/turf/open/misc/asteroid/airless, +/area/mine/explored) "glJ" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 1 @@ -22119,6 +22114,18 @@ }, /turf/open/floor/iron, /area/station/security/courtroom) +"hLw" = ( +/obj/docking_port/stationary{ + dir = 8; + dwidth = 3; + height = 15; + shuttle_id = "arrival_stationary"; + name = "arrivals"; + roundstart_template = /datum/map_template/shuttle/arrival/box; + width = 7 + }, +/turf/open/space/openspace, +/area/space) "hLx" = ( /obj/item/storage/toolbox/drone, /obj/effect/turf_decal/stripes/corner, @@ -23458,17 +23465,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron, /area/station/construction/mining/aux_base) -"iia" = ( -/obj/docking_port/stationary{ - dwidth = 2; - height = 5; - id = "laborcamp_home"; - name = "fore bay 1"; - roundstart_template = /datum/map_template/shuttle/labour/generic; - width = 9 - }, -/turf/open/misc/asteroid/airless, -/area/mine/explored) "iin" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -26767,6 +26763,11 @@ /obj/machinery/newscaster/directional/west, /turf/open/floor/iron/grimy, /area/station/service/chapel/office) +"jpH" = ( +/obj/effect/spawner/structure/electrified_grille, +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/plating/airless, +/area/mine/explored) "jpV" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ dir = 8 @@ -27118,6 +27119,19 @@ }, /turf/open/floor/glass/reinforced, /area/station/hallway/primary/tram/left) +"jvc" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "pharmacy_shutters_2"; + name = "Pharmacy Shutters" + }, +/obj/machinery/door/window/left/directional/north{ + name = "Chemistry Desk"; + req_access = list("pharmacy") + }, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) "jvf" = ( /turf/closed/wall, /area/station/command/heads_quarters/hop) @@ -30342,17 +30356,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/cargo/warehouse) -"kyU" = ( -/obj/docking_port/stationary{ - dir = 4; - dwidth = 12; - height = 18; - id = "emergency_home"; - name = "Tramstation emergency evac bay"; - width = 32 - }, -/turf/open/space/openspace, -/area/space) "kzw" = ( /obj/effect/spawner/random/vending/snackvend, /obj/effect/turf_decal/stripes/line{ @@ -32715,6 +32718,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/catwalk_floor, /area/station/maintenance/port/central) +"lpg" = ( +/obj/docking_port/stationary/random{ + dir = 4; + shuttle_id = "pod_lavaland"; + name = "lavaland" + }, +/turf/open/misc/asteroid/airless, +/area/mine/explored) "lpj" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 1 @@ -33147,6 +33158,14 @@ }, /turf/open/floor/iron/dark, /area/station/security/prison/garden) +"lvO" = ( +/obj/docking_port/stationary/random{ + dir = 8; + shuttle_id = "pod_lavaland"; + name = "lavaland" + }, +/turf/open/space/openspace, +/area/space) "lvQ" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "prisondorm"; @@ -38508,6 +38527,13 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/secondary/exit) +"ngf" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 + }, +/obj/machinery/computer/camera_advanced/base_construction/aux, +/turf/open/floor/iron, +/area/station/construction/mining/aux_base) "ngg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, /obj/effect/spawner/structure/window/reinforced, @@ -39094,6 +39120,17 @@ }, /turf/open/space/basic, /area/space/nearstation) +"nqC" = ( +/obj/docking_port/stationary{ + dir = 8; + dwidth = 2; + height = 13; + shuttle_id = "ferry_home"; + name = "port bay 2"; + width = 5 + }, +/turf/open/space/openspace, +/area/space) "nqH" = ( /obj/structure/railing{ dir = 8 @@ -40074,6 +40111,17 @@ }, /turf/open/floor/iron, /area/station/commons/storage/primary) +"nLU" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 4 + }, +/obj/machinery/button/door/directional/east{ + id = "robotics2"; + name = "Robotics Lockdown"; + req_access = list("robotics") + }, +/turf/open/floor/iron, +/area/station/science/robotics/lab) "nLZ" = ( /obj/structure/table, /obj/structure/cable, @@ -42117,16 +42165,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/execution/transfer) -"oAy" = ( -/obj/docking_port/stationary{ - dwidth = 5; - height = 7; - id = "supply_home"; - name = "Cargo Bay"; - width = 12 - }, -/turf/open/misc/asteroid/airless, -/area/mine/explored) "oAA" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 4 @@ -43373,6 +43411,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/primary/tram/center) +"oWo" = ( +/obj/structure/sign/warning/radiation/rad_area/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/secondary/construction/engineering) "oWr" = ( /obj/structure/chair{ dir = 8 @@ -44606,6 +44654,16 @@ }, /turf/open/floor/iron, /area/station/tcommsat/computer) +"psC" = ( +/obj/docking_port/stationary{ + dwidth = 5; + height = 7; + shuttle_id = "cargo_home"; + name = "Cargo Bay"; + width = 12 + }, +/turf/open/misc/asteroid/airless, +/area/mine/explored) "psE" = ( /obj/structure/filingcabinet/chestdrawer, /obj/effect/decal/cleanable/cobweb, @@ -45382,16 +45440,6 @@ /obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) -"pDW" = ( -/obj/structure/sign/warning/radiation/rad_area/directional/north, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/hallway/secondary/construction/engineering) "pEe" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 1 @@ -45423,17 +45471,6 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/station/hallway/secondary/exit/departure_lounge) -"pEB" = ( -/obj/docking_port/stationary{ - dir = 2; - dwidth = 11; - height = 22; - id = "whiteship_home"; - name = "SS13: Auxiliary Dock, Station-Port"; - width = 35 - }, -/turf/open/space/openspace, -/area/space) "pEH" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -46059,6 +46096,18 @@ }, /turf/open/floor/plating/airless, /area/station/ai_monitored/turret_protected/aisat_interior) +"pRy" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/table, +/obj/item/scalpel{ + pixel_y = 16 + }, +/obj/item/circular_saw, +/obj/structure/noticeboard/directional/west, +/turf/open/floor/iron/white, +/area/station/science/robotics/lab) "pRB" = ( /obj/structure/table/glass, /obj/structure/window/reinforced{ @@ -54222,14 +54271,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/secondary/command) -"sIm" = ( -/obj/docking_port/stationary/random{ - dir = 4; - id = "pod_lavaland"; - name = "lavaland" - }, -/turf/open/misc/asteroid/airless, -/area/mine/explored) "sIq" = ( /obj/structure/table/glass, /obj/item/reagent_containers/cup/bottle/multiver{ @@ -57013,17 +57054,6 @@ /obj/effect/turf_decal/trimline/neutral/filled/line, /turf/open/floor/iron, /area/station/commons/fitness/recreation) -"tFT" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 4 - }, -/obj/machinery/button/door/directional/east{ - id = "robotics2"; - name = "Robotics Lockdown"; - req_access = list("robotics") - }, -/turf/open/floor/iron, -/area/station/science/robotics/lab) "tFV" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -60653,17 +60683,6 @@ }, /turf/open/floor/carpet, /area/station/command/bridge) -"uUB" = ( -/obj/docking_port/stationary{ - dir = 8; - dwidth = 2; - height = 13; - id = "ferry_home"; - name = "port bay 2"; - width = 5 - }, -/turf/open/space/openspace, -/area/space) "uUG" = ( /obj/structure/table/reinforced, /obj/item/folder/blue{ @@ -61304,11 +61323,6 @@ /obj/machinery/power/emitter, /turf/open/floor/plating, /area/station/engineering/engine_smes) -"vfU" = ( -/obj/effect/spawner/structure/electrified_grille, -/obj/effect/turf_decal/sand/plating, -/turf/open/floor/plating/airless, -/area/mine/explored) "vfY" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -63132,6 +63146,17 @@ /obj/structure/ladder, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/hallway) +"vOF" = ( +/obj/docking_port/stationary{ + dir = 4; + dwidth = 12; + height = 18; + shuttle_id = "emergency_home"; + name = "Tramstation emergency evac bay"; + width = 32 + }, +/turf/open/space/openspace, +/area/space) "vOH" = ( /obj/effect/turf_decal/trimline/yellow/warning{ dir = 1 @@ -63951,6 +63976,19 @@ }, /turf/open/space/openspace, /area/station/ai_monitored/turret_protected/ai_upload) +"wdD" = ( +/obj/structure/sign/warning/radiation/rad_area/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/secondary/construction/engineering) "wdG" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment, @@ -64568,19 +64606,6 @@ }, /turf/open/floor/iron, /area/station/security/checkpoint/engineering) -"wpo" = ( -/obj/structure/sign/warning/radiation/rad_area/directional/north, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/hallway/secondary/construction/engineering) "wpt" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 4 @@ -65145,19 +65170,6 @@ }, /turf/open/floor/circuit/telecomms, /area/station/science/xenobiology) -"wAe" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "pharmacy_shutters_2"; - name = "Pharmacy Shutters" - }, -/obj/machinery/door/window/left/directional/north{ - name = "Chemistry Desk"; - req_access = list("pharmacy") - }, -/turf/open/floor/iron/white, -/area/station/medical/pharmacy) "wAm" = ( /obj/machinery/pdapainter/security, /turf/open/floor/carpet, @@ -66589,18 +66601,6 @@ }, /turf/open/floor/iron, /area/station/engineering/break_room) -"wYP" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/table, -/obj/item/scalpel{ - pixel_y = 16 - }, -/obj/item/circular_saw, -/obj/structure/noticeboard/directional/west, -/turf/open/floor/iron/white, -/area/station/science/robotics/lab) "wYX" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -87618,12 +87618,12 @@ dhe dDG dDG dDG -vfU -vfU -vfU -vfU -vfU -vfU +jpH +jpH +jpH +jpH +jpH +jpH dDG dDG dDG @@ -87873,19 +87873,19 @@ dDG dhe dhe dDG -vfU -vfU -vfU +jpH +jpH +jpH bhr ryo bhr bhr -vfU -vfU -vfU -vfU -vfU -vfU +jpH +jpH +jpH +jpH +jpH +jpH dhe jWs jvE @@ -88130,7 +88130,7 @@ dhe dhe dDG dDG -vfU +jpH bhr bhr bhr @@ -88386,8 +88386,8 @@ vXM dhe dhe dDG -vfU -vfU +jpH +jpH kPC lFk lFk @@ -88643,7 +88643,7 @@ vXM dhe dhe dDG -vfU +jpH bhr bhr lFk @@ -88900,7 +88900,7 @@ vXM dhe dhe dDG -vfU +jpH bhr lFk lFk @@ -89157,7 +89157,7 @@ vXM dhe dhe dDG -vfU +jpH ryo bCc lFk @@ -89414,7 +89414,7 @@ vXM dhe dhe dDG -vfU +jpH bhr lFk lFk @@ -89671,7 +89671,7 @@ dhe dhe dhe dDG -vfU +jpH bhr cRM lFk @@ -89928,7 +89928,7 @@ dhe dhe dhe dDG -vfU +jpH ryo lFk lFk @@ -90185,7 +90185,7 @@ dhe dhe dhe dDG -vfU +jpH ryo lFk lFk @@ -90442,7 +90442,7 @@ dhe dhe dhe dDG -vfU +jpH kPC lFk lFk @@ -90699,7 +90699,7 @@ dhe dhe dhe dDG -vfU +jpH bhr cRM lFk @@ -90956,7 +90956,7 @@ dhe dhe dhe dDG -vfU +jpH bhr lFk lFk @@ -91213,7 +91213,7 @@ dhe dhe dhe dDG -vfU +jpH ryo fwW lFk @@ -91470,7 +91470,7 @@ dhe dhe dhe dDG -vfU +jpH bhr lFk lFk @@ -91727,7 +91727,7 @@ dhe dhe dhe dDG -vfU +jpH bhr bhr lFk @@ -91984,8 +91984,8 @@ dhe dhe dhe dDG -vfU -vfU +jpH +jpH kPC lFk lFk @@ -92242,7 +92242,7 @@ dhe dDG dDG dDG -vfU +jpH bhr bhr ryo @@ -92499,9 +92499,9 @@ dDG mEZ mEZ mEZ -vfU -vfU -vfU +jpH +jpH +jpH bhr kPC bhr @@ -92758,10 +92758,10 @@ dDG dDG dhe dhe -vfU -vfU -vfU -vfU +jpH +jpH +jpH +jpH pxW gqb lnC @@ -102074,7 +102074,7 @@ cjq cSp tFV fal -wpo +wdD jbs stZ cgR @@ -102588,7 +102588,7 @@ cjq aKm uLW fal -pDW +oWo jbs stZ cgR @@ -120308,7 +120308,7 @@ dhe dhe dDG dDG -sIm +lpg dDG dDG dhe @@ -143168,7 +143168,7 @@ jhd avE jhd jhd -bQr +lvO jhd jhd jhd @@ -143196,7 +143196,7 @@ jhd jhd jhd jhd -bQr +lvO jhd jhd jhd @@ -145513,7 +145513,7 @@ vcI gYz tCT oTC -pEB +dql jhd jhd jhd @@ -147301,7 +147301,7 @@ jhd jhd jhd jhd -uUB +nqC jhd jhd jhd @@ -147801,7 +147801,7 @@ jhd jhd jhd jhd -eYn +hLw jhd jhd jhd @@ -149341,7 +149341,7 @@ rlv rlv rlv sXa -eVQ +ngf bMe oQF vTB @@ -150106,7 +150106,7 @@ rlv rlv rlv rlv -cYA +bvb rlv rlv rlv @@ -152385,7 +152385,7 @@ jhd dDG dDG dDG -iia +glG kzZ izO eUH @@ -162154,7 +162154,7 @@ dDG dDG dDG dDG -sIm +lpg dDG dDG dDG @@ -166324,7 +166324,7 @@ woW chH ctF lum -wAe +jvc dyI tDq nYk @@ -176098,7 +176098,7 @@ rVC kcF aDg qtN -wYP +pRy syn soq wJO @@ -177121,7 +177121,7 @@ nql moz niI wdT -cjd +age iKY lPf aCY @@ -177636,7 +177636,7 @@ nUg fla wdT dAU -tFT +nLU ucl ugm bze @@ -179644,7 +179644,7 @@ dDG dDG dDG dDG -oAy +psC jxz cdy iWz @@ -179945,7 +179945,7 @@ nMU kiA rVA deg -fCE +emM gVu fXq ese @@ -188925,7 +188925,7 @@ jhd jhd jhd jhd -kyU +vOF jhd jhd jhd diff --git a/_maps/shuttles/ferry_base.dmm b/_maps/shuttles/ferry_base.dmm index 9297a6e7751..cc44e839e2e 100644 --- a/_maps/shuttles/ferry_base.dmm +++ b/_maps/shuttles/ferry_base.dmm @@ -47,7 +47,7 @@ dir = 8; dwidth = 2; height = 12; - id = "ferry"; + shuttle_id = "ferry"; name = "ferry shuttle"; port_direction = 2; width = 5 diff --git a/_maps/shuttles/ferry_fancy.dmm b/_maps/shuttles/ferry_fancy.dmm index fbc07a0383f..76b4a2114a9 100644 --- a/_maps/shuttles/ferry_fancy.dmm +++ b/_maps/shuttles/ferry_fancy.dmm @@ -66,7 +66,7 @@ dir = 8; dwidth = 2; height = 13; - id = "ferry"; + shuttle_id = "ferry"; name = "ferry shuttle"; preferred_direction = 4; width = 5 diff --git a/_maps/shuttles/ferry_kilo.dmm b/_maps/shuttles/ferry_kilo.dmm index d6e60d8dec3..47f6a7f9ce1 100644 --- a/_maps/shuttles/ferry_kilo.dmm +++ b/_maps/shuttles/ferry_kilo.dmm @@ -152,7 +152,7 @@ dir = 8; dwidth = 2; height = 11; - id = "ferry"; + shuttle_id = "ferry"; name = "ferry shuttle"; preferred_direction = 4; width = 5 diff --git a/_maps/shuttles/ferry_lighthouse.dmm b/_maps/shuttles/ferry_lighthouse.dmm index 385d26914b1..35c4407568c 100644 --- a/_maps/shuttles/ferry_lighthouse.dmm +++ b/_maps/shuttles/ferry_lighthouse.dmm @@ -152,7 +152,7 @@ dir = 8; dwidth = 8; height = 27; - id = "ferry"; + shuttle_id = "ferry"; name = "The Lighthouse"; port_direction = 2; width = 16 diff --git a/_maps/shuttles/ferry_meat.dmm b/_maps/shuttles/ferry_meat.dmm index c5c296e63a8..543cc393977 100644 --- a/_maps/shuttles/ferry_meat.dmm +++ b/_maps/shuttles/ferry_meat.dmm @@ -104,7 +104,7 @@ dir = 8; dwidth = 2; height = 12; - id = "ferry"; + shuttle_id = "ferry"; name = "ferry shuttle"; port_direction = 2; width = 5 diff --git a/_maps/shuttles/hunter_bounty.dmm b/_maps/shuttles/hunter_bounty.dmm index 79f99bad492..abb2753ec87 100644 --- a/_maps/shuttles/hunter_bounty.dmm +++ b/_maps/shuttles/hunter_bounty.dmm @@ -193,7 +193,7 @@ /obj/docking_port/stationary{ dwidth = 11; height = 16; - id = "pirateship_home"; + shuttle_id = "pirateship_home"; name = "Deep Space"; width = 17 }, @@ -201,7 +201,7 @@ dheight = 3; dwidth = 3; height = 13; - id = "huntership"; + shuttle_id = "huntership"; movement_force = list("KNOCKDOWN" = 0, "THROW" = 0); name = "hunter shuttle"; rechargeTime = 1800; diff --git a/_maps/shuttles/hunter_russian.dmm b/_maps/shuttles/hunter_russian.dmm index de430d2c861..5e001b3a4db 100644 --- a/_maps/shuttles/hunter_russian.dmm +++ b/_maps/shuttles/hunter_russian.dmm @@ -498,7 +498,7 @@ dheight = 3; dwidth = 3; height = 13; - id = "huntership"; + shuttle_id = "huntership"; movement_force = list("KNOCKDOWN" = 0, "THROW" = 0); name = "hunter shuttle"; rechargeTime = 1800; @@ -507,7 +507,7 @@ /obj/docking_port/stationary{ dwidth = 11; height = 16; - id = "pirateship_home"; + shuttle_id = "pirateship_home"; name = "Deep Space"; width = 17 }, diff --git a/_maps/shuttles/hunter_space_cop.dmm b/_maps/shuttles/hunter_space_cop.dmm index 2d8486d13a0..732f7c84534 100644 --- a/_maps/shuttles/hunter_space_cop.dmm +++ b/_maps/shuttles/hunter_space_cop.dmm @@ -19,7 +19,7 @@ dir = 4; dwidth = 3; height = 12; - id = "huntership_home"; + shuttle_id = "huntership_home"; name = "Deep Space"; width = 7 }, @@ -27,7 +27,7 @@ dir = 4; dwidth = 3; height = 12; - id = "huntership"; + shuttle_id = "huntership"; name = "hunter shuttle"; rechargeTime = 1800; width = 7 diff --git a/_maps/shuttles/labour_box.dmm b/_maps/shuttles/labour_box.dmm index 42f439753c7..3d15af318b9 100644 --- a/_maps/shuttles/labour_box.dmm +++ b/_maps/shuttles/labour_box.dmm @@ -97,7 +97,7 @@ dir = 8; dwidth = 2; height = 5; - id = "laborcamp"; + shuttle_id = "laborcamp"; name = "labor camp shuttle"; width = 9; port_direction = 4 diff --git a/_maps/shuttles/labour_delta.dmm b/_maps/shuttles/labour_delta.dmm index 210fab5eed6..5d48f97cfbe 100644 --- a/_maps/shuttles/labour_delta.dmm +++ b/_maps/shuttles/labour_delta.dmm @@ -230,7 +230,7 @@ dir = 8; dwidth = 2; height = 5; - id = "laborcamp"; + shuttle_id = "laborcamp"; name = "labor camp shuttle"; port_direction = 4; width = 9 diff --git a/_maps/shuttles/labour_generic.dmm b/_maps/shuttles/labour_generic.dmm index bccc8ad5b53..0ba38c89e65 100644 --- a/_maps/shuttles/labour_generic.dmm +++ b/_maps/shuttles/labour_generic.dmm @@ -90,7 +90,7 @@ dir = 8; dwidth = 2; height = 5; - id = "laborcamp"; + shuttle_id = "laborcamp"; name = "labor camp shuttle"; width = 9; port_direction = 4 diff --git a/_maps/shuttles/labour_kilo.dmm b/_maps/shuttles/labour_kilo.dmm index cddc3599a73..d65c45bb844 100644 --- a/_maps/shuttles/labour_kilo.dmm +++ b/_maps/shuttles/labour_kilo.dmm @@ -219,7 +219,7 @@ dir = 8; dwidth = 2; height = 5; - id = "laborcamp"; + shuttle_id = "laborcamp"; name = "labor camp shuttle"; port_direction = 4; width = 9 diff --git a/_maps/shuttles/mining_box.dmm b/_maps/shuttles/mining_box.dmm index 80540b7c259..8c4b4406043 100644 --- a/_maps/shuttles/mining_box.dmm +++ b/_maps/shuttles/mining_box.dmm @@ -35,7 +35,7 @@ dir = 8; dwidth = 3; height = 5; - id = "mining"; + shuttle_id = "mining"; name = "mining shuttle"; port_direction = 4; width = 7 diff --git a/_maps/shuttles/mining_common_kilo.dmm b/_maps/shuttles/mining_common_kilo.dmm index 76b22ac9622..e92f8f24432 100644 --- a/_maps/shuttles/mining_common_kilo.dmm +++ b/_maps/shuttles/mining_common_kilo.dmm @@ -84,7 +84,7 @@ dir = 8; dwidth = 3; height = 5; - id = "mining_common"; + shuttle_id = "mining_common"; name = "lavaland shuttle"; port_direction = 4; width = 7 diff --git a/_maps/shuttles/mining_common_meta.dmm b/_maps/shuttles/mining_common_meta.dmm index 013ff187afc..7865abfd127 100644 --- a/_maps/shuttles/mining_common_meta.dmm +++ b/_maps/shuttles/mining_common_meta.dmm @@ -35,7 +35,7 @@ dir = 8; dwidth = 3; height = 5; - id = "mining_common"; + shuttle_id = "mining_common"; name = "lavaland shuttle"; port_direction = 4; width = 7 diff --git a/_maps/shuttles/mining_delta.dmm b/_maps/shuttles/mining_delta.dmm index a366ab3f704..45575e6db00 100644 --- a/_maps/shuttles/mining_delta.dmm +++ b/_maps/shuttles/mining_delta.dmm @@ -71,7 +71,7 @@ dir = 4; dwidth = 3; height = 5; - id = "mining"; + shuttle_id = "mining"; name = "mining shuttle"; port_direction = 8; width = 7 diff --git a/_maps/shuttles/mining_freight.dmm b/_maps/shuttles/mining_freight.dmm index c6fe00f27ae..03d9b4ddd50 100644 --- a/_maps/shuttles/mining_freight.dmm +++ b/_maps/shuttles/mining_freight.dmm @@ -82,7 +82,7 @@ dir = 8; dwidth = 3; height = 5; - id = "mining_common"; + shuttle_id = "mining_common"; name = "lavaland shuttle"; port_direction = 4; width = 7 diff --git a/_maps/shuttles/mining_kilo.dmm b/_maps/shuttles/mining_kilo.dmm index 4ca83cc22a1..929fb6c16a6 100644 --- a/_maps/shuttles/mining_kilo.dmm +++ b/_maps/shuttles/mining_kilo.dmm @@ -321,7 +321,7 @@ /obj/docking_port/mobile{ dwidth = 3; height = 10; - id = "mining"; + shuttle_id = "mining"; name = "mining shuttle"; port_direction = 2; width = 7 diff --git a/_maps/shuttles/mining_large.dmm b/_maps/shuttles/mining_large.dmm index 0519e570a11..701f80a73af 100644 --- a/_maps/shuttles/mining_large.dmm +++ b/_maps/shuttles/mining_large.dmm @@ -445,7 +445,7 @@ /obj/docking_port/mobile{ dwidth = 3; height = 10; - id = "mining"; + shuttle_id = "mining"; name = "mining shuttle"; port_direction = 2; width = 7 diff --git a/_maps/shuttles/pirate_default.dmm b/_maps/shuttles/pirate_default.dmm index adafca9b9ee..663521b169c 100644 --- a/_maps/shuttles/pirate_default.dmm +++ b/_maps/shuttles/pirate_default.dmm @@ -292,24 +292,6 @@ }, /turf/open/floor/iron, /area/shuttle/pirate) -"aB" = ( -/obj/machinery/light/small/directional/east, -/obj/machinery/computer/monitor{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/airalarm/all_access{ - pixel_y = -24 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/shuttle/pirate) "aC" = ( /obj/machinery/shuttle_scrambler, /obj/effect/decal/cleanable/dirt, @@ -760,33 +742,6 @@ /obj/effect/mapping_helpers/airlock/cutaiwire, /turf/open/floor/plating, /area/shuttle/pirate) -"ce" = ( -/obj/machinery/door/airlock/external/glass/ruin{ - id_tag = "piratestarboardexternal" - }, -/obj/effect/mapping_helpers/airlock/locked, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/obj/docking_port/mobile/pirate{ - dwidth = 11; - height = 16; - launch_status = 0; - movement_force = list("KNOCKDOWN" = 0, "THROW" = 0); - name = "Pirate Ship"; - port_direction = 2; - width = 17 - }, -/obj/docking_port/stationary{ - dwidth = 11; - height = 16; - id = "pirateship_home"; - name = "Deep Space"; - width = 17 - }, -/obj/effect/mapping_helpers/airlock/cutaiwire, -/turf/open/floor/plating, -/area/shuttle/pirate) "df" = ( /obj/machinery/porta_turret/syndicate/energy{ dir = 4; @@ -947,6 +902,24 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/shuttle/pirate) +"sP" = ( +/obj/machinery/light/small/directional/east, +/obj/machinery/computer/monitor{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/airalarm/all_access{ + pixel_y = -24 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/shuttle/pirate) "vB" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -1090,6 +1063,33 @@ }, /turf/open/floor/wood, /area/shuttle/pirate) +"TU" = ( +/obj/machinery/door/airlock/external/glass/ruin{ + id_tag = "piratestarboardexternal" + }, +/obj/effect/mapping_helpers/airlock/locked, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/docking_port/mobile/pirate{ + dwidth = 11; + height = 16; + launch_status = 0; + movement_force = list("KNOCKDOWN" = 0, "THROW" = 0); + name = "Pirate Ship"; + port_direction = 2; + width = 17 + }, +/obj/docking_port/stationary{ + dwidth = 11; + height = 16; + shuttle_id = "pirateship_home"; + name = "Deep Space"; + width = 17 + }, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/turf/open/floor/plating, +/area/shuttle/pirate) "Ur" = ( /obj/structure/closet/secure_closet/personal, /obj/effect/decal/cleanable/dirt, @@ -1286,7 +1286,7 @@ af ey ey al -aB +sP aj ek bA @@ -1314,7 +1314,7 @@ ED aS bZ bo -ce +TU "} (13,1,1) = {" af diff --git a/_maps/shuttles/pirate_dutchman.dmm b/_maps/shuttles/pirate_dutchman.dmm index 58146e30a59..f275122cb36 100644 --- a/_maps/shuttles/pirate_dutchman.dmm +++ b/_maps/shuttles/pirate_dutchman.dmm @@ -108,12 +108,6 @@ }, /turf/open/floor/wood/airless, /area/shuttle/pirate/flying_dutchman) -"aw" = ( -/obj/machinery/computer/monitor{ - dir = 8 - }, -/turf/open/floor/carpet/royalblack/airless, -/area/shuttle/pirate/flying_dutchman) "aB" = ( /obj/structure/railing/corner{ color = "#4C3117"; @@ -745,33 +739,6 @@ }, /turf/open/floor/wood/airless, /area/shuttle/pirate/flying_dutchman) -"LD" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 6 - }, -/obj/machinery/light/floor, -/obj/docking_port/stationary{ - dir = 8; - dwidth = 11; - height = 16; - id = "pirateship_home"; - name = "Deep Space"; - width = 17 - }, -/obj/docking_port/mobile/pirate{ - dheight = 7; - dir = 8; - dwidth = 18; - height = 6; - launch_status = 0; - movement_force = list("KNOCKDOWN" = 0, "THROW" = 0); - name = "Pirate Ship"; - port_direction = 4; - preferred_direction = 8; - width = 13 - }, -/turf/open/floor/wood/airless, -/area/shuttle/pirate/flying_dutchman) "Ms" = ( /obj/machinery/light/small/directional/north, /turf/open/floor/carpet/royalblack/airless, @@ -790,6 +757,33 @@ /obj/structure/cable, /turf/open/space/basic, /area/shuttle/pirate/flying_dutchman) +"Op" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/obj/machinery/light/floor, +/obj/docking_port/stationary{ + dir = 8; + dwidth = 11; + height = 16; + shuttle_id = "pirateship_home"; + name = "Deep Space"; + width = 17 + }, +/obj/docking_port/mobile/pirate{ + dheight = 7; + dir = 8; + dwidth = 18; + height = 6; + launch_status = 0; + movement_force = list("KNOCKDOWN" = 0, "THROW" = 0); + name = "Pirate Ship"; + port_direction = 4; + preferred_direction = 8; + width = 13 + }, +/turf/open/floor/wood/airless, +/area/shuttle/pirate/flying_dutchman) "OL" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 8 @@ -947,6 +941,12 @@ /obj/effect/mob_spawn/ghost_role/human/pirate/skeleton, /turf/open/floor/wood/airless, /area/shuttle/pirate/flying_dutchman) +"YJ" = ( +/obj/machinery/computer/monitor{ + dir = 8 + }, +/turf/open/floor/carpet/royalblack/airless, +/area/shuttle/pirate/flying_dutchman) "ZL" = ( /obj/effect/turf_decal/siding/wood{ dir = 9 @@ -1324,7 +1324,7 @@ af af af zO -LD +Op WR vi WR @@ -1340,7 +1340,7 @@ Gr WR EU bO -aw +YJ WR WR "} diff --git a/_maps/shuttles/pirate_silverscale.dmm b/_maps/shuttles/pirate_silverscale.dmm index 54e50d30ba3..6aab870831e 100644 --- a/_maps/shuttles/pirate_silverscale.dmm +++ b/_maps/shuttles/pirate_silverscale.dmm @@ -31,6 +31,14 @@ /obj/effect/turf_decal/bot_red, /turf/open/floor/pod/dark, /area/shuttle/pirate) +"bp" = ( +/obj/machinery/computer/monitor{ + dir = 8 + }, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/shuttle/pirate) "bH" = ( /obj/machinery/airalarm/all_access{ dir = 4; @@ -186,34 +194,6 @@ "je" = ( /turf/template_noop, /area/template_noop) -"jm" = ( -/obj/machinery/door/airlock/external/glass/ruin{ - id_tag = "piratestarboardexternal" - }, -/obj/docking_port/stationary{ - dir = 4; - dwidth = 13; - height = 3; - id = "pirateship_home"; - name = "Deep Space"; - width = 26 - }, -/obj/docking_port/mobile/pirate{ - dir = 4; - dwidth = 13; - height = 3; - launch_status = 0; - movement_force = list("KNOCKDOWN" = 0, "THROW" = 0); - name = "Silverscale Cruiser"; - preferred_direction = 4; - width = 26 - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/obj/effect/mapping_helpers/airlock/cutaiwire, -/turf/open/floor/pod/light, -/area/shuttle/pirate) "jG" = ( /obj/effect/turf_decal/trimline/yellow/warning{ dir = 9 @@ -292,14 +272,6 @@ }, /turf/open/floor/carpet/royalblack, /area/shuttle/pirate) -"nh" = ( -/obj/machinery/computer/monitor{ - dir = 8 - }, -/turf/open/floor/iron/dark/side{ - dir = 8 - }, -/area/shuttle/pirate) "nm" = ( /obj/structure/shuttle/engine/propulsion{ dir = 4 @@ -536,6 +508,34 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/pod/dark, /area/shuttle/pirate) +"Bl" = ( +/obj/machinery/door/airlock/external/glass/ruin{ + id_tag = "piratestarboardexternal" + }, +/obj/docking_port/stationary{ + dir = 4; + dwidth = 13; + height = 3; + shuttle_id = "pirateship_home"; + name = "Deep Space"; + width = 26 + }, +/obj/docking_port/mobile/pirate{ + dir = 4; + dwidth = 13; + height = 3; + launch_status = 0; + movement_force = list("KNOCKDOWN" = 0, "THROW" = 0); + name = "Silverscale Cruiser"; + preferred_direction = 4; + width = 26 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/turf/open/floor/pod/light, +/area/shuttle/pirate) "Ch" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/iron/dark, @@ -1028,7 +1028,7 @@ jG Gr Gr rB -jm +Bl rB je je @@ -1271,7 +1271,7 @@ rB HD Mo fj -nh +bp HD rB rB diff --git a/_maps/shuttles/ruin_caravan_victim.dmm b/_maps/shuttles/ruin_caravan_victim.dmm index 50c6ba20cfd..3f7de51f042 100644 --- a/_maps/shuttles/ruin_caravan_victim.dmm +++ b/_maps/shuttles/ruin_caravan_victim.dmm @@ -929,7 +929,7 @@ dir = 2; dwidth = 5; height = 11; - id = "caravantrade1"; + shuttle_id = "caravantrade1"; movement_force = list("KNOCKDOWN" = 0, "THROW" = 0); name = "Small Freighter"; port_direction = 8; diff --git a/_maps/shuttles/ruin_pirate_cutter.dmm b/_maps/shuttles/ruin_pirate_cutter.dmm index ed5ad714fc1..34050606922 100644 --- a/_maps/shuttles/ruin_pirate_cutter.dmm +++ b/_maps/shuttles/ruin_pirate_cutter.dmm @@ -669,7 +669,7 @@ dir = 2; dwidth = 14; height = 13; - id = "caravanpirate"; + shuttle_id = "caravanpirate"; movement_force = list("KNOCKDOWN" = 0, "THROW" = 0); name = "Pirate Cutter"; port_direction = 8; diff --git a/_maps/shuttles/ruin_syndicate_dropship.dmm b/_maps/shuttles/ruin_syndicate_dropship.dmm index d43cf4eeb08..2d16c19f4db 100644 --- a/_maps/shuttles/ruin_syndicate_dropship.dmm +++ b/_maps/shuttles/ruin_syndicate_dropship.dmm @@ -40,26 +40,6 @@ }, /turf/open/floor/plating/airless, /area/shuttle/caravan/syndicate3) -"gl" = ( -/obj/machinery/door/airlock/hatch{ - id_tag = "caravansyndicate3_bolt_port"; - name = "External Airlock"; - normalspeed = 0 - }, -/obj/docking_port/mobile{ - dir = 2; - dwidth = 6; - height = 7; - id = "caravansyndicate3"; - name = "Syndicate Drop Ship"; - port_direction = 8; - preferred_direction = 4; - width = 15 - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, -/turf/open/floor/plating, -/area/shuttle/caravan/syndicate3) "ha" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -84,6 +64,26 @@ /obj/structure/cable, /turf/open/floor/pod/dark, /area/shuttle/caravan/syndicate3) +"jT" = ( +/obj/machinery/door/airlock/hatch{ + id_tag = "caravansyndicate3_bolt_port"; + name = "External Airlock"; + normalspeed = 0 + }, +/obj/docking_port/mobile{ + dir = 2; + dwidth = 6; + height = 7; + shuttle_id = "caravansyndicate3"; + name = "Syndicate Drop Ship"; + port_direction = 8; + preferred_direction = 4; + width = 15 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/turf/open/floor/plating, +/area/shuttle/caravan/syndicate3) "ka" = ( /obj/structure/chair/comfy/shuttle{ dir = 1 @@ -155,13 +155,6 @@ }, /turf/open/floor/iron/dark, /area/shuttle/caravan/syndicate3) -"rU" = ( -/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, -/obj/machinery/door/poddoor{ - id = "caravansyndicate3_bridge" - }, -/turf/open/floor/plating, -/area/shuttle/caravan/syndicate3) "rV" = ( /obj/structure/chair/comfy/shuttle{ dir = 1 @@ -262,6 +255,13 @@ /obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/iron/dark, /area/shuttle/caravan/syndicate3) +"Dc" = ( +/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, +/obj/machinery/door/poddoor{ + id = "caravansyndicate3_bridge" + }, +/turf/open/floor/plating, +/area/shuttle/caravan/syndicate3) "Dt" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -619,7 +619,7 @@ Tn PL "} (9,1,1) = {" -gl +jT xC al Vr @@ -655,29 +655,29 @@ Sl Tn "} (13,1,1) = {" -rU +Dc ns Ij HM Wr Ia -rU +Dc "} (14,1,1) = {" -rU -rU +Dc +Dc sb rz ZK -rU -rU +Dc +Dc "} (15,1,1) = {" Jv -rU -rU -rU -rU -rU +Dc +Dc +Dc +Dc +Dc Jv "} diff --git a/_maps/shuttles/ruin_syndicate_fighter_shiv.dmm b/_maps/shuttles/ruin_syndicate_fighter_shiv.dmm index 237b704ec24..9449390bcb3 100644 --- a/_maps/shuttles/ruin_syndicate_fighter_shiv.dmm +++ b/_maps/shuttles/ruin_syndicate_fighter_shiv.dmm @@ -38,6 +38,18 @@ }, /turf/open/floor/mineral/plastitanium/red, /area/shuttle/caravan/syndicate1) +"uM" = ( +/obj/machinery/power/apc/highcap/ten_k/directional/west{ + name = "Syndicate Fighter Power Controller"; + req_access = list("syndicate") + }, +/obj/machinery/computer/security{ + dir = 1; + network = list("caravansyndicate1") + }, +/obj/structure/cable, +/turf/open/floor/mineral/plastitanium/red, +/area/shuttle/caravan/syndicate1) "uW" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/computer/camera_advanced/shuttle_docker/caravan/syndicate1, @@ -56,19 +68,10 @@ }, /turf/closed/wall/mineral/plastitanium, /area/shuttle/caravan/syndicate1) -"vK" = ( -/obj/machinery/power/apc/highcap/ten_k/directional/west{ - name = "Syndicate Fighter Power Controller"; - req_access = list("syndicate") - }, -/obj/machinery/computer/security{ - dir = 1; - network = list("caravansyndicate1") - }, -/obj/structure/cable, -/turf/open/floor/mineral/plastitanium/red, -/area/shuttle/caravan/syndicate1) -"wV" = ( +"Jv" = ( +/turf/template_noop, +/area/template_noop) +"MC" = ( /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/hatch{ id_tag = "caravansyndicate1_bolt"; @@ -81,7 +84,7 @@ dir = 4; dwidth = 4; height = 5; - id = "caravansyndicate1"; + shuttle_id = "caravansyndicate1"; ignitionTime = 25; name = "Syndicate Fighter"; port_direction = 2; @@ -92,9 +95,6 @@ /obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/shuttle/caravan/syndicate1) -"Jv" = ( -/turf/template_noop, -/area/template_noop) "YP" = ( /obj/structure/shuttle/engine/propulsion/burst{ dir = 8 @@ -110,7 +110,7 @@ Jv Jv YP fp -wV +MC fp YP Jv @@ -122,7 +122,7 @@ YP fp uW aA -vK +uM fp YP Jv diff --git a/_maps/shuttles/snowdin_excavation.dmm b/_maps/shuttles/snowdin_excavation.dmm index 709d9fb00dd..42bba4439f9 100644 --- a/_maps/shuttles/snowdin_excavation.dmm +++ b/_maps/shuttles/snowdin_excavation.dmm @@ -6,7 +6,7 @@ /obj/docking_port/mobile/elevator{ dir = 4; height = 6; - id = "snowdin_excavation"; + shuttle_id = "snowdin_excavation"; name = "excavation elevator"; width = 6 }, diff --git a/_maps/shuttles/snowdin_mining.dmm b/_maps/shuttles/snowdin_mining.dmm index 1d9f13193b2..67b2ee5fe9c 100644 --- a/_maps/shuttles/snowdin_mining.dmm +++ b/_maps/shuttles/snowdin_mining.dmm @@ -7,7 +7,7 @@ dir = 4; dwidth = 2; height = 5; - id = "snowdin_mining"; + shuttle_id = "snowdin_mining"; name = "mining elevator"; width = 5 }, diff --git a/_maps/shuttles/whiteship_box.dmm b/_maps/shuttles/whiteship_box.dmm index 4620ee04d91..83c4fee5f02 100644 --- a/_maps/shuttles/whiteship_box.dmm +++ b/_maps/shuttles/whiteship_box.dmm @@ -20,7 +20,7 @@ dir = 2; dwidth = 11; height = 17; - id = "whiteship"; + shuttle_id = "whiteship"; launch_status = 0; movement_force = list("KNOCKDOWN" = 0, "THROW" = 0); name = "Hospital Ship"; diff --git a/_maps/shuttles/whiteship_cere.dmm b/_maps/shuttles/whiteship_cere.dmm index d0f297f6f5a..1ad442d98af 100644 --- a/_maps/shuttles/whiteship_cere.dmm +++ b/_maps/shuttles/whiteship_cere.dmm @@ -14,7 +14,7 @@ dir = 2; dwidth = 8; height = 16; - id = "whiteship"; + shuttle_id = "whiteship"; launch_status = 0; name = "NT Recovery White-Ship"; port_direction = 8; diff --git a/_maps/shuttles/whiteship_delta.dmm b/_maps/shuttles/whiteship_delta.dmm index 799ed8adb0a..df6f57d7325 100644 --- a/_maps/shuttles/whiteship_delta.dmm +++ b/_maps/shuttles/whiteship_delta.dmm @@ -22,7 +22,7 @@ dir = 2; dwidth = 11; height = 17; - id = "whiteship"; + shuttle_id = "whiteship"; launch_status = 0; movement_force = list("KNOCKDOWN" = 0, "THROW" = 0); name = "NT Frigate"; diff --git a/_maps/shuttles/whiteship_donut.dmm b/_maps/shuttles/whiteship_donut.dmm index 3e3e7d71932..976f84b97aa 100644 --- a/_maps/shuttles/whiteship_donut.dmm +++ b/_maps/shuttles/whiteship_donut.dmm @@ -15,7 +15,7 @@ dir = 2; dwidth = 8; height = 17; - id = "whiteship"; + shuttle_id = "whiteship"; launch_status = 0; name = "White Ship"; port_direction = 2; diff --git a/_maps/shuttles/whiteship_kilo.dmm b/_maps/shuttles/whiteship_kilo.dmm index 9983d798ae9..9e59a53ee30 100644 --- a/_maps/shuttles/whiteship_kilo.dmm +++ b/_maps/shuttles/whiteship_kilo.dmm @@ -248,7 +248,7 @@ dir = 2; dwidth = 7; height = 17; - id = "whiteship"; + shuttle_id = "whiteship"; launch_status = 0; movement_force = list("KNOCKDOWN"=0,"THROW"=0); name = "Mining Shuttle"; diff --git a/_maps/shuttles/whiteship_meta.dmm b/_maps/shuttles/whiteship_meta.dmm index cc09997d35c..754e4626eb2 100644 --- a/_maps/shuttles/whiteship_meta.dmm +++ b/_maps/shuttles/whiteship_meta.dmm @@ -38,7 +38,7 @@ dir = 2; dwidth = 11; height = 17; - id = "whiteship"; + shuttle_id = "whiteship"; launch_status = 0; movement_force = list("KNOCKDOWN" = 0, "THROW" = 0); name = "Salvage Ship"; diff --git a/_maps/shuttles/whiteship_pubby.dmm b/_maps/shuttles/whiteship_pubby.dmm index d4f65c8c5ad..dda8e986dbc 100644 --- a/_maps/shuttles/whiteship_pubby.dmm +++ b/_maps/shuttles/whiteship_pubby.dmm @@ -87,7 +87,7 @@ dir = 8; dwidth = 4; height = 9; - id = "whiteship"; + shuttle_id = "whiteship"; launch_status = 0; name = "White Ship"; port_direction = 4; diff --git a/_maps/shuttles/whiteship_tram.dmm b/_maps/shuttles/whiteship_tram.dmm index b7c2dc5c3ee..e4c542b131e 100644 --- a/_maps/shuttles/whiteship_tram.dmm +++ b/_maps/shuttles/whiteship_tram.dmm @@ -578,7 +578,7 @@ dir = 2; dwidth = 6; height = 27; - id = "whiteship"; + shuttle_id = "whiteship"; launch_status = 0; name = "White Ship"; port_direction = 2; diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm index 67ee5928fe9..362f9334b6d 100644 --- a/code/controllers/subsystem/shuttle.dm +++ b/code/controllers/subsystem/shuttle.dm @@ -253,13 +253,13 @@ SUBSYSTEM_DEF(shuttle) /datum/controller/subsystem/shuttle/proc/getShuttle(id) for(var/obj/docking_port/mobile/M in mobile_docking_ports) - if(M.id == id) + if(M.shuttle_id == id) return M WARNING("couldn't find shuttle with id: [id]") /datum/controller/subsystem/shuttle/proc/getDock(id) for(var/obj/docking_port/stationary/S in stationary_docking_ports) - if(S.id == id) + if(S.shuttle_id == id) return S WARNING("couldn't find dock with id: [id]") @@ -492,7 +492,7 @@ SUBSYSTEM_DEF(shuttle) return DOCKING_BLOCKED var/obj/docking_port/stationary/docked_at = shuttle_port.get_docked() var/destination = dock_home - if(docked_at && docked_at.id == dock_home) + if(docked_at && docked_at.shuttle_id == dock_home) destination = dock_away if(timed) if(shuttle_port.request(getDock(destination))) @@ -601,7 +601,7 @@ SUBSYSTEM_DEF(shuttle) A.contents = proposal.reserved_turfs var/obj/docking_port/stationary/transit/new_transit_dock = new(midpoint) new_transit_dock.reserved_area = proposal - new_transit_dock.name = "Transit for [M.id]/[M.name]" + new_transit_dock.name = "Transit for [M.shuttle_id]/[M.name]" new_transit_dock.owner = M new_transit_dock.assigned_area = A @@ -908,7 +908,7 @@ SUBSYSTEM_DEF(shuttle) var/timeleft = M.timeLeft(1) var/list/L = list() L["name"] = M.name - L["id"] = M.id + L["id"] = M.shuttle_id L["timer"] = M.timer L["timeleft"] = M.getTimerStr() if (timeleft > 1 HOURS) @@ -950,7 +950,7 @@ SUBSYSTEM_DEF(shuttle) if(params["type"] == "mobile") for(var/i in mobile_docking_ports) var/obj/docking_port/mobile/M = i - if(M.id == params["id"]) + if(M.shuttle_id == params["id"]) user.forceMove(get_turf(M)) . = TRUE break @@ -958,7 +958,7 @@ SUBSYSTEM_DEF(shuttle) if("fly") for(var/i in mobile_docking_ports) var/obj/docking_port/mobile/M = i - if(M.id == params["id"]) + if(M.shuttle_id == params["id"]) . = TRUE M.admin_fly_shuttle(user) break @@ -966,7 +966,7 @@ SUBSYSTEM_DEF(shuttle) if("fast_travel") for(var/i in mobile_docking_ports) var/obj/docking_port/mobile/M = i - if(M.id == params["id"] && M.timer && M.timeLeft(1) >= 50) + if(M.shuttle_id == params["id"] && M.timer && M.timeLeft(1) >= 50) M.setTimer(50) . = TRUE message_admins("[key_name_admin(usr)] fast travelled [M]") diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm index ffff8475318..cafb46c14b0 100644 --- a/code/datums/shuttles.dm +++ b/code/datums/shuttles.dm @@ -4,7 +4,13 @@ name = "Base Shuttle Template" var/prefix = "_maps/shuttles/" var/suffix + /** + * Port ID is the place this template should be docking at, set on '/obj/docking_port/stationary' + * Because getShuttle() compares port_id to shuttle_id to find an already existing shuttle, + * you should set shuttle_id to be the same as port_id if you want them to be replacable. + */ var/port_id + ///ID of the shuttle, make sure it matches port_id if necessary. var/shuttle_id var/description diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 05d1b1bc14d..f5270743c64 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -1569,7 +1569,7 @@ return ///Connect this atom to a shuttle -/atom/proc/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock) +/atom/proc/connect_to_shuttle(mapload, obj/docking_port/mobile/port, obj/docking_port/stationary/dock) return /atom/proc/add_filter(name,priority,list/params) diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index a8ca38ca580..a25b8b4d38a 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -134,9 +134,9 @@ A.id = id initialized_button = 1 -/obj/machinery/button/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock) +/obj/machinery/button/connect_to_shuttle(mapload, obj/docking_port/mobile/port, obj/docking_port/stationary/dock) if(id) - id = "[port.id]_[id]" + id = "[port.shuttle_id]_[id]" setup_device() /obj/machinery/button/attack_hand(mob/user, list/modifiers) diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index 257f04a9421..b70fd5edc7a 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -102,10 +102,10 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/camera/xray, 0) alarm_manager = new(src) -/obj/machinery/camera/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock) +/obj/machinery/camera/connect_to_shuttle(mapload, obj/docking_port/mobile/port, obj/docking_port/stationary/dock) for(var/i in network) network -= i - network += "[port.id]_[i]" + network += "[port.shuttle_id]_[i]" /obj/machinery/camera/proc/create_prox_monitor() if(!proximity_monitor) diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index 92847e60fb6..90982d06e06 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -58,10 +58,10 @@ QDEL_NULL(cam_background) return ..() -/obj/machinery/computer/security/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock) +/obj/machinery/computer/security/connect_to_shuttle(mapload, obj/docking_port/mobile/port, obj/docking_port/stationary/dock) for(var/i in network) network -= i - network += "[port.id]_[i]" + network += "[port.shuttle_id]_[i]" /obj/machinery/computer/security/ui_interact(mob/user, datum/tgui/ui) . = ..() diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm index 5491d46a739..69ace12caf4 100644 --- a/code/game/machinery/computer/camera_advanced.dm +++ b/code/game/machinery/computer/camera_advanced.dm @@ -50,16 +50,16 @@ if(move_down_action) actions += new move_down_action(src) -/obj/machinery/computer/camera_advanced/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock) +/obj/machinery/computer/camera_advanced/connect_to_shuttle(mapload, obj/docking_port/mobile/port, obj/docking_port/stationary/dock) for(var/i in networks) networks -= i - networks += "[port.id]_[i]" + networks += "[port.shuttle_id]_[i]" /obj/machinery/computer/camera_advanced/syndie icon_keyboard = "syndie_key" circuit = /obj/item/circuitboard/computer/advanced_camera -/obj/machinery/computer/camera_advanced/syndie/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock) +/obj/machinery/computer/camera_advanced/syndie/connect_to_shuttle(mapload, obj/docking_port/mobile/port, obj/docking_port/stationary/dock) return //For syndie nuke shuttle, to spy for station. /obj/machinery/computer/camera_advanced/proc/CreateEye() diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index a8bf5a3517e..a82d643d3db 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -183,9 +183,9 @@ return INITIALIZE_HINT_LATELOAD -/obj/machinery/door/airlock/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock) +/obj/machinery/door/airlock/connect_to_shuttle(mapload, obj/docking_port/mobile/port, obj/docking_port/stationary/dock) if(id_tag) - id_tag = "[port.id]_[id_tag]" + id_tag = "[port.shuttle_id]_[id_tag]" /obj/machinery/door/airlock/proc/update_other_id() for(var/obj/machinery/door/airlock/Airlock in GLOB.airlocks) diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm index ba21d0e1d03..e0a30a7be95 100644 --- a/code/game/machinery/doors/poddoor.dm +++ b/code/game/machinery/doors/poddoor.dm @@ -109,8 +109,8 @@ else if(deconstruction == BLASTDOOR_NEEDS_WIRES) . += span_notice("The wires have been removed and it's ready to be sliced apart.") -/obj/machinery/door/poddoor/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock) - id = "[port.id]_[id]" +/obj/machinery/door/poddoor/connect_to_shuttle(mapload, obj/docking_port/mobile/port, obj/docking_port/stationary/dock) + id = "[port.shuttle_id]_[id]" //"BLAST" doors are obviously stronger than regular doors when it comes to BLASTS. /obj/machinery/door/poddoor/ex_act(severity, target) diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index 994aba11b0a..6dcf4397a31 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -39,8 +39,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/flasher, 26) bulb = new(src) -/obj/machinery/flasher/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock) - id = "[port.id]_[id]" +/obj/machinery/flasher/connect_to_shuttle(mapload, obj/docking_port/mobile/port, obj/docking_port/stationary/dock) + id = "[port.shuttle_id]_[id]" /obj/machinery/flasher/Destroy() QDEL_NULL(bulb) diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm index 9cc0b0ab0e3..e33e8441636 100644 --- a/code/game/machinery/igniter.dm +++ b/code/game/machinery/igniter.dm @@ -49,8 +49,8 @@ icon_state = "[base_icon_state][(machine_stat & NOPOWER) ? 0 : on]" return ..() -/obj/machinery/igniter/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock) - id = "[port.id]_[id]" +/obj/machinery/igniter/connect_to_shuttle(mapload, obj/docking_port/mobile/port, obj/docking_port/stationary/dock) + id = "[port.shuttle_id]_[id]" // Wall mounted remote-control igniter. diff --git a/code/game/machinery/mass_driver.dm b/code/game/machinery/mass_driver.dm index 7cc2a0753d7..9c65fceb11c 100644 --- a/code/game/machinery/mass_driver.dm +++ b/code/game/machinery/mass_driver.dm @@ -27,8 +27,8 @@ control.connected = null return ..() -/obj/machinery/mass_driver/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock) - id = "[port.id]_[id]" +/obj/machinery/mass_driver/connect_to_shuttle(mapload, obj/docking_port/mobile/port, obj/docking_port/stationary/dock) + id = "[port.shuttle_id]_[id]" /obj/machinery/mass_driver/proc/drive(amount) if(machine_stat & (BROKEN|NOPOWER)) diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm index 2f4e760e41a..c97beae759d 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -448,9 +448,9 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/status_display/evac, 32) if(NAMEOF(src, shuttle_id)) update() -/obj/machinery/status_display/shuttle/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock) +/obj/machinery/status_display/shuttle/connect_to_shuttle(mapload, obj/docking_port/mobile/port, obj/docking_port/stationary/dock) if(port) - shuttle_id = port.id + shuttle_id = port.shuttle_id update() diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index a6689ad4e4e..02eb799d7d1 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -240,8 +240,8 @@ GLOBAL_LIST_EMPTY(crematoriums) GLOB.crematoriums -= src return ..() -/obj/structure/bodycontainer/crematorium/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock) - id = "[port.id]_[id]" +/obj/structure/bodycontainer/crematorium/connect_to_shuttle(mapload, obj/docking_port/mobile/port, obj/docking_port/stationary/dock) + id = "[port.shuttle_id]_[id]" /obj/structure/bodycontainer/crematorium/update_icon_state() if(!connected || connected.loc != src) diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 017c8a3b91f..2922c08ce50 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -822,8 +822,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sink/kitchen, (-16)) . = ..() GLOB.curtains += src -/obj/structure/curtain/cloth/fancy/mechanical/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock) - id = "[port.id]_[id]" +/obj/structure/curtain/cloth/fancy/mechanical/connect_to_shuttle(mapload, obj/docking_port/mobile/port, obj/docking_port/stationary/dock) + id = "[port.shuttle_id]_[id]" /obj/structure/curtain/cloth/fancy/mechanical/proc/open() icon_state = "[icon_type]-open" diff --git a/code/game/shuttle_engines.dm b/code/game/shuttle_engines.dm index 4ddf62bfdd8..514fbfd896f 100644 --- a/code/game/shuttle_engines.dm +++ b/code/game/shuttle_engines.dm @@ -1,7 +1,8 @@ #define ENGINE_UNWRENCHED 0 #define ENGINE_WRENCHED 1 #define ENGINE_WELDED 2 -#define ENGINE_WELDTIME 200 +///How long it takes to weld/unweld an engine in place. +#define ENGINE_WELDTIME (20 SECONDS) /obj/structure/shuttle name = "shuttle" @@ -17,75 +18,103 @@ desc = "A bluespace engine used to make shuttles move." density = TRUE anchored = TRUE + + ///How well the engine affects the ship's speed. var/engine_power = 1 - var/state = ENGINE_WELDED //welding shmelding + ///Construction state of the Engine. + var/engine_state = ENGINE_WELDED //welding shmelding //i love welding + + ///The mobile ship we are connected to. + var/datum/weakref/connected_ship_ref + +/obj/structure/shuttle/engine/connect_to_shuttle(mapload, obj/docking_port/mobile/port, obj/docking_port/stationary/dock) + . = ..() + if(!port) + return FALSE + connected_ship_ref = WEAKREF(port) + port.engine_list += src + port.current_engines++ + if(mapload) + port.initial_engines++ + +/obj/structure/shuttle/engine/Destroy() + if(engine_state == ENGINE_WELDED) + alter_engine_power(-engine_power) + unsync_ship() + return ..() + +/** + * Called on destroy and when we need to unsync an engine from their ship. + */ +/obj/structure/shuttle/engine/proc/unsync_ship() + var/obj/docking_port/mobile/port = connected_ship_ref?.resolve() + if(port) + port.engine_list -= src + port.current_engines-- + connected_ship_ref = null //Ugh this is a lot of copypasta from emitters, welding need some boilerplate reduction /obj/structure/shuttle/engine/can_be_unfasten_wrench(mob/user, silent) - if(state == ENGINE_WELDED) + if(engine_state == ENGINE_WELDED) if(!silent) to_chat(user, span_warning("[src] is welded to the floor!")) return FAILED_UNFASTEN return ..() -/obj/structure/shuttle/engine/default_unfasten_wrench(mob/user, obj/item/I, time = 20) +/obj/structure/shuttle/engine/default_unfasten_wrench(mob/user, obj/item/tool, time = 20) . = ..() if(. == SUCCESSFUL_UNFASTEN) if(anchored) - state = ENGINE_WRENCHED + connect_to_shuttle(port = SSshuttle.get_containing_shuttle(src)) //connect to a new ship, if needed + engine_state = ENGINE_WRENCHED else - state = ENGINE_UNWRENCHED + unsync_ship() //not part of the ship anymore + engine_state = ENGINE_UNWRENCHED /obj/structure/shuttle/engine/wrench_act(mob/living/user, obj/item/tool) . = ..() default_unfasten_wrench(user, tool) return TOOL_ACT_TOOLTYPE_SUCCESS -/obj/structure/shuttle/engine/welder_act(mob/living/user, obj/item/I) +/obj/structure/shuttle/engine/welder_act(mob/living/user, obj/item/tool) . = ..() - switch(state) + switch(engine_state) if(ENGINE_UNWRENCHED) to_chat(user, span_warning("The [src.name] needs to be wrenched to the floor!")) if(ENGINE_WRENCHED) - if(!I.tool_start_check(user, amount=0)) + if(!tool.tool_start_check(user, amount=0)) return TRUE user.visible_message(span_notice("[user.name] starts to weld the [name] to the floor."), \ span_notice("You start to weld \the [src] to the floor..."), \ span_hear("You hear welding.")) - if(I.use_tool(src, user, ENGINE_WELDTIME, volume=50)) - state = ENGINE_WELDED + if(tool.use_tool(src, user, ENGINE_WELDTIME, volume=50)) + engine_state = ENGINE_WELDED to_chat(user, span_notice("You weld \the [src] to the floor.")) alter_engine_power(engine_power) if(ENGINE_WELDED) - if(!I.tool_start_check(user, amount=0)) + if(!tool.tool_start_check(user, amount=0)) return TRUE user.visible_message(span_notice("[user.name] starts to cut the [name] free from the floor."), \ span_notice("You start to cut \the [src] free from the floor..."), \ span_hear("You hear welding.")) - if(I.use_tool(src, user, ENGINE_WELDTIME, volume=50)) - state = ENGINE_WRENCHED + if(tool.use_tool(src, user, ENGINE_WELDTIME, volume=50)) + engine_state = ENGINE_WRENCHED to_chat(user, span_notice("You cut \the [src] free from the floor.")) alter_engine_power(-engine_power) return TRUE -/obj/structure/shuttle/engine/Destroy() - if(state == ENGINE_WELDED) - alter_engine_power(-engine_power) - . = ..() - //Propagates the change to the shuttle. /obj/structure/shuttle/engine/proc/alter_engine_power(mod) - if(mod == 0) + if(!mod) return - if(SSshuttle.is_in_shuttle_bounds(src)) - var/obj/docking_port/mobile/M = SSshuttle.get_containing_shuttle(src) - if(M) - M.alter_engines(mod) + var/obj/docking_port/mobile/port = connected_ship_ref?.resolve() + if(port) + port.alter_engines(mod) /obj/structure/shuttle/engine/heater name = "engine heater" @@ -125,7 +154,7 @@ desc = "An engine that releases a large bluespace burst to propel it." /obj/structure/shuttle/engine/propulsion/burst/cargo - state = ENGINE_UNWRENCHED + engine_state = ENGINE_UNWRENCHED anchored = FALSE /obj/structure/shuttle/engine/propulsion/burst/left @@ -143,10 +172,10 @@ /obj/structure/shuttle/engine/large name = "engine" - opacity = TRUE icon = 'icons/obj/2x2.dmi' icon_state = "large_engine" desc = "A very large bluespace engine used to propel very large ships." + opacity = TRUE bound_width = 64 bound_height = 64 appearance_flags = LONG_GLIDE @@ -160,10 +189,10 @@ /obj/structure/shuttle/engine/huge name = "engine" - opacity = TRUE icon = 'icons/obj/3x3.dmi' icon_state = "huge_engine" desc = "An extremely large bluespace engine used to propel extremely large ships." + opacity = TRUE bound_width = 96 bound_height = 96 appearance_flags = LONG_GLIDE diff --git a/code/modules/admin/fun_balloon.dm b/code/modules/admin/fun_balloon.dm index 06c4af61a31..77d9fdd0fbe 100644 --- a/code/modules/admin/fun_balloon.dm +++ b/code/modules/admin/fun_balloon.dm @@ -141,7 +141,7 @@ var/crash_strength = rand(min_crash_strength,max_crash_strength) for (var/S in SSshuttle.stationary_docking_ports) var/obj/docking_port/stationary/SM = S - if (SM.id == "emergency_home") + if (SM.shuttle_id == "emergency_home") var/new_dir = turn(SM.dir, 180) SM.forceMove(get_ranged_target_turf(SM, new_dir, crash_strength)) break diff --git a/code/modules/admin/verbs/shuttlepanel.dm b/code/modules/admin/verbs/shuttlepanel.dm index 3689d882411..d3cccafa683 100644 --- a/code/modules/admin/verbs/shuttlepanel.dm +++ b/code/modules/admin/verbs/shuttlepanel.dm @@ -17,14 +17,14 @@ continue // please don't do this var/obj/docking_port/stationary/S = port if (canDock(S) == SHUTTLE_CAN_DOCK) - options[S.name || S.id] = S + options[S.name || S.shuttle_id] = S options += "--------" options += "Infinite Transit" options += "Delete Shuttle" options += "Into The Sunset (delete & greentext 'escape')" - var/selection = tgui_input_list(user, "Select where to fly [name || id]:", "Fly Shuttle", options) + var/selection = tgui_input_list(user, "Select where to fly [name || shuttle_id]:", "Fly Shuttle", options) if(isnull(selection)) return @@ -35,12 +35,12 @@ setTimer(ignitionTime) if("Delete Shuttle") - if(tgui_alert(user, "Really delete [name || id]?", "Delete Shuttle", list("Cancel", "Really!")) != "Really!") + if(tgui_alert(user, "Really delete [name || shuttle_id]?", "Delete Shuttle", list("Cancel", "Really!")) != "Really!") return jumpToNullSpace() if("Into The Sunset (delete & greentext 'escape')") - if(tgui_alert(user, "Really delete [name || id] and greentext escape objectives?", "Delete Shuttle", list("Cancel", "Really!")) != "Really!") + if(tgui_alert(user, "Really delete [name || shuttle_id] and greentext escape objectives?", "Delete Shuttle", list("Cancel", "Really!")) != "Really!") return intoTheSunset() @@ -65,7 +65,7 @@ continue // please don't do this var/obj/docking_port/stationary/S = port if (canDock(S) == SHUTTLE_CAN_DOCK) - options[S.name || S.id] = S + options[S.name || S.shuttle_id] = S var/selection = tgui_input_list(user, "New arrivals destination", "Fly Shuttle", options) if(isnull(selection)) diff --git a/code/modules/cargo/orderconsole.dm b/code/modules/cargo/orderconsole.dm index 26be607049a..3ce9c493991 100644 --- a/code/modules/cargo/orderconsole.dm +++ b/code/modules/cargo/orderconsole.dm @@ -24,12 +24,12 @@ var/list/loaded_coupons /// var that makes express console use rockets var/is_express = FALSE - ///The name of the shuttle template being used as the cargo shuttle. 'supply' is default and contains critical code. Don't change this unless you know what you're doing. - var/cargo_shuttle = "supply" + ///The name of the shuttle template being used as the cargo shuttle. 'cargo' is default and contains critical code. Don't change this unless you know what you're doing. + var/cargo_shuttle = "cargo" ///The docking port called when returning to the station. - var/docking_home = "supply_home" + var/docking_home = "cargo_home" ///The docking port called when leaving the station. - var/docking_away = "supply_away" + var/docking_away = "cargo_away" ///If this console can loan the cargo shuttle. Set to false to disable. var/stationcargo = TRUE ///The account this console processes and displays. Independent from the account the shuttle processes. diff --git a/code/modules/events/pirates.dm b/code/modules/events/pirates.dm index 6a27b480b6e..ced684a2952 100644 --- a/code/modules/events/pirates.dm +++ b/code/modules/events/pirates.dm @@ -203,7 +203,7 @@ /obj/docking_port/mobile/pirate name = "pirate shuttle" - id = "pirateship" + shuttle_id = "pirate" rechargeTime = 3 MINUTES /obj/machinery/suit_storage_unit/pirate diff --git a/code/modules/events/shuttle_loan.dm b/code/modules/events/shuttle_loan.dm index 5f90664ed8f..e96d9fe7682 100644 --- a/code/modules/events/shuttle_loan.dm +++ b/code/modules/events/shuttle_loan.dm @@ -65,7 +65,7 @@ end_when = activeFor + 1 SSshuttle.supply.mode = SHUTTLE_CALL - SSshuttle.supply.destination = SSshuttle.getDock("supply_home") + SSshuttle.supply.destination = SSshuttle.getDock("cargo_home") SSshuttle.supply.setTimer(3000) switch(dispatch_type) diff --git a/code/modules/mining/aux_base.dm b/code/modules/mining/aux_base.dm index 4961a16e003..925ea5b1f97 100644 --- a/code/modules/mining/aux_base.dm +++ b/code/modules/mining/aux_base.dm @@ -106,7 +106,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/auxiliary_base, 32) if(!M.check_dock(S, silent = TRUE)) continue var/list/location_data = list( - id = S.id, + id = S.shuttle_id, name = S.name ) data["locations"] += list(location_data) @@ -233,7 +233,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/auxiliary_base, 32) var/area/A = get_area(T) var/obj/docking_port/stationary/landing_zone = new /obj/docking_port/stationary(T) - landing_zone.id = "colony_drop([REF(src)])" + landing_zone.shuttle_id = "colony_drop([REF(src)])" landing_zone.port_destinations = "colony_drop([REF(src)])" landing_zone.name = "Landing Zone ([T.x], [T.y])" landing_zone.dwidth = base_dock.dwidth @@ -243,7 +243,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/auxiliary_base, 32) landing_zone.setDir(base_dock.dir) landing_zone.area_type = A.type - possible_destinations += "[landing_zone.id];" + possible_destinations += "[landing_zone.shuttle_id];" //Serves as a nice mechanic to people get ready for the launch. minor_announce("Auxiliary base landing zone coordinates locked in for [A]. Launch command now available!") @@ -304,7 +304,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/auxiliary_base, 32) /obj/docking_port/mobile/auxiliary_base name = "auxiliary base" - id = "colony_drop" + shuttle_id = "colony_drop" //Reminder to map-makers to set these values equal to the size of your base. dheight = 4 dwidth = 4 @@ -320,7 +320,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/auxiliary_base, 32) /obj/docking_port/stationary/public_mining_dock name = "public mining base dock" - id = "disabled" //The Aux Base has to leave before this can be used as a dock. + shuttle_id = "disabled" //The Aux Base has to leave before this can be used as a dock. //Should be checked on the map to ensure it matchs the mining shuttle dimensions. dwidth = 3 width = 7 @@ -369,15 +369,15 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/auxiliary_base, 32) to_chat(user, span_warning("The auxiliary base's console must be within [console_range] meters in order to interface.")) return -//Mining shuttles may not be created equal, so we find the map's shuttle dock and size accordingly. + //Mining shuttles may not be created equal, so we find the map's shuttle dock and size accordingly. for(var/S in SSshuttle.stationary_docking_ports) var/obj/docking_port/stationary/SM = S //SM is declared outside so it can be checked for null - if(SM.id == "mining_home" || SM.id == "mining_away") + if(SM.shuttle_id == "mining_home" || SM.shuttle_id == "mining_away") var/area/A = get_area(landing_spot) Mport = new(landing_spot) - Mport.id = "landing_zone_dock" + Mport.shuttle_id = "landing_zone_dock" Mport.port_destinations = "landing_zone_dock" Mport.name = "auxiliary base landing site" Mport.dwidth = SM.dwidth @@ -394,9 +394,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/auxiliary_base, 32) var/obj/docking_port/mobile/mining_shuttle var/list/landing_turfs = list() //List of turfs where the mining shuttle may land. - for(var/S in SSshuttle.mobile_docking_ports) - var/obj/docking_port/mobile/MS = S - if(MS.id != "mining") + for(var/obj/docking_port/mobile/MS as anything in SSshuttle.mobile_docking_ports) + if(MS.shuttle_id != "mining") continue mining_shuttle = MS landing_turfs = mining_shuttle.return_ordered_turfs(x,y,z,dir) diff --git a/code/modules/mining/laborcamp/laborshuttle.dm b/code/modules/mining/laborcamp/laborshuttle.dm index 8bcb1230bd5..3687ac71633 100644 --- a/code/modules/mining/laborcamp/laborshuttle.dm +++ b/code/modules/mining/laborcamp/laborshuttle.dm @@ -29,7 +29,7 @@ /obj/docking_port/stationary/laborcamp_home name = "SS13: Labor Shuttle Dock" - id = "laborcamp_home" + shuttle_id = "laborcamp_home" roundstart_template = /datum/map_template/shuttle/labour/delta width = 9 dwidth = 2 diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 165100bd0e9..2896fc959ca 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -124,7 +124,7 @@ /obj/docking_port/stationary/mining_home name = "SS13: Mining Dock" - id = "mining_home" + shuttle_id = "mining_home" roundstart_template = /datum/map_template/shuttle/mining/delta width = 7 dwidth = 3 @@ -136,7 +136,7 @@ /obj/docking_port/stationary/mining_home/common name = "SS13: Common Mining Dock" - id = "commonmining_home" + shuttle_id = "commonmining_home" roundstart_template = /datum/map_template/shuttle/mining_common/meta /obj/docking_port/stationary/mining_home/common/kilo diff --git a/code/modules/modular_computers/file_system/programs/budgetordering.dm b/code/modules/modular_computers/file_system/programs/budgetordering.dm index 145bae84cde..b8c13ce615a 100644 --- a/code/modules/modular_computers/file_system/programs/budgetordering.dm +++ b/code/modules/modular_computers/file_system/programs/budgetordering.dm @@ -22,12 +22,12 @@ homing beacons, unstable eigenstates, or machinery housing any form of artificial intelligence." ///If you're being raided by pirates, what do you tell the crew? var/blockade_warning = "Bluespace instability detected. Shuttle movement impossible." - ///The name of the shuttle template being used as the cargo shuttle. 'supply' is default and contains critical code. Don't change this unless you know what you're doing. - var/cargo_shuttle = "supply" + ///The name of the shuttle template being used as the cargo shuttle. 'cargo' is default and contains critical code. Don't change this unless you know what you're doing. + var/cargo_shuttle = "cargo" ///The docking port called when returning to the station. - var/docking_home = "supply_home" + var/docking_home = "cargo_home" ///The docking port called when leaving the station. - var/docking_away = "supply_away" + var/docking_away = "cargo_away" ///If this console can loan the cargo shuttle. Set to false to disable. var/stationcargo = TRUE ///The account this console processes and displays. Independent from the account the shuttle processes. diff --git a/code/modules/shuttle/arrivals.dm b/code/modules/shuttle/arrivals.dm index b2a0e3302db..02498f51a82 100644 --- a/code/modules/shuttle/arrivals.dm +++ b/code/modules/shuttle/arrivals.dm @@ -1,6 +1,6 @@ /obj/docking_port/mobile/arrivals name = "arrivals shuttle" - id = "arrivals" + shuttle_id = "arrival" dwidth = 3 width = 7 @@ -181,7 +181,7 @@ console.say(pickingup ? "Departing immediately for new employee pickup." : "Shuttle departing.") var/obj/docking_port/stationary/target = target_dock if(QDELETED(target)) - target = SSshuttle.getDock("arrivals_stationary") + target = SSshuttle.getDock("arrival_stationary") request(target) //we will intentionally never return SHUTTLE_ALREADY_DOCKED /obj/docking_port/mobile/arrivals/proc/RequireUndocked(mob/user) diff --git a/code/modules/shuttle/assault_pod.dm b/code/modules/shuttle/assault_pod.dm index edf33a4133f..dc2f0a524dc 100644 --- a/code/modules/shuttle/assault_pod.dm +++ b/code/modules/shuttle/assault_pod.dm @@ -1,6 +1,6 @@ /obj/docking_port/mobile/assault_pod name = "assault pod" - id = "steel_rain" + shuttle_id = "steel_rain" dwidth = 3 width = 7 height = 7 @@ -48,7 +48,7 @@ return var/turf/T = pick(turfs) var/obj/docking_port/stationary/landing_zone = new /obj/docking_port/stationary(T) - landing_zone.id = "assault_pod([REF(src)])" + landing_zone.shuttle_id = "assault_pod([REF(src)])" landing_zone.port_destinations = "assault_pod([REF(src)])" landing_zone.name = "Landing Zone" landing_zone.dwidth = dwidth @@ -59,7 +59,7 @@ for(var/obj/machinery/computer/shuttle/S in GLOB.machines) if(S.shuttleId == shuttle_id) - S.possible_destinations = "[landing_zone.id]" + S.possible_destinations = "[landing_zone.shuttle_id]" to_chat(user, span_notice("Landing zone set.")) diff --git a/code/modules/shuttle/battlecruiser_starfury.dm b/code/modules/shuttle/battlecruiser_starfury.dm index 72b837dcb5d..a513f60fbba 100644 --- a/code/modules/shuttle/battlecruiser_starfury.dm +++ b/code/modules/shuttle/battlecruiser_starfury.dm @@ -7,7 +7,7 @@ // Stationary docking ports for the Starfury's strike shuttles. /obj/docking_port/stationary/starfury_corvette name = "SBC Starfury Corvette Bay" - id = "SBC_corvette_bay" + shuttle_id = "SBC_corvette_bay" roundstart_template = /datum/map_template/shuttle/starfury/corvette hidden = TRUE width = 14 @@ -17,7 +17,7 @@ /obj/docking_port/stationary/starfury_fighter name = "SBC Starfury Fighter Bay" - id = "SBC_fighter_bay" + shuttle_id = "SBC_fighter_bay" hidden = TRUE width = 5 height = 7 @@ -26,23 +26,23 @@ /obj/docking_port/stationary/starfury_fighter/fighter_one name = "SBC Starfury Port Fighter Bay" - id = "SBC_fighter1_bay" + shuttle_id = "SBC_fighter1_bay" roundstart_template = /datum/map_template/shuttle/starfury/fighter_one /obj/docking_port/stationary/starfury_fighter/fighter_two name = "SBC Starfury Center Fighter Bay" - id = "SBC_fighter2_bay" + shuttle_id = "SBC_fighter2_bay" roundstart_template = /datum/map_template/shuttle/starfury/fighter_two /obj/docking_port/stationary/starfury_fighter/fighter_three name = "SBC Starfury Starboard Fighter Bay" - id = "SBC_fighter3_bay" + shuttle_id = "SBC_fighter3_bay" roundstart_template = /datum/map_template/shuttle/starfury/fighter_three // Mobile docking ports for the Starfury's strike shuttles. /obj/docking_port/mobile/syndicate_fighter name = "syndicate fighter" - id = "syndicate_fighter" + shuttle_id = "syndicate_fighter" movement_force = list("KNOCKDOWN" = 0, "THROW" = 0) hidden = TRUE dir = NORTH @@ -53,19 +53,19 @@ /obj/docking_port/mobile/syndicate_fighter/fighter_one name = "syndicate fighter one" - id = "SBC_fighter1" + shuttle_id = "SBC_fighter1" /obj/docking_port/mobile/syndicate_fighter/fighter_two name = "syndicate fighter two" - id = "SBC_fighter2" + shuttle_id = "SBC_fighter2" /obj/docking_port/mobile/syndicate_fighter/fighter_three name = "syndicate fighter three" - id = "SBC_fighter3" + shuttle_id = "SBC_fighter3" /obj/docking_port/mobile/syndicate_corvette name = "syndicate corvette" - id = "SBC_corvette" + shuttle_id = "SBC_corvette" movement_force = list("KNOCKDOWN" = 0, "THROW" = 0) hidden = TRUE dir = NORTH diff --git a/code/modules/shuttle/computer.dm b/code/modules/shuttle/computer.dm index cffe675b72a..a47cdc44041 100644 --- a/code/modules/shuttle/computer.dm +++ b/code/modules/shuttle/computer.dm @@ -4,7 +4,7 @@ icon_screen = "shuttle" icon_keyboard = "tech_key" light_color = LIGHT_COLOR_CYAN - req_access = list( ) + req_access = list() /// ID of the attached shuttle var/shuttleId /// Possible destinations of the attached shuttle @@ -22,8 +22,7 @@ /obj/machinery/computer/shuttle/Initialize(mapload) . = ..() - if(!mapload) - connect_to_shuttle(SSshuttle.get_containing_shuttle(src)) + connect_to_shuttle(mapload, SSshuttle.get_containing_shuttle(src)) /obj/machinery/computer/shuttle/ui_interact(mob/user, datum/tgui/ui) . = ..() @@ -65,7 +64,7 @@ if(!M.check_dock(S, silent = TRUE)) continue var/list/location_data = list( - id = S.id, + id = S.shuttle_id, name = S.name ) data["locations"] += list(location_data) @@ -146,11 +145,14 @@ obj_flags |= EMAGGED to_chat(user, span_notice("You fried the consoles ID checking system.")) -/obj/machinery/computer/shuttle/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock) - if(port) - //Remove old custom port id and ";;" - var/find_old = findtextEx(possible_destinations, "[shuttleId]_custom") - if(find_old) - possible_destinations = replacetext(replacetextEx(possible_destinations, "[shuttleId]_custom", ""), ";;", ";") - shuttleId = port.id - possible_destinations += ";[port.id]_custom" +/obj/machinery/computer/shuttle/connect_to_shuttle(mapload, obj/docking_port/mobile/port, obj/docking_port/stationary/dock) + if(!mapload) + return + if(!port) + return + //Remove old custom port id and ";;" + var/find_old = findtextEx(possible_destinations, "[shuttleId]_custom") + if(find_old) + possible_destinations = replacetext(replacetextEx(possible_destinations, "[shuttleId]_custom", ""), ";;", ";") + shuttleId = port.shuttle_id + possible_destinations += ";[port.shuttle_id]_custom" diff --git a/code/modules/shuttle/elevator.dm b/code/modules/shuttle/elevator.dm index de5d88ee17c..73d16d11708 100644 --- a/code/modules/shuttle/elevator.dm +++ b/code/modules/shuttle/elevator.dm @@ -1,6 +1,6 @@ /obj/docking_port/mobile/elevator name = "elevator" - id = "elevator" + shuttle_id = "elevator" dwidth = 3 width = 7 height = 7 diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm index 9449b2efaaf..27997ba7c8e 100644 --- a/code/modules/shuttle/emergency.dm +++ b/code/modules/shuttle/emergency.dm @@ -302,7 +302,7 @@ /obj/docking_port/mobile/emergency name = "emergency shuttle" - id = "emergency" + shuttle_id = "emergency" dwidth = 9 width = 22 @@ -570,17 +570,17 @@ /obj/docking_port/mobile/pod name = "escape pod" - id = "pod" + shuttle_id = "pod" dwidth = 1 width = 3 height = 4 launch_status = UNLAUNCHED /obj/docking_port/mobile/pod/request(obj/docking_port/stationary/S) - var/obj/machinery/computer/shuttle/C = getControlConsole() - if(!istype(C, /obj/machinery/computer/shuttle/pod)) + var/obj/machinery/computer/shuttle/connected_computer = get_control_console() + if(!istype(connected_computer, /obj/machinery/computer/shuttle/pod)) return ..() - if(SSsecurity_level.get_current_level_as_number() >= SEC_LEVEL_RED || (C && (C.obj_flags & EMAGGED))) + if(SSsecurity_level.get_current_level_as_number() >= SEC_LEVEL_RED || (connected_computer && (connected_computer.obj_flags & EMAGGED))) if(launch_status == UNLAUNCHED) launch_status = EARLY_LAUNCHED return ..() @@ -612,10 +612,10 @@ locked = FALSE to_chat(user, span_warning("You fry the pod's alert level checking system.")) -/obj/machinery/computer/shuttle/pod/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock) +/obj/machinery/computer/shuttle/pod/connect_to_shuttle(mapload, obj/docking_port/mobile/port, obj/docking_port/stationary/dock) . = ..() if(port) - possible_destinations += ";[port.id]_lavaland" + possible_destinations += ";[port.shuttle_id]_lavaland" /** * Signal handler for checking if we should lock or unlock escape pods accordingly to a newly set security level @@ -629,11 +629,11 @@ if(obj_flags & EMAGGED) return - locked = new_level < SEC_LEVEL_RED + locked = (new_level < SEC_LEVEL_RED) /obj/docking_port/stationary/random name = "escape pod" - id = "pod" + shuttle_id = "pod" dwidth = 1 width = 3 height = 4 @@ -658,7 +658,7 @@ return // Fallback: couldn't find anything - WARNING("docking port '[id]' could not be randomly placed in [target_area]: of [original_len] turfs, none were suitable") + WARNING("docking port '[shuttle_id]' could not be randomly placed in [target_area]: of [original_len] turfs, none were suitable") return INITIALIZE_HINT_QDEL /obj/docking_port/stationary/random/icemoon @@ -733,7 +733,7 @@ /obj/item/storage/pod/AltClick(mob/user) if(!can_interact(user)) return - ..() + return ..() /obj/item/storage/pod/can_interact(mob/user) if(!..()) @@ -745,7 +745,7 @@ /obj/docking_port/mobile/emergency/backup name = "backup shuttle" - id = "backup" + shuttle_id = "backup" dwidth = 2 width = 8 height = 8 diff --git a/code/modules/shuttle/infiltrator.dm b/code/modules/shuttle/infiltrator.dm index 154a7dd1bc4..f8cf37d80f5 100644 --- a/code/modules/shuttle/infiltrator.dm +++ b/code/modules/shuttle/infiltrator.dm @@ -1,7 +1,7 @@ /// The syndicate infiltrator shuttle port. /obj/docking_port/mobile/infiltrator name = "syndicate infiltrator" - id = "syndicate" + shuttle_id = "syndicate" movement_force = list("KNOCKDOWN" = 0, "THROW" = 0) hidden = TRUE dheight = 1 diff --git a/code/modules/shuttle/navigation_computer.dm b/code/modules/shuttle/navigation_computer.dm index f8248879591..b58e02d4095 100644 --- a/code/modules/shuttle/navigation_computer.dm +++ b/code/modules/shuttle/navigation_computer.dm @@ -36,17 +36,15 @@ set_init_ports() - if(!mapload) - connect_to_shuttle(SSshuttle.get_containing_shuttle(src)) - + if(connect_to_shuttle(mapload, SSshuttle.get_containing_shuttle(src))) for(var/obj/docking_port/stationary/port as anything in SSshuttle.stationary_docking_ports) - if(port.id == shuttleId) - add_jumpable_port(port.id) + if(port.shuttle_id == shuttleId) + add_jumpable_port(port.shuttle_id) for(var/obj/docking_port/stationary/port as anything in SSshuttle.stationary_docking_ports) if(!port) continue - if(jump_to_ports[port.id]) + if(jump_to_ports[port.shuttle_id]) z_lock |= port.z whitelist_turfs = typecacheof(whitelist_turfs) @@ -56,7 +54,7 @@ if(my_port?.get_docked()) my_port.delete_after = TRUE - my_port.id = null + my_port.shuttle_id = null my_port.name = "Old [my_port.name]" my_port = null else @@ -170,7 +168,7 @@ if(my_port?.get_docked()) my_port.unregister() my_port.delete_after = TRUE - my_port.id = null + my_port.shuttle_id = null my_port.name = "Old [my_port.name]" my_port = null @@ -178,7 +176,7 @@ my_port = new() my_port.unregister() my_port.name = shuttlePortName - my_port.id = shuttlePortId + my_port.shuttle_id = shuttlePortId my_port.height = shuttle_port.height my_port.width = shuttle_port.width my_port.dheight = shuttle_port.dheight @@ -296,12 +294,15 @@ current_user.client.images -= remove_images current_user.client.images += add_images -/obj/machinery/computer/camera_advanced/shuttle_docker/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock) +/obj/machinery/computer/camera_advanced/shuttle_docker/connect_to_shuttle(mapload, obj/docking_port/mobile/port, obj/docking_port/stationary/dock) + if(!mapload) + return FALSE if(port) - shuttleId = port.id - shuttlePortId = "[port.id]_custom" + shuttleId = port.shuttle_id + shuttlePortId = "[port.shuttle_id]_custom" if(dock) - add_jumpable_port(dock.id) + add_jumpable_port(dock.shuttle_id) + return TRUE /mob/camera/ai_eye/remote/shuttle_docker visible_icon = FALSE @@ -368,7 +369,7 @@ var/obj/docking_port/stationary/S = V if(console.z_lock.len && !(S.z in console.z_lock)) continue - if(console.jump_to_ports[S.id]) + if(console.jump_to_ports[S.shuttle_id]) L["([L.len])[S.name]"] = S for(var/V in SSshuttle.beacon_list) diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm index de90e97265a..3929b3d125a 100644 --- a/code/modules/shuttle/on_move.dm +++ b/code/modules/shuttle/on_move.dm @@ -375,4 +375,4 @@ All ShuttleMove procs go here return TRUE /obj/docking_port/stationary/public_mining_dock/onShuttleMove(turf/newT, turf/oldT, list/movement_force, move_dir, obj/docking_port/stationary/old_dock, obj/docking_port/mobile/moving_dock) - id = "mining_public" //It will not move with the base, but will become enabled as a docking point. + shuttle_id = "mining_public" //It will not move with the base, but will become enabled as a docking point. diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index 189de9c50b4..38bfff7a742 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -11,15 +11,15 @@ resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF anchored = TRUE + ///Common standard is for this to point -away- from the dockingport door, ie towards the ship + dir = NORTH /// The identifier of the port or ship. /// This will be used in numerous other places like the console, /// stationary ports and whatnot to tell them your ship's mobile /// port can be used in these places, or the docking port is compatible, etc. - var/id + var/shuttle_id /// Possible destinations var/port_destinations - ///Common standard is for this to point -away- from the dockingport door, ie towards the ship - dir = NORTH ///size of covered area, perpendicular to dir. You shouldn't modify this for mobile dockingports, set automatically. var/width = 0 ///size of covered area, parallel to dir. You shouldn't modify this for mobile dockingports, set automatically. @@ -67,7 +67,7 @@ else return QDEL_HINT_LETMELIVE -/obj/docking_port/has_gravity(turf/T) +/obj/docking_port/has_gravity(turf/current_turf) return TRUE /obj/docking_port/take_damage() @@ -75,8 +75,10 @@ /obj/docking_port/singularity_pull() return + /obj/docking_port/singularity_act() - return 0 + return FALSE + /obj/docking_port/shuttleRotate() return //we don't rotate with shuttles via this code. @@ -107,8 +109,8 @@ _x + (-dwidth*cos) - (-dheight*sin), _y + (-dwidth*sin) + (-dheight*cos), _x + (-dwidth+width-1)*cos - (-dheight+height-1)*sin, - _y + (-dwidth+width-1)*sin + (-dheight+height-1)*cos - ) + _y + (-dwidth+width-1)*sin + (-dheight+height-1)*cos, + ) ///returns turfs within our projected rectangle in no particular order /obj/docking_port/proc/return_turfs() @@ -171,7 +173,7 @@ /obj/docking_port/proc/getDockedId() var/obj/docking_port/P = get_docked() if(P) - return P.id + return P.shuttle_id // Say that A in the absolute (rectangular) bounds of this shuttle or no. /obj/docking_port/proc/is_in_shuttle_bounds(atom/A) @@ -199,26 +201,26 @@ /obj/docking_port/stationary/register(replace = FALSE) . = ..() - if(!id) - id = "dock" + if(!shuttle_id) + shuttle_id = "dock" else - port_destinations = id + port_destinations = shuttle_id if(!name) name = "dock" - var/counter = SSshuttle.assoc_stationary[id] + var/counter = SSshuttle.assoc_stationary[shuttle_id] if(!replace || !counter) if(counter) counter++ - SSshuttle.assoc_stationary[id] = counter - id = "[id]_[counter]" + SSshuttle.assoc_stationary[shuttle_id] = counter + shuttle_id = "[shuttle_id]_[counter]" name = "[name] [counter]" else - SSshuttle.assoc_stationary[id] = 1 + SSshuttle.assoc_stationary[shuttle_id] = 1 if(!port_destinations) - port_destinations = id + port_destinations = shuttle_id SSshuttle.stationary_docking_ports += src @@ -244,7 +246,7 @@ /obj/docking_port/stationary/Destroy(force) if(force) unregister() - . = ..() + return ..() /obj/docking_port/stationary/Moved(atom/old_loc, movement_dir, forced, list/old_locs, momentum_change = TRUE) . = ..() @@ -304,20 +306,29 @@ /obj/docking_port/stationary/picked/Initialize(mapload) . = ..() if(!LAZYLEN(shuttlekeys)) - WARNING("Random docking port [id] loaded with no shuttle keys") + WARNING("Random docking port [shuttle_id] loaded with no shuttle keys") return var/selectedid = pick(shuttlekeys) roundstart_template = SSmapping.shuttle_templates[selectedid] /obj/docking_port/stationary/picked/whiteship name = "Deep Space" - id = "whiteship_away" + shuttle_id = "whiteship_away" height = 45 //Width and height need to remain in sync with the size of whiteshipdock.dmm, otherwise we'll get overflow width = 44 dheight = 18 dwidth = 18 dir = 2 - shuttlekeys = list("whiteship_meta", "whiteship_pubby", "whiteship_box", "whiteship_cere", "whiteship_kilo", "whiteship_donut", "whiteship_delta", "whiteship_tram") + shuttlekeys = list( + "whiteship_meta", + "whiteship_pubby", + "whiteship_box", + "whiteship_cere", + "whiteship_kilo", + "whiteship_donut", + "whiteship_delta", + "whiteship_tram", + ) /// Helper proc that tests to ensure all whiteship templates can spawn at their docking port, and logs their sizes /// This should be a unit test, but too much of our other code breaks during shuttle movement, so not yet, not yet. @@ -369,7 +380,10 @@ area_type = SHUTTLE_DEFAULT_SHUTTLE_AREA_TYPE - var/list/shuttle_areas + ///List of all areas our shuttle holds. + var/list/shuttle_areas = list() + ///List of all currently used engines that propels us. + var/list/obj/structure/shuttle/engine/engine_list = list() ///used as a timer (if you want time left to complete move, use timeLeft proc) var/timer @@ -398,36 +412,39 @@ var/launch_status = NOLAUNCH ///Whether or not you want your ship to knock people down, and also whether it will throw them several tiles upon launching. - var/list/movement_force = list("KNOCKDOWN" = 3, "THROW" = 0) + var/list/movement_force = list( + "KNOCKDOWN" = 3, + "THROW" = 0, + ) var/list/ripples = list() var/engine_coeff = 1 var/current_engines = 0 var/initial_engines = 0 - var/list/engine_list = list() + ///if this shuttle can move docking ports other than the one it is docked at var/can_move_docking_ports = FALSE var/list/hidden_turfs = list() /obj/docking_port/mobile/register(replace = FALSE) . = ..() - if(!id) - id = "shuttle" + if(!shuttle_id) + shuttle_id = "shuttle" if(!name) name = "shuttle" - var/counter = SSshuttle.assoc_mobile[id] + var/counter = SSshuttle.assoc_mobile[shuttle_id] if(!replace || !counter) if(counter) counter++ - SSshuttle.assoc_mobile[id] = counter - id = "[id]_[counter]" + SSshuttle.assoc_mobile[shuttle_id] = counter + shuttle_id = "[shuttle_id]_[counter]" name = "[name] [counter]" //Re link machinery to new shuttle id linkup() else - SSshuttle.assoc_mobile[id] = 1 + SSshuttle.assoc_mobile[shuttle_id] = 1 SSshuttle.mobile_docking_ports += src @@ -436,31 +453,29 @@ SSshuttle.mobile_docking_ports -= src /obj/docking_port/mobile/Destroy(force) - if(force) - unregister() - destination = null - previous = null - QDEL_NULL(assigned_transit) //don't need it where we're goin'! - shuttle_areas = null - remove_ripples() - . = ..() + unregister() + destination = null + previous = null + QDEL_NULL(assigned_transit) //don't need it where we're goin'! + shuttle_areas = null + remove_ripples() + return ..() /obj/docking_port/mobile/Initialize(mapload) . = ..() - if(!id) - id = "shuttle" + if(!shuttle_id) + shuttle_id = "shuttle" if(!name) name = "shuttle" var/counter = 1 - var/tmp_id = id + var/tmp_id = shuttle_id var/tmp_name = name - while(Check_id(id)) + while(Check_id(shuttle_id)) counter++ - id = "[tmp_id]_[counter]" + shuttle_id = "[tmp_id]_[counter]" name = "[tmp_name] [counter]" - shuttle_areas = list() var/list/all_turfs = return_ordered_turfs(x, y, z, dir) for(var/i in 1 to all_turfs.len) var/turf/curT = all_turfs[i] @@ -468,22 +483,16 @@ if(istype(cur_area, area_type)) shuttle_areas[cur_area] = TRUE - initial_engines = count_engines() - current_engines = initial_engines - #ifdef DOCKING_PORT_HIGHLIGHT highlight("#0f0") #endif -// Called after the shuttle is loaded from template +// Called after the shuttle is loaded from template, so we make sure they know it's from mapload. /obj/docking_port/mobile/proc/linkup(obj/docking_port/stationary/dock) - for(var/place in shuttle_areas) - var/area/area = place - area.connect_to_shuttle(src, dock) - for(var/each in place) - var/atom/atom = each - atom.connect_to_shuttle(src, dock) - + for(var/area/place as anything in shuttle_areas) + place.connect_to_shuttle(TRUE, src, dock) + for(var/atom/individual_atoms in place) + individual_atoms.connect_to_shuttle(TRUE, src, dock) //this is a hook for custom behaviour. Maybe at some point we could add checks to see if engines are intact /obj/docking_port/mobile/proc/canMove() @@ -522,14 +531,13 @@ return SHUTTLE_CAN_DOCK -/obj/docking_port/mobile/proc/check_dock(obj/docking_port/stationary/S, silent=FALSE) +/obj/docking_port/mobile/proc/check_dock(obj/docking_port/stationary/S, silent = FALSE) var/status = canDock(S) if(status == SHUTTLE_CAN_DOCK) return TRUE else if(status != SHUTTLE_ALREADY_DOCKED && !silent) // SHUTTLE_ALREADY_DOCKED is no cause for error - var/msg = "Shuttle [src] cannot dock at [S], error: [status]" - message_admins(msg) + message_admins("Shuttle [src] cannot dock at [S], error: [status]") // We're already docked there, don't need to do anything. // Triggering shuttle movement code in place is weird return FALSE @@ -588,14 +596,14 @@ var/obj/docking_port/stationary/S1 = assigned_transit if(S1) if(initiate_docking(S1) != DOCKING_SUCCESS) - WARNING("shuttle \"[id]\" could not enter transit space. Docked at [S0 ? S0.id : "null"]. Transit dock [S1 ? S1.id : "null"].") + WARNING("shuttle \"[shuttle_id]\" could not enter transit space. Docked at [S0 ? S0.shuttle_id : "null"]. Transit dock [S1 ? S1.shuttle_id : "null"].") else if(S0) if(S0.delete_after) qdel(S0, TRUE) else previous = S0 else - WARNING("shuttle \"[id]\" could not enter transit space. S0=[S0 ? S0.id : "null"] S1=[S1 ? S1.id : "null"]") + WARNING("shuttle \"[shuttle_id]\" could not enter transit space. S0=[S0 ? S0.shuttle_id : "null"] S1=[S1 ? S1.shuttle_id : "null"]") /obj/docking_port/mobile/proc/jumpToNullSpace() @@ -635,16 +643,15 @@ /obj/docking_port/mobile/proc/intoTheSunset() // Loop over mobs - for(var/t in return_turfs()) - var/turf/T = t - for(var/mob/living/M in T.get_all_contents()) + for(var/turf/turfs as anything in return_turfs()) + for(var/mob/living/sunset_mobs in turfs.get_all_contents()) // If they have a mind and they're not in the brig, they escaped - if(M.mind && !istype(t, /turf/open/floor/mineral/plastitanium/red/brig)) - M.mind.force_escaped = TRUE + if(sunset_mobs.mind && !istype(turfs, /turf/open/floor/mineral/plastitanium/red/brig)) + sunset_mobs.mind.force_escaped = TRUE // Ghostize them and put them in nullspace stasis (for stat & possession checks) - M.notransform = TRUE - M.ghostize(FALSE) - M.moveToNullspace() + sunset_mobs.notransform = TRUE + sunset_mobs.ghostize(FALSE) + sunset_mobs.moveToNullspace() // Now that mobs are stowed, delete the shuttle jumpToNullSpace() @@ -846,18 +853,13 @@ /obj/docking_port/mobile/proc/get_status_text_tgui() var/obj/docking_port/stationary/dockedAt = get_docked() var/docked_at = dockedAt?.name || "Unknown" - if(istype(dockedAt, /obj/docking_port/stationary/transit)) - if(timeLeft() > 1 HOURS) - return "Hyperspace" - else - var/obj/docking_port/stationary/dst - if(mode == SHUTTLE_RECALL) - dst = previous - else - dst = destination - return "In transit to [dst?.name || "unknown location"]" - else + if(!istype(dockedAt, /obj/docking_port/stationary/transit)) return docked_at + if(timeLeft() > 1 HOURS) + return "Hyperspace" + else + var/obj/docking_port/stationary/dst = (mode == SHUTTLE_RECALL) ? previous : destination + return "In transit to [dst?.name || "unknown location"]" /obj/docking_port/mobile/proc/getStatusText() var/obj/docking_port/stationary/dockedAt = get_docked() @@ -887,22 +889,22 @@ else dst = destination if(dst) - . = "(transit to) [dst.name || dst.id]" + . = "(transit to) [dst.name || dst.shuttle_id]" else . = "(transit to) nowhere" else if(dockedAt) - . = dockedAt.name || dockedAt.id + . = dockedAt.name || dockedAt.shuttle_id else . = "unknown" // attempts to locate /obj/machinery/computer/shuttle with matching ID inside the shuttle -/obj/docking_port/mobile/proc/getControlConsole() - for(var/place in shuttle_areas) - var/area/shuttle/shuttle_area = place - for(var/obj/machinery/computer/shuttle/S in shuttle_area) - if(S.shuttleId == id) - return S +/obj/docking_port/mobile/proc/get_control_console() + for(var/area/shuttle/shuttle_area as anything in shuttle_areas) + for(var/obj/machinery/computer/shuttle/shuttle_computers as anything in shuttle_area) + if(shuttle_computers.shuttleId != shuttle_id) + continue + return shuttle_computers return null /obj/docking_port/mobile/proc/hyperspace_sound(phase, list/areas) @@ -922,66 +924,51 @@ var/range = (engine_coeff * max(width, height)) var/long_range = range * 2.5 var/atom/distant_source - var/list/engines = list() - for(var/datum/weakref/engine in engine_list) - var/obj/structure/shuttle/engine/real_engine = engine.resolve() - if(!real_engine) - engine_list -= engine - continue - engines += real_engine - if(engines.len > 0) - distant_source = engines[1] + if(engine_list.len) + distant_source = engine_list[1] else - for(var/A in areas) - distant_source = locate(/obj/machinery/door) in A + for(var/our_area in areas) + distant_source = locate(/obj/machinery/door) in our_area if(distant_source) break - if(distant_source) - for(var/mob/M in SSmobs.clients_by_zlevel[z]) - var/dist_far = get_dist(M, distant_source) - if(dist_far <= long_range && dist_far > range) - M.playsound_local(distant_source, "sound/runtime/hyperspace/[selected_sound]_distance.ogg", 100) - else if(dist_far <= range) - var/source - if(engines.len == 0) - source = distant_source - else - var/closest_dist = 10000 - for(var/obj/O in engines) - var/dist_near = get_dist(M, O) - if(dist_near < closest_dist) - source = O - closest_dist = dist_near - M.playsound_local(source, "sound/runtime/hyperspace/[selected_sound].ogg", 100) + if(!distant_source) + return + for(var/mob/zlevel_mobs as anything in SSmobs.clients_by_zlevel[z]) + var/dist_far = get_dist(zlevel_mobs, distant_source) + if(dist_far <= long_range && dist_far > range) + zlevel_mobs.playsound_local(distant_source, "sound/runtime/hyperspace/[selected_sound]_distance.ogg", 100) + else if(dist_far <= range) + var/source + if(!engine_list.len) + source = distant_source + else + var/closest_dist = 10000 + for(var/obj/structure/shuttle/engine/engines as anything in engine_list) + var/dist_near = get_dist(zlevel_mobs, engines) + if(dist_near < closest_dist) + source = engines + closest_dist = dist_near + zlevel_mobs.playsound_local(source, "sound/runtime/hyperspace/[selected_sound].ogg", 100) // Losing all initial engines should get you 2 // Adding another set of engines at 0.5 time /obj/docking_port/mobile/proc/alter_engines(mod) - if(mod == 0) + if(!mod) return var/old_coeff = engine_coeff engine_coeff = get_engine_coeff(current_engines,mod) - current_engines = max(0,current_engines + mod) + current_engines = max(0, current_engines + mod) if(in_flight()) var/delta_coeff = engine_coeff / old_coeff modTimer(delta_coeff) -/obj/docking_port/mobile/proc/count_engines() - . = 0 - for(var/thing in shuttle_areas) - var/area/shuttle/areaInstance = thing - for(var/obj/structure/shuttle/engine/E in areaInstance.contents) - if(!QDELETED(E)) - engine_list += WEAKREF(E) - . += E.engine_power - // Double initial engines to get to 0.5 minimum // Lose all initial engines to get to 2 //For 0 engine shuttles like BYOS 5 engines to get to doublespeed /obj/docking_port/mobile/proc/get_engine_coeff(current,engine_mod) - var/new_value = max(0,current + engine_mod) + var/new_value = max(0, current + engine_mod) if(new_value == initial_engines) return 1 if(new_value > initial_engines) @@ -1004,8 +991,7 @@ return TRUE if(SHUTTLE_IDLE,SHUTTLE_IGNITING) return FALSE - else - return FALSE // hmm + return FALSE // hmm /obj/docking_port/mobile/emergency/in_flight() switch(mode) @@ -1013,8 +999,7 @@ return TRUE if(SHUTTLE_STRANDED,SHUTTLE_ENDGAME) return FALSE - else - return ..() + return ..() //Called when emergency shuttle leaves the station @@ -1034,7 +1019,7 @@ /obj/docking_port/mobile/pod/on_emergency_dock() if(launch_status == ENDGAME_LAUNCHED) - initiate_docking(SSshuttle.getDock("[id]_away")) //Escape pods dock at centcom + initiate_docking(SSshuttle.getDock("[shuttle_id]_away")) //Escape pods dock at centcom mode = SHUTTLE_ENDGAME /obj/docking_port/mobile/emergency/on_emergency_dock() diff --git a/code/modules/shuttle/supply.dm b/code/modules/shuttle/supply.dm index 926cf0798c3..d38b9f2ce81 100644 --- a/code/modules/shuttle/supply.dm +++ b/code/modules/shuttle/supply.dm @@ -41,7 +41,7 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list( /obj/docking_port/mobile/supply name = "supply shuttle" - id = "supply" + shuttle_id = "cargo" callTime = 600 dir = WEST @@ -79,13 +79,13 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list( return ..() /obj/docking_port/mobile/supply/initiate_docking() - if(getDockedId() == "supply_away") // Buy when we leave home. + if(getDockedId() == "cargo_away") // Buy when we leave home. buy() create_mail() . = ..() // Fly/enter transit. if(. != DOCKING_SUCCESS) return - if(getDockedId() == "supply_away") // Sell when we get home + if(getDockedId() == "cargo_away") // Sell when we get home sell() /obj/docking_port/mobile/supply/proc/buy()