From 355319485f6920d77e7faed7c87ca62b70d23cb2 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Mon, 9 Jan 2023 07:57:06 +0100 Subject: [PATCH] [MIRROR] Fixes layering between tram bridge, pipes, and cables [MDB IGNORE] (#18590) * Fixes layering between tram bridge, pipes, and cables (#72389) ## About The Pull Request Fixes the cover up job of https://github.com/tgstation/tgstation/pull/71858 throwing iron tiles instead of the tram bridge to get ambient occlusion working. Puts the pipes and wires on an appropriate plane and layer so they can co-exist with the tram bridge without screwing with the tram's shading. ![tramlayers1](https://user-images.githubusercontent.com/83487515/210128789-4d57493e-5bd9-444d-bc2e-3b9c2209b47a.png) ![tramlayers2](https://user-images.githubusercontent.com/83487515/210128798-4e283498-a831-431a-b039-e1cdc751d909.png) ## Why It's Good For The Game #71858 was a temporary fix for the bridge until a permanent solution was found. ## Changelog :cl: LT3 fix: Disposal pipes and cable wires now co-exist with the tram bridge /:cl: * Fixes layering between tram bridge, pipes, and cables Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com> --- _maps/map_files/tramstation/tramstation.dmm | 2006 ++++++++++--------- code/__DEFINES/layers.dm | 6 +- code/modules/power/cable.dm | 1 + code/modules/recycling/disposal/pipe.dm | 1 + 4 files changed, 1010 insertions(+), 1004 deletions(-) diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index a1d401ec808..0104864c6b2 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -46,21 +46,6 @@ "abE" = ( /turf/closed/wall/r_wall, /area/station/hallway/primary/tram/center) -"abT" = ( -/obj/machinery/door/airlock/command{ - name = "Research Director's Office" - }, -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/science/rd, -/turf/open/floor/iron/cafeteria, -/area/station/command/heads_quarters/rd) "acd" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 4 @@ -325,6 +310,11 @@ }, /turf/open/floor/iron, /area/station/security/execution/transfer) +"agT" = ( +/obj/structure/window/reinforced/tinted/fulltile, +/obj/structure/grille, +/turf/open/floor/plating, +/area/station/science/breakroom) "agX" = ( /obj/effect/turf_decal/trimline/white/tram, /obj/structure/railing, @@ -941,11 +931,6 @@ /obj/item/seeds/tower, /turf/open/floor/iron/dark, /area/station/security/prison/garden) -"asv" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron, -/area/station/hallway/primary/tram/left) "asw" = ( /obj/machinery/computer/monitor{ dir = 8 @@ -1225,6 +1210,12 @@ /obj/machinery/firealarm/directional/east, /turf/open/floor/iron, /area/station/hallway/primary/tram/right) +"azO" = ( +/obj/structure/fluff/tram_rail, +/obj/structure/industrial_lift/tram, +/obj/structure/chair/sofa/bench/tram/left, +/turf/open/openspace, +/area/station/hallway/primary/tram/center) "azX" = ( /obj/item/radio/intercom/directional/east, /turf/open/floor/iron/dark, @@ -2350,6 +2341,19 @@ "bbj" = ( /turf/closed/wall, /area/station/engineering/break_room) +"bbG" = ( +/obj/effect/turf_decal/delivery/white, +/obj/structure/holosign/barrier/atmos/tram, +/obj/machinery/camera/directional/south{ + c_tag = "Hallway - Eastern Tram Bridge 2" + }, +/turf/open/floor/vault{ + base_icon_state = "tram2"; + icon_state = "tram2"; + desc = "A sturdy looking tram platform."; + name = "tram platform" + }, +/area/station/hallway/primary/tram/right) "bcq" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 8 @@ -2590,6 +2594,13 @@ /obj/effect/turf_decal/trimline/purple/filled/line, /turf/open/floor/iron/white, /area/station/science/research) +"bga" = ( +/obj/structure/industrial_lift/tram/white, +/obj/machinery/door/window/tram/left{ + dir = 1 + }, +/turf/open/openspace, +/area/station/hallway/primary/tram/center) "bgg" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/cable, @@ -2788,13 +2799,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/carpet, /area/station/service/chapel) -"biX" = ( -/obj/structure/industrial_lift/tram, -/obj/structure/fluff/tram_rail{ - dir = 1 - }, -/turf/open/openspace, -/area/station/hallway/primary/tram/center) "bja" = ( /obj/structure/table, /obj/item/radio/intercom/directional/east{ @@ -3033,10 +3037,6 @@ }, /turf/open/floor/iron, /area/station/maintenance/tram/right) -"bmI" = ( -/obj/structure/cable, -/turf/open/floor/iron/cafeteria, -/area/station/command/heads_quarters/rd) "bmU" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ dir = 8 @@ -3216,6 +3216,13 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/security/lockers) +"bpr" = ( +/obj/structure/table/wood, +/obj/item/candle, +/turf/open/floor/iron/chapel{ + dir = 4 + }, +/area/station/service/chapel) "bpv" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 8 @@ -3386,12 +3393,6 @@ /obj/machinery/rnd/server, /turf/open/floor/circuit/telecomms/server, /area/station/science/server) -"btS" = ( -/obj/structure/industrial_lift/tram/white, -/obj/structure/fluff/tram_rail, -/obj/structure/window/reinforced/shuttle/tram, -/turf/open/openspace, -/area/station/hallway/primary/tram/center) "bug" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 5 @@ -4576,6 +4577,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/service/chapel/monastery) +"bMP" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/item/kirbyplants/random, +/obj/structure/extinguisher_cabinet/directional/north, +/turf/open/floor/iron/cafeteria, +/area/station/science/breakroom) "bMX" = ( /obj/effect/turf_decal/trimline/brown/filled/corner{ dir = 1 @@ -4697,6 +4704,13 @@ dir = 4 }, /area/station/service/theater) +"bOO" = ( +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/reagent_dispensers/water_cooler, +/obj/machinery/firealarm/directional/south, +/obj/structure/cable, +/turf/open/floor/iron/cafeteria, +/area/station/science/breakroom) "bOR" = ( /obj/effect/turf_decal/trimline/yellow/warning, /obj/effect/decal/cleanable/dirt, @@ -4764,6 +4778,17 @@ /obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/iron, /area/station/cargo/miningdock/cafeteria) +"bPP" = ( +/obj/docking_port/stationary/escape_pod{ + dir = 8 + }, +/turf/open/space/openspace, +/area/space) +"bPX" = ( +/obj/structure/industrial_lift/tram, +/obj/effect/landmark/start/hangover, +/turf/open/floor/noslip/tram_plate, +/area/station/hallway/primary/tram/center) "bPZ" = ( /obj/machinery/camera/motion{ c_tag = "Secure - AI Upper External South"; @@ -4972,6 +4997,19 @@ }, /turf/open/floor/iron/freezer, /area/station/science/lower) +"bTr" = ( +/obj/effect/turf_decal/delivery/white, +/obj/structure/holosign/barrier/atmos/tram, +/obj/structure/fluff/tram_rail/floor{ + dir = 1 + }, +/turf/open/floor/vault{ + base_icon_state = "tram2"; + icon_state = "tram2"; + desc = "A sturdy looking tram platform."; + name = "tram platform" + }, +/area/station/hallway/primary/tram/center) "bTx" = ( /obj/effect/turf_decal/siding/thinplating, /turf/open/floor/iron, @@ -5233,6 +5271,11 @@ /obj/effect/mapping_helpers/airlock/locked, /turf/open/floor/plating, /area/station/hallway/primary/tram/right) +"bXU" = ( +/obj/structure/industrial_lift/tram/white, +/obj/machinery/door/window/tram/right, +/turf/open/openspace, +/area/station/hallway/primary/tram/center) "bYa" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -5411,6 +5454,14 @@ }, /turf/open/floor/iron, /area/station/maintenance/tram/left) +"caQ" = ( +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/structure/chair/sofa/right, +/turf/open/floor/iron, +/area/station/cargo/miningdock/cafeteria) "caR" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 @@ -5472,17 +5523,6 @@ }, /turf/open/floor/iron, /area/station/security/office) -"cbP" = ( -/obj/effect/turf_decal/delivery/white, -/obj/structure/holosign/barrier/atmos/tram, -/obj/structure/fluff/tram_rail/floor, -/turf/open/floor/vault{ - base_icon_state = "tram2"; - icon_state = "tram2"; - desc = "A sturdy looking tram platform."; - name = "tram platform" - }, -/area/station/hallway/primary/tram/right) "cbV" = ( /obj/effect/spawner/random/trash/soap{ spawn_scatter_radius = 1 @@ -5982,6 +6022,12 @@ "cjy" = ( /turf/closed/wall/r_wall, /area/station/engineering/main) +"cjE" = ( +/obj/machinery/computer/robotics, +/obj/structure/sign/clock/directional/north, +/obj/structure/window/reinforced/spawner/east, +/turf/open/floor/iron/cafeteria, +/area/station/command/heads_quarters/rd) "cjG" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, /turf/closed/wall/r_wall, @@ -6178,11 +6224,6 @@ "cmr" = ( /turf/open/floor/iron/stairs/medium, /area/station/engineering/transit_tube) -"cmw" = ( -/obj/structure/industrial_lift/tram/white, -/obj/structure/tramwall/titanium, -/turf/open/openspace, -/area/station/hallway/primary/tram/center) "cnv" = ( /obj/effect/turf_decal/trimline/purple/filled/corner{ dir = 4 @@ -6404,12 +6445,6 @@ }, /turf/open/floor/carpet, /area/station/commons/vacant_room/office) -"cra" = ( -/obj/structure/chair/sofa/corner{ - dir = 8 - }, -/turf/open/floor/iron/cafeteria, -/area/station/science/breakroom) "crb" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/yellow/filled/corner{ @@ -6597,11 +6632,6 @@ }, /turf/open/floor/iron, /area/station/commons/dorms) -"ctx" = ( -/obj/structure/chair/stool/directional/west, -/obj/effect/landmark/start/scientist, -/turf/open/floor/iron/cafeteria, -/area/station/science/breakroom) "ctA" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -7333,11 +7363,31 @@ /obj/effect/landmark/start/hangover/closet, /turf/open/floor/iron/smooth, /area/station/maintenance/tram/mid) +"cEB" = ( +/obj/machinery/modular_computer/console/preset/id{ + dir = 1 + }, +/obj/structure/window/reinforced/spawner, +/turf/open/floor/iron/cafeteria, +/area/station/command/heads_quarters/rd) "cEC" = ( /obj/structure/ladder, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/smooth, /area/station/hallway/primary/tram/right) +"cEH" = ( +/obj/item/kirbyplants/dead, +/obj/machinery/requests_console/directional/north{ + announcementConsole = 1; + department = "Research Director's Desk"; + departmentType = 5; + name = "Research Director's Requests Console"; + pixel_x = 30; + receive_ore_updates = 1 + }, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/iron/cafeteria, +/area/station/command/heads_quarters/rd) "cEN" = ( /obj/effect/turf_decal/trimline/yellow/warning{ dir = 1 @@ -7394,14 +7444,6 @@ "cFs" = ( /turf/open/openspace, /area/station/hallway/primary/tram/left) -"cFE" = ( -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/obj/structure/chair/sofa/right, -/turf/open/floor/iron, -/area/station/cargo/miningdock/cafeteria) "cGm" = ( /obj/effect/turf_decal/bot, /obj/structure/reagent_dispensers/watertank, @@ -7903,13 +7945,6 @@ }, /turf/open/floor/iron, /area/station/security/checkpoint/arrivals) -"cQq" = ( -/obj/structure/industrial_lift/tram/white, -/obj/machinery/door/window/tram/right{ - dir = 1 - }, -/turf/open/openspace, -/area/station/hallway/primary/tram/center) "cQr" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -8322,10 +8357,25 @@ "cXL" = ( /turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) +"cXU" = ( +/obj/structure/fluff/tram_rail/floor{ + dir = 1 + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/turf/open/floor/glass/reinforced/tram, +/area/station/hallway/primary/tram/left) "cXV" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /turf/open/floor/circuit/telecomms, /area/station/science/xenobiology) +"cXW" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/open/floor/iron/cafeteria, +/area/station/science/breakroom) "cYh" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/effect/turf_decal/stripes/line{ @@ -8422,13 +8472,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/cargo/storage) -"cZX" = ( -/obj/structure/fluff/tram_rail, -/obj/effect/landmark/start/hangover, -/obj/structure/industrial_lift/tram, -/obj/structure/chair/sofa/bench/tram/right, -/turf/open/openspace, -/area/station/hallway/primary/tram/center) "dac" = ( /obj/machinery/light/directional/south, /obj/effect/turf_decal/trimline/purple/filled/line, @@ -8710,6 +8753,11 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/eva) +"dgc" = ( +/obj/structure/industrial_lift/tram/white, +/obj/structure/window/reinforced/shuttle/tram, +/turf/open/floor/noslip/tram_plate, +/area/station/hallway/primary/tram/center) "dgw" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, @@ -9584,6 +9632,10 @@ "duU" = ( /turf/closed/wall/r_wall, /area/lavaland/surface) +"duZ" = ( +/obj/structure/industrial_lift/tram, +/turf/open/floor/noslip/tram_plate, +/area/station/hallway/primary/tram/center) "dvn" = ( /obj/structure/easel, /obj/item/canvas/twentythree_twentythree, @@ -10437,6 +10489,11 @@ /obj/structure/window/reinforced/spawner/east, /turf/open/floor/iron/dark, /area/station/science/xenobiology) +"dJx" = ( +/obj/structure/industrial_lift/tram/white, +/obj/structure/window/reinforced/shuttle/tram, +/turf/open/openspace, +/area/station/hallway/primary/tram/center) "dJF" = ( /obj/effect/turf_decal/trimline/purple/filled/corner{ dir = 8 @@ -11793,6 +11850,12 @@ /obj/structure/cable, /turf/open/floor/wood, /area/station/service/theater) +"ejB" = ( +/obj/structure/chair/sofa/right{ + dir = 8 + }, +/turf/open/floor/iron/cafeteria, +/area/station/science/breakroom) "ejL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -11963,17 +12026,6 @@ }, /turf/open/floor/carpet, /area/station/command/heads_quarters/qm) -"elT" = ( -/obj/structure/table/glass, -/obj/machinery/microwave, -/obj/machinery/camera{ - c_tag = "Science - Break Room"; - dir = 9; - network = list("ss13","rd") - }, -/obj/item/radio/intercom/directional/north, -/turf/open/floor/iron/cafeteria, -/area/station/science/breakroom) "elW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -11996,13 +12048,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /turf/open/floor/iron/dark, /area/station/science/xenobiology) -"emx" = ( -/obj/structure/chair/office{ - dir = 1 - }, -/obj/effect/landmark/start/research_director, -/turf/open/floor/iron/cafeteria, -/area/station/command/heads_quarters/rd) "emP" = ( /obj/structure/railing/corner{ dir = 4 @@ -12343,10 +12388,6 @@ }, /turf/open/floor/glass/reinforced, /area/station/security/warden) -"etL" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/cafeteria, -/area/station/command/heads_quarters/rd) "etO" = ( /obj/machinery/duct, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -12538,6 +12579,16 @@ }, /turf/open/floor/iron, /area/station/maintenance/tram/mid) +"exO" = ( +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/structure/chair/sofa/corner{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/cargo/miningdock/cafeteria) "eyc" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -12616,13 +12667,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/commons/fitness/recreation) -"ezQ" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/fluff/tram_rail/floor{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/tram/right) "ezX" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -12925,6 +12969,13 @@ /obj/structure/cable, /turf/open/floor/iron/checker, /area/station/commons/lounge) +"eED" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/cafeteria, +/area/station/command/heads_quarters/rd) "eEK" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/air_input{ dir = 1 @@ -13250,10 +13301,6 @@ /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron/grimy, /area/station/service/library/lounge) -"eLS" = ( -/obj/structure/cable, -/turf/open/floor/iron/cafeteria, -/area/station/science/breakroom) "eLY" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -13439,11 +13486,6 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/engine/o2, /area/station/engineering/atmos) -"ePa" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/landmark/blobstart, -/turf/open/floor/iron/cafeteria, -/area/station/science/breakroom) "ePi" = ( /obj/machinery/vending/dinnerware, /obj/effect/turf_decal/bot_white, @@ -13461,6 +13503,13 @@ }, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) +"ePl" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron/cafeteria, +/area/station/science/breakroom) "ePw" = ( /obj/structure/filingcabinet, /obj/effect/turf_decal/trimline/brown/filled/line{ @@ -13470,12 +13519,6 @@ /obj/structure/sign/clock/directional/west, /turf/open/floor/iron, /area/station/command/heads_quarters/qm) -"ePF" = ( -/obj/structure/industrial_lift/tram, -/obj/structure/fluff/tram_rail, -/obj/structure/chair/sofa/bench/tram/right, -/turf/open/openspace, -/area/station/hallway/primary/tram/center) "ePZ" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 4 @@ -13939,17 +13982,6 @@ /obj/effect/turf_decal/trimline/red/corner, /turf/open/floor/iron, /area/station/security/checkpoint/supply) -"eXZ" = ( -/obj/machinery/door/airlock/command{ - name = "Research Director's Office" - }, -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/obj/effect/mapping_helpers/airlock/access/all/science/rd, -/turf/open/floor/iron/cafeteria, -/area/station/command/heads_quarters/rd) "eYa" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, /obj/machinery/door/poddoor/preopen{ @@ -13959,6 +13991,10 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/station/engineering/atmos) +"eYe" = ( +/obj/machinery/suit_storage_unit/rd, +/turf/open/floor/iron/cafeteria, +/area/station/command/heads_quarters/rd) "eYn" = ( /obj/docking_port/stationary{ dir = 8; @@ -14624,6 +14660,12 @@ /obj/effect/landmark/navigate_destination/hydro, /turf/open/floor/iron/dark, /area/station/service/hydroponics) +"fma" = ( +/obj/structure/chair/sofa/corner{ + dir = 8 + }, +/turf/open/floor/iron/cafeteria, +/area/station/science/breakroom) "fmf" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 4 @@ -14824,15 +14866,6 @@ }, /turf/open/floor/plating, /area/station/cargo/sorting) -"fpW" = ( -/obj/structure/table/reinforced, -/obj/item/computer_disk/ordnance, -/obj/item/computer_disk/ordnance, -/obj/item/computer_disk/ordnance, -/obj/effect/landmark/event_spawn, -/obj/structure/window/reinforced/spawner, -/turf/open/floor/iron/cafeteria, -/area/station/command/heads_quarters/rd) "fql" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/red/filled/corner{ @@ -15216,13 +15249,6 @@ /obj/item/stack/ore/glass, /turf/open/misc/asteroid, /area/station/security/prison/workout) -"fxk" = ( -/obj/structure/chair/sofa/left{ - dir = 8 - }, -/obj/structure/sign/clock/directional/east, -/turf/open/floor/carpet, -/area/station/medical/psychology) "fxq" = ( /obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/visible{ dir = 4 @@ -16198,19 +16224,6 @@ /obj/structure/stairs/south, /turf/open/floor/iron/stairs/medium, /area/station/science/lower) -"fRp" = ( -/obj/effect/turf_decal/delivery/white, -/obj/structure/holosign/barrier/atmos/tram, -/obj/machinery/camera/directional/south{ - c_tag = "Hallway - Western Tram Bridge 2" - }, -/turf/open/floor/vault{ - base_icon_state = "tram2"; - icon_state = "tram2"; - desc = "A sturdy looking tram platform."; - name = "tram platform" - }, -/area/station/hallway/primary/tram/center) "fRs" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -16367,13 +16380,6 @@ /obj/effect/turf_decal/trimline/neutral/filled/line, /turf/open/floor/iron, /area/station/commons/fitness/recreation) -"fUH" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/turf/open/floor/iron/cafeteria, -/area/station/science/breakroom) "fUQ" = ( /obj/machinery/door/airlock/hatch{ name = "Ladder Access Hatch" @@ -16607,6 +16613,15 @@ /obj/item/storage/bag/tray/cafeteria, /turf/open/floor/iron/cafeteria, /area/station/security/prison/mess) +"fZz" = ( +/obj/structure/table/reinforced, +/obj/item/computer_disk/ordnance, +/obj/item/computer_disk/ordnance, +/obj/item/computer_disk/ordnance, +/obj/effect/landmark/event_spawn, +/obj/structure/window/reinforced/spawner, +/turf/open/floor/iron/cafeteria, +/area/station/command/heads_quarters/rd) "fZI" = ( /obj/machinery/door/airlock/hatch{ name = "MiniSat Recharge Bay" @@ -16917,6 +16932,15 @@ /obj/effect/landmark/xeno_spawn, /turf/open/floor/iron, /area/station/maintenance/port/central) +"ggi" = ( +/obj/structure/table/reinforced, +/obj/item/stamp/rd{ + pixel_x = 3; + pixel_y = -2 + }, +/obj/structure/window/reinforced/spawner, +/turf/open/floor/iron/cafeteria, +/area/station/command/heads_quarters/rd) "ggp" = ( /obj/effect/turf_decal/trimline/brown/filled/corner{ dir = 8 @@ -17034,6 +17058,10 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/iron/smooth, /area/station/service/hydroponics/garden) +"gil" = ( +/obj/structure/closet/secure_closet/research_director, +/turf/open/floor/iron/cafeteria, +/area/station/command/heads_quarters/rd) "gio" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 @@ -17326,6 +17354,13 @@ /obj/structure/destructible/cult/item_dispenser/archives/library, /turf/open/floor/engine/cult, /area/station/service/library) +"gmN" = ( +/obj/machinery/vending/cigarette, +/obj/structure/sign/flag{ + pixel_x = -32 + }, +/turf/open/floor/iron/cafeteria, +/area/station/science/breakroom) "gmP" = ( /obj/structure/rack, /obj/item/storage/box/lights/tubes{ @@ -17516,11 +17551,6 @@ /obj/item/radio/intercom/directional/south, /turf/open/floor/iron/white, /area/station/science/explab) -"gqn" = ( -/obj/structure/industrial_lift/tram, -/obj/structure/tramwall/titanium, -/turf/open/openspace, -/area/station/hallway/primary/tram/center) "gqp" = ( /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) @@ -17871,12 +17901,6 @@ /obj/effect/turf_decal/trimline/neutral/filled/line, /turf/open/floor/iron, /area/station/ai_monitored/command/storage/eva) -"gxM" = ( -/obj/machinery/keycard_auth{ - pixel_y = -24 - }, -/turf/open/floor/iron/cafeteria, -/area/station/command/heads_quarters/rd) "gxN" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -18233,17 +18257,19 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) -"gDR" = ( +"gEn" = ( /obj/effect/turf_decal/delivery/white, /obj/structure/holosign/barrier/atmos/tram, -/obj/structure/fluff/tram_rail/floor, +/obj/structure/fluff/tram_rail/floor{ + dir = 1 + }, /turf/open/floor/vault{ base_icon_state = "tram2"; icon_state = "tram2"; desc = "A sturdy looking tram platform."; name = "tram platform" }, -/area/station/hallway/primary/tram/center) +/area/station/hallway/primary/tram/left) "gEQ" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 4 @@ -18261,6 +18287,11 @@ /obj/structure/chair/stool/directional/north, /turf/open/floor/circuit/green, /area/station/science/robotics/mechbay) +"gFJ" = ( +/obj/effect/spawner/random/vending/colavend, +/obj/machinery/newscaster/directional/west, +/turf/open/floor/iron/cafeteria, +/area/station/science/breakroom) "gFV" = ( /obj/machinery/computer/operating{ dir = 1 @@ -18363,6 +18394,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/prison) +"gGL" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria, +/area/station/command/heads_quarters/rd) "gGU" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/trimline/brown/filled/line{ @@ -19395,6 +19433,16 @@ /obj/structure/cable, /turf/open/floor/catwalk_floor, /area/station/maintenance/solars/port/aft) +"gXS" = ( +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/structure/chair/sofa{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/cargo/miningdock/cafeteria) "gXT" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -19539,6 +19587,12 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation/entertainment) +"hat" = ( +/obj/structure/industrial_lift/tram/white, +/obj/structure/fluff/tram_rail, +/obj/structure/window/reinforced/shuttle/tram, +/turf/open/openspace, +/area/station/hallway/primary/tram/center) "haH" = ( /obj/structure/chair{ dir = 1 @@ -19835,6 +19889,20 @@ }, /turf/open/floor/engine, /area/station/science/explab) +"hgS" = ( +/obj/machinery/computer/rdconsole, +/obj/machinery/computer/security/telescreen/rd{ + pixel_y = 30 + }, +/obj/machinery/camera{ + c_tag = "Science - Research Director's Office"; + dir = 9; + network = list("ss13","rd") + }, +/obj/machinery/light/directional/north, +/obj/item/folder/white, +/turf/open/floor/iron/cafeteria, +/area/station/command/heads_quarters/rd) "hhc" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -19885,6 +19953,12 @@ }, /turf/open/floor/glass/reinforced, /area/station/security/warden) +"hhS" = ( +/obj/structure/industrial_lift/tram, +/obj/structure/fluff/tram_rail, +/obj/structure/chair/sofa/bench/tram/left, +/turf/open/openspace, +/area/station/hallway/primary/tram/center) "hhT" = ( /obj/machinery/vending/wardrobe/gene_wardrobe, /obj/machinery/firealarm/directional/west, @@ -20012,14 +20086,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/tram/center) -"hku" = ( -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/cafeteria, -/area/station/science/breakroom) "hkF" = ( /obj/structure/table, /obj/item/electronics/apc, @@ -20176,12 +20242,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/security/office) -"hpz" = ( -/obj/docking_port/stationary/escape_pod{ - dir = 8 - }, -/turf/open/space/openspace, -/area/space) "hpF" = ( /obj/machinery/light/directional/south, /obj/effect/turf_decal/trimline/purple/filled/line, @@ -20461,13 +20521,6 @@ /obj/effect/decal/cleanable/cobweb, /turf/open/floor/iron, /area/station/maintenance/port/central) -"hvC" = ( -/obj/structure/table/wood, -/obj/item/candle, -/turf/open/floor/iron/chapel{ - dir = 4 - }, -/area/station/service/chapel) "hvH" = ( /obj/effect/turf_decal/tile{ dir = 1 @@ -20519,6 +20572,16 @@ /obj/item/ai_module/supplied/freeform, /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/ai_upload) +"hwL" = ( +/obj/structure/fluff/tram_rail{ + dir = 1 + }, +/obj/structure/industrial_lift/tram, +/obj/structure/chair/sofa/bench/tram/right{ + dir = 1 + }, +/turf/open/openspace, +/area/station/hallway/primary/tram/center) "hwM" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 4 @@ -20532,6 +20595,14 @@ dir = 1 }, /area/station/hallway/secondary/service) +"hya" = ( +/obj/structure/industrial_lift/tram/white, +/obj/structure/window/reinforced/shuttle/tram, +/obj/structure/fluff/tram_rail{ + dir = 1 + }, +/turf/open/openspace, +/area/station/hallway/primary/tram/center) "hyE" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -21065,6 +21136,10 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/commons/fitness) +"hHv" = ( +/obj/structure/cable, +/turf/open/floor/iron/cafeteria, +/area/station/science/breakroom) "hHw" = ( /obj/machinery/door/airlock/security{ name = "Interrogation Monitoring" @@ -21802,6 +21877,11 @@ dir = 9 }, /area/station/service/chapel) +"hWi" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/cafeteria, +/area/station/command/heads_quarters/rd) "hWl" = ( /obj/effect/turf_decal/siding/wood{ dir = 10 @@ -22040,9 +22120,6 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/science/lower) -"iaE" = ( -/turf/open/floor/iron/cafeteria, -/area/station/command/heads_quarters/rd) "iaJ" = ( /obj/machinery/power/smes/engineering, /obj/structure/cable, @@ -22350,6 +22427,17 @@ "igy" = ( /turf/closed/wall, /area/station/engineering/supermatter/room) +"igB" = ( +/obj/structure/table/glass, +/obj/machinery/microwave, +/obj/machinery/camera{ + c_tag = "Science - Break Room"; + dir = 9; + network = list("ss13","rd") + }, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron/cafeteria, +/area/station/science/breakroom) "igN" = ( /obj/effect/turf_decal/siding/wood, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -22980,14 +23068,6 @@ /obj/effect/turf_decal/trimline/purple/filled/line, /turf/open/floor/iron/dark, /area/station/science/xenobiology) -"itV" = ( -/obj/structure/industrial_lift/tram/white, -/obj/structure/fluff/tram_rail{ - dir = 1 - }, -/obj/structure/window/reinforced/shuttle/tram, -/turf/open/openspace, -/area/station/hallway/primary/tram/center) "itW" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -23265,13 +23345,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/secondary/exit) -"iwX" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/cafeteria, -/area/station/science/breakroom) "ixa" = ( /obj/structure/table/wood, /obj/machinery/light/warm/directional/north, @@ -23407,6 +23480,17 @@ /obj/machinery/telecomms/bus/preset_two, /turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) +"iyP" = ( +/obj/effect/turf_decal/delivery/white, +/obj/structure/holosign/barrier/atmos/tram, +/obj/structure/fluff/tram_rail/floor, +/turf/open/floor/vault{ + base_icon_state = "tram2"; + icon_state = "tram2"; + desc = "A sturdy looking tram platform."; + name = "tram platform" + }, +/area/station/hallway/primary/tram/center) "izi" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 @@ -23544,13 +23628,10 @@ }, /turf/open/floor/iron/white, /area/station/science/lobby) -"iBD" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +"iBB" = ( /obj/structure/cable, /turf/open/floor/iron/cafeteria, -/area/station/science/breakroom) +/area/station/command/heads_quarters/rd) "iBP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -23573,12 +23654,6 @@ }, /turf/open/floor/iron/freezer, /area/station/commons/toilet) -"iCz" = ( -/obj/structure/fluff/tram_rail/floor, -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron, -/area/station/hallway/primary/tram/left) "iCA" = ( /obj/structure/fluff{ desc = "What, you think the water just magically soaks into the metallic flooring?"; @@ -23967,17 +24042,6 @@ }, /turf/open/floor/iron/dark, /area/station/medical/storage) -"iKU" = ( -/obj/effect/turf_decal/delivery/white, -/obj/structure/holosign/barrier/atmos/tram, -/obj/structure/fluff/tram_rail/floor, -/turf/open/floor/vault{ - base_icon_state = "tram2"; - icon_state = "tram2"; - desc = "A sturdy looking tram platform."; - name = "tram platform" - }, -/area/station/hallway/primary/tram/left) "iKY" = ( /obj/effect/turf_decal/trimline/purple/corner{ dir = 1 @@ -24097,13 +24161,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/grimy, /area/station/service/library/lounge) -"iNz" = ( -/obj/machinery/modular_computer/console/preset/id{ - dir = 1 - }, -/obj/structure/window/reinforced/spawner, -/turf/open/floor/iron/cafeteria, -/area/station/command/heads_quarters/rd) "iNH" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 4 @@ -25028,6 +25085,9 @@ /obj/structure/railing/corner, /turf/open/floor/glass/reinforced, /area/station/ai_monitored/turret_protected/aisat/hallway) +"jgD" = ( +/turf/open/floor/iron/cafeteria, +/area/station/command/heads_quarters/rd) "jgM" = ( /obj/structure/stairs/south, /turf/open/floor/iron/stairs/medium, @@ -25136,13 +25196,6 @@ }, /turf/open/floor/plating, /area/station/engineering/atmos/pumproom) -"jir" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/iron/cafeteria, -/area/station/command/heads_quarters/rd) "jiy" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 5 @@ -25317,17 +25370,6 @@ }, /turf/open/floor/noslip, /area/station/hallway/primary/tram/right) -"jlK" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 6 - }, -/mob/living/basic/pet/dog/pug{ - desc = "A pug with an insatiable appetite for pasta and pasta-adjacent piping."; - name = "Spaghetti" - }, -/obj/structure/bed/dogbed/ian, -/turf/open/floor/iron, -/area/station/engineering/atmos) "jlQ" = ( /obj/structure/rack, /obj/item/gun/energy/e_gun/dragnet, @@ -25501,10 +25543,6 @@ }, /turf/open/floor/iron/white, /area/station/science/research) -"jpc" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/cafeteria, -/area/station/science/breakroom) "jpp" = ( /obj/structure/window/reinforced/spawner/north, /obj/structure/window/reinforced/spawner/east, @@ -26542,6 +26580,16 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/hallway/primary/tram/right) +"jIK" = ( +/obj/effect/turf_decal/delivery/white, +/obj/structure/holosign/barrier/atmos/tram, +/turf/open/floor/vault{ + base_icon_state = "tram2"; + icon_state = "tram2"; + desc = "A sturdy looking tram platform."; + name = "tram platform" + }, +/area/station/hallway/primary/tram/left) "jIV" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment{ @@ -26588,14 +26636,6 @@ }, /turf/open/floor/iron/checker, /area/station/commons/lounge) -"jJM" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/fluff/tram_rail/floor{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/hallway/primary/tram/center) "jJO" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -26779,6 +26819,10 @@ }, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) +"jMD" = ( +/obj/structure/table/glass, +/turf/open/floor/iron/cafeteria, +/area/station/science/breakroom) "jMH" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -27017,10 +27061,6 @@ /obj/structure/cable, /turf/open/floor/wood/parquet, /area/station/medical/psychology) -"jRn" = ( -/obj/machinery/suit_storage_unit/rd, -/turf/open/floor/iron/cafeteria, -/area/station/command/heads_quarters/rd) "jRr" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -27237,12 +27277,6 @@ }, /turf/open/floor/iron, /area/station/security/brig) -"jUN" = ( -/obj/structure/table/glass, -/obj/structure/sign/calendar/directional/east, -/obj/machinery/coffeemaker, -/turf/open/floor/iron/cafeteria, -/area/station/science/breakroom) "jUO" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 4 @@ -27355,6 +27389,11 @@ }, /turf/open/floor/iron, /area/station/maintenance/tram/right) +"jXk" = ( +/obj/structure/industrial_lift/tram/white, +/obj/machinery/door/window/tram/left, +/turf/open/openspace, +/area/station/hallway/primary/tram/center) "jXn" = ( /obj/machinery/door/airlock/security/glass{ name = "Prisoner Processing" @@ -27741,19 +27780,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/service) -"keR" = ( -/obj/effect/turf_decal/delivery/white, -/obj/structure/holosign/barrier/atmos/tram, -/obj/machinery/camera/directional/south{ - c_tag = "Hallway - Eastern Tram Bridge 1" - }, -/turf/open/floor/vault{ - base_icon_state = "tram2"; - icon_state = "tram2"; - desc = "A sturdy looking tram platform."; - name = "tram platform" - }, -/area/station/hallway/primary/tram/center) "keX" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 8 @@ -28278,6 +28304,10 @@ /obj/structure/window/reinforced/spawner/east, /turf/open/floor/iron/dark, /area/station/command/bridge) +"kmZ" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/glass/reinforced/tram, +/area/station/hallway/primary/tram/right) "kna" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 8 @@ -28322,16 +28352,6 @@ "knJ" = ( /turf/open/floor/iron, /area/station/hallway/secondary/command) -"knN" = ( -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/obj/structure/chair/sofa/left{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/cargo/miningdock/cafeteria) "knO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -28583,6 +28603,11 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/tram/right) +"krX" = ( +/obj/structure/fluff/tram_rail, +/obj/structure/industrial_lift/tram, +/turf/open/openspace, +/area/station/hallway/primary/tram/center) "ksa" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 4 @@ -28814,6 +28839,11 @@ /obj/machinery/power/energy_accumulator/grounding_rod/anchored, /turf/open/floor/engine, /area/station/engineering/supermatter) +"kwA" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/cafeteria, +/area/station/science/breakroom) "kwD" = ( /obj/effect/landmark/start/cargo_technician, /turf/open/floor/glass, @@ -29393,6 +29423,10 @@ }, /turf/open/floor/iron, /area/station/commons/vacant_room/commissary) +"kGQ" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/cafeteria, +/area/station/command/heads_quarters/rd) "kGR" = ( /obj/effect/turf_decal/trimline/white/tram{ dir = 1 @@ -29581,6 +29615,19 @@ /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/iron, /area/station/engineering/atmos) +"kKd" = ( +/obj/effect/turf_decal/delivery/white, +/obj/structure/holosign/barrier/atmos/tram, +/obj/structure/fluff/tram_rail/floor{ + dir = 1 + }, +/turf/open/floor/vault{ + base_icon_state = "tram2"; + icon_state = "tram2"; + desc = "A sturdy looking tram platform."; + name = "tram platform" + }, +/area/station/hallway/primary/tram/right) "kKe" = ( /obj/machinery/conveyor_switch/oneway{ dir = 8; @@ -30092,6 +30139,13 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/iron, /area/station/security/checkpoint/supply) +"kTB" = ( +/obj/structure/chair/sofa{ + dir = 8 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/carpet, +/area/station/medical/psychology) "kTD" = ( /obj/effect/landmark/start/hangover, /obj/effect/turf_decal/trimline/yellow/filled/line, @@ -30503,11 +30557,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/security/evidence) -"kYX" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/hallway/primary/tram/center) "kYZ" = ( /obj/machinery/airalarm/server{ dir = 4; @@ -30957,6 +31006,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/commons/fitness/recreation) +"lhA" = ( +/obj/structure/table/glass, +/obj/structure/sign/calendar/directional/east, +/obj/machinery/coffeemaker, +/turf/open/floor/iron/cafeteria, +/area/station/science/breakroom) +"lhB" = ( +/obj/machinery/vending/coffee, +/turf/open/floor/iron/cafeteria, +/area/station/science/breakroom) "lhM" = ( /obj/effect/turf_decal/trimline/white/tram, /obj/structure/disposalpipe/segment{ @@ -31014,13 +31073,6 @@ }, /turf/open/floor/iron, /area/station/security/checkpoint/escape) -"liQ" = ( -/obj/structure/industrial_lift/tram/white, -/obj/machinery/door/window/tram/left{ - dir = 1 - }, -/turf/open/openspace, -/area/station/hallway/primary/tram/center) "ljv" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/trimline/purple/filled/corner{ @@ -31164,6 +31216,13 @@ "lml" = ( /turf/closed/wall/r_wall, /area/station/engineering/atmos/pumproom) +"lmm" = ( +/obj/structure/industrial_lift/tram/white, +/obj/machinery/door/window/tram/right{ + dir = 1 + }, +/turf/open/openspace, +/area/station/hallway/primary/tram/center) "lms" = ( /obj/effect/turf_decal/trimline/purple/filled/corner{ dir = 1 @@ -31189,6 +31248,11 @@ }, /turf/open/floor/iron/dark, /area/station/command/bridge) +"lmK" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/blobstart, +/turf/open/floor/iron/cafeteria, +/area/station/science/breakroom) "lmZ" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -31242,11 +31306,6 @@ /obj/machinery/duct, /turf/open/floor/iron/white, /area/station/medical/medbay/central) -"lnx" = ( -/obj/effect/spawner/random/vending/colavend, -/obj/machinery/newscaster/directional/west, -/turf/open/floor/iron/cafeteria, -/area/station/science/breakroom) "lnC" = ( /obj/effect/turf_decal/trimline/red/filled/corner, /obj/effect/turf_decal/trimline/red/filled/corner{ @@ -31558,19 +31617,6 @@ "lse" = ( /turf/open/floor/carpet, /area/station/service/theater) -"lsk" = ( -/obj/effect/turf_decal/delivery/white, -/obj/structure/holosign/barrier/atmos/tram, -/obj/structure/fluff/tram_rail/floor{ - dir = 1 - }, -/turf/open/floor/vault{ - base_icon_state = "tram2"; - icon_state = "tram2"; - desc = "A sturdy looking tram platform."; - name = "tram platform" - }, -/area/station/hallway/primary/tram/center) "lsn" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -31631,14 +31677,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/cargo/lobby) -"ltK" = ( -/obj/structure/industrial_lift/tram/white, -/obj/structure/window/reinforced/shuttle/tram, -/obj/structure/fluff/tram_rail{ - dir = 1 - }, -/turf/open/openspace, -/area/station/hallway/primary/tram/center) "ltZ" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 5 @@ -32141,6 +32179,12 @@ }, /turf/open/floor/iron, /area/station/security/checkpoint/science) +"lBL" = ( +/obj/effect/landmark/tram/middle_part, +/obj/structure/industrial_lift/tram, +/obj/machinery/computer/tram_controls, +/turf/open/floor/noslip/tram_plate, +/area/station/hallway/primary/tram/center) "lBQ" = ( /turf/closed/wall, /area/station/medical/surgery/aft) @@ -32257,12 +32301,6 @@ }, /turf/open/floor/plating, /area/station/engineering/atmos) -"lEx" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/item/kirbyplants/random, -/obj/structure/extinguisher_cabinet/directional/north, -/turf/open/floor/iron/cafeteria, -/area/station/science/breakroom) "lEE" = ( /obj/machinery/power/solar_control{ dir = 8; @@ -32426,6 +32464,11 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit) +"lJn" = ( +/obj/structure/chair/stool/directional/west, +/obj/effect/landmark/start/scientist, +/turf/open/floor/iron/cafeteria, +/area/station/science/breakroom) "lJu" = ( /obj/structure/sign/warning/vacuum/external{ pixel_x = -32 @@ -32507,10 +32550,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/break_room) -"lJK" = ( -/obj/machinery/vending/coffee, -/turf/open/floor/iron/cafeteria, -/area/station/science/breakroom) "lJU" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -32743,6 +32782,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/primary/tram/left) +"lOb" = ( +/obj/structure/sign/collision_counter, +/turf/closed/wall, +/area/station/medical/treatment_center) "lOt" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/red/filled/corner{ @@ -32829,6 +32872,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/brig) +"lPq" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 6 + }, +/mob/living/basic/pet/dog/pug{ + desc = "A pug with an insatiable appetite for pasta and pasta-adjacent piping."; + name = "Spaghetti" + }, +/obj/structure/bed/dogbed/ian, +/turf/open/floor/iron, +/area/station/engineering/atmos) "lPz" = ( /obj/effect/turf_decal/sand/plating, /obj/item/stack/ore/glass, @@ -32905,6 +32959,14 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"lQJ" = ( +/obj/structure/industrial_lift/tram/white, +/obj/structure/fluff/tram_rail{ + dir = 1 + }, +/obj/structure/window/reinforced/shuttle/tram, +/turf/open/openspace, +/area/station/hallway/primary/tram/center) "lQM" = ( /turf/closed/wall/r_wall, /area/station/maintenance/port/central) @@ -33538,6 +33600,13 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/science/genetics) +"meY" = ( +/obj/structure/fluff/tram_rail{ + dir = 1 + }, +/obj/structure/industrial_lift/tram, +/turf/open/openspace, +/area/station/hallway/primary/tram/center) "mfC" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -33748,6 +33817,21 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/tech_storage, /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) +"miQ" = ( +/obj/machinery/door/airlock/command{ + name = "Research Director's Office" + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/science/rd, +/turf/open/floor/iron/cafeteria, +/area/station/command/heads_quarters/rd) "miU" = ( /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/components/binary/pump{ @@ -33842,16 +33926,6 @@ /obj/item/hand_labeler, /turf/open/floor/iron/white, /area/station/service/kitchen) -"mkm" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/obj/machinery/light/directional/east, -/obj/structure/sign/poster/official/science{ - pixel_x = 32 - }, -/turf/open/floor/iron/cafeteria, -/area/station/science/breakroom) "mky" = ( /obj/structure/table, /obj/item/paper_bin{ @@ -34309,12 +34383,6 @@ /obj/effect/spawner/random/engineering/tracking_beacon, /turf/open/floor/iron, /area/station/engineering/main) -"msr" = ( -/obj/machinery/computer/robotics, -/obj/structure/sign/clock/directional/north, -/obj/structure/window/reinforced/spawner/east, -/turf/open/floor/iron/cafeteria, -/area/station/command/heads_quarters/rd) "msx" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -34395,11 +34463,6 @@ /obj/machinery/telecomms/server/presets/science, /turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) -"muQ" = ( -/obj/machinery/holopad, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/cafeteria, -/area/station/command/heads_quarters/rd) "muR" = ( /obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ dir = 1 @@ -34627,6 +34690,12 @@ /obj/item/radio/off, /turf/open/floor/iron, /area/station/command/gateway) +"mxV" = ( +/obj/structure/table/glass, +/obj/machinery/airalarm/directional/north, +/obj/effect/spawner/random/food_or_drink/donkpockets, +/turf/open/floor/iron/cafeteria, +/area/station/science/breakroom) "myb" = ( /obj/machinery/door/poddoor/massdriver_ordnance, /obj/structure/fans/tiny, @@ -34710,6 +34779,13 @@ }, /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/ai_upload) +"mzQ" = ( +/obj/structure/chair/office{ + dir = 1 + }, +/obj/effect/landmark/start/research_director, +/turf/open/floor/iron/cafeteria, +/area/station/command/heads_quarters/rd) "mzX" = ( /obj/effect/turf_decal/trimline/white/tram{ dir = 1 @@ -35078,6 +35154,12 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"mFz" = ( +/obj/structure/fluff/tram_rail/floor, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/turf/open/floor/glass/reinforced/tram, +/area/station/hallway/primary/tram/left) "mFQ" = ( /obj/structure/table, /obj/item/stack/sheet/plasteel{ @@ -35147,11 +35229,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/prison) -"mGJ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/landmark/event_spawn, -/turf/open/floor/iron/cafeteria, -/area/station/science/breakroom) "mGN" = ( /obj/effect/turf_decal/siding/thinplating/end, /obj/machinery/button/door{ @@ -35756,12 +35833,6 @@ /obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron, /area/station/commons/dorms) -"mQW" = ( -/obj/structure/industrial_lift/tram, -/obj/structure/fluff/tram_rail, -/obj/structure/chair/sofa/bench/tram/left, -/turf/open/openspace, -/area/station/hallway/primary/tram/center) "mRd" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -35784,16 +35855,17 @@ }, /turf/open/floor/iron, /area/station/maintenance/tram/right) -"mRi" = ( -/obj/structure/industrial_lift/tram/white, -/obj/machinery/door/window/tram/right, -/turf/open/openspace, -/area/station/hallway/primary/tram/center) "mRs" = ( /obj/effect/turf_decal/bot, /obj/machinery/portable_atmospherics/scrubber, /turf/open/floor/iron, /area/station/engineering/atmos) +"mRy" = ( +/obj/machinery/keycard_auth{ + pixel_y = -24 + }, +/turf/open/floor/iron/cafeteria, +/area/station/command/heads_quarters/rd) "mRE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, @@ -36083,11 +36155,6 @@ /obj/effect/turf_decal/weather/snow, /turf/open/floor/iron/kitchen_coldroom, /area/station/service/kitchen/coldroom) -"mXp" = ( -/obj/structure/industrial_lift/tram, -/obj/effect/landmark/lift_id, -/turf/open/floor/noslip/tram_plate, -/area/station/hallway/primary/tram/center) "mXu" = ( /obj/structure/sign/warning/vacuum{ pixel_y = -32 @@ -36320,14 +36387,6 @@ }, /turf/open/floor/plating/airless, /area/lavaland/surface) -"naL" = ( -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/obj/structure/chair/sofa/corner, -/turf/open/floor/iron, -/area/station/cargo/miningdock/cafeteria) "naX" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, @@ -36388,15 +36447,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/tram/left) -"nbS" = ( -/obj/structure/industrial_lift/tram/white, -/obj/structure/tramwall/titanium, -/obj/machinery/destination_sign{ - dir = 1; - layer = 3.4 - }, -/turf/open/openspace, -/area/station/hallway/primary/tram/center) "nca" = ( /turf/open/openspace, /area/station/security/brig) @@ -36699,6 +36749,18 @@ /obj/machinery/status_display/evac/directional/west, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"nhc" = ( +/obj/machinery/light_switch/directional/north{ + pixel_x = 12 + }, +/obj/machinery/newscaster/directional/north, +/obj/machinery/fax{ + fax_name = "Research Director's Office"; + name = "Research Director's Fax Machine" + }, +/obj/structure/table/reinforced, +/turf/open/floor/iron/cafeteria, +/area/station/command/heads_quarters/rd) "nhm" = ( /turf/closed/wall, /area/station/security/prison/shower) @@ -36831,12 +36893,6 @@ /obj/structure/window/reinforced/spawner/north, /turf/open/floor/iron/dark, /area/station/command/bridge) -"njs" = ( -/obj/effect/landmark/tram/middle_part, -/obj/structure/industrial_lift/tram, -/obj/machinery/computer/tram_controls, -/turf/open/floor/noslip/tram_plate, -/area/station/hallway/primary/tram/center) "njt" = ( /obj/structure/railing/corner{ dir = 4 @@ -37057,6 +37113,14 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/hallway/secondary/entry) +"nnn" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/obj/effect/spawner/xmastree, +/turf/open/floor/carpet, +/area/station/service/chapel) "nns" = ( /obj/machinery/computer/operating{ dir = 1; @@ -37298,6 +37362,13 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/service/kitchen) +"nqX" = ( +/obj/docking_port/stationary/escape_pod{ + dir = 4 + }, +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/plating/airless, +/area/lavaland/surface) "nra" = ( /obj/machinery/light/small/directional/east, /turf/open/floor/engine/vacuum, @@ -38581,16 +38652,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/catwalk_floor, /area/station/hallway/primary/tram/right) -"nTy" = ( -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/obj/structure/chair/sofa{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/cargo/miningdock/cafeteria) "nTz" = ( /obj/machinery/holopad{ pixel_y = 16 @@ -38916,6 +38977,12 @@ /obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron/freezer, /area/station/commons/toilet) +"nZs" = ( +/obj/machinery/computer/mecha, +/obj/structure/sign/calendar/directional/north, +/obj/structure/window/reinforced/spawner/west, +/turf/open/floor/iron/cafeteria, +/area/station/command/heads_quarters/rd) "nZx" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 4 @@ -39091,19 +39158,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/wood, /area/station/service/bar/backroom) -"obW" = ( -/obj/effect/turf_decal/delivery/white, -/obj/structure/holosign/barrier/atmos/tram, -/obj/structure/fluff/tram_rail/floor{ - dir = 1 - }, -/turf/open/floor/vault{ - base_icon_state = "tram2"; - icon_state = "tram2"; - desc = "A sturdy looking tram platform."; - name = "tram platform" - }, -/area/station/hallway/primary/tram/right) "oca" = ( /turf/closed/wall, /area/station/construction/mining/aux_base) @@ -39524,6 +39578,19 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/smooth, /area/station/hallway/primary/tram/left) +"okc" = ( +/obj/effect/turf_decal/delivery/white, +/obj/structure/holosign/barrier/atmos/tram, +/obj/machinery/camera/directional/south{ + c_tag = "Hallway - Eastern Tram Bridge 1" + }, +/turf/open/floor/vault{ + base_icon_state = "tram2"; + icon_state = "tram2"; + desc = "A sturdy looking tram platform."; + name = "tram platform" + }, +/area/station/hallway/primary/tram/center) "okf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -39969,16 +40036,6 @@ }, /turf/open/floor/iron, /area/station/command/gateway) -"ota" = ( -/obj/structure/fluff/tram_rail{ - dir = 1 - }, -/obj/structure/industrial_lift/tram, -/obj/structure/chair/sofa/bench/tram/right{ - dir = 1 - }, -/turf/open/openspace, -/area/station/hallway/primary/tram/center) "otf" = ( /obj/structure/chair, /obj/effect/turf_decal/trimline/neutral/filled/line, @@ -40197,6 +40254,12 @@ /obj/machinery/light/directional/north, /turf/open/floor/iron/dark, /area/station/science/genetics) +"ozg" = ( +/obj/structure/chair/sofa/left{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria, +/area/station/science/breakroom) "ozo" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 10 @@ -40357,6 +40420,16 @@ /obj/machinery/status_display/ai/directional/south, /turf/open/floor/iron, /area/station/security/checkpoint/arrivals) +"oCu" = ( +/obj/structure/industrial_lift/tram, +/obj/structure/fluff/tram_rail{ + dir = 1 + }, +/obj/structure/chair/sofa/bench/tram/left{ + dir = 1 + }, +/turf/open/openspace, +/area/station/hallway/primary/tram/center) "oCO" = ( /obj/structure/lattice/catwalk, /obj/structure/railing{ @@ -40488,12 +40561,6 @@ }, /turf/open/space/basic, /area/space/nearstation) -"oFI" = ( -/obj/machinery/computer/mecha, -/obj/structure/sign/calendar/directional/north, -/obj/structure/window/reinforced/spawner/west, -/turf/open/floor/iron/cafeteria, -/area/station/command/heads_quarters/rd) "oFJ" = ( /obj/machinery/door/airlock/hatch{ name = "MiniSat Telecomms Relay Access" @@ -40537,19 +40604,6 @@ /obj/structure/cable, /turf/open/floor/iron/smooth, /area/station/maintenance/department/science) -"oGh" = ( -/obj/effect/turf_decal/delivery/white, -/obj/structure/holosign/barrier/atmos/tram, -/obj/structure/fluff/tram_rail/floor{ - dir = 1 - }, -/turf/open/floor/vault{ - base_icon_state = "tram2"; - icon_state = "tram2"; - desc = "A sturdy looking tram platform."; - name = "tram platform" - }, -/area/station/hallway/primary/tram/left) "oGj" = ( /obj/structure/lattice/catwalk, /obj/structure/railing{ @@ -40864,20 +40918,6 @@ /obj/machinery/space_heater, /turf/open/floor/iron, /area/station/engineering/atmos) -"oLV" = ( -/obj/machinery/computer/rdconsole, -/obj/machinery/computer/security/telescreen/rd{ - pixel_y = 30 - }, -/obj/machinery/camera{ - c_tag = "Science - Research Director's Office"; - dir = 9; - network = list("ss13","rd") - }, -/obj/machinery/light/directional/north, -/obj/item/folder/white, -/turf/open/floor/iron/cafeteria, -/area/station/command/heads_quarters/rd) "oLX" = ( /obj/effect/turf_decal/siding/thinplating/corner{ dir = 1 @@ -41076,16 +41116,6 @@ /obj/machinery/status_display/ai/directional/north, /turf/open/floor/iron/dark, /area/station/command/bridge) -"oPO" = ( -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/obj/structure/chair/sofa/corner{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/cargo/miningdock/cafeteria) "oPP" = ( /obj/effect/landmark/navigate_destination/minisat_access_ai, /turf/open/floor/iron/white, @@ -41237,6 +41267,16 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) +"oTm" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/machinery/light/directional/east, +/obj/structure/sign/poster/official/science{ + pixel_x = 32 + }, +/turf/open/floor/iron/cafeteria, +/area/station/science/breakroom) "oTn" = ( /obj/structure/toilet{ dir = 1 @@ -42099,6 +42139,12 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/engine_smes) +"pkw" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/iron/cafeteria, +/area/station/command/heads_quarters/rd) "pkF" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/rack, @@ -42238,16 +42284,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/execution/transfer) -"pmD" = ( -/obj/structure/industrial_lift/tram, -/obj/structure/fluff/tram_rail{ - dir = 1 - }, -/obj/structure/chair/sofa/bench/tram/right{ - dir = 1 - }, -/turf/open/openspace, -/area/station/hallway/primary/tram/center) "pmQ" = ( /obj/effect/turf_decal/trimline/neutral/filled/line, /obj/effect/turf_decal/trimline/neutral/filled/corner{ @@ -42408,11 +42444,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/security/checkpoint/science) -"ppM" = ( -/obj/structure/window/reinforced/tinted/fulltile, -/obj/structure/grille, -/turf/open/floor/plating, -/area/station/science/breakroom) "ppS" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -42631,15 +42662,6 @@ }, /turf/open/floor/iron/dark, /area/station/science/genetics) -"ptl" = ( -/obj/structure/table/reinforced, -/obj/item/stamp/rd{ - pixel_x = 3; - pixel_y = -2 - }, -/obj/structure/window/reinforced/spawner, -/turf/open/floor/iron/cafeteria, -/area/station/command/heads_quarters/rd) "ptp" = ( /obj/structure/table/wood, /obj/effect/turf_decal/siding/wood{ @@ -43352,6 +43374,17 @@ /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 = 24; + name = "SS13: Auxiliary Dock, Station-Port"; + shuttle_id = "whiteship_home"; + width = 35 + }, +/turf/open/space/openspace, +/area/space) "pEH" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -43667,6 +43700,11 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/hallway/secondary/service) +"pKT" = ( +/obj/structure/industrial_lift/tram, +/obj/structure/tramwall/titanium, +/turf/open/openspace, +/area/station/hallway/primary/tram/center) "pKZ" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp, @@ -44033,6 +44071,16 @@ /obj/structure/ore_box, /turf/open/floor/iron, /area/station/cargo/warehouse) +"pSf" = ( +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/structure/chair/sofa/left{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/miningdock/cafeteria) "pSg" = ( /obj/machinery/light/directional/west, /obj/effect/turf_decal/trimline/white/corner{ @@ -44081,12 +44129,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) -"pTG" = ( -/obj/structure/chair/sofa/right{ - dir = 8 - }, -/turf/open/floor/iron/cafeteria, -/area/station/science/breakroom) "pTM" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 @@ -44393,6 +44435,19 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) +"pYg" = ( +/obj/effect/turf_decal/delivery/white, +/obj/structure/holosign/barrier/atmos/tram, +/obj/machinery/camera/directional/south{ + c_tag = "Hallway - Western Tram Bridge 1" + }, +/turf/open/floor/vault{ + base_icon_state = "tram2"; + icon_state = "tram2"; + desc = "A sturdy looking tram platform."; + name = "tram platform" + }, +/area/station/hallway/primary/tram/left) "pYt" = ( /obj/structure/table/wood, /obj/item/book/manual/wiki/security_space_law, @@ -44411,16 +44466,6 @@ }, /turf/open/floor/carpet, /area/station/cargo/miningdock) -"pYR" = ( -/obj/effect/turf_decal/delivery/white, -/obj/structure/holosign/barrier/atmos/tram, -/turf/open/floor/vault{ - base_icon_state = "tram2"; - icon_state = "tram2"; - desc = "A sturdy looking tram platform."; - name = "tram platform" - }, -/area/station/hallway/primary/tram/left) "pYW" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 4 @@ -44905,10 +44950,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/commons/dorms) -"qia" = ( -/obj/structure/industrial_lift/tram, -/turf/open/floor/noslip/tram_plate, -/area/station/hallway/primary/tram/center) "qif" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 8 @@ -45156,19 +45197,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/cafeteria, /area/station/commons/dorms/laundry) -"qmF" = ( -/obj/effect/turf_decal/delivery/white, -/obj/structure/holosign/barrier/atmos/tram, -/obj/machinery/camera/directional/south{ - c_tag = "Hallway - Western Tram Bridge 1" - }, -/turf/open/floor/vault{ - base_icon_state = "tram2"; - icon_state = "tram2"; - desc = "A sturdy looking tram platform."; - name = "tram platform" - }, -/area/station/hallway/primary/tram/left) "qmH" = ( /obj/structure/closet/secure_closet/quartermaster, /obj/effect/turf_decal/trimline/brown/filled/line{ @@ -45768,6 +45796,14 @@ /obj/effect/turf_decal/trimline/neutral/filled/warning, /turf/open/floor/iron, /area/station/hallway/primary/tram/left) +"qwj" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/fluff/tram_rail/floor{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/glass/reinforced/tram, +/area/station/hallway/primary/tram/center) "qwq" = ( /obj/structure/table/wood, /obj/item/radio/intercom, @@ -46484,12 +46520,6 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/station/hallway/secondary/command) -"qHi" = ( -/obj/machinery/modular_computer/console/preset/research{ - dir = 1 - }, -/turf/open/floor/iron/cafeteria, -/area/station/command/heads_quarters/rd) "qHl" = ( /obj/machinery/door/airlock/research{ name = "Cytology Access" @@ -47352,6 +47382,13 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/security/prison/safe) +"qXN" = ( +/obj/structure/industrial_lift/tram, +/obj/structure/fluff/tram_rail{ + dir = 1 + }, +/turf/open/openspace, +/area/station/hallway/primary/tram/center) "qXX" = ( /obj/effect/turf_decal/trimline/neutral/filled/line, /obj/structure/disposalpipe/segment{ @@ -47401,6 +47438,15 @@ /obj/machinery/status_display/evac/directional/east, /turf/open/floor/iron/dark, /area/station/tcommsat/computer) +"qYR" = ( +/obj/structure/industrial_lift/tram/white, +/obj/structure/tramwall/titanium, +/obj/machinery/destination_sign{ + dir = 1; + layer = 3.4 + }, +/turf/open/openspace, +/area/station/hallway/primary/tram/center) "qYU" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -47589,14 +47635,6 @@ "rbP" = ( /turf/closed/wall, /area/station/security/execution/education) -"rcc" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment, -/obj/effect/spawner/xmastree, -/turf/open/floor/carpet, -/area/station/service/chapel) "rcg" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/structure/cable, @@ -47660,6 +47698,11 @@ }, /turf/open/floor/iron/freezer, /area/station/commons/toilet) +"rdm" = ( +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/turf/open/floor/iron/cafeteria, +/area/station/command/heads_quarters/rd) "rdn" = ( /obj/effect/turf_decal/trimline/brown/filled/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -48301,13 +48344,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/station/hallway/secondary/service) -"rqT" = ( -/obj/structure/chair/sofa{ - dir = 8 - }, -/obj/machinery/light/directional/east, -/turf/open/floor/carpet, -/area/station/medical/psychology) "rrc" = ( /obj/structure/railing{ dir = 8 @@ -48361,11 +48397,6 @@ /obj/machinery/vending/drugs, /turf/open/floor/iron/dark, /area/station/medical/storage) -"rrF" = ( -/obj/structure/fluff/tram_rail, -/obj/structure/industrial_lift/tram, -/turf/open/openspace, -/area/station/hallway/primary/tram/center) "rrM" = ( /obj/machinery/photocopier{ pixel_y = 3 @@ -49131,12 +49162,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/prison/safe) -"rEn" = ( -/obj/structure/fluff/tram_rail, -/obj/structure/industrial_lift/tram, -/obj/structure/chair/sofa/bench/tram/left, -/turf/open/openspace, -/area/station/hallway/primary/tram/center) "rEu" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -49362,6 +49387,16 @@ /obj/structure/plasticflaps, /turf/open/floor/plating, /area/station/cargo/storage) +"rIz" = ( +/obj/machinery/button/door{ + id = "rdoffice"; + name = "Privacy Shutter Control"; + pixel_x = -6; + pixel_y = -25; + req_access = list("research") + }, +/turf/open/floor/iron/cafeteria, +/area/station/command/heads_quarters/rd) "rIP" = ( /obj/machinery/light/directional/north, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -49920,11 +49955,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood, /area/station/commons/dorms) -"rPU" = ( -/obj/structure/industrial_lift/tram, -/obj/structure/fluff/tram_rail, -/turf/open/openspace, -/area/station/hallway/primary/tram/center) "rQl" = ( /obj/structure/chair/stool/directional/south, /obj/effect/landmark/start/assistant, @@ -50165,10 +50195,6 @@ }, /turf/open/floor/iron/dark, /area/station/command/teleporter) -"rUF" = ( -/obj/structure/sign/collision_counter, -/turf/closed/wall, -/area/station/medical/treatment_center) "rUQ" = ( /obj/structure/window/reinforced/fulltile, /turf/open/floor/grass, @@ -50565,6 +50591,10 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/command/heads_quarters/cmo) +"sdf" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/cafeteria, +/area/station/science/breakroom) "sdo" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -50840,11 +50870,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) -"sjd" = ( -/obj/structure/industrial_lift/tram, -/obj/effect/landmark/start/hangover, -/turf/open/floor/noslip/tram_plate, -/area/station/hallway/primary/tram/center) "sjf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -50901,16 +50926,6 @@ }, /turf/open/floor/iron, /area/station/security/processing) -"smz" = ( -/obj/machinery/button/door{ - id = "rdoffice"; - name = "Privacy Shutter Control"; - pixel_x = -6; - pixel_y = -25; - req_access = list("research") - }, -/turf/open/floor/iron/cafeteria, -/area/station/command/heads_quarters/rd) "smF" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 8 @@ -51459,6 +51474,11 @@ /obj/effect/turf_decal/trimline/neutral/filled/line, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) +"swx" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/fluff/tram_rail/floor, +/turf/open/floor/glass/reinforced/tram, +/area/station/hallway/primary/tram/right) "swC" = ( /obj/structure/closet/firecloset, /obj/effect/turf_decal/siding/thinplating/dark{ @@ -51890,12 +51910,17 @@ /obj/machinery/telecomms/broadcaster/preset_right, /turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) -"sGb" = ( -/obj/structure/chair/sofa/left{ - dir = 1 +"sFL" = ( +/obj/machinery/door/airlock/command{ + name = "Research Director's Office" }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/science/rd, /turf/open/floor/iron/cafeteria, -/area/station/science/breakroom) +/area/station/command/heads_quarters/rd) "sGp" = ( /obj/structure/rack, /obj/item/clothing/glasses/meson{ @@ -51914,11 +51939,6 @@ /obj/item/computer_disk/atmos, /turf/open/floor/iron, /area/station/command/heads_quarters/ce) -"sGy" = ( -/obj/structure/industrial_lift/tram/white, -/obj/structure/window/reinforced/shuttle/tram, -/turf/open/openspace, -/area/station/hallway/primary/tram/center) "sGF" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 @@ -52063,12 +52083,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/security/checkpoint/science) -"sJo" = ( -/obj/structure/table/glass, -/obj/machinery/airalarm/directional/north, -/obj/effect/spawner/random/food_or_drink/donkpockets, -/turf/open/floor/iron/cafeteria, -/area/station/science/breakroom) "sJS" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/trimline/brown/filled/line, @@ -52338,17 +52352,6 @@ }, /turf/open/floor/iron, /area/station/cargo/miningdock) -"sOi" = ( -/obj/docking_port/stationary{ - dir = 2; - dwidth = 11; - height = 24; - name = "SS13: Auxiliary Dock, Station-Port"; - shuttle_id = "whiteship_home"; - width = 35 - }, -/turf/open/space/openspace, -/area/space) "sOq" = ( /obj/machinery/vending/wardrobe/sec_wardrobe, /obj/machinery/status_display/ai/directional/west, @@ -54053,23 +54056,6 @@ /obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/iron, /area/station/cargo/warehouse) -"trO" = ( -/obj/structure/table/glass, -/obj/item/paper_bin{ - pixel_x = 6; - pixel_y = 3 - }, -/obj/item/pen{ - pixel_x = 6; - pixel_y = 4 - }, -/obj/structure/sign/clock/directional/east, -/obj/item/storage/fancy/coffee_cart_rack{ - pixel_x = -7; - pixel_y = 1 - }, -/turf/open/floor/iron/cafeteria, -/area/station/science/breakroom) "trY" = ( /obj/structure/closet/secure_closet/contraband/armory, /obj/effect/spawner/random/contraband/armory, @@ -54320,6 +54306,11 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/hallway/secondary/exit) +"txc" = ( +/obj/structure/industrial_lift/tram, +/obj/effect/landmark/lift_id, +/turf/open/floor/noslip/tram_plate, +/area/station/hallway/primary/tram/center) "txd" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -54355,16 +54346,6 @@ /obj/effect/spawner/random/entertainment/dice, /turf/open/floor/iron, /area/station/commons/fitness/recreation) -"txT" = ( -/obj/effect/turf_decal/delivery/white, -/obj/structure/holosign/barrier/atmos/tram, -/turf/open/floor/vault{ - base_icon_state = "tram2"; - icon_state = "tram2"; - desc = "A sturdy looking tram platform."; - name = "tram platform" - }, -/area/station/hallway/primary/tram/right) "txZ" = ( /obj/effect/turf_decal/trimline/yellow/filled/line, /obj/structure/cable, @@ -54589,6 +54570,13 @@ }, /turf/open/floor/iron, /area/station/cargo/lobby) +"tCd" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/fluff/tram_rail/floor{ + dir = 1 + }, +/turf/open/floor/glass/reinforced/tram, +/area/station/hallway/primary/tram/right) "tCe" = ( /obj/effect/turf_decal/siding/thinplating{ dir = 6 @@ -55686,6 +55674,11 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/station/command/teleporter) +"tZC" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/turf/open/floor/glass/reinforced/tram, +/area/station/hallway/primary/tram/left) "tZN" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 8 @@ -55921,11 +55914,6 @@ }, /turf/open/floor/iron, /area/station/science/robotics/lab) -"ucQ" = ( -/obj/structure/industrial_lift/tram/white, -/obj/machinery/door/window/tram/left, -/turf/open/openspace, -/area/station/hallway/primary/tram/center) "udb" = ( /obj/structure/table/glass, /obj/item/paper_bin, @@ -56357,6 +56345,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/science/ordnance/testlab) +"ukL" = ( +/obj/structure/industrial_lift/tram, +/obj/structure/fluff/tram_rail, +/turf/open/openspace, +/area/station/hallway/primary/tram/center) "ukM" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 4 @@ -56712,6 +56705,16 @@ /obj/structure/window/reinforced/spawner/east, /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/ai) +"url" = ( +/obj/effect/turf_decal/delivery/white, +/obj/structure/holosign/barrier/atmos/tram, +/turf/open/floor/vault{ + base_icon_state = "tram2"; + icon_state = "tram2"; + desc = "A sturdy looking tram platform."; + name = "tram platform" + }, +/area/station/hallway/primary/tram/center) "urm" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -57637,14 +57640,6 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/station/command/bridge) -"uIC" = ( -/obj/structure/fluff/tram_rail/floor{ - dir = 1 - }, -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron, -/area/station/hallway/primary/tram/left) "uIO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -57847,6 +57842,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/brig) +"uMP" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/turf/open/floor/glass/reinforced/tram, +/area/station/hallway/primary/tram/center) "uMR" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ dir = 8 @@ -57886,10 +57886,6 @@ }, /turf/open/floor/iron, /area/station/cargo/drone_bay) -"uNw" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/cafeteria, -/area/station/science/breakroom) "uNC" = ( /obj/effect/turf_decal/trimline/brown/filled/line, /obj/effect/turf_decal/stripes/corner{ @@ -58106,6 +58102,12 @@ }, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation/entertainment) +"uRh" = ( +/obj/structure/industrial_lift/tram, +/obj/structure/fluff/tram_rail, +/obj/structure/chair/sofa/bench/tram/right, +/turf/open/openspace, +/area/station/hallway/primary/tram/center) "uRx" = ( /obj/machinery/airalarm/directional/north, /obj/effect/turf_decal/trimline/purple/filled/line{ @@ -59018,13 +59020,6 @@ }, /turf/open/floor/wood, /area/station/service/library) -"viA" = ( -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/reagent_dispensers/water_cooler, -/obj/machinery/firealarm/directional/south, -/obj/structure/cable, -/turf/open/floor/iron/cafeteria, -/area/station/science/breakroom) "viW" = ( /obj/effect/decal/remains/human, /obj/effect/decal/cleanable/crayon{ @@ -59121,13 +59116,6 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/plating, /area/station/service/chapel/monastery) -"vkm" = ( -/obj/machinery/vending/cigarette, -/obj/structure/sign/flag{ - pixel_x = -32 - }, -/turf/open/floor/iron/cafeteria, -/area/station/science/breakroom) "vkq" = ( /obj/structure/table, /obj/machinery/light/directional/north, @@ -59326,6 +59314,16 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron, /area/station/service/janitor) +"vpM" = ( +/obj/effect/turf_decal/delivery/white, +/obj/structure/holosign/barrier/atmos/tram, +/turf/open/floor/vault{ + base_icon_state = "tram2"; + icon_state = "tram2"; + desc = "A sturdy looking tram platform."; + name = "tram platform" + }, +/area/station/hallway/primary/tram/right) "vpP" = ( /obj/machinery/door/poddoor/preopen{ id = "Engineering"; @@ -59358,16 +59356,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation/entertainment) -"vqF" = ( -/obj/structure/industrial_lift/tram, -/obj/structure/fluff/tram_rail{ - dir = 1 - }, -/obj/structure/chair/sofa/bench/tram/left{ - dir = 1 - }, -/turf/open/openspace, -/area/station/hallway/primary/tram/center) "vqI" = ( /obj/effect/landmark/start/depsec/science, /obj/effect/turf_decal/trimline/red/arrow_cw, @@ -59535,16 +59523,6 @@ /obj/effect/turf_decal/trimline/neutral/filled/line, /turf/open/floor/iron, /area/station/hallway/primary/tram/right) -"vsj" = ( -/obj/effect/turf_decal/delivery/white, -/obj/structure/holosign/barrier/atmos/tram, -/turf/open/floor/vault{ - base_icon_state = "tram2"; - icon_state = "tram2"; - desc = "A sturdy looking tram platform."; - name = "tram platform" - }, -/area/station/hallway/primary/tram/center) "vsz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -60304,6 +60282,13 @@ }, /turf/open/floor/engine/n2o, /area/station/engineering/atmos) +"vFS" = ( +/obj/structure/fluff/tram_rail, +/obj/effect/landmark/start/hangover, +/obj/structure/industrial_lift/tram, +/obj/structure/chair/sofa/bench/tram/right, +/turf/open/openspace, +/area/station/hallway/primary/tram/center) "vFV" = ( /obj/structure/flora/bush/lavendergrass/style_random, /obj/structure/window/reinforced/spawner/west, @@ -60344,12 +60329,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/maintenance/radshelter/civil) -"vHk" = ( -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/turf/open/floor/iron/cafeteria, -/area/station/command/heads_quarters/rd) "vHq" = ( /obj/machinery/light/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -60451,12 +60430,6 @@ }, /turf/open/floor/iron/white, /area/station/science/xenobiology) -"vJU" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/fluff/tram_rail/floor, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/hallway/primary/tram/center) "vKb" = ( /obj/structure/lattice, /obj/machinery/camera/motion{ @@ -60680,19 +60653,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/cargo/office) -"vOv" = ( -/obj/item/kirbyplants/dead, -/obj/machinery/requests_console/directional/north{ - announcementConsole = 1; - department = "Research Director's Desk"; - departmentType = 5; - name = "Research Director's Requests Console"; - pixel_x = 30; - receive_ore_updates = 1 - }, -/obj/machinery/airalarm/directional/north, -/turf/open/floor/iron/cafeteria, -/area/station/command/heads_quarters/rd) "vOD" = ( /obj/effect/turf_decal/siding/thinplating/corner, /obj/effect/turf_decal/siding/thinplating/corner{ @@ -60757,9 +60717,6 @@ }, /turf/open/floor/iron/dark, /area/station/medical/break_room) -"vPq" = ( -/turf/open/floor/iron/cafeteria, -/area/station/science/breakroom) "vPB" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 1 @@ -61285,6 +61242,13 @@ }, /turf/open/floor/iron/stairs/medium, /area/station/commons/dorms) +"vYL" = ( +/obj/structure/chair/sofa/left{ + dir = 8 + }, +/obj/structure/sign/clock/directional/east, +/turf/open/floor/carpet, +/area/station/medical/psychology) "vYU" = ( /obj/machinery/door/airlock/security/glass{ name = "Holding Area" @@ -61525,6 +61489,17 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) +"wdA" = ( +/obj/effect/turf_decal/delivery/white, +/obj/structure/holosign/barrier/atmos/tram, +/obj/structure/fluff/tram_rail/floor, +/turf/open/floor/vault{ + base_icon_state = "tram2"; + icon_state = "tram2"; + desc = "A sturdy looking tram platform."; + name = "tram platform" + }, +/area/station/hallway/primary/tram/left) "wdG" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment, @@ -61549,9 +61524,10 @@ }, /area/station/commons/fitness) "wew" = ( -/obj/structure/closet/secure_closet/research_director, -/turf/open/floor/iron/cafeteria, -/area/station/command/heads_quarters/rd) +/obj/structure/industrial_lift/tram/white, +/obj/structure/tramwall/titanium, +/turf/open/openspace, +/area/station/hallway/primary/tram/center) "weI" = ( /obj/structure/cable, /obj/machinery/light/small/directional/south, @@ -62380,11 +62356,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/science/lobby) -"wvL" = ( -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable, -/turf/open/floor/iron/cafeteria, -/area/station/command/heads_quarters/rd) "wvN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment{ @@ -62393,10 +62364,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/command/heads_quarters/ce) -"wvY" = ( -/obj/structure/table/glass, -/turf/open/floor/iron/cafeteria, -/area/station/science/breakroom) "wwc" = ( /obj/structure/table/wood, /obj/item/paper_bin{ @@ -62418,6 +62385,14 @@ /obj/item/gun/ballistic/shotgun/doublebarrel, /turf/open/floor/wood, /area/station/service/bar/backroom) +"wwg" = ( +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/structure/chair/sofa/corner, +/turf/open/floor/iron, +/area/station/cargo/miningdock/cafeteria) "wwn" = ( /obj/structure/table, /obj/effect/turf_decal/stripes/line{ @@ -63522,11 +63497,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/secondary/service) -"wQO" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/fluff/tram_rail/floor, -/turf/open/floor/iron, -/area/station/hallway/primary/tram/right) "wQP" = ( /turf/closed/wall, /area/station/maintenance/starboard/lesser) @@ -63659,18 +63629,6 @@ /obj/structure/weightmachine/stacklifter, /turf/open/floor/iron, /area/station/security/prison/workout) -"wSY" = ( -/obj/machinery/light_switch/directional/north{ - pixel_x = 12 - }, -/obj/machinery/newscaster/directional/north, -/obj/machinery/fax{ - fax_name = "Research Director's Office"; - name = "Research Director's Fax Machine" - }, -/obj/structure/table/reinforced, -/turf/open/floor/iron/cafeteria, -/area/station/command/heads_quarters/rd) "wTy" = ( /obj/machinery/button/crematorium{ id = "crematoriumChapel"; @@ -64588,11 +64546,6 @@ /obj/machinery/firealarm/directional/north, /turf/open/floor/iron, /area/station/hallway/secondary/construction/engineering) -"xgy" = ( -/obj/structure/industrial_lift/tram/white, -/obj/structure/window/reinforced/shuttle/tram, -/turf/open/floor/noslip/tram_plate, -/area/station/hallway/primary/tram/center) "xgC" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -64812,6 +64765,19 @@ /obj/item/paper/fluff/genpop_instructions, /turf/open/floor/iron, /area/station/security/execution/transfer) +"xlu" = ( +/obj/effect/turf_decal/delivery/white, +/obj/structure/holosign/barrier/atmos/tram, +/obj/machinery/camera/directional/south{ + c_tag = "Hallway - Western Tram Bridge 2" + }, +/turf/open/floor/vault{ + base_icon_state = "tram2"; + icon_state = "tram2"; + desc = "A sturdy looking tram platform."; + name = "tram platform" + }, +/area/station/hallway/primary/tram/center) "xlw" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -64929,6 +64895,12 @@ /obj/machinery/airalarm/directional/east, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"xor" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/fluff/tram_rail/floor, +/obj/structure/cable, +/turf/open/floor/glass/reinforced/tram, +/area/station/hallway/primary/tram/center) "xoN" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -65642,13 +65614,6 @@ /obj/machinery/pdapainter/engineering, /turf/open/floor/iron, /area/station/command/heads_quarters/ce) -"xBF" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/turf/open/floor/iron/cafeteria, -/area/station/command/heads_quarters/rd) "xBG" = ( /obj/structure/disposalpipe/trunk/multiz{ dir = 1 @@ -65808,19 +65773,6 @@ "xFx" = ( /turf/open/floor/iron, /area/station/commons/fitness) -"xFN" = ( -/obj/effect/turf_decal/delivery/white, -/obj/structure/holosign/barrier/atmos/tram, -/obj/machinery/camera/directional/south{ - c_tag = "Hallway - Eastern Tram Bridge 2" - }, -/turf/open/floor/vault{ - base_icon_state = "tram2"; - icon_state = "tram2"; - desc = "A sturdy looking tram platform."; - name = "tram platform" - }, -/area/station/hallway/primary/tram/right) "xFY" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 @@ -65983,6 +65935,17 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) +"xJH" = ( +/obj/effect/turf_decal/delivery/white, +/obj/structure/holosign/barrier/atmos/tram, +/obj/structure/fluff/tram_rail/floor, +/turf/open/floor/vault{ + base_icon_state = "tram2"; + icon_state = "tram2"; + desc = "A sturdy looking tram platform."; + name = "tram platform" + }, +/area/station/hallway/primary/tram/right) "xJV" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/red/filled/line, @@ -66195,6 +66158,9 @@ /obj/structure/chair/stool/bar/directional/south, /turf/open/floor/eighties, /area/station/commons/fitness/recreation/entertainment) +"xNQ" = ( +/turf/open/floor/iron/cafeteria, +/area/station/science/breakroom) "xNR" = ( /obj/effect/turf_decal/trimline/yellow/filled/corner{ dir = 1 @@ -66436,6 +66402,16 @@ /obj/item/paper_bin, /turf/open/floor/iron, /area/station/security/checkpoint/arrivals) +"xSu" = ( +/obj/structure/industrial_lift/tram, +/obj/structure/fluff/tram_rail{ + dir = 1 + }, +/obj/structure/chair/sofa/bench/tram/right{ + dir = 1 + }, +/turf/open/openspace, +/area/station/hallway/primary/tram/center) "xSv" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /turf/open/floor/iron/white, @@ -66540,6 +66516,10 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/engine_equipment, /turf/open/floor/catwalk_floor, /area/station/maintenance/central/lesser) +"xUs" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/cafeteria, +/area/station/science/breakroom) "xUw" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 8 @@ -66580,6 +66560,12 @@ }, /turf/open/floor/iron, /area/station/security/checkpoint/arrivals) +"xVz" = ( +/obj/machinery/modular_computer/console/preset/research{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria, +/area/station/command/heads_quarters/rd) "xVE" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 8; @@ -66751,13 +66737,6 @@ /obj/effect/landmark/xeno_spawn, /turf/open/floor/iron, /area/station/cargo/miningdock) -"xXi" = ( -/obj/structure/chair/sofa/right{ - dir = 8 - }, -/obj/structure/sign/calendar/directional/east, -/turf/open/floor/carpet, -/area/station/medical/psychology) "xXo" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -66776,13 +66755,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/catwalk_floor, /area/station/hallway/primary/tram/left) -"xXs" = ( -/obj/docking_port/stationary/escape_pod{ - dir = 4 - }, -/obj/effect/turf_decal/sand/plating, -/turf/open/floor/plating/airless, -/area/lavaland/surface) "xXC" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /turf/closed/wall/r_wall, @@ -66850,13 +66822,6 @@ /obj/structure/closet/secure_closet/personal, /turf/open/floor/iron, /area/station/commons/dorms) -"xZu" = ( -/obj/structure/fluff/tram_rail{ - dir = 1 - }, -/obj/structure/industrial_lift/tram, -/turf/open/openspace, -/area/station/hallway/primary/tram/center) "xZx" = ( /obj/machinery/power/terminal{ dir = 1 @@ -66873,6 +66838,14 @@ }, /turf/open/floor/iron, /area/station/security/execution/transfer) +"xZZ" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/cafeteria, +/area/station/science/breakroom) "yan" = ( /obj/machinery/airalarm/directional/east, /turf/open/floor/iron, @@ -67023,10 +66996,24 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"ydF" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/cafeteria, +/area/station/science/breakroom) "ydS" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/cargo/storage) +"yek" = ( +/obj/structure/chair/sofa/right{ + dir = 8 + }, +/obj/structure/sign/calendar/directional/east, +/turf/open/floor/carpet, +/area/station/medical/psychology) "yeo" = ( /obj/machinery/duct, /obj/effect/turf_decal/trimline/neutral/filled/line, @@ -67426,6 +67413,23 @@ }, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) +"yky" = ( +/obj/structure/table/glass, +/obj/item/paper_bin{ + pixel_x = 6; + pixel_y = 3 + }, +/obj/item/pen{ + pixel_x = 6; + pixel_y = 4 + }, +/obj/structure/sign/clock/directional/east, +/obj/item/storage/fancy/coffee_cart_rack{ + pixel_x = -7; + pixel_y = 1 + }, +/turf/open/floor/iron/cafeteria, +/area/station/science/breakroom) "ykN" = ( /obj/effect/turf_decal/trimline/green/corner{ dir = 8 @@ -102608,7 +102612,7 @@ bia hZr gdJ hRj -jlK +lPq mwK xtu beG @@ -111078,11 +111082,11 @@ xtu xtu xtu oys -lJK -lnx -vkm -fUH -viA +lhB +gFJ +gmN +cXW +bOO qig kwK xtS @@ -111335,12 +111339,12 @@ xtu xtu xtu oys -lEx -uNw -ePa -iwX -eLS -ppM +bMP +xUs +lmK +ydF +hHv +agT xOv xBB eiC @@ -111592,11 +111596,11 @@ xtu xtu xtu oys -elT -vPq -mGJ -hku -iBD +igB +xNQ +kwA +xZZ +ePl sPy egP khl @@ -111849,12 +111853,12 @@ xtu xtu xtu oys -sJo -ctx -jpc -wvY -sGb -ppM +mxV +lJn +sdf +jMD +ozg +agT nbq iyC eQy @@ -112106,11 +112110,11 @@ xtu xtu xtu oys -trO -jUN -mkm -pTG -cra +yky +lhA +oTm +ejB +fma qig bnS rGx @@ -112326,10 +112330,10 @@ dhe dhe dhe unl -cFE +caQ nTG nTG -knN +pSf unl qaV kDi @@ -112583,10 +112587,10 @@ dhe dhe dhe unl -naL -nTy -nTy -oPO +wwg +gXS +gXS +exO unl gxw kDi @@ -116466,7 +116470,7 @@ dDG dhe qxm aRN -xXs +nqX aRN qxm dhe @@ -141382,7 +141386,7 @@ jhd avE jhd jhd -hpz +bPP jhd jhd jhd @@ -141410,7 +141414,7 @@ jhd jhd jhd jhd -hpz +bPP jhd jhd jhd @@ -142699,7 +142703,7 @@ vcI gYz tCT oTC -sOi +pEB jhd jhd jhd @@ -152472,7 +152476,7 @@ tDT ylF mSw pUw -hvC +bpr jLf oYR jLf @@ -152987,7 +152991,7 @@ bdz mSw ckb gyt -rcc +nnn iUs iUs iUs @@ -155015,11 +155019,11 @@ yiM jUu xwC eNO -asv -iCz +tZC +mFz qoE -uIC -asv +cXU +tZC eOr aKp sTs @@ -158055,7 +158059,7 @@ dDG dDG iZb aRN -xXs +nqX aRN uIt dhe @@ -158612,13 +158616,13 @@ dDG dDG dOi klT -pYR -pYR -iKU +jIK +jIK +wdA fbM -oGh -pYR -qmF +gEn +jIK +pYg klT aRN dDG @@ -159383,13 +159387,13 @@ cuX dDG dOi pdW -vsj -vsj -gDR +url +url +iyP dns -lsk -vsj -fRp +bTr +url +xlu pdW aRN dDG @@ -162982,11 +162986,11 @@ eSz kQF tGW jJw -kYX -vJU +uMP +xor eGA -jJM -kYX +qwj +uMP hke lNj dVP @@ -163753,11 +163757,11 @@ izU jpv aEM cRU -cmw -btS -xgy -ltK -cmw +wew +hat +dgc +hya +wew lyv eOi agt @@ -164010,11 +164014,11 @@ vyH qGw wHs gej -nbS -cZX -qia -vqF -nbS +qYR +vFS +duZ +oCu +qYR sqz oej vJF @@ -164267,11 +164271,11 @@ vyH qGw bqI izU -cmw -mQW -qia -pmD -cmw +wew +hhS +duZ +xSu +wew izU gYR vJF @@ -164524,11 +164528,11 @@ mlx nfD bip dtC -liQ -rPU -qia -biX -ucQ +bga +ukL +duZ +qXN +jXk wFw qLh vJF @@ -164781,11 +164785,11 @@ beW vrF bip wFw -cQq -rPU -mXp -biX -mRi +lmm +ukL +txc +qXN +bXU pZm eTp eHk @@ -165038,11 +165042,11 @@ vyH vRL vjl fld -sGy -rrF -njs -xZu -sGy +dJx +krX +lBL +meY +dJx jEO anS uwY @@ -165295,11 +165299,11 @@ beW gKo bip wFw -liQ -rPU -sjd -biX -ucQ +bga +ukL +bPX +qXN +jXk wFw fug buT @@ -165552,11 +165556,11 @@ gWq wMY bip wFw -cQq -rPU -qia -biX -mRi +lmm +ukL +duZ +qXN +bXU pWK eyS vJF @@ -165809,11 +165813,11 @@ vyH jfC kBX izU -cmw -ePF -qia -vqF -gqn +wew +uRh +duZ +oCu +pKT izU nWl vJF @@ -166066,11 +166070,11 @@ vyH jfC waf odj -nbS -rEn -qia -ota -nbS +qYR +azO +duZ +hwL +qYR kXK qms vJF @@ -166323,11 +166327,11 @@ izU vtp dUC cRU -cmw -btS -xgy -itV -cmw +wew +hat +dgc +lQJ +wew lyv ebF vsR @@ -166344,7 +166348,7 @@ pnU itk jtr jtr -rUF +lOb xSZ lJC xSZ @@ -167094,11 +167098,11 @@ eSz rMA fmf bxy -kYX -vJU +uMP +xor bwZ -jJM -kYX +qwj +uMP ipd vbL gMZ @@ -168657,9 +168661,9 @@ dvK bLQ bFq qgd -xXi -rqT -fxk +yek +kTB +vYL kcZ ugt pbn @@ -170691,13 +170695,13 @@ dhe dDG dOi pdW -vsj -vsj -gDR +url +url +iyP dns -lsk -vsj -keR +bTr +url +okc pdW aRN dDG @@ -171462,13 +171466,13 @@ dhe dDG dOi pev -txT -txT -cbP +vpM +vpM +xJH uZg -obW -txT -xFN +kKd +vpM +bbG pev aRN dDG @@ -175061,11 +175065,11 @@ wkz xHd xPU nXJ -iDv -wQO +kmZ +swx oSW -ezQ -iDv +tCd +kmZ qsl aNP czl @@ -176116,7 +176120,7 @@ gyB oPT bSE bSE -abT +miQ bSE bSE oPT @@ -176371,11 +176375,11 @@ wAt tby hTG oPT -wSY -iaE -jir -bmI -wvL +nhc +jgD +eED +iBB +rdm oPT uDW xjr @@ -176628,11 +176632,11 @@ efT kpG hTG bSE -wew -iaE -vHk -etL -xBF +gil +jgD +pkw +kGQ +gGL bSE joR xjr @@ -176885,9 +176889,9 @@ ezw jIC hTG oPT -oFI -gxM -ptl +nZs +mRy +ggi gip hJW bSE @@ -177142,9 +177146,9 @@ ezw jIC ocz oPT -oLV -emx -iNz +hgS +mzQ +cEB fIR lyq oPT @@ -177399,9 +177403,9 @@ ezw jIC hTG oPT -msr -smz -fpW +cjE +rIz +fZz xYj wwn bSE @@ -177656,11 +177660,11 @@ rrc jhi hTG bSE -jRn -iaE -muQ -iaE -qHi +eYe +jgD +hWi +jgD +xVz bSE joR xjr @@ -177913,10 +177917,10 @@ dvH tby hTG oPT -vOv -iaE -iaE -iaE +cEH +jgD +jgD +jgD cqS oPT joR @@ -178172,7 +178176,7 @@ tUm oPT bSE bSE -eXZ +sFL bSE bSE oPT diff --git a/code/__DEFINES/layers.dm b/code/__DEFINES/layers.dm index 70134486de4..a06085bbf04 100644 --- a/code/__DEFINES/layers.dm +++ b/code/__DEFINES/layers.dm @@ -111,7 +111,9 @@ #define HIGH_TURF_LAYER 2.03 #define TURF_PLATING_DECAL_LAYER 2.031 #define TURF_DECAL_LAYER 2.039 //Makes turf decals appear in DM how they will look inworld. -#define ABOVE_OPEN_TURF_LAYER 2.04 +#define DISPOSAL_PIPE_LAYER 2.04 +#define WIRE_LAYER 2.041 +#define ABOVE_OPEN_TURF_LAYER 2.042 //WALL_PLANE layers #define CLOSED_TURF_LAYER 2.05 @@ -120,9 +122,7 @@ #define BULLET_HOLE_LAYER 2.06 #define ABOVE_NORMAL_TURF_LAYER 2.08 #define LATTICE_LAYER 2.2 -#define DISPOSAL_PIPE_LAYER 2.3 #define GAS_PIPE_HIDDEN_LAYER 2.35 //layer = initial(layer) + piping_layer / 1000 in atmospherics/update_icon() to determine order of pipe overlap -#define WIRE_LAYER 2.4 #define TRAM_XING_LAYER 2.41 #define TRAM_RAIL_LAYER 2.42 #define TRAM_FLOOR_LAYER 2.43 diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index c10ead23b4a..d9e10fbbf03 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -17,6 +17,7 @@ GLOBAL_LIST_INIT(wire_node_generating_types, typecacheof(list(/obj/structure/gri icon = 'icons/obj/power_cond/layer_cable.dmi' icon_state = "l2-1-2-4-8-node" color = CABLE_HEX_COLOR_YELLOW + plane = FLOOR_PLANE layer = WIRE_LAYER //Above hidden pipes, GAS_PIPE_HIDDEN_LAYER anchored = TRUE obj_flags = CAN_BE_HIT diff --git a/code/modules/recycling/disposal/pipe.dm b/code/modules/recycling/disposal/pipe.dm index 2412cb2facb..836d5807981 100644 --- a/code/modules/recycling/disposal/pipe.dm +++ b/code/modules/recycling/disposal/pipe.dm @@ -10,6 +10,7 @@ dir = NONE // dir will contain dominant direction for junction pipes max_integrity = 200 armor_type = /datum/armor/structure_disposalpipe + plane = FLOOR_PLANE layer = DISPOSAL_PIPE_LAYER // slightly lower than wires and other pipes damage_deflection = 10 var/dpdir = NONE // bitmask of pipe directions