From d64f4506a3d4014441e85122f51286e0f1dfde3d Mon Sep 17 00:00:00 2001 From: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com> Date: Sun, 13 Nov 2022 17:25:05 +0100 Subject: [PATCH] Compactor and Disposals Access Tweaks (#15062) --- .../programs/civilian/crusher_control.dm | 5 +- html/changelogs/crusher_fr.yml | 13 + maps/sccv_horizon/sccv_horizon-1_deck_1.dmm | 5585 ++++++++--------- maps/sccv_horizon/sccv_horizon-2_deck_2.dmm | 954 +-- 4 files changed, 2991 insertions(+), 3566 deletions(-) create mode 100644 html/changelogs/crusher_fr.yml diff --git a/code/modules/modular_computers/file_system/programs/civilian/crusher_control.dm b/code/modules/modular_computers/file_system/programs/civilian/crusher_control.dm index 4715d0a0742..70c6bf2d5d9 100644 --- a/code/modules/modular_computers/file_system/programs/civilian/crusher_control.dm +++ b/code/modules/modular_computers/file_system/programs/civilian/crusher_control.dm @@ -7,8 +7,9 @@ size = 8 requires_ntnet = FALSE available_on_ntnet = FALSE + required_access_run = list(access_janitor, access_first_responder) required_access_download = access_hop - required_access_run = access_janitor + requires_access_to_run = PROGRAM_ACCESS_LIST_ONE usage_flags = PROGRAM_TELESCREEN nanomodule_path = /datum/nano_module/program/crushercontrol @@ -68,7 +69,7 @@ airlocks = list() for(var/obj/machinery/door/airlock/arlk in orange(10, src.ui_host())) - if(arlk.id_tag != "crusher") + if(arlk.id_tag != "compactor_access") continue airlocks += arlk diff --git a/html/changelogs/crusher_fr.yml b/html/changelogs/crusher_fr.yml new file mode 100644 index 00000000000..542bd95c23e --- /dev/null +++ b/html/changelogs/crusher_fr.yml @@ -0,0 +1,13 @@ +author: SleepyGemmy + +delete-after: True + +changes: + - bugfix: "Gives the First Responder access to the disposals room and its computer." + - maptweak: "Maps in a proper disposals pit." + - maptweak: "Makes the SM reactor waste management room more compact." + - maptweak: "Adds a maintenance tunnel beneath the custodial closet." + - maptweak: "Tweaks maintenance behind the machinist workshop." + - maptweak: "Tweaks the layout of the machinist workshop." + - maptweak: "Makes the area below the machinist workshop a public area and a staging area for the Intrepid." + - maptweak: "Gives the custodian and first responder access to the mail room." \ No newline at end of file diff --git a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm index a7ea4741a85..73c377d0d05 100644 --- a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm +++ b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm @@ -1,7 +1,4 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"aag" = ( -/turf/simulated/floor/tiled, -/area/maintenance/operations) "aaZ" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance{ @@ -10,15 +7,6 @@ }, /turf/simulated/floor/tiled/dark, /area/storage/eva) -"abh" = ( -/obj/structure/railing/mapped{ - dir = 8 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/maintenance/engineering) "abr" = ( /obj/structure/grille/diagonal{ dir = 4 @@ -147,16 +135,10 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard/deck1) "ajK" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-4" - }, +/obj/structure/table/standard, +/obj/item/reagent_containers/glass/beaker/sulphuric, /turf/simulated/floor/tiled, -/area/hangar/intrepid/interstitial) +/area/operations/lower/machinist) "ajM" = ( /obj/machinery/cryopod/robot, /obj/machinery/computer/cryopod/robot{ @@ -277,6 +259,9 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/intrepid/crew_compartment) "apf" = ( +/obj/effect/floor_decal/corner/green{ + dir = 10 + }, /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled, /area/hangar/intrepid) @@ -311,19 +296,6 @@ /obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/tiled/dark, /area/maintenance/disposal) -"aqn" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/light, -/obj/effect/floor_decal/corner/black{ - dir = 10 - }, -/turf/simulated/floor/tiled/dark, -/area/operations/lower/machinist) "aqp" = ( /obj/structure/window/shuttle/scc, /obj/machinery/door/firedoor, @@ -357,23 +329,9 @@ /turf/simulated/wall, /area/janitor) "ars" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/railing/mapped, -/obj/effect/floor_decal/spline/plain, -/obj/machinery/light/small/emergency{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/maintenance/engineering) "arw" = ( @@ -449,20 +407,18 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, +/obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/engineering) "awf" = ( -/obj/structure/bed/stool/chair{ - dir = 1 +/obj/effect/floor_decal/corner/lime/full{ + dir = 4 }, -/obj/effect/floor_decal/spline/plain{ - dir = 5 - }, -/turf/simulated/floor/tiled/dark, -/area/hangar/intrepid) +/obj/structure/railing/mapped, +/turf/simulated/floor/tiled, +/area/medical/morgue/lower) "awo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -649,6 +605,14 @@ /obj/effect/floor_decal/corner/brown/full{ dir = 1 }, +/obj/machinery/power/apc/low{ + dir = 4; + name = "east bump"; + pixel_x = 24 + }, +/obj/structure/cable{ + icon_state = "0-8" + }, /turf/simulated/floor/tiled/dark, /area/maintenance/operations) "aEl" = ( @@ -802,11 +766,8 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/intrepid/rotary) "aHY" = ( -/obj/structure/railing/mapped, -/obj/effect/floor_decal/corner/black{ - dir = 10 - }, -/turf/simulated/floor/tiled/dark, +/obj/effect/map_effect/window_spawner/full/reinforced/firedoor, +/turf/simulated/floor/tiled/dark/full, /area/hangar/intrepid) "aIC" = ( /obj/structure/railing/mapped{ @@ -826,15 +787,6 @@ }, /turf/simulated/wall/shuttle/scc/cardinal, /area/shuttle/intrepid/rotary) -"aJa" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/simulated/floor/plating, -/area/maintenance/substation/hangar) "aJA" = ( /obj/effect/floor_decal/industrial/warning{ dir = 6 @@ -901,10 +853,14 @@ /turf/simulated/floor/tiled/white, /area/shuttle/intrepid/medical_compartment) "aMh" = ( -/obj/structure/railing/mapped, -/obj/structure/trash_pile, +/obj/effect/floor_decal/corner/lime{ + dir = 10 + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, /turf/simulated/floor/tiled, -/area/maintenance/operations) +/area/medical/morgue/lower) "aME" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 5 @@ -920,7 +876,7 @@ dir = 5 }, /obj/structure/reagent_dispensers/peppertank/spacecleaner{ - pixel_y = 24 + pixel_y = 32 }, /turf/simulated/floor/tiled, /area/janitor) @@ -1010,10 +966,6 @@ /obj/machinery/light, /turf/simulated/floor/shuttle/dark_blue, /area/shuttle/escape_pod/pod3) -"aPV" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/tiled/white, -/area/operations/lower/machinist) "aPY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -1032,20 +984,19 @@ /turf/simulated/floor/tiled/dark, /area/rnd/eva) "aQr" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/effect/floor_decal/corner/white{ - dir = 10 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/cable{ + icon_state = "1-8" }, -/turf/simulated/floor/tiled/white, -/area/operations/lower/machinist) +/turf/simulated/floor/tiled/full, +/area/maintenance/engineering) "aRG" = ( /obj/machinery/access_button{ command = "cycle_exterior"; @@ -1127,10 +1078,15 @@ /turf/simulated/floor/plating, /area/hangar/intrepid) "aUC" = ( -/obj/item/stack/rods, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/operations) +/obj/effect/floor_decal/spline/plain{ + dir = 5 + }, +/obj/structure/table/standard, +/obj/item/storage/box/masks, +/obj/item/storage/box/gloves, +/obj/item/reagent_containers/spray/cleaner, +/turf/simulated/floor/tiled/white, +/area/operations/lower/machinist) "aVg" = ( /turf/simulated/floor/tiled/ramp{ dir = 4 @@ -1148,13 +1104,9 @@ /turf/simulated/floor/tiled/dark, /area/hangar/auxiliary) "aWr" = ( -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable{ icon_state = "1-2" }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 5 }, @@ -1168,6 +1120,7 @@ dir = 4; icon_state = "pipe-c" }, +/obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/engineering) "aWx" = ( @@ -1262,12 +1215,18 @@ /turf/simulated/floor/plating, /area/maintenance/wing/port/deck1) "aYY" = ( -/obj/machinery/door/firedoor, -/obj/effect/floor_decal/corner/green{ +/obj/effect/floor_decal/corner/lime{ dir = 10 }, +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 1; + name = "Emergency Supplies Storage" + }, +/obj/machinery/door/firedoor/multi_tile{ + dir = 1 + }, /obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/medical/morgue/lower) "aZd" = ( /obj/structure/table/steel, @@ -1354,18 +1313,10 @@ /turf/simulated/floor/plating, /area/engineering/atmos/air) "baV" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/floor_decal/corner/black{ - dir = 9 - }, -/obj/machinery/firealarm/west, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, -/area/hangar/intrepid/interstitial) +/obj/machinery/door/airlock/maintenance_hatch, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, +/area/maintenance/operations) "bbY" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 4 @@ -1393,23 +1344,13 @@ /turf/simulated/wall, /area/maintenance/substation/engineering/lower) "bdY" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/structure/closet/secure_closet/machinist, +/obj/effect/floor_decal/corner/black{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/railing/mapped{ - dir = 1 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/maintenance/engineering) +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled, +/area/operations/lower/machinist) "bec" = ( /obj/effect/floor_decal/corner/white{ dir = 5 @@ -1491,15 +1432,6 @@ /turf/simulated/floor/plating, /area/engineering/atmos/air) "bfL" = ( -/obj/effect/floor_decal/corner/black{ - dir = 9 - }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 - }, /obj/machinery/light{ dir = 4 }, @@ -1507,7 +1439,17 @@ dir = 4; pixel_x = 32 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/corner/green/full{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled, /area/hangar/intrepid) "bfX" = ( /obj/effect/floor_decal/industrial/warning{ @@ -1515,10 +1457,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/engineering) -"bgA" = ( -/obj/effect/floor_decal/corner/brown/full, -/turf/simulated/floor/tiled/dark, -/area/hangar/intrepid) "bgP" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -1602,14 +1540,11 @@ /turf/simulated/floor/reinforced/airless, /area/shuttle/mining) "blO" = ( -/obj/structure/cable/green{ - icon_state = "1-4" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 5 - }, -/turf/simulated/floor/plating, -/area/maintenance/engineering) +/turf/simulated/floor/tiled, +/area/operations/lower/machinist) "blP" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -1646,7 +1581,6 @@ /turf/simulated/floor/tiled, /area/hangar/operations) "boB" = ( -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable{ icon_state = "1-2" }, @@ -1658,7 +1592,7 @@ req_one_access = list(11,24) }, /obj/machinery/atmospherics/pipe/simple/hidden/black, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/engineering/atmos/propulsion/starboard) "boC" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple, @@ -1776,15 +1710,14 @@ /turf/simulated/floor/tiled, /area/operations/storage) "btw" = ( -/obj/effect/floor_decal/corner/yellow, -/obj/effect/floor_decal/corner/blue{ - dir = 8 +/obj/effect/floor_decal/corner/green{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/visible/black{ +/obj/machinery/light{ dir = 4 }, -/turf/simulated/floor/tiled/dark, -/area/engineering/atmos) +/turf/simulated/floor/tiled, +/area/hallway/primary/aft) "buc" = ( /obj/machinery/atmospherics/pipe/simple/visible/blue{ dir = 10 @@ -1868,23 +1801,7 @@ /turf/simulated/floor/plating, /area/engineering/atmos/air) "bwp" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/railing/mapped, -/obj/effect/floor_decal/spline/plain, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/alarm{ - pixel_y = 28 - }, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/plating, /area/maintenance/engineering) "bwN" = ( @@ -1951,9 +1868,6 @@ /turf/simulated/floor/plating, /area/maintenance/hangar/port) "bzh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/glass_command{ name = "E.V.A."; @@ -1961,16 +1875,17 @@ }, /obj/machinery/door/firedoor, /obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/storage/eva) "bzv" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/effect/floor_decal/corner/black{ - dir = 9 - }, /obj/machinery/firealarm/east, +/obj/effect/floor_decal/corner/green{ + dir = 6 + }, /obj/effect/floor_decal/industrial/warning/corner, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hangar/intrepid) "bAq" = ( /obj/structure/cable/green{ @@ -1999,14 +1914,6 @@ /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/hangar/auxiliary) -"bBg" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_hatch, -/turf/simulated/floor/plating, -/area/maintenance/operations) "bBA" = ( /obj/structure/shuttle_part{ icon = 'icons/turf/shuttles_unique/scc_shuttle_pieces.dmi'; @@ -2016,12 +1923,6 @@ /turf/simulated/floor/plating, /area/shuttle/intrepid/engine_compartment) "bBD" = ( -/obj/effect/floor_decal/corner/black{ - dir = 9 - }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 - }, /obj/machinery/button/remote/blast_door{ dir = 4; id = "shutters_custodialgarage"; @@ -2036,6 +1937,12 @@ pixel_x = -24; pixel_y = -7 }, +/obj/effect/floor_decal/corner/green{ + dir = 9 + }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/primary/aft) "bBL" = ( @@ -2122,6 +2029,15 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/engineering/atmos) +"bDv" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/corner/green{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/aft) "bDQ" = ( /obj/structure/railing/mapped{ dir = 8 @@ -2189,6 +2105,14 @@ /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/wing/starboard/deck1) +"bFv" = ( +/obj/structure/table/steel, +/obj/machinery/cell_charger, +/obj/effect/floor_decal/corner/green{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/hangar/intrepid) "bFw" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -2217,11 +2141,6 @@ /obj/structure/ship_weapon_dummy, /turf/simulated/floor/plating, /area/shuttle/intrepid/cockpit) -"bGH" = ( -/turf/simulated/floor/tiled/ramp/bottom{ - dir = 4 - }, -/area/maintenance/operations) "bGM" = ( /obj/structure/cable{ icon_state = "2-8" @@ -2395,10 +2314,11 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/ramp/bottom{ - dir = 1 +/obj/effect/floor_decal/corner/green{ + dir = 10 }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, /area/hallway/primary/aft) "bMg" = ( /obj/structure/table/steel, @@ -2417,33 +2337,21 @@ /turf/simulated/floor/tiled, /area/janitor) "bMO" = ( -/obj/structure/table/standard, -/obj/item/material/ashtray/bronze, -/obj/machinery/camera/network/first_deck{ - c_tag = "First Deck - Hangar 2"; - dir = 4 - }, -/obj/machinery/alarm{ - dir = 4; - pixel_x = -28 - }, -/obj/effect/floor_decal/spline/plain{ +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/turf/simulated/floor/tiled/dark, -/area/hangar/intrepid) +/turf/simulated/floor/tiled, +/area/operations/lower/machinist) "bNT" = ( -/obj/effect/floor_decal/corner/black/full{ - dir = 4 - }, /obj/machinery/light, /obj/structure/bed/stool/chair/padded/brown{ - can_buckle = 0; - dir = 8; - name = "old chair" + dir = 8 + }, +/obj/effect/floor_decal/corner/green/full{ + dir = 4 }, /turf/simulated/floor/tiled, -/area/storage/eva) +/area/hallway/primary/aft) "bNW" = ( /obj/effect/floor_decal/corner_wide/purple/full{ dir = 1 @@ -2543,21 +2451,6 @@ }, /turf/simulated/floor/tiled, /area/operations/loading) -"bRX" = ( -/obj/machinery/conveyor_switch/oneway{ - id = "ops"; - pixel_x = -13; - pixel_y = 20 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/floor_decal/corner/white/full{ - dir = 1 - }, -/obj/machinery/firealarm/east, -/turf/simulated/floor/tiled/white, -/area/operations/lower/machinist) "bSo" = ( /obj/effect/floor_decal/corner_wide/purple{ dir = 4 @@ -2570,33 +2463,17 @@ /turf/simulated/floor/tiled/white, /area/rnd/xenoarch_atrium) "bSr" = ( -/obj/structure/railing/mapped{ - dir = 8 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 8 - }, /obj/effect/decal/cleanable/dirt, /obj/item/material/shard, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/engineering) "bSM" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/airless, /area/hangar/intrepid) -"bSO" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/hologram/holopad, -/turf/simulated/floor/tiled/dark, -/area/operations/lower/machinist) "bUN" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -2613,17 +2490,13 @@ /turf/simulated/floor/tiled, /area/hangar/intrepid) "bVc" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 + dir = 4 }, -/obj/structure/cable{ - icon_state = "2-4" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/tiled/ramp/bottom{ +/turf/simulated/floor/tiled/ramp{ dir = 8 }, /area/maintenance/engineering) @@ -2634,9 +2507,24 @@ /turf/simulated/floor/tiled/dark, /area/turret_protected/ai_upload) "bVV" = ( -/obj/item/material/shard, -/turf/simulated/floor/plating, -/area/maintenance/operations) +/obj/machinery/camera/network/supply{ + c_tag = "Operations - Workshop Aft"; + dir = 4 + }, +/obj/structure/reagent_dispensers/watertank, +/obj/machinery/firealarm/west, +/obj/structure/sign/nosmoking_1{ + pixel_y = 32 + }, +/obj/effect/floor_decal/corner/black/full{ + dir = 8 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled, +/area/operations/lower/machinist) "bWE" = ( /obj/machinery/atmospherics/pipe/simple/visible/blue{ dir = 9 @@ -2656,6 +2544,19 @@ }, /turf/simulated/floor/reinforced/oxygen, /area/engineering/atmos/air) +"bYz" = ( +/obj/machinery/power/apc/super{ + dir = 8; + pixel_x = -24 + }, +/obj/structure/cable/green, +/obj/effect/floor_decal/corner/black{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/operations/lower/machinist) "bZn" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -2724,8 +2625,8 @@ /obj/structure/railing/mapped{ dir = 8 }, -/obj/effect/floor_decal/corner/green/full, /obj/structure/table/rack, +/obj/effect/floor_decal/corner/lime/full, /turf/simulated/floor/tiled/white{ name = "cooled white floor"; temperature = 278.15 @@ -2890,6 +2791,15 @@ }, /turf/simulated/floor/reinforced, /area/engineering/gravity_gen) +"chY" = ( +/obj/structure/sink{ + pixel_y = 28 + }, +/obj/effect/floor_decal/corner/black{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/operations/lower/machinist) "cir" = ( /obj/effect/map_effect/window_spawner/full/reinforced/firedoor, /turf/simulated/floor/tiled/dark/full, @@ -3024,16 +2934,6 @@ /obj/machinery/atmospherics/pipe/manifold/visible/cyan, /turf/simulated/floor/plating, /area/engineering/atmos/air) -"coF" = ( -/obj/structure/bed/stool/chair{ - dir = 1 - }, -/obj/machinery/light, -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, -/area/hangar/intrepid) "cpf" = ( /obj/effect/floor_decal/corner/brown/diagonal, /turf/simulated/floor/tiled, @@ -3089,8 +2989,7 @@ /turf/simulated/floor/tiled, /area/maintenance/wing/starboard/deck1) "cqu" = ( -/obj/structure/closet/crate/bin, -/obj/random/loot, +/obj/effect/spider/stickyweb, /turf/simulated/floor/plating, /area/maintenance/operations) "crb" = ( @@ -3133,21 +3032,6 @@ /obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/plating, /area/shuttle/intrepid/cargo_bay) -"ctf" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/corner/black/full{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/operations/lower/machinist) "cty" = ( /obj/structure/closet/crate, /obj/effect/floor_decal/corner/brown{ @@ -3200,24 +3084,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/hallway/primary/aft) "cuA" = ( -/obj/machinery/light/small, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 +/obj/effect/floor_decal/corner/lime{ + dir = 8 }, -/obj/effect/landmark{ - name = "borerstart" - }, -/obj/effect/floor_decal/corner/green{ - dir = 10 - }, -/obj/machinery/computer/shuttle_control/lift/wall{ - dir = 1; - pixel_y = -32; - shuttle_tag = "Morgue Lift" +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 }, /turf/simulated/floor/tiled, /area/medical/morgue/lower) @@ -3272,7 +3146,7 @@ /obj/item/device/radio/off{ pixel_y = 5 }, -/obj/effect/floor_decal/corner/green{ +/obj/effect/floor_decal/corner/lime{ dir = 9 }, /turf/simulated/floor/tiled, @@ -3304,6 +3178,20 @@ /obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/maintenance/wing/port/deck1) +"cyS" = ( +/obj/machinery/power/smes/buildable{ + RCon_tag = "Substation - Hangar" + }, +/obj/structure/cable, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/turf/simulated/floor/plating, +/area/maintenance/substation/hangar) "cyU" = ( /obj/effect/floor_decal/corner_wide/purple{ dir = 9 @@ -3627,15 +3515,6 @@ }, /turf/simulated/floor/tiled, /area/operations/loading) -"cNk" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, -/area/maintenance/engineering) "cNp" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -3643,10 +3522,13 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/effect/floor_decal/corner/black{ +/obj/effect/floor_decal/corner/green{ + dir = 8 + }, +/obj/effect/floor_decal/corner/paleblue{ dir = 6 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hangar/intrepid/interstitial) "cND" = ( /obj/structure/bed/stool/chair/office/bridge, @@ -3749,8 +3631,15 @@ /turf/simulated/floor/plating, /area/maintenance/engineering) "cSq" = ( -/obj/effect/floor_decal/corner/black, -/turf/simulated/floor/tiled/dark, +/obj/structure/table/standard, +/obj/item/storage/bag/circuits/basic, +/obj/item/device/integrated_electronics/debugger{ + pixel_x = 6 + }, +/obj/item/device/integrated_electronics/wirer{ + pixel_x = -6 + }, +/turf/simulated/floor/tiled, /area/operations/lower/machinist) "cSt" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -3765,51 +3654,47 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/structure/sign/kiddieplaque/janitor{ - name = "wooden plaque"; - pixel_x = -32 - }, /obj/effect/floor_decal/corner/purple{ dir = 9 }, +/obj/item/modular_computer/telescreen/preset/trashcompactor{ + pixel_x = -32 + }, /turf/simulated/floor/tiled/dark, /area/maintenance/disposal) +"cSz" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/full, +/area/maintenance/engineering) "cSQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, +/obj/structure/disposalpipe/segment, /obj/structure/cable/green{ - icon_state = "2-8" + icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/corner/green{ + dir = 5 }, /turf/simulated/floor/tiled, /area/hangar/intrepid) "cSZ" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/railing/mapped{ dir = 8 }, -/obj/structure/railing/mapped, -/obj/effect/floor_decal/spline/plain{ +/obj/effect/floor_decal/industrial/warning{ dir = 10 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plating, /area/maintenance/engineering) "cTj" = ( @@ -3964,8 +3849,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/cleanable/dirt, -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/disposalpipe/segment, +/obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/engineering) "cZw" = ( @@ -4009,22 +3894,20 @@ /obj/machinery/washing_machine, /turf/simulated/floor/tiled/dark, /area/rnd/xenoarch_atrium) -"dcC" = ( -/obj/machinery/door/firedoor, -/obj/structure/table/reinforced/steel, -/obj/machinery/door/window/westright{ - name = "Workshop Desk Internal"; - req_access = list(29) +"ddJ" = ( +/obj/structure/cable/green{ + icon_state = "2-8" }, -/obj/machinery/door/window/eastleft{ - name = "Workshop Desk External" +/obj/effect/floor_decal/corner/black{ + dir = 9 }, -/obj/machinery/door/blast/shutters/open{ - dir = 4; - id = "shutters_deck1_workshopdesk"; - name = "Workshop Desk Shutter" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, -/turf/simulated/floor/tiled/dark/full, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/tiled, /area/operations/lower/machinist) "ddL" = ( /obj/structure/cable/green{ @@ -4053,10 +3936,10 @@ /turf/simulated/floor/plating, /area/engineering/atmos) "dei" = ( -/obj/structure/cable/green{ - icon_state = "2-8" - }, /obj/effect/decal/cleanable/dirt, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/engineering) @@ -4071,27 +3954,6 @@ /obj/effect/floor_decal/industrial/outline/emergency_closet, /turf/simulated/floor/tiled, /area/hangar/operations) -"dgl" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/railing/mapped{ - dir = 1 - }, -/obj/structure/railing/mapped{ - dir = 8 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 9 - }, -/turf/simulated/floor/plating, -/area/maintenance/engineering) "dgC" = ( /obj/effect/floor_decal/industrial/warning{ dir = 5 @@ -4181,13 +4043,14 @@ /turf/simulated/floor/plating, /area/shuttle/intrepid/cargo_bay) "diJ" = ( +/obj/structure/disposalpipe/sortjunction/flipped{ + dir = 1; + name = "Workshop"; + sortType = "Workshop" + }, /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /turf/simulated/floor/tiled, /area/hangar/intrepid/interstitial) "diR" = ( @@ -4214,7 +4077,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/effect/floor_decal/corner/green/full, +/obj/effect/floor_decal/corner/lime/full, /turf/simulated/floor/tiled, /area/medical/emergency_storage) "dka" = ( @@ -4229,6 +4092,14 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled, /area/storage/eva) +"dmS" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/mining{ + name = "Workshop"; + req_access = list(29) + }, +/turf/simulated/floor/tiled/full, +/area/operations/lower/machinist) "dns" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -4325,14 +4196,14 @@ /turf/simulated/floor/tiled, /area/horizon/stairwell/central) "doK" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 +/obj/effect/floor_decal/corner/lime{ + dir = 10 }, -/turf/simulated/floor/plating, -/area/tcommsat/mainlvl_tcomms__relay) +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/medical/morgue/lower) "doM" = ( /obj/effect/floor_decal/corner_wide/purple{ dir = 1 @@ -4354,10 +4225,6 @@ }, /turf/space/dynamic, /area/horizon/exterior) -"dpK" = ( -/obj/structure/lattice/catwalk/indoor/grate/damaged, -/turf/simulated/floor/plating, -/area/maintenance/operations) "dqy" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -4416,19 +4283,16 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard/deck1) "dsT" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/effect/floor_decal/industrial/hatch, +/obj/machinery/r_n_d/protolathe, +/obj/structure/railing/mapped{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/spline/plain{ + dir = 6 }, -/obj/effect/floor_decal/corner/white{ - dir = 10 - }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/carpet/rubber, /area/operations/lower/machinist) "dtN" = ( /obj/machinery/light/spot/weak{ @@ -4478,10 +4342,15 @@ /turf/simulated/floor/tiled, /area/hallway/engineering) "dvT" = ( -/obj/effect/map_effect/window_spawner/full/reinforced/polarized/firedoor{ - id = "1deckworkshop" +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/mining{ + name = "Workshop"; + req_access = list(29) }, -/turf/simulated/floor/tiled/dark/full, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/full, /area/operations/lower/machinist) "dwt" = ( /obj/structure/window/shuttle/scc, @@ -4571,16 +4440,6 @@ }, /turf/simulated/floor/tiled, /area/operations/loading) -"dBd" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/structure/lattice/catwalk/indoor/grate, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/maintenance/operations) "dBA" = ( /turf/simulated/floor/reinforced/hydrogen, /area/engineering/atmos) @@ -4896,11 +4755,6 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark/full, /area/engineering/atmos) -"dMM" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_hatch, -/turf/simulated/floor/plating, -/area/outpost/mining_main/refinery) "dMS" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/machinery/portable_atmospherics/hydroponics/soil, @@ -4996,26 +4850,6 @@ /obj/effect/shuttle_landmark/horizon/nav2, /turf/simulated/floor/plating, /area/hangar/auxiliary) -"dUK" = ( -/obj/structure/table/steel, -/obj/structure/railing/mapped{ - dir = 1 - }, -/obj/effect/floor_decal/corner/white/full{ - dir = 1 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, -/obj/item/storage/bag/circuits/basic, -/obj/item/device/integrated_electronics/debugger{ - pixel_x = 6 - }, -/obj/item/device/integrated_electronics/wirer{ - pixel_x = -6 - }, -/turf/simulated/floor/tiled/white, -/area/operations/lower/machinist) "dUP" = ( /obj/structure/railing/mapped, /obj/structure/morgue{ @@ -5102,11 +4936,8 @@ /turf/simulated/floor/tiled, /area/outpost/mining_main/refinery) "dWL" = ( -/obj/structure/lattice/catwalk/indoor/grate, -/obj/effect/decal/cleanable/cobweb2{ - icon_state = "cobweb1" - }, -/turf/simulated/floor/plating, +/obj/random/junk, +/turf/simulated/floor/tiled, /area/maintenance/operations) "dXd" = ( /turf/simulated/floor/plating, @@ -5188,24 +5019,13 @@ }, /turf/simulated/floor/tiled, /area/maintenance/wing/starboard/deck1) -"eaw" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/hologram/holopad, -/obj/effect/floor_decal/corner/white{ - dir = 10 - }, -/turf/simulated/floor/tiled/white, -/area/operations/lower/machinist) "eaO" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/hangar/intrepid/interstitial) "eaS" = ( @@ -5244,11 +5064,9 @@ /turf/simulated/floor/plating, /area/engineering/atmos/air) "ebK" = ( -/obj/structure/railing/mapped{ - dir = 8 - }, /obj/structure/railing/mapped, -/obj/effect/floor_decal/spline/plain{ +/obj/item/stack/rods, +/obj/effect/floor_decal/industrial/warning{ dir = 10 }, /turf/simulated/floor/plating, @@ -5278,15 +5096,20 @@ /turf/simulated/floor/tiled, /area/maintenance/wing/starboard/deck1) "edm" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/machinery/light{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/structure/table/steel, -/obj/item/device/destTagger, -/obj/effect/floor_decal/corner/brown/diagonal, -/turf/simulated/floor/tiled/dark, -/area/hangar/intrepid) +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/full, +/area/maintenance/engineering) "eds" = ( /obj/effect/floor_decal/corner_wide/purple{ dir = 4 @@ -5395,7 +5218,7 @@ /turf/simulated/floor/plating, /area/engineering/atmos/air) "ege" = ( -/obj/effect/floor_decal/corner/green/full{ +/obj/effect/floor_decal/corner/lime/full{ dir = 8 }, /turf/simulated/floor/tiled/white{ @@ -5444,8 +5267,7 @@ /area/maintenance/substation/engineering/lower) "ekb" = ( /obj/structure/disposalpipe/segment, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/hallway/primary/aft) "ekm" = ( /obj/effect/floor_decal/industrial/warning{ @@ -5497,18 +5319,6 @@ /obj/machinery/firealarm/west, /turf/simulated/floor/plating, /area/engineering/storage/lower) -"emF" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_hatch{ - req_one_access = list(12,26,29) - }, -/turf/simulated/floor/plating, -/area/maintenance/operations) "emH" = ( /obj/effect/floor_decal/corner/green/diagonal, /obj/machinery/alarm{ @@ -5628,17 +5438,11 @@ /turf/simulated/floor/tiled/dark, /area/storage/eva) "erk" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/structure/cable/green{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/tiled, /area/hangar/intrepid/interstitial) @@ -5732,9 +5536,16 @@ /turf/simulated/floor/plating, /area/maintenance/engineering) "evA" = ( -/obj/effect/floor_decal/corner/green{ +/obj/effect/floor_decal/corner/lime{ dir = 10 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/obj/effect/landmark{ + name = "borerstart" + }, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled, /area/medical/morgue/lower) "evK" = ( @@ -5761,16 +5572,17 @@ /turf/simulated/floor/plating, /area/shuttle/intrepid/crew_compartment) "ewI" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 +/obj/machinery/door/firedoor, +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/structure/table/reinforced/steel, -/obj/item/material/ashtray/glass, -/obj/effect/floor_decal/corner/brown{ - dir = 6 +/obj/machinery/door/airlock/engineering{ + name = "Hangar Substation"; + req_one_access = list(11,24) }, -/turf/simulated/floor/tiled/dark, -/area/hangar/intrepid) +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/full, +/area/maintenance/substation/hangar) "exg" = ( /obj/machinery/light/small{ dir = 1 @@ -5807,6 +5619,15 @@ /obj/structure/railing/mapped, /turf/simulated/floor/plating, /area/maintenance/research_port) +"exV" = ( +/obj/effect/floor_decal/corner/black{ + dir = 6 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/operations/lower/machinist) "exX" = ( /obj/structure/disposalpipe/segment, /obj/structure/lattice/catwalk/indoor/grate, @@ -5882,6 +5703,12 @@ /obj/effect/floor_decal/corner/purple{ dir = 6 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/maintenance/disposal) "ezF" = ( @@ -5943,17 +5770,6 @@ }, /turf/simulated/floor/tiled, /area/outpost/mining_main/refinery) -"eBw" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock/highsecurity{ - name = "First Deck Telecommunications Relay"; - req_access = list(61) - }, -/turf/simulated/floor/plating, -/area/tcommsat/mainlvl_tcomms__relay) "eCh" = ( /obj/structure/railing/mapped{ dir = 8 @@ -5981,6 +5797,14 @@ }, /turf/simulated/floor/tiled, /area/operations/loading) +"eDn" = ( +/obj/structure/reagent_dispensers/fueltank, +/obj/effect/floor_decal/corner/black{ + dir = 5 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled, +/area/operations/lower/machinist) "eDE" = ( /obj/machinery/atmospherics/pipe/manifold/visible/black, /obj/machinery/air_sensor{ @@ -5996,6 +5820,15 @@ }, /turf/simulated/floor/tiled/dark, /area/hangar/auxiliary) +"eEm" = ( +/obj/structure/bed/stool/chair/padded/brown{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/hangar/intrepid) "eET" = ( /obj/machinery/atmospherics/pipe/simple/visible/black, /turf/simulated/floor/tiled/dark, @@ -6184,33 +6017,24 @@ /turf/simulated/floor/plating, /area/rnd/xenoarch_atrium) "eKo" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/item/paper_bin, +/obj/item/pen/black, +/obj/machinery/ringer{ + department = "Robotics"; + id = "robo_ringer"; + pixel_x = 32; + req_access = list(29) }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/sign/nosmoking_1{ + pixel_y = -32 + }, +/obj/effect/floor_decal/corner/black/full{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/airlock/glass_mining{ - name = "Cargo Bay"; - req_access = null; - req_one_access = list(26,31,48,67,29) - }, -/obj/machinery/door/blast/regular/open{ - id = "hangarlockdown"; - name = "Hangar Lockdown" - }, -/obj/effect/map_effect/door_helper/unres{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/hangar/intrepid) +/obj/machinery/light, +/obj/structure/table/standard, +/turf/simulated/floor/tiled, +/area/operations/lower/machinist) "eKr" = ( /obj/structure/cable{ icon_state = "4-8" @@ -6225,7 +6049,9 @@ /turf/simulated/floor/reinforced, /area/rnd/test_range) "eKJ" = ( -/obj/machinery/door/airlock/engineering, +/obj/machinery/door/airlock/engineering{ + name = "Operations Substation" + }, /obj/structure/cable{ icon_state = "4-8" }, @@ -6563,20 +6389,17 @@ /area/engineering/drone_fabrication) "eYb" = ( /obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 }, /obj/structure/lattice/catwalk/indoor/grate, -/obj/structure/railing/mapped{ - dir = 1 - }, /turf/simulated/floor/plating, -/area/maintenance/operations) +/area/maintenance/engineering) "eYl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -6695,10 +6518,8 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/mining) "fbL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/rnd/eva) "fcc" = ( @@ -6779,20 +6600,21 @@ /turf/simulated/floor/plating, /area/maintenance/substation/security) "feW" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/effect/floor_decal/corner/black{ - dir = 9 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/airlock/multi_tile/glass{ + name = "Hangar" }, -/obj/structure/sign/emergency/evacuation{ - pixel_x = -32 +/obj/machinery/door/firedoor/multi_tile, +/obj/machinery/door/blast/regular/open{ + dir = 8; + id = "hangarlockdown"; + name = "Hangar Lockdown" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/hangar/intrepid) "feY" = ( /obj/structure/cable/green{ @@ -6802,17 +6624,20 @@ /turf/simulated/floor/plating, /area/maintenance/operations) "fga" = ( -/obj/machinery/optable{ - desc = "Used for advanced medical procedures, such as removing brains for cyborgification. Also used to repair unlawed synthetics."; - name = "Workshop Operation Table" +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark/full, -/area/operations/lower/machinist) -"fgF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/corner/black{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hangar/intrepid) +"fgF" = ( +/obj/effect/floor_decal/corner/green{ dir = 5 }, /turf/simulated/floor/tiled, @@ -6827,14 +6652,8 @@ "fhF" = ( /obj/structure/closet/crate/bin, /obj/random/loot, -/obj/structure/railing/mapped{ - dir = 8 - }, /obj/effect/floor_decal/industrial/warning{ - dir = 9 - }, -/obj/structure/railing/mapped{ - dir = 1 + dir = 8 }, /turf/simulated/floor/plating, /area/maintenance/operations) @@ -6970,10 +6789,20 @@ /turf/simulated/floor/plating, /area/maintenance/wing/port/deck1) "fmL" = ( -/obj/effect/decal/cleanable/dirt, -/obj/random/loot, -/turf/simulated/floor/plating, -/area/maintenance/operations) +/obj/effect/floor_decal/corner/lime/full{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/medical/morgue/lower) +"fmV" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/corner/green{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/hangar/intrepid/interstitial) "fnB" = ( /obj/structure/sign/nosmoking_1{ pixel_y = 32 @@ -6998,6 +6827,15 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/engineering/atmos/propulsion) +"fob" = ( +/obj/structure/table/steel, +/obj/item/paper_bin, +/obj/item/pen, +/obj/effect/floor_decal/corner/green{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/hangar/intrepid) "fox" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -7067,16 +6905,6 @@ }, /turf/simulated/floor/tiled, /area/hangar/operations) -"fqU" = ( -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/machinery/disposal/small/east, -/obj/effect/floor_decal/corner/white{ - dir = 9 - }, -/turf/simulated/floor/tiled/white, -/area/operations/lower/machinist) "frg" = ( /obj/structure/table/steel, /obj/machinery/light{ @@ -7128,11 +6956,9 @@ /turf/simulated/wall, /area/maintenance/engineering) "ftn" = ( -/obj/structure/cable/green{ +/obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/hangar/intrepid/interstitial) "ftL" = ( @@ -7145,10 +6971,10 @@ /turf/simulated/floor/airless, /area/engineering/atmos) "fuL" = ( -/obj/effect/floor_decal/corner/black{ +/obj/effect/floor_decal/corner/paleblue{ dir = 6 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hangar/intrepid/interstitial) "fuU" = ( /obj/machinery/bodyscanner{ @@ -7294,26 +7120,9 @@ /turf/simulated/floor/tiled/white, /area/shuttle/intrepid/medical_compartment) "fBg" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/structure/railing/mapped, -/obj/structure/railing/mapped{ - dir = 4 - }, -/obj/effect/floor_decal/spline/plain{ +/obj/effect/floor_decal/industrial/warning{ dir = 6 }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /turf/simulated/floor/plating, /area/maintenance/engineering) "fBi" = ( @@ -7538,19 +7347,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/research_port) -"fKw" = ( -/obj/effect/floor_decal/corner/black{ - dir = 10 - }, -/obj/machinery/conveyor_switch/oneway{ - desc = "A conveyor control switch. It appears to only go in one direction. Controls the components conveyor belt."; - id = "Robocompo"; - pixel_x = 13; - pixel_y = -5 - }, -/obj/structure/railing/mapped, -/turf/simulated/floor/tiled/dark, -/area/operations/lower/machinist) "fKB" = ( /obj/structure/railing/mapped{ dir = 1 @@ -7600,7 +7396,10 @@ "fMM" = ( /obj/machinery/door/airlock/multi_tile/glass, /obj/machinery/door/firedoor/multi_tile, -/turf/simulated/floor/tiled, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/full, /area/hangar/intrepid/interstitial) "fOC" = ( /obj/structure/tank_wall/hydrogen{ @@ -7620,8 +7419,7 @@ dir = 2; icon_state = "pipe-c" }, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/hallway/primary/aft) "fPF" = ( /obj/machinery/door/firedoor, @@ -7734,7 +7532,6 @@ /turf/simulated/open/airless, /area/template_noop) "fRj" = ( -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -7747,6 +7544,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 8 }, +/obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/engineering) "fRu" = ( @@ -7845,18 +7643,21 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard/deck1) "fUm" = ( +/obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, /turf/simulated/floor/tiled/dark/full, /area/maintenance/disposal) "fUG" = ( -/obj/effect/floor_decal/corner/black/full, /obj/structure/bed/stool/chair/padded/brown{ dir = 4 }, +/obj/effect/floor_decal/corner/green{ + dir = 10 + }, /turf/simulated/floor/tiled, -/area/storage/eva) +/area/hallway/primary/aft) "fUS" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -7864,6 +7665,9 @@ /obj/effect/floor_decal/corner/brown{ dir = 6 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/dark, /area/maintenance/operations) "fVh" = ( @@ -7912,20 +7716,11 @@ }, /area/engineering/atmos/propulsion) "fWx" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_mining{ - name = "Cargo Bay"; - req_access = null; - req_one_access = list(26,31,48,67,29) +/obj/effect/floor_decal/corner/green{ + dir = 5 }, -/obj/machinery/door/blast/regular/open{ - id = "hangarlockdown"; - name = "Hangar Lockdown" - }, -/obj/effect/map_effect/door_helper/unres{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, +/obj/structure/table/wood, +/turf/simulated/floor/tiled, /area/hangar/intrepid) "fWU" = ( /obj/structure/cable{ @@ -7962,6 +7757,15 @@ /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/hangar/starboard) +"fXS" = ( +/obj/effect/floor_decal/corner/black{ + dir = 9 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hangar/intrepid/interstitial) "fYt" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -7973,7 +7777,7 @@ /turf/simulated/floor/tiled/dark, /area/turret_protected/ai_upload) "fZr" = ( -/obj/random/junk, +/obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning{ dir = 10 }, @@ -8124,7 +7928,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/effect/floor_decal/corner/green{ +/obj/effect/floor_decal/corner/lime{ dir = 4 }, /turf/simulated/floor/tiled, @@ -8236,22 +8040,6 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/intrepid/engine_compartment) -"ggZ" = ( -/obj/structure/plasticflaps/mining, -/obj/machinery/conveyor{ - dir = 8; - id = "ops"; - layer = 2.9 - }, -/obj/machinery/door/firedoor, -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/machinery/door/blast/shutters{ - dir = 4; - id = "machinistworkshop"; - name = "Machinist Workshop Conveyor Shutter" - }, -/turf/simulated/floor/tiled/dark/full, -/area/operations/lower/machinist) "ghn" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -8327,8 +8115,9 @@ /turf/simulated/floor/tiled, /area/operations/storage) "gkE" = ( -/obj/effect/floor_decal/corner/black{ - dir = 10 +/obj/machinery/vending/snack, +/obj/effect/floor_decal/corner/green{ + dir = 5 }, /turf/simulated/floor/tiled, /area/hangar/intrepid) @@ -8480,6 +8269,25 @@ temperature = 278.15 }, /area/medical/morgue/lower) +"gry" = ( +/obj/item/device/flash/synthetic{ + pixel_x = -7; + pixel_y = 1 + }, +/obj/item/device/flash/synthetic{ + pixel_y = 1 + }, +/obj/item/device/flash/synthetic{ + pixel_x = 7; + pixel_y = 1 + }, +/obj/item/device/flash/synthetic{ + pixel_x = 14; + pixel_y = 1 + }, +/obj/structure/table/standard, +/turf/simulated/floor/tiled, +/area/operations/lower/machinist) "grH" = ( /turf/simulated/floor/holofloor/tiled/ramp/bottom{ dir = 1 @@ -8536,9 +8344,22 @@ /turf/simulated/floor/plating, /area/maintenance/operations) "gtS" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/full, /area/maintenance/engineering) "gua" = ( /obj/structure/bed/stool/chair/office/bridge{ @@ -8655,25 +8476,29 @@ }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos) -"gxS" = ( -/obj/structure/closet/secure_closet/machinist, -/obj/effect/floor_decal/corner/black{ - dir = 5 - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/dark, -/area/operations/lower/machinist) "gya" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/manifold4w/visible/black, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/propulsion) +"gye" = ( +/obj/item/stack/wrapping_paper, +/obj/item/stack/packageWrap{ + pixel_y = 8 + }, +/obj/item/device/hand_labeler, +/obj/effect/floor_decal/corner/black{ + dir = 10 + }, +/obj/structure/table/standard, +/turf/simulated/floor/tiled, +/area/operations/lower/machinist) "gyg" = ( /obj/structure/cable/green{ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/hangar/intrepid/interstitial) "gyj" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -8713,24 +8538,6 @@ /obj/machinery/atmospherics/pipe/simple/visible/blue, /turf/simulated/floor/reinforced/airmix, /area/engineering/atmos/air) -"gzI" = ( -/obj/structure/table/reinforced/steel, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/item/reagent_containers/glass/beaker/sulphuric, -/obj/structure/railing/mapped{ - dir = 1 - }, -/obj/effect/floor_decal/corner/white{ - dir = 5 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/operations/lower/machinist) "gzQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -8831,12 +8638,15 @@ /turf/simulated/floor/plating, /area/shuttle/intrepid/cargo_bay) "gDC" = ( -/obj/machinery/door/blast/regular/open{ - id = "hangarlockdown"; - name = "Hangar Lockdown" +/obj/structure/sign/nosmoking_1{ + pixel_y = -32 }, -/turf/simulated/floor/tiled/dark, -/area/hangar/intrepid) +/obj/effect/floor_decal/corner/black{ + dir = 10 + }, +/obj/machinery/light, +/turf/simulated/floor/tiled, +/area/operations/lower/machinist) "gDV" = ( /obj/effect/floor_decal/corner_wide/purple{ dir = 6 @@ -8888,30 +8698,18 @@ /turf/simulated/floor/plating, /area/engineering/atmos/propulsion/starboard) "gFI" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/camera/network/supply{ + c_tag = "Operations - Workshop Fore"; dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/power/apc/super/critical{ - dir = 1; - pixel_y = 24 - }, -/obj/structure/cable/green{ - icon_state = "0-4" +/obj/machinery/newscaster{ + pixel_x = -32 }, /obj/effect/floor_decal/corner/black{ - dir = 5 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 + dir = 9 }, /turf/simulated/floor/tiled, -/area/hangar/intrepid) +/area/operations/lower/machinist) "gGb" = ( /obj/machinery/atmospherics/pipe/simple/visible/universal{ dir = 4 @@ -9027,6 +8825,15 @@ /obj/machinery/mineral/equipment_vendor, /turf/simulated/floor/tiled, /area/outpost/mining_main/refinery) +"gLs" = ( +/obj/effect/floor_decal/corner/purple{ + dir = 6 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/maintenance/disposal) "gMp" = ( /obj/effect/shuttle_landmark/lift/morgue_bottom, /turf/simulated/floor/plating, @@ -9126,8 +8933,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/firealarm/north, -/obj/effect/floor_decal/corner/green{ +/obj/effect/floor_decal/corner/lime{ dir = 5 }, /turf/simulated/floor/tiled{ @@ -9282,27 +9088,19 @@ /turf/simulated/floor/plating, /area/engineering/atmos/air) "gYZ" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/machinery/alarm{ + pixel_y = -28; + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/corner/black{ - dir = 5 - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/effect/floor_decal/industrial/loading/yellow{ +/obj/machinery/camera/network/telecom{ + c_tag = "Telecomms - First Deck Relay"; dir = 8 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/light/small{ dir = 4 }, -/turf/simulated/floor/tiled, -/area/hangar/intrepid) +/turf/simulated/floor/tiled/dark/full, +/area/tcommsat/mainlvl_tcomms__relay) "gZP" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -9349,7 +9147,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/effect/floor_decal/corner/green/diagonal, +/obj/effect/floor_decal/corner/lime/diagonal, /turf/simulated/floor/tiled/white{ name = "cooled white floor"; temperature = 278.15 @@ -9430,25 +9228,17 @@ /turf/simulated/floor/plating, /area/shuttle/intrepid/cargo_bay) "her" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/railing/mapped{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/effect/floor_decal/corner/black{ + dir = 6 }, -/obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/airlock/mining{ - name = "Workshop"; - req_access = list(29) +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 }, /turf/simulated/floor/tiled/dark, -/area/operations/lower/machinist) +/area/hangar/intrepid) "heH" = ( /turf/simulated/floor/reinforced/oxygen, /area/engineering/atmos/air) @@ -9495,7 +9285,6 @@ /turf/simulated/floor/tiled/dark, /area/engineering/atmos) "hgt" = ( -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -9515,7 +9304,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/maintenance/engineering) "hgA" = ( /obj/machinery/atmospherics/binary/pump{ @@ -9738,6 +9527,21 @@ }, /turf/simulated/floor/tiled/dark, /area/hangar/auxiliary) +"hqb" = ( +/obj/machinery/mecha_part_fabricator{ + dir = 8 + }, +/obj/structure/railing/mapped{ + dir = 1 + }, +/obj/structure/railing/mapped{ + dir = 8 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/turf/simulated/floor/carpet/rubber, +/area/operations/lower/machinist) "hqg" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/door/blast/shutters/open{ @@ -9821,21 +9625,14 @@ /turf/simulated/wall, /area/maintenance/substation/security) "hts" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/effect/landmark/start{ + name = "Machinist" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/effect/floor_decal/spline/plain{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/effect/floor_decal/corner/brown{ - dir = 5 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/hangar/intrepid) +/turf/simulated/floor/carpet/rubber, +/area/operations/lower/machinist) "htv" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/airless, @@ -9862,19 +9659,22 @@ /turf/simulated/floor/tiled/dark/full, /area/engineering/atmos) "hvO" = ( -/obj/machinery/vending/robotics, -/obj/structure/sign/nosmoking_1{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/light/small/emergency, +/obj/machinery/alarm{ pixel_y = 28 }, -/obj/machinery/camera/network/supply{ - c_tag = "Cargo - Machinist Workshop Entrance" +/obj/structure/lattice/catwalk/indoor/grate, +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/effect/floor_decal/corner/black{ - dir = 5 - }, -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled, -/area/operations/lower/machinist) +/turf/simulated/floor/plating, +/area/maintenance/engineering) "hwk" = ( /obj/machinery/atmospherics/binary/pump{ dir = 8; @@ -9910,7 +9710,7 @@ req_access = list(11); req_one_access = null }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/full, /area/engineering/gravity_gen) "hxj" = ( /obj/structure/table/steel, @@ -10039,11 +9839,17 @@ /turf/simulated/floor/plating, /area/engineering/atmos/air) "hDI" = ( -/obj/effect/floor_decal/corner/black{ - dir = 9 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/machinery/light{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/corner/green{ + dir = 9 }, /turf/simulated/floor/tiled, /area/hallway/primary/aft) @@ -10255,18 +10061,8 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate/bin, /obj/random/loot, -/obj/structure/railing/mapped{ - dir = 8 - }, /turf/simulated/floor/plating, /area/maintenance/operations) -"hMV" = ( -/obj/effect/floor_decal/industrial/loading/yellow{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/dark/full, -/area/operations/lower/machinist) "hNC" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -10324,18 +10120,6 @@ }, /turf/simulated/floor/plating, /area/engineering/atmos) -"hPD" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/corner/white{ - dir = 5 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/operations/lower/machinist) "hQr" = ( /obj/effect/floor_decal/corner/blue{ dir = 6 @@ -10410,22 +10194,32 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/hatch{ +/obj/machinery/door/airlock/service{ name = "Disposals and Recycling"; req_one_access = list(26,67) }, -/turf/simulated/floor/tiled/dark/full, +/turf/simulated/floor/tiled/full, /area/maintenance/disposal) "hUh" = ( /obj/structure/closet/secure_closet/engineering_welding, /turf/simulated/floor/plating, /area/engineering/storage/lower) "hUk" = ( -/obj/effect/floor_decal/corner/black{ - dir = 6 +/obj/effect/floor_decal/corner/green/full, +/obj/machinery/light{ + dir = 8 }, +/obj/effect/floor_decal/industrial/outline/yellow, /obj/effect/floor_decal/industrial/warning/corner, -/turf/simulated/floor/tiled/dark, +/obj/structure/sign/emergency/evacuation{ + dir = 8; + pixel_x = -32 + }, +/obj/machinery/camera/network/first_deck{ + c_tag = "First Deck - Hangar 2"; + dir = 1 + }, +/turf/simulated/floor/tiled, /area/hangar/intrepid) "hUt" = ( /obj/machinery/portable_atmospherics/canister/air/airlock, @@ -10477,17 +10271,11 @@ /area/engineering/atmos) "hVL" = ( /obj/structure/cable{ - icon_state = "1-8" + icon_state = "1-2" }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled/ramp/bottom, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/ramp, /area/maintenance/engineering) "hWb" = ( /turf/simulated/wall/shuttle/scc_space_ship/cardinal, @@ -10544,23 +10332,6 @@ /obj/structure/cable/green, /turf/simulated/floor/plating, /area/maintenance/substation/research_sublevel) -"hYh" = ( -/obj/structure/table/steel, -/obj/machinery/light{ - dir = 1; - icon_state = "tube1" - }, -/obj/item/storage/box/gloves, -/obj/item/storage/box/masks, -/obj/item/reagent_containers/spray/cleaner, -/obj/structure/extinguisher_cabinet{ - pixel_y = 32 - }, -/obj/effect/floor_decal/corner/black{ - dir = 5 - }, -/turf/simulated/floor/tiled/dark, -/area/operations/lower/machinist) "hYy" = ( /turf/simulated/floor/tiled, /area/hangar/intrepid) @@ -10722,10 +10493,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/corner/black{ +/obj/effect/floor_decal/corner/paleblue{ dir = 6 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hangar/intrepid/interstitial) "ife" = ( /obj/machinery/suit_storage_unit/standard_unit, @@ -10757,11 +10528,20 @@ /turf/simulated/floor/plating, /area/shuttle/intrepid/crew_compartment) "ifD" = ( -/obj/structure/railing/mapped, -/obj/effect/decal/cleanable/dirt, -/obj/structure/trash_pile, +/obj/machinery/camera/network/first_deck{ + c_tag = "First Deck - Hangar 8"; + dir = 1 + }, +/obj/effect/floor_decal/corner/green{ + dir = 10 + }, +/obj/machinery/photocopier, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -28 + }, /turf/simulated/floor/tiled, -/area/maintenance/operations) +/area/hangar/intrepid) "ifE" = ( /obj/machinery/door/blast/regular{ id = "iso_c_purge"; @@ -10776,20 +10556,18 @@ /turf/simulated/floor/plating, /area/hangar/intrepid) "ifK" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/machinery/r_n_d/circuit_imprinter, +/obj/structure/reagent_dispensers/acid{ + pixel_y = -32 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/structure/railing/mapped{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/effect/floor_decal/spline/plain{ + dir = 10 }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/effect/floor_decal/corner/white/full, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/carpet/rubber, /area/operations/lower/machinist) "ifU" = ( /obj/structure/grille, @@ -10829,6 +10607,10 @@ }, /turf/simulated/floor/tiled/dark, /area/hangar/intrepid) +"iiM" = ( +/obj/structure/table/standard, +/turf/simulated/floor/tiled, +/area/operations/lower/machinist) "ijj" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 @@ -10862,11 +10644,11 @@ }, /obj/random/junk, /obj/effect/decal/cleanable/dirt, -/obj/structure/railing/mapped{ +/obj/effect/floor_decal/industrial/warning{ dir = 8 }, /turf/simulated/floor/plating, -/area/maintenance/operations) +/area/maintenance/engineering) "ikm" = ( /obj/structure/cable{ icon_state = "2-4" @@ -10905,9 +10687,6 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/structure/railing/mapped{ - dir = 4 - }, /turf/simulated/floor/plating, /area/maintenance/operations) "ikV" = ( @@ -11141,9 +10920,6 @@ /turf/simulated/floor/tiled/airless, /area/hangar/operations) "iyV" = ( -/obj/effect/floor_decal/corner/black{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, @@ -11152,24 +10928,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/aft) -"izN" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/corner/white/diagonal, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_mining{ - name = "Workshop"; - req_access = list(29) - }, -/turf/simulated/floor/tiled/white, -/area/operations/lower/machinist) "iAs" = ( /obj/structure/railing/mapped{ dir = 1 @@ -11260,10 +11018,7 @@ /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/full, /area/medical/morgue/lower) "iEz" = ( /obj/machinery/atmospherics/pipe/simple/visible/supply{ @@ -11466,15 +11221,11 @@ /turf/simulated/floor/airless, /area/engineering/atmos) "iMj" = ( -/obj/structure/railing/mapped{ - dir = 8 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/engineering) +/obj/machinery/recharge_station, +/obj/effect/floor_decal/corner/black/full, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/dark/full, +/area/operations/lower/machinist) "iMY" = ( /obj/structure/cable{ icon_state = "1-8" @@ -11744,19 +11495,22 @@ /area/shuttle/mining) "iZk" = ( /obj/machinery/door/blast/regular/open{ - dir = 4; + dir = 8; id = "hangarlockdown"; name = "Hangar Lockdown" }, /turf/simulated/floor/tiled/dark, /area/hangar/intrepid) "jak" = ( -/obj/structure/lattice/catwalk/indoor/grate, -/obj/structure/railing/mapped{ - dir = 1 +/obj/machinery/conveyor{ + dir = 10; + id = "Robocompo" }, -/turf/simulated/floor/plating, -/area/maintenance/operations) +/obj/effect/floor_decal/spline/plain{ + dir = 9 + }, +/turf/simulated/floor/carpet/rubber, +/area/operations/lower/machinist) "jaP" = ( /obj/structure/grille, /obj/structure/window/shuttle/scc_space_ship, @@ -11813,13 +11567,16 @@ /turf/simulated/floor/tiled, /area/hangar/intrepid) "jcZ" = ( -/obj/structure/sign/flag/scc{ - pixel_y = 32 +/obj/effect/floor_decal/corner/green/full{ + dir = 1 }, -/obj/effect/floor_decal/corner/black/full{ +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/bed/stool/chair/padded/brown{ dir = 8 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hangar/intrepid) "jdm" = ( /obj/structure/morgue{ @@ -11857,13 +11614,6 @@ /obj/effect/map_effect/window_spawner/full/reinforced/firedoor, /turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) -"jeS" = ( -/obj/machinery/light, -/obj/effect/floor_decal/corner/brown{ - dir = 10 - }, -/turf/simulated/floor/tiled/dark, -/area/hangar/intrepid) "jfc" = ( /obj/structure/cable/green{ icon_state = "2-4" @@ -11900,6 +11650,15 @@ }, /turf/simulated/floor/tiled/dark, /area/security/checkpoint) +"jhg" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/operations/lower/machinist) "jiL" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -11921,17 +11680,9 @@ /obj/effect/floor_decal/industrial/outline/custodial, /turf/simulated/floor/tiled, /area/janitor) -"jiU" = ( -/obj/effect/floor_decal/corner/black{ - dir = 5 - }, -/obj/structure/reagent_dispensers/fueltank, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/dark, -/area/operations/lower/machinist) "jjZ" = ( /obj/machinery/firealarm/east, -/obj/effect/floor_decal/corner/black/full{ +/obj/effect/floor_decal/corner/green/full{ dir = 4 }, /turf/simulated/floor/tiled, @@ -11979,6 +11730,12 @@ }, /turf/simulated/floor/tiled, /area/hangar/operations) +"jnS" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled, +/area/hangar/intrepid) "jof" = ( /obj/structure/table/rack, /obj/item/storage/box/monkeycubes{ @@ -12013,11 +11770,17 @@ /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/maintenance/wing/port/deck1) "joW" = ( -/obj/effect/decal/cleanable/dirt, -/obj/random/junk, -/obj/effect/spider/stickyweb, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lime{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/tiled, -/area/maintenance/operations) +/area/medical/morgue/lower) "jpI" = ( /obj/machinery/atmospherics/unary/outlet_injector{ frequency = 1441; @@ -12028,16 +11791,11 @@ /turf/simulated/floor/reinforced/phoron, /area/engineering/atmos) "jpK" = ( -/obj/structure/cable/green{ - icon_state = "1-4" +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/floor_decal/corner/green{ + dir = 5 }, /turf/simulated/floor/tiled, /area/hangar/intrepid) @@ -12207,7 +11965,7 @@ name = "north bump"; pixel_y = 24 }, -/obj/effect/floor_decal/corner/black{ +/obj/effect/floor_decal/corner/green{ dir = 5 }, /turf/simulated/floor/tiled, @@ -12279,7 +12037,7 @@ c_tag = "Medical - Morgue Storage Room"; dir = 8 }, -/obj/effect/floor_decal/corner/green{ +/obj/effect/floor_decal/corner/lime{ dir = 6 }, /turf/simulated/floor/tiled, @@ -12299,13 +12057,13 @@ /area/horizon/stairwell/central) "jxj" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/door/blast/regular/open{ - dir = 8; - id = "hangarlockdown"; - name = "Hangar Lockdown" +/obj/structure/cable/green{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled, -/area/hangar/intrepid) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/full, +/area/hangar/intrepid/interstitial) "jxt" = ( /obj/structure/tank_wall/air{ density = 0; @@ -12407,10 +12165,12 @@ }, /area/maintenance/research_port) "jBh" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, /obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/hangar/intrepid/interstitial) "jBx" = ( @@ -12475,23 +12235,11 @@ /turf/simulated/wall, /area/engineering/atmos) "jDq" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/corner/brown{ +/obj/effect/floor_decal/spline/plain{ dir = 5 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/hangar/intrepid) +/turf/simulated/floor/carpet/rubber, +/area/operations/lower/machinist) "jDs" = ( /obj/item/device/radio/intercom{ dir = 1; @@ -12522,13 +12270,12 @@ /turf/simulated/floor/tiled, /area/operations/storage) "jEf" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 5 +/obj/structure/table/standard, +/obj/item/storage/box/fancy/tray/robotics, +/obj/effect/floor_decal/spline/plain{ + dir = 9 }, -/obj/structure/railing/mapped{ - dir = 4 - }, -/turf/simulated/floor/carpet/rubber, +/turf/simulated/floor/tiled/white, /area/operations/lower/machinist) "jEt" = ( /obj/structure/shuttle_part{ @@ -12573,6 +12320,12 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/xenoarch_atrium) +"jFa" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 6 + }, +/turf/simulated/floor/tiled/white, +/area/operations/lower/machinist) "jFb" = ( /obj/machinery/atmospherics/pipe/simple/visible/black, /obj/structure/shuttle/engine/heater{ @@ -12850,14 +12603,12 @@ /turf/simulated/floor/plating, /area/engineering/atmos/propulsion) "jTl" = ( -/obj/machinery/camera/network/first_deck{ - c_tag = "First Deck - Hangar 8" +/obj/effect/floor_decal/corner/lime{ + dir = 10 }, -/obj/effect/floor_decal/corner/black{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, -/area/hangar/intrepid) +/obj/structure/railing/mapped, +/turf/simulated/floor/tiled, +/area/medical/morgue/lower) "jTJ" = ( /obj/machinery/atmospherics/pipe/manifold/visible/black{ dir = 8 @@ -12872,6 +12623,9 @@ layer = 2.9; reversed = 1 }, +/obj/structure/railing/mapped{ + dir = 1 + }, /turf/simulated/floor/plating, /area/outpost/mining_main/refinery) "jUT" = ( @@ -12908,13 +12662,10 @@ /turf/simulated/floor/tiled/dark/full, /area/engineering/atmos) "jWE" = ( -/obj/effect/floor_decal/corner/black{ +/obj/effect/floor_decal/spline/plain{ dir = 9 }, -/obj/effect/floor_decal/industrial/loading/yellow{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/carpet/rubber, /area/operations/lower/machinist) "jWI" = ( /obj/machinery/newscaster{ @@ -12969,21 +12720,18 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/alarm{ - pixel_y = 28 - }, -/obj/machinery/camera/network/medbay{ - c_tag = "Medical - Morgue Elevator" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/corner/green{ +/obj/machinery/light/small{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lime{ dir = 5 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/tiled{ name = "cooled floor"; temperature = 278 @@ -13192,12 +12940,6 @@ /obj/effect/floor_decal/industrial/warning{ dir = 9 }, -/obj/structure/railing/mapped{ - dir = 8 - }, -/obj/structure/railing/mapped{ - dir = 1 - }, /turf/simulated/floor/plating, /area/maintenance/operations) "klR" = ( @@ -13216,12 +12958,20 @@ /turf/simulated/floor/tiled, /area/operations/storage) "kmS" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/structure/disposalpipe/junction{ dir = 1 }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/corner/green{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/hangar/intrepid/interstitial) "kna" = ( @@ -13253,12 +13003,12 @@ dir = 8; pixel_x = 28 }, -/obj/effect/floor_decal/corner/black/full{ - dir = 1 - }, /obj/machinery/light{ dir = 4 }, +/obj/effect/floor_decal/corner/green/full{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/hallway/primary/aft) "koi" = ( @@ -13384,15 +13134,9 @@ /turf/simulated/floor/tiled/dark/full, /area/engineering/atmos) "kqO" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/lattice/catwalk/indoor/grate, -/obj/structure/disposalpipe/segment, +/obj/random/junk, /turf/simulated/floor/plating, -/area/maintenance/engineering) +/area/maintenance/operations) "kqT" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -13475,6 +13219,14 @@ }, /turf/simulated/floor/tiled, /area/hangar/operations) +"kto" = ( +/obj/machinery/recharge_station, +/obj/effect/floor_decal/corner/black/full{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/dark/full, +/area/operations/lower/machinist) "ktZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 6 @@ -13530,6 +13282,16 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/eva) +"kvq" = ( +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/dark/full, +/area/maintenance/disposal) "kxl" = ( /obj/structure/window/reinforced, /obj/machinery/door/window/westright, @@ -13572,8 +13334,7 @@ /turf/simulated/floor/tiled/dark, /area/hangar/auxiliary) "kzs" = ( -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/hallway/primary/aft) "kzv" = ( /obj/machinery/alarm{ @@ -13592,26 +13353,21 @@ /turf/simulated/floor/tiled, /area/janitor) "kzx" = ( -/obj/structure/table/steel, +/obj/machinery/requests_console{ + department = "Machinist Workshop"; + departmentType = 2; + name = "Machinist Workshop"; + pixel_x = 32 + }, /obj/item/device/flashlight/lamp{ pixel_x = 2; pixel_y = 2 }, -/obj/structure/railing/mapped{ - dir = 1 +/obj/effect/floor_decal/corner/black{ + dir = 6 }, -/obj/machinery/button/remote/blast_door{ - dir = 8; - id = "shutters_deck1_workshopdesk"; - name = "Workshop Desk Shutters"; - pixel_x = 25; - pixel_y = -7; - req_access = list(29) - }, -/obj/effect/floor_decal/corner/black/full{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, +/obj/structure/table/standard, +/turf/simulated/floor/tiled, /area/operations/lower/machinist) "kzC" = ( /obj/machinery/atmospherics/pipe/manifold/visible/black, @@ -13671,19 +13427,9 @@ /turf/simulated/floor/plating, /area/shuttle/intrepid/cockpit) "kBe" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/structure/banner/scc, -/obj/structure/window/reinforced, -/obj/effect/floor_decal/corner/black/full, -/obj/effect/floor_decal/corner/black/full{ - dir = 1 - }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/spline/fancy/wood/full, +/turf/simulated/floor/wood, /area/hallway/primary/aft) "kBt" = ( /obj/machinery/atmospherics/pipe/simple/visible/red, @@ -13723,20 +13469,13 @@ /turf/simulated/wall/shuttle/scc/cardinal, /area/shuttle/mining) "kCA" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ - icon_state = "1-8" + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled/ramp/bottom, +/turf/simulated/floor/tiled/ramp, /area/maintenance/engineering) "kCG" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ @@ -13852,15 +13591,18 @@ }, /area/rnd/xenoarch_atrium) "kEt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/structure/cable/green{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/hangar/intrepid) "kEJ" = ( @@ -13900,10 +13642,6 @@ dir = 6 }, /obj/effect/decal/cleanable/dirt, -/obj/structure/railing/mapped, -/obj/structure/railing/mapped{ - dir = 4 - }, /turf/simulated/floor/plating, /area/maintenance/operations) "kHg" = ( @@ -13921,31 +13659,6 @@ }, /turf/simulated/floor/plating, /area/engineering/atmos/air) -"kHz" = ( -/obj/machinery/conveyor{ - dir = 1; - id = "Robocompo" - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/operations/lower/machinist) -"kHS" = ( -/obj/machinery/button/remote/blast_door{ - id = "machinistworkshop"; - name = "Conveyor Belt Shutter"; - pixel_x = 24; - pixel_y = 24 - }, -/obj/effect/floor_decal/corner/white{ - dir = 6 - }, -/turf/simulated/floor/tiled/white, -/area/operations/lower/machinist) "kHT" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -13958,16 +13671,18 @@ /turf/simulated/floor/plating, /area/engineering/storage/lower) "kIf" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, /turf/simulated/floor/tiled, /area/hangar/intrepid/interstitial) @@ -14097,27 +13812,14 @@ /turf/simulated/floor/reinforced, /area/engineering/gravity_gen) "kLR" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/effect/floor_decal/corner/lime{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_mining{ - name = "Cargo Bay"; - req_access = null; - req_one_access = list(26,31,48,67,29) +/obj/structure/railing/mapped{ + dir = 4 }, -/obj/machinery/door/blast/regular/open{ - dir = 4; - id = "hangarlockdown"; - name = "Hangar Lockdown" - }, -/obj/effect/map_effect/door_helper/unres{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, -/area/hangar/intrepid) +/turf/simulated/floor/tiled, +/area/medical/morgue/lower) "kMG" = ( /obj/structure/shuttle_part{ icon = 'icons/turf/shuttles_unique/scc_shuttle_pieces.dmi'; @@ -14188,24 +13890,11 @@ /turf/simulated/floor/tiled, /area/operations/storage) "kQI" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /obj/structure/railing/mapped, /obj/machinery/light/small/emergency{ dir = 8 }, -/obj/effect/floor_decal/spline/plain, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/plating, /area/maintenance/engineering) "kRx" = ( @@ -14341,7 +14030,7 @@ }, /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, -/area/maintenance/operations) +/area/maintenance/engineering) "kVu" = ( /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /obj/machinery/atmospherics/portables_connector{ @@ -14366,11 +14055,8 @@ /turf/simulated/floor/tiled/dark, /area/rnd/eva) "kWx" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/obj/effect/floor_decal/corner/green/full{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "1-2" }, /turf/simulated/floor/tiled, /area/medical/morgue/lower) @@ -14400,13 +14086,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/rnd/xenoarch_atrium) -"kXj" = ( -/obj/effect/floor_decal/corner/black/full, -/obj/structure/railing/mapped, -/obj/structure/reagent_dispensers/watertank, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/dark, -/area/operations/lower/machinist) "kXr" = ( /obj/machinery/atmospherics/binary/pump{ dir = 8; @@ -14414,11 +14093,23 @@ }, /turf/simulated/floor/plating, /area/engineering/atmos/air) +"kXw" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/hangar/intrepid) "kYv" = ( /obj/structure/closet/radiation, /obj/machinery/firealarm/north, /turf/simulated/floor/tiled/dark, /area/engineering/gravity_gen) +"kYE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/operations/lower/machinist) "kYO" = ( /turf/simulated/floor/tiled/ramp/bottom{ dir = 4 @@ -14587,6 +14278,16 @@ /obj/structure/lattice/catwalk, /turf/space/dynamic, /area/template_noop) +"lji" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, +/area/maintenance/engineering) "ljs" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/dark, @@ -14627,42 +14328,29 @@ /turf/simulated/floor/plating, /area/engineering/atmos/air) "lmf" = ( -/obj/structure/cable/green{ - icon_state = "2-4" +/obj/effect/floor_decal/corner/green{ + dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 +/obj/structure/bed/stool/chair/padded/brown{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/effect/floor_decal/corner/brown/full{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hangar/intrepid) "lnk" = ( /obj/effect/shuttle_landmark/burglar_ship/hangar, /turf/simulated/floor/plating, /area/hangar/auxiliary) "lnt" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/machinery/light{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/corner/black{ +/obj/effect/floor_decal/corner/green{ dir = 9 }, -/turf/simulated/floor/tiled/dark, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, /area/hangar/intrepid/interstitial) "lnF" = ( /obj/structure/cable{ @@ -14714,12 +14402,6 @@ }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos) -"lou" = ( -/obj/machinery/power/breakerbox/activated{ - RCon_tag = "Hangar Substation" - }, -/turf/simulated/floor/plating, -/area/maintenance/substation/hangar) "loW" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -14803,20 +14485,12 @@ /turf/simulated/floor/tiled/dark, /area/engineering/atmos/propulsion/starboard) "ltM" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/effect/floor_decal/spline/plain/corner{ - dir = 1 - }, /obj/structure/closet/crate/bin, /obj/random/loot, +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/obj/structure/railing/mapped, /turf/simulated/floor/plating, /area/maintenance/engineering) "lup" = ( @@ -14851,12 +14525,16 @@ /obj/effect/floor_decal/corner/grey/diagonal, /turf/simulated/floor/tiled, /area/maintenance/research_port) -"lwm" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/machinery/photocopier, -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled/dark, -/area/hangar/intrepid) +"lxQ" = ( +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/obj/machinery/power/apc/low{ + dir = 8; + pixel_x = -24 + }, +/turf/simulated/floor/plating, +/area/maintenance/substation/hangar) "lyc" = ( /obj/machinery/floodlight, /obj/effect/floor_decal/industrial/outline/yellow, @@ -14880,11 +14558,6 @@ }, /turf/simulated/floor/tiled, /area/outpost/mining_main/refinery) -"lyG" = ( -/obj/effect/decal/cleanable/dirt, -/obj/random/junk, -/turf/simulated/floor/tiled, -/area/maintenance/operations) "lyU" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -14916,12 +14589,6 @@ /obj/structure/bed/stool/chair/office/light, /turf/simulated/floor/plating, /area/engineering/storage/lower) -"lzt" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 10 - }, -/turf/simulated/floor/tiled/dark/full, -/area/operations/lower/machinist) "lAU" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -14978,10 +14645,15 @@ /turf/simulated/floor/plating, /area/maintenance/research_port) "lCX" = ( -/obj/effect/floor_decal/corner/black{ - dir = 1 +/obj/effect/floor_decal/corner/green{ + dir = 10 }, -/turf/simulated/floor/tiled/dark, +/obj/machinery/papershredder, +/obj/machinery/power/apc/super/critical{ + pixel_y = -24 + }, +/obj/structure/cable/green, +/turf/simulated/floor/tiled, /area/hangar/intrepid) "lDd" = ( /obj/structure/cable/green{ @@ -15019,9 +14691,9 @@ /turf/simulated/floor/tiled/dark, /area/turret_protected/ai_upload) "lEQ" = ( -/obj/effect/map_effect/window_spawner/full/reinforced/firedoor, -/turf/simulated/floor/tiled/dark/full, -/area/maintenance/operations) +/obj/effect/floor_decal/industrial/outline/medical, +/turf/simulated/floor/tiled/full, +/area/medical/morgue/lower) "lFa" = ( /obj/machinery/door/firedoor, /obj/structure/window/shuttle/scc, @@ -15169,14 +14841,15 @@ /turf/simulated/floor/tiled/dark, /area/hangar/intrepid) "lMS" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/machinery/conveyor{ + dir = 1; + id = "Robocompo" }, -/obj/effect/floor_decal/corner/brown{ - dir = 9 +/obj/effect/floor_decal/spline/plain{ + dir = 10 }, -/turf/simulated/floor/tiled/dark, -/area/hangar/intrepid) +/turf/simulated/floor/carpet/rubber, +/area/operations/lower/machinist) "lNi" = ( /obj/effect/floor_decal/corner/brown{ dir = 10 @@ -15325,18 +14998,17 @@ /turf/simulated/wall, /area/hangar/auxiliary) "lQI" = ( -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/bed/stool/chair/padded/black{ +/obj/machinery/mecha_part_fabricator{ dir = 8 }, -/obj/effect/floor_decal/corner/brown{ +/obj/structure/railing/mapped{ + dir = 8 + }, +/obj/effect/floor_decal/spline/plain{ dir = 6 }, -/turf/simulated/floor/tiled/dark, -/area/hangar/intrepid) +/turf/simulated/floor/carpet/rubber, +/area/operations/lower/machinist) "lQQ" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -15356,6 +15028,7 @@ dir = 6 }, /obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/warning/corner, /turf/simulated/floor/tiled/dark/full, /area/maintenance/disposal) "lRu" = ( @@ -15558,19 +15231,6 @@ }, /turf/simulated/floor/tiled/dark, /area/hangar/intrepid) -"lWM" = ( -/obj/machinery/cell_charger, -/obj/effect/floor_decal/corner/brown/full{ - dir = 4 - }, -/obj/structure/table/steel, -/obj/item/paper_bin{ - pixel_x = -3; - pixel_y = 7 - }, -/obj/item/pen/blue, -/turf/simulated/floor/tiled/dark, -/area/hangar/intrepid) "lXa" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering{ @@ -15683,25 +15343,29 @@ /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/horizon/hydroponics/lower) "mdZ" = ( -/obj/machinery/conveyor{ - dir = 10; - id = "Robocompo" +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/effect/floor_decal/industrial/warning{ - dir = 9 - }, -/obj/effect/floor_decal/industrial/warning/corner, -/turf/simulated/floor/tiled/dark, -/area/operations/lower/machinist) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, +/area/maintenance/engineering) "mey" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/effect/landmark/start{ - name = "Machinist" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/carpet/rubber, -/area/operations/lower/machinist) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/hangar/intrepid) "mfn" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -15737,10 +15401,11 @@ /turf/simulated/floor/tiled, /area/operations/storage) "mhd" = ( -/obj/machinery/door/airlock/maintenance{ - req_access = list(12) +/obj/machinery/vending/cola, +/obj/effect/floor_decal/corner/green{ + dir = 5 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled, /area/hangar/intrepid) "mhf" = ( /obj/structure/lattice/catwalk/indoor/grate, @@ -15772,10 +15437,20 @@ }, /turf/simulated/floor/plating, /area/engineering/atmos/propulsion) -"mik" = ( -/obj/item/modular_computer/telescreen/preset/trashcompactor{ - pixel_x = -32 +"mhN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, +/area/maintenance/engineering) +"mik" = ( /obj/effect/floor_decal/corner/purple{ dir = 9 }, @@ -15783,6 +15458,10 @@ c_tag = "Custodial - Disposals Fore"; dir = 4 }, +/obj/structure/sign/kiddieplaque/janitor{ + name = "wooden plaque"; + pixel_x = -32 + }, /turf/simulated/floor/tiled/dark, /area/maintenance/disposal) "mil" = ( @@ -15861,7 +15540,7 @@ name = "Engineering Maintenance"; req_access = list(10) }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/hallway/engineering) "mlL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -15877,9 +15556,6 @@ /obj/effect/floor_decal/corner/purple/full{ dir = 4 }, -/obj/effect/floor_decal/industrial/loading/yellow{ - dir = 8 - }, /turf/simulated/floor/tiled/dark, /area/maintenance/disposal) "mmA" = ( @@ -15893,6 +15569,11 @@ }, /turf/simulated/floor/tiled, /area/rnd/eva) +"mmG" = ( +/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, +/obj/structure/cable/green, +/turf/simulated/floor/tiled/dark/full, +/area/maintenance/disposal) "mnr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -15938,18 +15619,18 @@ /turf/simulated/floor/reinforced/airless, /area/engineering/atmos/propulsion) "mon" = ( -/obj/structure/cable/green{ - icon_state = "2-4" +/obj/machinery/camera/network/medbay{ + c_tag = "Medical - Morgue Elevator" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 +/obj/machinery/firealarm/north, +/obj/effect/floor_decal/corner/lime{ + dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/effect/floor_decal/corner/brown{ - dir = 6 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/tiled/dark, -/area/hangar/intrepid) +/turf/simulated/floor/tiled, +/area/medical/morgue/lower) "mov" = ( /obj/structure/cable{ icon_state = "1-2" @@ -16025,10 +15706,10 @@ /obj/structure/railing/mapped{ dir = 4 }, -/obj/effect/floor_decal/corner/green/full{ +/obj/structure/table/rack, +/obj/effect/floor_decal/corner/lime/full{ dir = 4 }, -/obj/structure/table/rack, /turf/simulated/floor/tiled/white{ name = "cooled white floor"; temperature = 278.15 @@ -16075,20 +15756,6 @@ }, /turf/simulated/floor/tiled, /area/hangar/auxiliary) -"mvq" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 1; - name = "Hangar" - }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 - }, -/obj/machinery/door/blast/regular/open{ - id = "hangarlockdown"; - name = "Hangar Lockdown" - }, -/turf/simulated/floor/tiled/dark, -/area/hangar/intrepid) "mwo" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -16196,12 +15863,15 @@ /turf/simulated/floor/tiled/dark, /area/engineering/atmos) "mzR" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/structure/railing/mapped, +/obj/structure/railing/mapped{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 }, -/obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, -/area/maintenance/operations) +/area/maintenance/engineering) "mBx" = ( /obj/machinery/door/airlock/multi_tile/glass{ dir = 1; @@ -16385,30 +16055,12 @@ /obj/machinery/recharger, /turf/simulated/floor/tiled, /area/outpost/mining_main/refinery) -"mKj" = ( -/turf/simulated/floor/tiled/ramp/bottom, -/area/maintenance/operations) "mKo" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/effect/floor_decal/corner/green{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/structure/railing/mapped{ - dir = 1 - }, -/obj/structure/railing/mapped{ - dir = 4 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 5 - }, -/turf/simulated/floor/plating, -/area/maintenance/engineering) +/turf/simulated/floor/tiled, +/area/hangar/intrepid) "mMC" = ( /obj/structure/cable{ icon_state = "1-2" @@ -16446,21 +16098,9 @@ /turf/simulated/floor/tiled/dark, /area/security/checkpoint) "mMR" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/railing/mapped{ +/obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/effect/floor_decal/spline/plain{ - dir = 9 - }, /turf/simulated/floor/plating, /area/maintenance/engineering) "mNG" = ( @@ -16527,21 +16167,6 @@ "mOK" = ( /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/operations/storage) -"mPm" = ( -/obj/machinery/r_n_d/circuit_imprinter, -/obj/structure/reagent_dispensers/acid{ - pixel_x = -32 - }, -/obj/machinery/alarm{ - dir = 1; - pixel_y = -28 - }, -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/effect/floor_decal/industrial/warning{ - dir = 10 - }, -/turf/simulated/floor/carpet/rubber, -/area/operations/lower/machinist) "mPy" = ( /obj/machinery/atmospherics/binary/pump{ name = "Mix to Connectors" @@ -16627,7 +16252,7 @@ /obj/item/device/radio/off{ pixel_y = 5 }, -/obj/effect/floor_decal/corner/green/full{ +/obj/effect/floor_decal/corner/lime/full{ dir = 8 }, /turf/simulated/floor/tiled, @@ -16652,8 +16277,11 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/intrepid/rotary) "mSk" = ( -/turf/simulated/wall/r_wall, -/area/maintenance/engineering) +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/operations) "mSq" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -16717,20 +16345,8 @@ /turf/simulated/floor/reinforced, /area/engineering/gravity_gen) "mTZ" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/random/junk, -/obj/structure/railing/mapped{ - dir = 1 - }, -/obj/effect/floor_decal/spline/plain{ +/obj/effect/floor_decal/industrial/warning{ dir = 1 }, /turf/simulated/floor/plating, @@ -16812,18 +16428,9 @@ /turf/simulated/floor/plating, /area/maintenance/research_port) "mVX" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/lattice/catwalk/indoor/grate, -/obj/structure/railing/mapped{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/operations) +/obj/machinery/telecomms/relay/preset/station, +/turf/simulated/floor/tiled/dark/full, +/area/tcommsat/mainlvl_tcomms__relay) "mWV" = ( /obj/machinery/atmospherics/portables_connector{ dir = 1; @@ -16881,24 +16488,6 @@ }, /turf/simulated/floor/tiled/dark, /area/hangar/intrepid) -"mXP" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/corner/black{ - dir = 5 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hangar/intrepid) "mXZ" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -16935,40 +16524,33 @@ /turf/simulated/floor/tiled/dark, /area/rnd/eva) "mYY" = ( -/obj/structure/railing/mapped{ - dir = 8 - }, /obj/machinery/light/small/emergency{ dir = 1 }, -/obj/effect/floor_decal/spline/plain{ +/obj/structure/railing/mapped{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ dir = 8 }, /turf/simulated/floor/plating, /area/maintenance/engineering) -"mZe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/firealarm/east, -/obj/effect/floor_decal/corner/brown/full{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, -/area/hangar/intrepid) "mZr" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/railing/mapped, -/obj/item/stack/rods, -/turf/simulated/floor/tiled, -/area/maintenance/operations) -"mZz" = ( -/obj/structure/railing/mapped, -/obj/effect/decal/cleanable/dirt, -/obj/item/material/shard{ - icon_state = "medium" +/obj/machinery/light/small, +/obj/effect/floor_decal/corner/lime/full{ + dir = 4 + }, +/obj/structure/railing/mapped{ + dir = 4 + }, +/obj/machinery/power/apc{ + pixel_y = -24 + }, +/obj/structure/cable/green{ + icon_state = "0-8" }, /turf/simulated/floor/tiled, -/area/maintenance/operations) +/area/medical/morgue/lower) "mZD" = ( /obj/structure/shuttle_part{ icon = 'icons/turf/shuttles_unique/scc_shuttle_pieces.dmi'; @@ -17055,15 +16637,9 @@ /turf/simulated/floor/tiled/dark, /area/hangar/auxiliary) "ney" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/hangar/intrepid/interstitial) +/obj/effect/floor_decal/spline/plain, +/turf/simulated/floor/tiled/white, +/area/operations/lower/machinist) "nfE" = ( /obj/machinery/atmospherics/pipe/simple/visible/green, /obj/structure/lattice/catwalk/indoor, @@ -17080,13 +16656,17 @@ /turf/simulated/floor/plating, /area/engineering/atmos/air) "nfO" = ( -/obj/effect/floor_decal/corner/brown{ - dir = 10 +/obj/effect/floor_decal/corner/black{ + dir = 9 }, -/obj/structure/table/steel, -/obj/machinery/recharger, -/turf/simulated/floor/tiled/dark, -/area/hangar/intrepid) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/operations/lower/machinist) "ngs" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -17352,21 +16932,6 @@ }, /turf/simulated/floor/plating, /area/engineering/atmos/air) -"nqA" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/operations/lower/machinist) "nqM" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -17605,7 +17170,7 @@ dir = 4 }, /obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/full, /area/engineering/storage/lower) "nAX" = ( /obj/structure/tank_wall/hydrogen{ @@ -17633,19 +17198,9 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/mining) "nBK" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/railing/mapped, -/obj/effect/floor_decal/spline/plain, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/light/small/emergency{ + dir = 1 }, /turf/simulated/floor/plating, /area/maintenance/engineering) @@ -17806,14 +17361,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/cleanable/dirt, -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/disposalpipe/segment, +/obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/engineering) "nMJ" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, @@ -17824,8 +17376,10 @@ dir = 1; icon_state = "pipe-c" }, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/simulated/floor/tiled/full, /area/hallway/primary/aft) "nNd" = ( /turf/simulated/wall, @@ -17856,8 +17410,19 @@ /turf/simulated/floor/tiled/dark, /area/rnd/eva) "nNE" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/turf/simulated/floor/tiled, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/full, /area/maintenance/engineering) "nNS" = ( /obj/machinery/portable_atmospherics/canister/oxygen, @@ -17878,13 +17443,9 @@ /turf/simulated/floor/tiled, /area/horizon/hydroponics/lower) "nOM" = ( -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -17894,7 +17455,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/hallway/primary/aft) "nOU" = ( /obj/effect/shuttle_landmark/horizon/deckone/port, @@ -17916,38 +17477,27 @@ /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/maintenance/wing/starboard/deck1) "nPK" = ( -/obj/machinery/power/terminal{ - dir = 4 +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/structure/cable, -/obj/machinery/camera/network/engineering{ - alarm_on = 1; - c_tag = "Engineering - Deck 1 - Hangar Substation"; - dir = 4 +/obj/effect/floor_decal/corner/green{ + dir = 5 }, -/turf/simulated/floor/plating, -/area/maintenance/substation/hangar) +/turf/simulated/floor/tiled, +/area/hangar/intrepid/interstitial) "nPL" = ( /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/hangar/starboard) "nPN" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/ramp/bottom{ - dir = 1 +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/structure/cable/green{ + icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/full, /area/maintenance/engineering) "nQn" = ( /obj/effect/floor_decal/corner_wide/purple{ @@ -18027,29 +17577,30 @@ /turf/simulated/floor/plating, /area/engineering/atmos) "nTm" = ( -/obj/item/material/shard{ - icon_state = "small" +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" }, -/turf/simulated/floor/plating, -/area/maintenance/operations) +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/full, +/area/maintenance/engineering) "nTP" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, /turf/simulated/floor/tiled, /area/outpost/mining_main/refinery) -"nTR" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/engineering{ - name = "Engineering Substation"; - req_access = list(29); - req_one_access = null - }, -/turf/simulated/floor/plating, -/area/maintenance/substation/hangar) "nTZ" = ( /obj/effect/map_effect/window_spawner/full/reinforced/firedoor, /turf/simulated/floor/tiled/dark/full, @@ -18226,34 +17777,15 @@ /turf/simulated/floor/shuttle/dark_blue, /area/shuttle/escape_pod/pod4) "obM" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/railing/mapped, -/obj/effect/floor_decal/spline/plain, -/obj/effect/decal/cleanable/dirt, /obj/structure/trash_pile, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/plating, /area/maintenance/engineering) "ock" = ( /turf/simulated/wall/shuttle/scc/cardinal, /area/shuttle/intrepid/cockpit) "ocs" = ( -/obj/machinery/conveyor{ - dir = 1; - id = "Robocompo" - }, -/obj/effect/floor_decal/industrial/warning/cee, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/operations/lower/machinist) "oct" = ( /obj/structure/disposalpipe/segment{ @@ -18383,6 +17915,9 @@ dir = 8; id = "processing_n" }, +/obj/structure/railing/mapped{ + dir = 1 + }, /turf/simulated/floor/plating, /area/outpost/mining_main/refinery) "oiS" = ( @@ -18423,13 +17958,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/disposal) -"omo" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/obj/effect/floor_decal/corner/black, -/turf/simulated/floor/tiled/dark, -/area/hangar/intrepid) "omL" = ( /obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -18496,7 +18024,10 @@ }, /obj/structure/disposalpipe/segment, /obj/structure/cable/green{ - icon_state = "2-4" + icon_state = "1-4" + }, +/obj/effect/floor_decal/corner/green{ + dir = 5 }, /turf/simulated/floor/tiled, /area/hangar/intrepid/interstitial) @@ -18607,19 +18138,16 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/intrepid/crew_compartment) "oys" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/bed/stool/chair/office/dark{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/effect/landmark/start{ + name = "Machinist" }, -/obj/effect/floor_decal/corner/white/full{ - dir = 4 +/obj/effect/floor_decal/corner/black{ + dir = 6 }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled, /area/operations/lower/machinist) "ozx" = ( /obj/effect/floor_decal/corner/purple{ @@ -18735,6 +18263,9 @@ id = "mining_2"; layer = 2.9 }, +/obj/structure/railing/mapped{ + dir = 1 + }, /turf/simulated/floor/plating, /area/outpost/mining_main/refinery) "oDA" = ( @@ -18776,10 +18307,22 @@ /turf/simulated/floor/tiled/dark, /area/hangar/control) "oFx" = ( -/obj/structure/lattice/catwalk/indoor/grate, -/obj/structure/railing/mapped, -/turf/simulated/floor/plating, -/area/outpost/mining_main/refinery) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/full, +/area/maintenance/engineering) "oFy" = ( /turf/simulated/floor/tiled/dark, /area/turret_protected/ai_upload) @@ -18868,7 +18411,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/effect/floor_decal/corner/green{ +/obj/effect/floor_decal/corner/lime{ dir = 10 }, /turf/simulated/floor/tiled, @@ -18894,27 +18437,11 @@ /turf/simulated/floor/plating, /area/maintenance/hangar/starboard) "oPL" = ( -/obj/structure/table/steel, -/obj/item/device/flash/synthetic{ - pixel_x = -7; - pixel_y = 1 +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/item/device/flash/synthetic{ - pixel_y = 1 - }, -/obj/item/device/flash/synthetic{ - pixel_x = 7; - pixel_y = 1 - }, -/obj/item/device/flash/synthetic{ - pixel_x = 14; - pixel_y = 1 - }, -/obj/effect/floor_decal/corner/black{ - dir = 6 - }, -/turf/simulated/floor/tiled/dark, -/area/operations/lower/machinist) +/turf/simulated/floor/tiled, +/area/hangar/intrepid) "oQa" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /turf/simulated/floor/tiled/dark, @@ -18979,7 +18506,7 @@ /turf/simulated/floor/plating, /area/engineering/atmos/propulsion) "oWg" = ( -/obj/random/junk, +/obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning{ dir = 8 }, @@ -19077,12 +18604,23 @@ /turf/simulated/floor/tiled/dark, /area/hangar/control) "oZj" = ( -/obj/machinery/mecha_part_fabricator{ - dir = 8 +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled/dark, -/area/operations/lower/machinist) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/corner/green{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/aft) "oZJ" = ( /obj/effect/floor_decal/corner_wide/purple{ dir = 9 @@ -19128,6 +18666,14 @@ }, /turf/simulated/floor/plating, /area/maintenance/wing/starboard/deck1) +"paY" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/ramp{ + dir = 4 + }, +/area/maintenance/engineering) "pbJ" = ( /turf/simulated/floor/shuttle/dark_blue, /area/shuttle/escape_pod/pod4) @@ -19267,22 +18813,13 @@ /turf/simulated/floor/tiled/airless, /area/hangar/operations) "phs" = ( -/obj/structure/disposalpipe/sortjunction/flipped{ - dir = 1; - name = "Workshop"; - sortType = "Workshop" +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/structure/lattice/catwalk/indoor/grate, -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/hallway/primary/aft) "phO" = ( /obj/effect/decal/cleanable/dirt, @@ -19307,6 +18844,9 @@ /obj/effect/floor_decal/corner/brown{ dir = 9 }, +/obj/structure/cable{ + icon_state = "1-4" + }, /turf/simulated/floor/tiled/dark, /area/maintenance/operations) "piS" = ( @@ -19346,10 +18886,11 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard/deck1) "pjy" = ( -/obj/effect/floor_decal/corner/black{ - dir = 6 +/obj/effect/floor_decal/corner/green{ + dir = 8 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled, /area/hangar/intrepid) "pkw" = ( /obj/structure/window/shuttle/scc, @@ -19410,12 +18951,6 @@ }, /turf/simulated/floor/shuttle/dark_blue, /area/shuttle/escape_pod/pod1) -"plZ" = ( -/obj/effect/floor_decal/corner/white{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/operations/lower/machinist) "pme" = ( /obj/effect/floor_decal/industrial/outline/research, /turf/simulated/floor/tiled, @@ -19430,16 +18965,6 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/intrepid/engine_compartment) -"pnf" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_hatch, -/turf/simulated/floor/plating, -/area/maintenance/operations) "png" = ( /obj/effect/floor_decal/industrial/warning, /obj/structure/tank_wall/nitrous_oxide{ @@ -19451,9 +18976,9 @@ /turf/simulated/wall, /area/engineering/gravity_gen) "pnZ" = ( -/obj/effect/decal/cleanable/ash, -/turf/simulated/floor/plating, -/area/maintenance/operations) +/obj/effect/floor_decal/corner/lime, +/turf/simulated/floor/tiled, +/area/medical/morgue/lower) "pom" = ( /turf/simulated/wall, /area/maintenance/research_port) @@ -19561,12 +19086,6 @@ /obj/random/loot, /turf/simulated/floor/tiled/dark, /area/maintenance/disposal) -"prv" = ( -/obj/effect/floor_decal/corner/black{ - dir = 9 - }, -/turf/simulated/floor/tiled/dark, -/area/operations/lower/machinist) "psd" = ( /obj/structure/closet/walllocker/emerglocker/west{ pixel_x = -27; @@ -19894,20 +19413,6 @@ }, /turf/simulated/floor/tiled/dark, /area/storage/eva) -"pEE" = ( -/obj/structure/cable/green{ - icon_state = "0-2" - }, -/obj/machinery/power/apc/super{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, -/obj/effect/floor_decal/corner/white{ - dir = 9 - }, -/turf/simulated/floor/tiled/white, -/area/operations/lower/machinist) "pEF" = ( /obj/structure/closet/secure_closet/xenoarchaeologist{ req_access = null; @@ -19927,14 +19432,6 @@ }, /turf/simulated/floor/tiled/dark, /area/hangar/intrepid) -"pFg" = ( -/obj/machinery/door/airlock/maintenance, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plating, -/area/maintenance/operations) "pFK" = ( /obj/structure/window/shuttle/scc_space_ship, /obj/structure/grille, @@ -19974,21 +19471,14 @@ /turf/simulated/floor/tiled, /area/hangar/operations) "pHI" = ( -/obj/machinery/recharge_station, -/obj/effect/floor_decal/corner/black{ - dir = 5 +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled/dark, -/area/operations/lower/machinist) -"pIf" = ( -/obj/effect/floor_decal/corner/brown{ - dir = 10 - }, -/obj/structure/table/steel, -/obj/machinery/cell_charger, -/turf/simulated/floor/tiled/dark, -/area/hangar/intrepid) +/turf/simulated/floor/tiled/full, +/area/maintenance/engineering) "pIm" = ( /obj/structure/cable{ icon_state = "1-2" @@ -19996,12 +19486,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/industrial/loading/yellow, +/obj/structure/cable{ + icon_state = "1-4" + }, /turf/simulated/floor/tiled/dark, /area/maintenance/operations) "pIy" = ( -/obj/effect/floor_decal/corner/black{ - dir = 10 - }, /obj/structure/table/reinforced/steel, /obj/item/paper_bin, /obj/item/pen, @@ -20009,8 +19499,11 @@ c_tag = "First Deck - Hangar Entrance"; dir = 1 }, +/obj/effect/floor_decal/corner/green{ + dir = 10 + }, /turf/simulated/floor/tiled, -/area/storage/eva) +/area/hallway/primary/aft) "pIC" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -20065,10 +19558,10 @@ /turf/simulated/floor/tiled/white, /area/rnd/isolation_a) "pLc" = ( +/obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning{ dir = 6 }, -/obj/effect/floor_decal/industrial/hatch/red, /turf/simulated/floor/tiled/dark/full, /area/maintenance/disposal) "pLU" = ( @@ -20124,12 +19617,16 @@ /turf/simulated/floor/reinforced/hydrogen, /area/engineering/atmos) "pNf" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - id_tag = "crusher"; - name = "Compactor Access"; - req_access = list(26) - }, /obj/machinery/door/firedoor, +/obj/machinery/door/airlock/hatch{ + name = "Compactor Access"; + req_one_access = list(26,67); + id_tag = "compactor_access"; + secured_wires = 1; + locked = 1; + icon_state = "door_locked" + }, +/obj/effect/floor_decal/industrial/hatch/red, /turf/simulated/floor/tiled/dark/full, /area/maintenance/disposal) "pNv" = ( @@ -20173,7 +19670,10 @@ "pPU" = ( /obj/structure/table/steel, /obj/item/storage/box/bodybags, -/obj/effect/floor_decal/corner/green/full, +/obj/effect/floor_decal/corner/lime/full, +/obj/item/storage/box/gloves{ + pixel_y = 11 + }, /turf/simulated/floor/tiled/white{ name = "cooled white floor"; temperature = 278.15 @@ -20251,6 +19751,12 @@ "pTF" = ( /turf/simulated/floor/tiled/dark, /area/maintenance/disposal) +"pTP" = ( +/obj/effect/floor_decal/corner/black{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/operations/lower/machinist) "pTT" = ( /turf/unsimulated/wall/fakepdoor{ dir = 4 @@ -20347,13 +19853,19 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/intrepid/atmos_compartment) "pXv" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 +/obj/machinery/button/remote/blast_door{ + dir = 8; + id = "shutters_deck1_workshopdesk"; + name = "Workshop Desk Shutters"; + pixel_x = 25; + pixel_y = 7; + req_access = list(29) }, -/obj/effect/floor_decal/corner/black/full{ - dir = 8 +/obj/effect/floor_decal/corner/black{ + dir = 6 }, -/turf/simulated/floor/tiled/dark, +/obj/structure/table/standard, +/turf/simulated/floor/tiled, /area/operations/lower/machinist) "pYa" = ( /turf/simulated/wall, @@ -20388,15 +19900,6 @@ /obj/structure/lattice, /turf/space/dynamic, /area/horizon/exterior) -"pYD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/floor_decal/corner/black{ - dir = 10 - }, -/turf/simulated/floor/tiled/dark, -/area/operations/lower/machinist) "pYW" = ( /obj/structure/railing/mapped{ dir = 8 @@ -20560,18 +20063,6 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/xenoarch_atrium) -"qcC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/effect/floor_decal/corner/black{ - dir = 10 - }, -/turf/simulated/floor/tiled/dark, -/area/operations/lower/machinist) "qdm" = ( /obj/effect/floor_decal/corner/purple/full{ dir = 4 @@ -20712,9 +20203,6 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/obj/structure/railing/mapped{ - dir = 8 - }, /turf/simulated/floor/plating, /area/maintenance/operations) "qiZ" = ( @@ -20765,11 +20253,22 @@ /turf/simulated/floor/tiled/dark, /area/security/checkpoint) "qks" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 5 +/obj/structure/railing/mapped{ + dir = 8 }, -/turf/simulated/floor/tiled/dark/full, -/area/operations/lower/machinist) +/obj/effect/floor_decal/corner/lime{ + dir = 9 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/computer/shuttle_control/lift{ + pixel_y = 23; + shuttle_tag = "Morgue Lift"; + pixel_x = -3 + }, +/turf/simulated/floor/tiled, +/area/medical/morgue/lower) "qlv" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/reinforced, @@ -20823,33 +20322,11 @@ }, /turf/simulated/floor/reinforced/airless, /area/engineering/atmos/propulsion) -"qns" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/lattice/catwalk/indoor/grate, -/obj/structure/railing/mapped{ - dir = 8 - }, -/obj/structure/railing/mapped{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plating, -/area/maintenance/operations) "qnt" = ( -/obj/effect/floor_decal/corner/black/full, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/spline/fancy/wood/full, +/obj/structure/banner/scc, +/turf/simulated/floor/wood, /area/hallway/primary/aft) -"qnL" = ( -/obj/structure/railing/mapped{ - dir = 4 - }, -/turf/simulated/floor/tiled/ramp, -/area/hangar/intrepid) "qog" = ( /obj/effect/landmark/entry_point/fore{ name = "fore, secondary hangar starboard" @@ -21007,11 +20484,6 @@ /obj/structure/lattice, /turf/space/dynamic, /area/horizon/exterior) -"qtm" = ( -/obj/machinery/papershredder, -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled/dark, -/area/hangar/intrepid) "qtp" = ( /obj/effect/floor_decal/industrial/loading/yellow{ dir = 8 @@ -21044,19 +20516,16 @@ }, /area/maintenance/research_port) "quA" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/structure/cable/green{ - icon_state = "1-4" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/ramp{ + dir = 1 }, -/obj/machinery/light/small, -/turf/simulated/floor/plating, -/area/maintenance/substation/hangar) +/area/maintenance/engineering) "qvl" = ( -/obj/structure/railing/mapped{ - dir = 4 - }, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, @@ -21086,15 +20555,14 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/maintenance/substation/civilian_west) -"qwB" = ( -/obj/effect/floor_decal/corner/black{ +"qwK" = ( +/obj/effect/floor_decal/corner/green{ dir = 6 }, -/obj/structure/sign/emergency/evacuation{ - dir = 8; - pixel_x = -32 +/obj/structure/bed/stool/chair/padded/brown{ + dir = 8 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hangar/intrepid) "qxk" = ( /obj/structure/closet/walllocker/emerglocker/east, @@ -21152,21 +20620,8 @@ /turf/simulated/floor/reinforced, /area/engineering/gravity_gen) "qzb" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/railing/mapped, -/obj/effect/floor_decal/spline/plain, /obj/random/junk, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/plating, /area/maintenance/engineering) "qzl" = ( @@ -21222,21 +20677,12 @@ /obj/machinery/firealarm/east, /turf/simulated/floor/plating, /area/engineering/atmos/air) -"qBv" = ( -/obj/structure/railing/mapped{ - dir = 8 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 8 - }, -/obj/structure/girder, -/turf/simulated/floor/plating, -/area/maintenance/engineering) "qBC" = ( /obj/structure/railing/mapped, -/obj/effect/floor_decal/corner/green{ +/obj/effect/floor_decal/corner/lime{ dir = 10 }, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled, /area/medical/morgue/lower) "qBU" = ( @@ -21299,23 +20745,10 @@ /turf/simulated/floor/tiled/white, /area/rnd/eva) "qDu" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/railing/mapped{ - dir = 1 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, /obj/machinery/light/small/emergency, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, /turf/simulated/floor/plating, /area/maintenance/engineering) "qDJ" = ( @@ -21334,10 +20767,21 @@ /obj/effect/floor_decal/industrial/outline, /turf/simulated/floor/reinforced, /area/rnd/eva) -"qEk" = ( -/obj/machinery/power/apc{ - pixel_y = -24 +"qEh" = ( +/obj/structure/table/standard, +/obj/machinery/cell_charger, +/obj/item/cell/high{ + pixel_y = 5 }, +/obj/item/cell/high{ + pixel_y = 10 + }, +/obj/effect/floor_decal/corner/black{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/operations/lower/machinist) +"qEk" = ( /obj/machinery/camera/network/medbay{ c_tag = "Medical - Morgue"; dir = 1 @@ -21345,10 +20789,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/effect/floor_decal/corner/green/diagonal, -/obj/structure/cable/green{ - icon_state = "0-4" - }, +/obj/effect/floor_decal/corner/lime/diagonal, /turf/simulated/floor/tiled/white{ name = "cooled white floor"; temperature = 278.15 @@ -21366,13 +20807,13 @@ /turf/simulated/floor/tiled, /area/operations/storage) "qFy" = ( -/obj/effect/floor_decal/corner/black{ - dir = 9 +/obj/effect/floor_decal/corner/green{ + dir = 6 }, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hangar/intrepid) "qGG" = ( /obj/machinery/door/blast/regular/open{ @@ -21469,7 +20910,7 @@ /obj/structure/lattice, /obj/structure/grille, /obj/effect/landmark/entry_point/aft{ - name = "aft, dioxide tank" + name = "aft, carbon dioxide tank" }, /turf/space/dynamic, /area/horizon/exterior) @@ -21491,22 +20932,6 @@ }, /turf/simulated/floor/tiled, /area/hangar/operations) -"qNU" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled/dark, -/area/operations/lower/machinist) "qOf" = ( /obj/effect/floor_decal/corner/brown/full{ dir = 8 @@ -21517,6 +20942,10 @@ }, /turf/simulated/floor/tiled, /area/outpost/mining_main/refinery) +"qOx" = ( +/obj/structure/bed/stool/chair/office/dark, +/turf/simulated/floor/tiled, +/area/operations/lower/machinist) "qOO" = ( /obj/effect/landmark/entry_point/aft{ name = "aft engines, starboard 3" @@ -21533,6 +20962,14 @@ /obj/effect/floor_decal/corner_wide/purple/diagonal, /turf/simulated/floor/tiled/white, /area/rnd/test_range) +"qPw" = ( +/obj/machinery/vending/robotics, +/obj/effect/floor_decal/corner/black{ + dir = 5 + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled, +/area/operations/lower/machinist) "qPF" = ( /obj/effect/floor_decal/corner/black{ dir = 10 @@ -21680,27 +21117,13 @@ /turf/simulated/floor/tiled/dark, /area/outpost/mining_main/eva) "qVh" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/sign/flag/scc{ - pixel_y = 32 - }, /obj/machinery/light{ dir = 1 }, -/obj/effect/floor_decal/corner/black{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/floor_decal/corner/green/full{ + dir = 8 }, +/obj/machinery/vending/zora, /turf/simulated/floor/tiled, /area/hangar/intrepid) "qVO" = ( @@ -21713,7 +21136,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/floor_decal/corner/green{ +/obj/effect/floor_decal/corner/lime{ dir = 5 }, /turf/simulated/floor/tiled{ @@ -21830,20 +21253,14 @@ /turf/simulated/floor/tiled/ramp, /area/maintenance/hangar/starboard) "qZW" = ( -/obj/machinery/light{ - dir = 4 +/obj/effect/map_effect/window_spawner/full/reinforced/firedoor, +/obj/machinery/door/blast/shutters{ + dir = 2; + name = "Viewing Shutter"; + id = "shutters_deck1_morgue" }, -/obj/machinery/alarm{ - pixel_y = 28 - }, -/obj/structure/closet/secure_closet/machinist, -/obj/machinery/firealarm/east, -/obj/effect/floor_decal/corner/black/full{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/dark, -/area/operations/lower/machinist) +/turf/simulated/floor/tiled/dark/full, +/area/medical/morgue/lower) "qZZ" = ( /obj/machinery/conveyor{ dir = 1; @@ -21902,9 +21319,12 @@ /area/engineering/atmos/air) "rco" = ( /obj/structure/cable/green{ - icon_state = "2-4" + icon_state = "4-8" }, -/obj/effect/floor_decal/corner/black{ +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/effect/floor_decal/corner/green{ dir = 4 }, /turf/simulated/floor/tiled, @@ -21955,44 +21375,34 @@ /turf/simulated/floor/tiled/dark, /area/hangar/control) "ref" = ( -/obj/structure/table/steel, -/obj/item/cell/high{ - pixel_y = 10 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, -/obj/item/cell/high{ - pixel_y = 5 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" }, -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/cell_charger, -/obj/effect/floor_decal/corner/black/full{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/operations/lower/machinist) -"reE" = ( /obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/corner/brown/full, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/corner/green{ + dir = 9 + }, +/turf/simulated/floor/tiled, /area/hangar/intrepid) "reR" = ( /obj/structure/cable/green{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, /obj/structure/disposalpipe/segment, +/obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/engineering) "rfJ" = ( @@ -22020,17 +21430,6 @@ }, /turf/simulated/floor/tiled, /area/janitor) -"rgo" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/engineering{ - name = "Engineering Substation"; - req_one_access = list(11,24) - }, -/turf/simulated/floor/plating, -/area/maintenance/substation/hangar) "riF" = ( /obj/structure/grille/broken, /obj/item/material/shard{ @@ -22056,7 +21455,7 @@ /turf/simulated/wall/r_wall, /area/engineering/atmos/air) "riM" = ( -/obj/effect/floor_decal/corner/black, +/obj/effect/floor_decal/corner/green, /turf/simulated/floor/tiled, /area/hallway/primary/aft) "rjr" = ( @@ -22073,10 +21472,10 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard/deck1) "rkQ" = ( -/obj/effect/floor_decal/corner/black, -/obj/effect/floor_decal/corner/black{ - dir = 10 +/obj/effect/floor_decal/corner/green{ + dir = 1 }, +/obj/machinery/vending/coffee, /turf/simulated/floor/tiled, /area/hangar/intrepid) "rlH" = ( @@ -22316,15 +21715,15 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, +/obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, -/area/maintenance/operations) +/area/maintenance/engineering) "rso" = ( /obj/effect/floor_decal/industrial/warning/corner, /turf/simulated/floor/tiled/dark, @@ -22362,9 +21761,16 @@ /turf/simulated/floor/plating, /area/maintenance/hangar/starboard) "rtJ" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/item/stack/rods, -/turf/simulated/floor/tiled, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled/full, /area/maintenance/engineering) "ruN" = ( /obj/effect/floor_decal/industrial/warning{ @@ -22430,12 +21836,22 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/maintenance/engineering) +"rza" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/effect/floor_decal/corner/black{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/operations/lower/machinist) "rzQ" = ( /obj/machinery/floodlight, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/effect/floor_decal/corner/green{ +/obj/effect/floor_decal/corner/lime{ dir = 9 }, /turf/simulated/floor/tiled, @@ -22552,6 +21968,15 @@ }, /turf/simulated/floor/tiled/dark, /area/hangar/control) +"rFx" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, +/area/maintenance/engineering) "rFO" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -22559,12 +21984,17 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/effect/floor_decal/corner/green{ +/obj/effect/floor_decal/corner/lime{ dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/button/remote/blast_door{ + id = "shutters_deck1_morgue"; + name = "Viewing Shutters"; + pixel_y = 25 + }, /turf/simulated/floor/tiled, /area/medical/morgue/lower) "rHi" = ( @@ -22575,15 +22005,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/carpet/rubber, /area/shuttle/intrepid/crew_compartment) -"rHm" = ( -/obj/machinery/door/blast/shutters/open{ - dir = 4; - id = "shutters_deck1_workshopdesk"; - name = "Workshop Desk Shutter" - }, -/obj/effect/map_effect/window_spawner/full/reinforced/firedoor, -/turf/simulated/floor/tiled/dark/full, -/area/operations/lower/machinist) "rHr" = ( /obj/machinery/conveyor{ dir = 4; @@ -22649,6 +22070,15 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/airless, /area/hangar/operations) +"rLm" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/light/small/emergency{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/engineering) "rMf" = ( /obj/structure/railing/mapped, /obj/effect/floor_decal/industrial/warning, @@ -22667,24 +22097,6 @@ /obj/machinery/bluespace_beacon, /turf/simulated/floor/tiled/dark, /area/shuttle/mining) -"rMZ" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/corner/black{ - dir = 6 - }, -/turf/simulated/floor/tiled/dark, -/area/operations/lower/machinist) "rNe" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 9 @@ -22709,32 +22121,27 @@ /turf/simulated/floor/tiled/dark, /area/engineering/atmos) "rNz" = ( -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/black, +/obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/engineering) "rNH" = ( /obj/structure/foamedmetal, /turf/simulated/floor/plating, -/area/maintenance/operations) +/area/maintenance/engineering) "rNR" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/railing/mapped{ +/obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/effect/floor_decal/spline/plain{ - dir = 4 +/obj/machinery/alarm{ + dir = 4; + pixel_x = -28 }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/engineering) "rOz" = ( @@ -22773,11 +22180,12 @@ /turf/simulated/floor/tiled, /area/outpost/mining_main/refinery) "rPA" = ( -/obj/effect/floor_decal/corner/brown{ - dir = 9 +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/light/small/emergency{ + dir = 1 }, -/turf/simulated/floor/tiled/dark, -/area/hangar/intrepid) +/turf/simulated/floor/plating, +/area/maintenance/operations) "rPJ" = ( /obj/structure/cable{ icon_state = "2-8" @@ -22819,9 +22227,11 @@ }, /area/medical/morgue/lower) "rQC" = ( -/obj/structure/grille, +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, /turf/simulated/floor/plating, -/area/maintenance/operations) +/area/maintenance/engineering) "rQR" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 @@ -22885,7 +22295,7 @@ /obj/machinery/alarm/cold{ pixel_y = 28 }, -/obj/effect/floor_decal/corner/green/diagonal, +/obj/effect/floor_decal/corner/lime/diagonal, /turf/simulated/floor/tiled/white{ name = "cooled white floor"; temperature = 278.15 @@ -22916,6 +22326,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, /turf/simulated/floor/tiled/dark, /area/maintenance/disposal) "rSW" = ( @@ -22926,9 +22339,10 @@ /turf/simulated/floor/plating, /area/engineering/atmos/air) "rTF" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/dark, -/area/operations/lower/machinist) +/obj/effect/decal/cleanable/dirt, +/obj/structure/trash_pile, +/turf/simulated/floor/plating, +/area/maintenance/operations) "rTG" = ( /obj/machinery/alarm{ pixel_y = 28 @@ -22947,9 +22361,12 @@ /obj/machinery/light/small, /obj/structure/table/steel, /obj/item/storage/box/bodybags, -/obj/effect/floor_decal/corner/green/full{ +/obj/effect/floor_decal/corner/lime/full{ dir = 4 }, +/obj/item/storage/box/gloves{ + pixel_y = 11 + }, /turf/simulated/floor/tiled/white{ name = "cooled white floor"; temperature = 278.15 @@ -22998,7 +22415,7 @@ dir = 8; pixel_x = 28 }, -/obj/effect/floor_decal/corner/green/full{ +/obj/effect/floor_decal/corner/lime/full{ dir = 1 }, /turf/simulated/floor/tiled, @@ -23089,23 +22506,12 @@ /turf/simulated/floor/tiled, /area/hangar/operations) "saH" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/railing/mapped, /obj/structure/railing/mapped{ dir = 4 }, -/obj/effect/floor_decal/spline/plain, /obj/item/material/shard, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/floor_decal/industrial/warning{ + dir = 6 }, /turf/simulated/floor/plating, /area/maintenance/engineering) @@ -23205,7 +22611,7 @@ /turf/simulated/floor/tiled, /area/rnd/xenoarch_atrium) "sfj" = ( -/obj/effect/floor_decal/corner/green{ +/obj/effect/floor_decal/corner/lime{ dir = 5 }, /turf/simulated/floor/tiled/white{ @@ -23213,12 +22619,6 @@ temperature = 278.15 }, /area/medical/morgue/lower) -"sfr" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 6 - }, -/turf/simulated/floor/tiled/dark/full, -/area/operations/lower/machinist) "sfF" = ( /turf/simulated/floor/tiled/dark, /area/engineering/atmos/propulsion/starboard) @@ -23279,32 +22679,6 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/reinforced, /area/rnd/xenoarch_atrium) -"shp" = ( -/obj/machinery/power/smes/buildable{ - RCon_tag = "Substation - Hangar" - }, -/obj/structure/cable, -/obj/structure/cable/green{ - icon_state = "0-2" - }, -/turf/simulated/floor/plating, -/area/maintenance/substation/hangar) -"shB" = ( -/obj/machinery/conveyor{ - dir = 1; - id = "Robocompo" - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/operations/lower/machinist) "siF" = ( /obj/machinery/atmospherics/pipe/simple/visible/red, /obj/structure/tank_wall/hydrogen{ @@ -23361,7 +22735,7 @@ /turf/simulated/floor/tiled, /area/hangar/operations) "slH" = ( -/obj/effect/floor_decal/corner/black{ +/obj/effect/floor_decal/corner/green{ dir = 6 }, /turf/simulated/floor/tiled, @@ -23535,6 +22909,23 @@ }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos) +"sti" = ( +/obj/machinery/door/firedoor, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/maintenance{ + name = "Workshop Maintenance"; + req_access = list(29) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/full, +/area/operations/lower/machinist) "stn" = ( /obj/machinery/door/airlock/maintenance{ name = "Fire Closet"; @@ -23679,19 +23070,14 @@ /turf/simulated/floor/tiled/dark, /area/turret_protected/ai) "sxx" = ( -/obj/effect/floor_decal/corner/black{ - dir = 9 - }, /obj/machinery/camera/network/first_deck{ c_tag = "First Deck - Hangar 1"; dir = 4 }, -/obj/machinery/ringer_button{ - id = "robo_ringer"; - pixel_x = -24; - pixel_y = 7 +/obj/effect/floor_decal/corner/green{ + dir = 9 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hangar/intrepid/interstitial) "sxy" = ( /turf/simulated/floor/plating, @@ -23748,28 +23134,14 @@ }, /area/engineering/atmos/propulsion/starboard) "sBd" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/railing/mapped, -/obj/effect/floor_decal/spline/plain, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - icon_state = "0-4" - }, /obj/machinery/power/apc{ dir = 1; name = "north bump"; pixel_y = 24 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/floor_decal/industrial/warning, +/obj/structure/cable{ + icon_state = "0-2" }, /turf/simulated/floor/plating, /area/maintenance/engineering) @@ -23922,6 +23294,16 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/xenoarch_atrium) +"sIC" = ( +/obj/machinery/power/breakerbox/activated{ + RCon_tag = "Hangar Substation" + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/substation/hangar) "sIQ" = ( /obj/structure/table/rack, /obj/item/clothing/suit/bio_suit/anomaly, @@ -23946,20 +23328,8 @@ /turf/simulated/floor/tiled/dark, /area/rnd/xenoarch_atrium) "sJJ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/effect/floor_decal/corner/white/full{ - dir = 8 - }, /obj/effect/floor_decal/spline/plain{ - dir = 1 - }, -/obj/structure/sink/kitchen{ - dir = 4; - name = "sink"; - pixel_x = -21 + dir = 10 }, /turf/simulated/floor/tiled/white, /area/operations/lower/machinist) @@ -24005,6 +23375,14 @@ /obj/machinery/atmospherics/pipe/simple/visible/cyan, /turf/simulated/floor/plating, /area/engineering/atmos/air) +"sKZ" = ( +/obj/structure/table/steel, +/obj/machinery/recharger, +/obj/effect/floor_decal/corner/green{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/hangar/intrepid) "sLg" = ( /obj/structure/shuttle/engine/propulsion/burst/left{ dir = 4 @@ -24076,7 +23454,7 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard/deck1) "sMx" = ( -/obj/random/junk, +/obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning{ dir = 5 }, @@ -24097,6 +23475,19 @@ }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos) +"sOo" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/light/small/emergency{ + dir = 1 + }, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, +/area/maintenance/engineering) "sOG" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 5 @@ -24129,7 +23520,6 @@ /turf/space/dynamic, /area/horizon/exterior) "sPQ" = ( -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -24145,23 +23535,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/engineering) -"sPT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/effect/floor_decal/corner/black{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/operations/lower/machinist) "sQT" = ( /obj/machinery/atmospherics/omni/filter{ name = "hydrogen filter"; @@ -24246,6 +23622,18 @@ }, /turf/simulated/floor/plating, /area/turret_protected/ai) +"sTu" = ( +/obj/machinery/door/firedoor, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/engineering{ + name = "Hangar Substation"; + req_one_access = list(11,24) + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/full, +/area/maintenance/substation/hangar) "sTw" = ( /turf/simulated/floor/plating, /area/maintenance/wing/starboard/deck1) @@ -24278,10 +23666,18 @@ /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/rnd/test_range) "sWa" = ( -/obj/effect/decal/cleanable/blood/oil, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, -/area/maintenance/operations) +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/full, +/area/hallway/primary/aft) "sWr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -24293,7 +23689,7 @@ /area/operations/storage) "sWB" = ( /obj/machinery/firealarm/north, -/obj/effect/floor_decal/corner/black/full{ +/obj/effect/floor_decal/corner/green/full{ dir = 1 }, /turf/simulated/floor/tiled, @@ -24322,14 +23718,15 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/mining) "sYZ" = ( -/obj/machinery/light{ - dir = 1 +/obj/machinery/conveyor{ + dir = 1; + id = "Robocompo" }, -/obj/effect/floor_decal/corner/brown/full{ +/obj/effect/floor_decal/spline/plain{ dir = 8 }, -/turf/simulated/floor/tiled/dark, -/area/hangar/intrepid) +/turf/simulated/floor/carpet/rubber, +/area/operations/lower/machinist) "sZp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -24348,31 +23745,15 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard/deck1) "taF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/door/airlock/highsecurity{ + name = "First Deck Telecommunications Relay"; + req_access = list(61) }, -/obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/corner/black{ - dir = 10 - }, -/turf/simulated/floor/tiled/dark, -/area/operations/lower/machinist) -"tbd" = ( -/obj/structure/cable/green{ +/obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/effect/floor_decal/corner/brown/full{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/hangar/intrepid) +/turf/simulated/floor/tiled/full, +/area/tcommsat/mainlvl_tcomms__relay) "tbP" = ( /obj/item/modular_computer/console/preset/civilian{ dir = 4 @@ -24430,9 +23811,14 @@ /turf/simulated/floor/plating, /area/maintenance/research_port) "teb" = ( -/obj/machinery/door/firedoor, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/machinery/light/small/emergency{ + dir = 8 + }, /turf/simulated/floor/plating, -/area/maintenance/operations) +/area/maintenance/engineering) "tei" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -24442,6 +23828,28 @@ }, /turf/simulated/floor/plating, /area/engineering/atmos/air) +"ten" = ( +/obj/item/storage/firstaid/regular{ + empty = 1; + name = "First-Aid (empty)" + }, +/obj/item/storage/firstaid/regular{ + empty = 1; + name = "First-Aid (empty)" + }, +/obj/item/device/healthanalyzer, +/obj/item/device/healthanalyzer, +/obj/item/reagent_containers/glass/bucket{ + pixel_y = 2 + }, +/obj/item/reagent_containers/glass/bucket{ + pixel_y = 2 + }, +/obj/item/device/assembly/prox_sensor, +/obj/item/device/assembly/prox_sensor, +/obj/structure/table/standard, +/turf/simulated/floor/tiled, +/area/operations/lower/machinist) "teq" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/light/small{ @@ -24481,6 +23889,9 @@ layer = 2.9; reversed = 1 }, +/obj/structure/railing/mapped{ + dir = 1 + }, /turf/simulated/floor/plating, /area/outpost/mining_main/refinery) "tfh" = ( @@ -24545,6 +23956,16 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/xenoarch_atrium) +"thd" = ( +/obj/effect/floor_decal/corner/green{ + dir = 5 + }, +/obj/machinery/disposal/small/south, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hangar/intrepid) "thF" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/camera/network/command{ @@ -24562,19 +23983,6 @@ }, /turf/simulated/floor/tiled, /area/operations/storage) -"thR" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/obj/machinery/camera/network/supply{ - c_tag = "Operations - Workshop Lobby"; - dir = 4 - }, -/obj/effect/floor_decal/corner/brown{ - dir = 9 - }, -/turf/simulated/floor/tiled/dark, -/area/hangar/intrepid) "thS" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -24683,44 +24091,21 @@ /turf/simulated/floor/tiled, /area/horizon/hydroponics/lower) "tlx" = ( -/obj/structure/table/rack, -/obj/item/stack/material/plasteel{ - amount = 20; - pixel_y = 4; - randpixel = 0 - }, -/obj/item/stack/material/glass{ - amount = 50; - pixel_x = -1; - pixel_y = 2; - randpixel = 0 - }, -/obj/item/stack/material/steel{ - amount = 50; - pixel_x = 1; - pixel_y = -2; - randpixel = 0 - }, -/obj/item/stack/material/steel{ - amount = 50; - pixel_x = 1; - pixel_y = -2; - randpixel = 0 - }, -/obj/item/stack/material/steel{ - amount = 50; - pixel_x = 1; - pixel_y = -2; - randpixel = 0 - }, -/obj/item/reagent_containers/glass/beaker/sulphuric, -/obj/effect/floor_decal/corner/black/full{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/device/floor_painter, -/turf/simulated/floor/tiled/dark, -/area/operations/lower/machinist) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance{ + req_one_access = list(12,26) + }, +/obj/machinery/door/firedoor, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/full, +/area/maintenance/engineering) "tlU" = ( /obj/effect/floor_decal/corner_wide/purple{ dir = 6 @@ -24772,27 +24157,44 @@ "tou" = ( /turf/simulated/floor/shuttle/dark_blue, /area/shuttle/escape_pod/pod2) -"tpR" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/effect/decal/cleanable/dirt, -/obj/random/junk, +"toL" = ( +/obj/machinery/alarm{ + pixel_x = -28; + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/corner/black{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, +/area/operations/lower/machinist) +"tpR" = ( +/obj/random/junk, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/full, /area/maintenance/engineering) "tqs" = ( /turf/simulated/floor/tiled/dark/airless, /area/shuttle/mining) "tqT" = ( -/obj/effect/floor_decal/industrial/warning/cee{ - dir = 4 +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/machinery/conveyor{ - dir = 4; - id = "Robocompo" +/turf/simulated/floor/tiled/ramp{ + dir = 8 }, -/turf/simulated/floor/tiled/dark, -/area/operations/lower/machinist) +/area/maintenance/engineering) "trc" = ( -/obj/random/junk, +/obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning{ dir = 9 }, @@ -24841,27 +24243,12 @@ }, /area/engineering/atmos/propulsion/starboard) "tsv" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/railing/mapped{ - dir = 1 - }, -/obj/structure/railing/mapped{ - dir = 4 - }, +/obj/machinery/optable, /obj/effect/floor_decal/spline/plain{ dir = 1 }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/engineering) +/turf/simulated/floor/tiled/white, +/area/operations/lower/machinist) "tsD" = ( /obj/effect/floor_decal/corner/green/full, /obj/effect/floor_decal/spline/plain/corner{ @@ -24939,8 +24326,11 @@ /turf/simulated/floor/tiled/dark, /area/engineering/atmos/propulsion) "twX" = ( -/obj/structure/lattice/catwalk/indoor/grate, -/obj/effect/spider/stickyweb, +/obj/machinery/light/small/emergency{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/maintenance/operations) "txa" = ( @@ -24951,13 +24341,13 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/effect/floor_decal/corner/black{ - dir = 9 +/obj/effect/floor_decal/corner/green{ + dir = 6 }, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hangar/intrepid) "txk" = ( /obj/machinery/light/small, @@ -25101,6 +24491,19 @@ /obj/effect/floor_decal/corner_wide/purple/diagonal, /turf/simulated/floor/tiled/white, /area/rnd/eva) +"tET" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/black, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, +/area/maintenance/engineering) "tFd" = ( /obj/structure/lattice/catwalk/indoor/grate/damaged, /turf/simulated/floor/plating, @@ -25129,17 +24532,25 @@ /obj/structure/table/rack, /turf/simulated/floor/plating, /area/maintenance/wing/port/deck1) -"tGK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_mining{ - name = "Workshop"; - req_access = list(29) +"tGE" = ( +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/effect/floor_decal/corner/white/diagonal, -/turf/simulated/floor/tiled/white, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/substation/hangar) +"tGK" = ( +/obj/machinery/conveyor{ + dir = 4; + id = "Robocompo" + }, +/obj/structure/plasticflaps, +/obj/effect/floor_decal/spline/plain{ + dir = 5 + }, +/turf/simulated/floor/carpet/rubber, /area/operations/lower/machinist) "tGU" = ( /obj/effect/floor_decal/corner/purple{ @@ -25155,13 +24566,15 @@ /turf/simulated/floor/tiled, /area/operations/storage) "tHk" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ +/obj/structure/railing/mapped, +/obj/structure/railing/mapped{ dir = 4 }, -/obj/machinery/firealarm/south, +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, /turf/simulated/floor/plating, -/area/tcommsat/mainlvl_tcomms__relay) +/area/maintenance/engineering) "tHv" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -25220,6 +24633,15 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/full, /area/operations/storage) +"tJb" = ( +/obj/structure/closet/secure_closet/machinist, +/obj/effect/floor_decal/corner/black{ + dir = 6 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/firealarm/east, +/turf/simulated/floor/tiled, +/area/operations/lower/machinist) "tJg" = ( /obj/effect/decal/cleanable/dirt, /obj/random/junk, @@ -25284,7 +24706,7 @@ /turf/simulated/floor/plating, /area/maintenance/engineering) "tLM" = ( -/obj/effect/floor_decal/corner/black{ +/obj/effect/floor_decal/corner/green{ dir = 10 }, /turf/simulated/floor/tiled, @@ -25327,19 +24749,18 @@ /turf/simulated/floor/tiled/dark, /area/operations/loading) "tMp" = ( -/obj/structure/table/steel, -/obj/machinery/button/switch/windowtint{ - id = "1deckworkshop"; - pixel_y = 25 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/item/device/mmi, -/obj/item/device/mmi, -/obj/item/device/mmi, -/obj/effect/floor_decal/corner/black{ - dir = 5 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/operations/lower/machinist) +/obj/structure/lattice/catwalk/indoor/grate, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/engineering) "tNo" = ( /obj/structure/closet/walllocker/firecloset{ pixel_x = 28; @@ -25491,21 +24912,14 @@ /turf/simulated/floor/tiled/dark, /area/engineering/atmos) "tTT" = ( +/obj/effect/decal/cleanable/dirt, /obj/structure/cable{ - icon_state = "1-4" + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/structure/lattice/catwalk/indoor/grate, -/obj/structure/railing/mapped{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/maintenance/operations) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/full, +/area/maintenance/engineering) "tUv" = ( /turf/simulated/floor/shuttle/dark_blue, /area/shuttle/escape_pod/pod3) @@ -25636,6 +25050,14 @@ /obj/machinery/atmospherics/pipe/simple/visible/purple, /turf/simulated/floor/reinforced/phoron, /area/engineering/atmos) +"tYB" = ( +/obj/machinery/door/blast/regular/open{ + dir = 8; + id = "hangarlockdown"; + name = "Hangar Lockdown" + }, +/turf/simulated/floor/tiled/full, +/area/hangar/intrepid) "tYN" = ( /obj/item/device/radio/intercom{ dir = 1; @@ -25670,6 +25092,18 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/shuttle/intrepid/crew_compartment) +"tZK" = ( +/obj/machinery/mecha_part_fabricator{ + dir = 8 + }, +/obj/structure/railing/mapped{ + dir = 8 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/turf/simulated/floor/carpet/rubber, +/area/operations/lower/machinist) "tZY" = ( /obj/machinery/conveyor{ id = "mining_2"; @@ -25717,6 +25151,9 @@ /obj/machinery/light/small{ dir = 4 }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, /turf/simulated/floor/plating, /area/maintenance/engineering) "ucs" = ( @@ -25759,19 +25196,14 @@ /turf/simulated/floor/plating, /area/maintenance/hangar/port) "udC" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/effect/floor_decal/corner/green/full{ + dir = 8 }, -/obj/effect/floor_decal/corner/brown{ - dir = 9 +/obj/structure/disposalpipe/junction/yjunction, +/obj/structure/cable{ + icon_state = "2-8" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hangar/intrepid) "ueg" = ( /obj/structure/closet/crate, @@ -25892,24 +25324,6 @@ }, /turf/simulated/floor/plating, /area/shuttle/intrepid/crew_compartment) -"ukF" = ( -/obj/machinery/computer/rdconsole/robotics{ - dir = 1 - }, -/obj/machinery/camera/network/supply{ - c_tag = "Operations - Workshop Desk"; - dir = 1 - }, -/obj/machinery/requests_console{ - department = "Machinist Workshop"; - departmentType = 2; - name = "Machinist Workshop"; - pixel_y = -30 - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/carpet/rubber, -/area/operations/lower/machinist) "ukS" = ( /turf/simulated/wall, /area/hangar/operations) @@ -26109,27 +25523,13 @@ /turf/simulated/floor/tiled/dark, /area/engineering/atmos) "uqn" = ( -/obj/effect/landmark/start{ - name = "Machinist" - }, -/obj/structure/bed/stool/chair/office/dark{ - dir = 4 - }, -/obj/effect/floor_decal/corner/black{ - dir = 6 - }, -/turf/simulated/floor/tiled/dark, -/area/operations/lower/machinist) +/obj/structure/sign/flag/scc, +/turf/simulated/wall, +/area/hangar/intrepid/interstitial) "uqE" = ( -/obj/item/stack/wrapping_paper, -/obj/item/stack/packageWrap, -/obj/item/device/hand_labeler, -/obj/structure/table/steel, -/obj/effect/floor_decal/corner/black/full{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/operations/lower/machinist) +/obj/structure/trash_pile, +/turf/simulated/floor/plating, +/area/maintenance/operations) "urr" = ( /obj/machinery/atmospherics/portables_connector{ dir = 8 @@ -26179,22 +25579,34 @@ dir = 4 }, /area/maintenance/research_port) +"usF" = ( +/obj/structure/table/standard, +/obj/item/device/mmi/digital/posibrain{ + pixel_y = -8 + }, +/obj/item/device/mmi/digital/posibrain{ + pixel_y = 8 + }, +/turf/simulated/floor/tiled, +/area/operations/lower/machinist) "usP" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/lattice/catwalk/indoor/grate, -/obj/structure/railing/mapped{ - dir = 8 - }, -/obj/structure/railing/mapped{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/operations) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/turf/simulated/floor/tiled, +/area/hangar/intrepid) "utd" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -26323,6 +25735,19 @@ }, /turf/simulated/floor/tiled, /area/hangar/intrepid) +"uAS" = ( +/obj/machinery/conveyor{ + dir = 1; + id = "Robocompo" + }, +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/carpet/rubber, +/area/operations/lower/machinist) "uBg" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -26451,17 +25876,6 @@ }, /turf/simulated/floor/plating, /area/engineering/atmos/air) -"uGn" = ( -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/obj/machinery/power/apc/low{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, -/turf/simulated/floor/plating, -/area/maintenance/substation/hangar) "uGI" = ( /obj/machinery/light/small{ dir = 4 @@ -26477,7 +25891,7 @@ /obj/machinery/light/small, /obj/structure/table/steel, /obj/item/reagent_containers/spray/cleaner, -/obj/effect/floor_decal/corner/green{ +/obj/effect/floor_decal/corner/lime{ dir = 10 }, /turf/simulated/floor/tiled/white{ @@ -26608,7 +26022,7 @@ }, /obj/machinery/door/firedoor/multi_tile, /obj/machinery/door/blast/regular/open{ - dir = 4; + dir = 8; id = "hangarlockdown"; name = "Hangar Lockdown" }, @@ -26640,16 +26054,6 @@ }, /turf/simulated/floor/reinforced/airless, /area/engineering/atmos/propulsion/starboard) -"uQa" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/machinery/alarm{ - pixel_y = 28 - }, -/turf/simulated/floor/plating, -/area/tcommsat/mainlvl_tcomms__relay) "uQL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -26692,10 +26096,13 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/intrepid/crew_compartment) "uSG" = ( -/obj/effect/floor_decal/corner/black{ - dir = 9 +/obj/machinery/ringer_button{ + id = "robo_ringer"; + pixel_x = -24; + pixel_y = 10 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/corner/green/full, +/turf/simulated/floor/tiled, /area/hangar/intrepid/interstitial) "uSZ" = ( /obj/effect/floor_decal/corner/blue/full, @@ -26744,21 +26151,12 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/mining) "uUZ" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/light{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/corner/black{ +/obj/effect/floor_decal/corner/green{ dir = 9 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/tiled, /area/hallway/primary/aft) "uVD" = ( @@ -26777,11 +26175,11 @@ /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/engineering/atmos/propulsion) "uVX" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/ramp{ - dir = 8 +/obj/effect/floor_decal/corner/black{ + dir = 9 }, -/area/maintenance/operations) +/turf/simulated/floor/tiled, +/area/operations/lower/machinist) "uWn" = ( /obj/machinery/door/blast/regular/open{ id = "iso_a"; @@ -26822,23 +26220,44 @@ /turf/simulated/floor/tiled/dark/full, /area/operations/lower/machinist) "uXR" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 9 +/obj/structure/table/rack, +/obj/item/stack/material/plasteel{ + amount = 20; + pixel_y = 4; + randpixel = 0 }, -/obj/structure/table/standard, -/obj/item/storage/box/fancy/tray/robotics, -/turf/simulated/floor/tiled/dark/full, +/obj/item/stack/material/glass{ + amount = 50; + pixel_x = -1; + pixel_y = 2; + randpixel = 0 + }, +/obj/item/stack/material/steel{ + amount = 50; + pixel_x = 1; + pixel_y = -2; + randpixel = 0 + }, +/obj/item/stack/material/steel{ + amount = 50; + pixel_x = 1; + pixel_y = -2; + randpixel = 0 + }, +/obj/item/stack/material/steel{ + amount = 50; + pixel_x = 1; + pixel_y = -2; + randpixel = 0 + }, +/obj/item/reagent_containers/glass/beaker/sulphuric, +/obj/item/device/floor_painter, +/obj/effect/floor_decal/corner/black{ + dir = 5 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled, /area/operations/lower/machinist) -"uYi" = ( -/obj/structure/railing/mapped, -/obj/structure/bed/stool/chair/padded/black{ - dir = 8 - }, -/obj/effect/floor_decal/corner/brown/full{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/hangar/intrepid) "uYW" = ( /obj/machinery/atmospherics/pipe/manifold/visible/purple{ dir = 4 @@ -26846,34 +26265,22 @@ /turf/simulated/floor/tiled/dark, /area/engineering/atmos) "uZe" = ( -/obj/effect/decal/cleanable/cobweb2{ - icon_state = "cobweb1" +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/obj/structure/railing/mapped{ + dir = 1 }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/operations) +/area/maintenance/engineering) "uZk" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, +/obj/random/junk, /obj/structure/railing/mapped{ dir = 4 }, -/obj/effect/floor_decal/spline/plain{ +/obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/obj/random/junk, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /turf/simulated/floor/plating, /area/maintenance/engineering) "uZm" = ( @@ -26922,12 +26329,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/airlock/maintenance{ - name = "Maintenance Passthrough"; - req_one_access = list(12,26,31,48,67) - }, /obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/dark, +/obj/machinery/door/airlock/maintenance_hatch, +/turf/simulated/floor/tiled/full, /area/maintenance/operations) "vbv" = ( /obj/effect/floor_decal/industrial/warning{ @@ -27114,18 +26518,15 @@ /turf/simulated/floor/tiled/dark/full, /area/hangar/control) "vhY" = ( -/obj/effect/floor_decal/corner/black{ - dir = 10 - }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, /turf/simulated/floor/tiled, /area/hallway/primary/aft) "vif" = ( -/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/corner/lime/diagonal, /turf/simulated/floor/tiled, -/area/maintenance/operations) +/area/medical/morgue/lower) "vil" = ( /turf/simulated/floor/plating, /area/maintenance/research_port) @@ -27177,25 +26578,40 @@ /turf/simulated/floor/plating, /area/maintenance/operations) "vjM" = ( -/turf/simulated/floor/tiled/dark, +/obj/structure/table/standard, +/obj/item/device/mmi, +/obj/item/device/mmi, +/obj/item/device/mmi, +/obj/item/device/mmi/digital/posibrain{ + pixel_y = -8 + }, +/obj/item/device/mmi/digital/posibrain{ + pixel_y = 8 + }, +/obj/structure/sign/nosmoking_1{ + pixel_y = 32 + }, +/obj/effect/floor_decal/corner/black/full{ + dir = 1 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled, /area/operations/lower/machinist) "vjT" = ( -/obj/structure/cable/green{ +/obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/mining{ - name = "Workshop"; - req_access = list(29) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/tiled/dark, -/area/operations/lower/machinist) +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, +/area/maintenance/engineering) "vjW" = ( /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ dir = 4 @@ -27245,11 +26661,10 @@ /turf/simulated/floor/plating, /area/maintenance/research_port) "voa" = ( -/obj/effect/floor_decal/corner/black{ - dir = 10 +/obj/effect/floor_decal/corner/green{ + dir = 5 }, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/effect/floor_decal/industrial/loading/yellow{ +/obj/structure/bed/stool/chair/padded/brown{ dir = 8 }, /turf/simulated/floor/tiled, @@ -27275,38 +26690,24 @@ /turf/simulated/floor/tiled/white, /area/rnd/test_range) "vpa" = ( -/obj/structure/lattice/catwalk/indoor/grate, -/obj/machinery/power/apc/low{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, -/obj/structure/cable{ - icon_state = "0-2" - }, -/turf/simulated/floor/plating, -/area/maintenance/operations) -"vpe" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/telecomms/relay/preset/station, -/obj/machinery/camera/network/telecom{ - c_tag = "Telecomms - First Deck Relay"; +/obj/random/junk, +/obj/effect/floor_decal/industrial/warning{ dir = 8 }, /turf/simulated/floor/plating, +/area/maintenance/engineering) +"vpe" = ( +/obj/machinery/firealarm/south, +/turf/simulated/floor/tiled/dark/full, /area/tcommsat/mainlvl_tcomms__relay) "vpl" = ( /obj/machinery/light/small/emergency{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/railing/mapped{ +/obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 10 - }, -/obj/structure/railing/mapped, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/maintenance/operations) "vpu" = ( @@ -27368,22 +26769,11 @@ /turf/simulated/floor/tiled/white, /area/shuttle/intrepid/medical_compartment) "vqW" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/railing/mapped{ +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/maintenance/engineering) "vrg" = ( @@ -27399,16 +26789,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock/maintenance{ - name = "Workshop Maintenance"; - req_access = list(29) - }, /obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/dark, -/area/operations/lower/machinist) +/obj/machinery/door/airlock/maintenance_hatch{ + req_one_access = list(12,26,29) + }, +/turf/simulated/floor/tiled/full, +/area/maintenance/engineering) "vrz" = ( /obj/structure/window/reinforced{ dir = 4 @@ -27423,6 +26809,12 @@ /mob/living/heavy_vehicle/premade/ripley/loader, /turf/simulated/floor/tiled/dark, /area/shuttle/intrepid/rotary) +"vrQ" = ( +/obj/effect/floor_decal/corner/black{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/operations/lower/machinist) "vse" = ( /obj/effect/landmark/entry_point/fore{ name = "fore, d3 airlock" @@ -27430,17 +26822,12 @@ /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/maintenance/hangar/starboard) "vsW" = ( -/obj/structure/table/steel, -/obj/item/device/mmi/digital/posibrain{ - pixel_y = -8 +/obj/machinery/computer/rdconsole/robotics{ + dir = 1 }, -/obj/item/device/mmi/digital/posibrain{ - pixel_y = 8 - }, -/obj/effect/floor_decal/corner/black{ - dir = 6 - }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/spline/plain, +/turf/simulated/floor/carpet/rubber, /area/operations/lower/machinist) "vsY" = ( /obj/structure/cable{ @@ -27467,10 +26854,15 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard/deck1) "vul" = ( -/obj/structure/railing/mapped, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, -/area/outpost/mining_main/refinery) +/obj/machinery/firealarm/east, +/obj/effect/floor_decal/corner/green{ + dir = 6 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hangar/intrepid/interstitial) "vuB" = ( /obj/structure/tank_wall/phoron{ density = 0; @@ -27582,10 +26974,13 @@ /obj/machinery/light{ dir = 4 }, -/obj/effect/floor_decal/corner/black{ +/obj/effect/floor_decal/corner/green{ dir = 6 }, -/turf/simulated/floor/tiled/dark, +/obj/machinery/newscaster{ + pixel_x = 32 + }, +/turf/simulated/floor/tiled, /area/hangar/intrepid/interstitial) "vDP" = ( /obj/effect/decal/cleanable/blood/oil, @@ -27616,6 +27011,26 @@ dir = 8 }, /area/maintenance/wing/port/deck1) +"vFu" = ( +/obj/machinery/alarm{ + pixel_x = -28; + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, +/area/maintenance/engineering) "vFD" = ( /obj/machinery/power/smes/buildable/horizon_shuttle{ RCon_tag = "Spark" @@ -27743,7 +27158,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/item/device/radio/intercom{ name = "Station Intercom (General)"; - pixel_y = 25 + pixel_y = 24 }, /obj/effect/floor_decal/corner/purple{ dir = 5 @@ -27857,7 +27272,6 @@ /turf/simulated/floor/plating, /area/maintenance/engineering) "vOu" = ( -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable/green{ icon_state = "1-8" }, @@ -27876,6 +27290,7 @@ dir = 2; icon_state = "pipe-c" }, +/obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/engineering) "vPo" = ( @@ -27938,14 +27353,13 @@ /turf/simulated/floor/tiled, /area/horizon/hydroponics/lower) "vSS" = ( -/obj/machinery/light{ - dir = 8 +/obj/structure/cable/green{ + icon_state = "1-8" }, -/obj/effect/floor_decal/industrial/warning{ - dir = 9 - }, -/turf/simulated/floor/carpet/rubber, -/area/operations/lower/machinist) +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/light/small/emergency, +/turf/simulated/floor/plating, +/area/maintenance/engineering) "vTJ" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -28064,6 +27478,13 @@ /area/engineering/atmos/air) "vZK" = ( /obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hangar/intrepid/interstitial) "vZL" = ( @@ -28104,6 +27525,9 @@ /turf/simulated/floor/tiled, /area/hangar/auxiliary) "waN" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/hallway/primary/aft) "wbg" = ( @@ -28152,6 +27576,15 @@ }, /turf/simulated/floor/reinforced, /area/rnd/test_range) +"wdT" = ( +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/substation/hangar) "wdX" = ( /obj/structure/tank_wall/phoron{ density = 0; @@ -28299,21 +27732,22 @@ }, /area/hangar/auxiliary) "wjr" = ( -/obj/effect/floor_decal/industrial/hatch, -/obj/machinery/r_n_d/protolathe, -/obj/structure/railing/mapped{ +/obj/effect/decal/cleanable/dirt, +/obj/item/material/shard{ + icon_state = "medium" + }, +/turf/simulated/floor/tiled, +/area/maintenance/operations) +"wjH" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/random/junk, +/obj/machinery/light/small/emergency{ dir = 4 }, -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/effect/floor_decal/industrial/warning{ - dir = 6 - }, -/turf/simulated/floor/carpet/rubber, -/area/operations/lower/machinist) -"wjH" = ( -/obj/effect/floor_decal/corner/black/full, -/turf/simulated/floor/tiled/dark, -/area/operations/lower/machinist) +/turf/simulated/floor/plating, +/area/maintenance/engineering) "wjM" = ( /obj/effect/floor_decal/corner/blue/full{ dir = 4 @@ -28365,15 +27799,23 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_mining{ - name = "Cargo Bay"; - req_access = null; - req_one_access = list(26,31,48,67) - }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/tiled/dark, +/obj/machinery/door/blast/regular/open{ + dir = 4; + id = "hangarlockdown"; + name = "Hangar Lockdown" + }, +/obj/machinery/door/airlock/glass_mining{ + name = "Cargo Bay"; + req_access = null; + req_one_access = list(12,26,31,48,67) + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/full, /area/hangar/intrepid) "wkj" = ( /obj/machinery/atmospherics/pipe/simple/visible/black, @@ -28532,19 +27974,6 @@ }, /turf/simulated/floor/tiled, /area/hangar/operations) -"wpC" = ( -/obj/machinery/ringer{ - department = "Robotics"; - id = "robo_ringer"; - pixel_x = -32; - req_access = list(29) - }, -/obj/item/paper_bin, -/obj/item/pen/black, -/obj/structure/table/steel, -/obj/effect/floor_decal/corner/black/full, -/turf/simulated/floor/tiled/dark, -/area/operations/lower/machinist) "wpM" = ( /obj/machinery/atmospherics/omni/mixer{ active_power_usage = 7500; @@ -28566,11 +27995,23 @@ }, /turf/simulated/floor/tiled, /area/maintenance/wing/starboard/deck1) -"wqf" = ( -/obj/effect/floor_decal/corner/brown{ +"wqd" = ( +/obj/machinery/disposal/small/west, +/obj/structure/disposalpipe/trunk, +/obj/effect/floor_decal/corner/black{ dir = 6 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, +/area/operations/lower/machinist) +"wqf" = ( +/obj/effect/floor_decal/corner/green{ + dir = 5 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled, /area/hangar/intrepid) "wqj" = ( /obj/effect/decal/cleanable/dirt, @@ -28590,37 +28031,27 @@ /turf/simulated/floor/tiled/dark, /area/engineering/atmos) "wqs" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/structure/railing/mapped{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/effect/floor_decal/industrial/warning{ + dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/operations/lower/machinist) +/turf/simulated/floor/plating, +/area/maintenance/engineering) "wqR" = ( /turf/simulated/wall/shuttle/scc/cardinal, /area/shuttle/escape_pod/pod4) "wrE" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/airlock/multi_tile/glass{ name = "Hangar" }, /obj/machinery/door/firedoor/multi_tile, -/obj/machinery/door/blast/regular/open{ - dir = 8; - id = "hangarlockdown"; - name = "Hangar Lockdown" +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled, -/area/hangar/intrepid) +/turf/simulated/floor/tiled/full, +/area/hangar/intrepid/interstitial) "wsA" = ( /obj/machinery/light/small/emergency, /obj/structure/cable/green{ @@ -28767,12 +28198,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, -/obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/door/airlock/maintenance_hatch{ req_one_access = list(12,26) }, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/maintenance/engineering) "wAg" = ( /obj/machinery/atmospherics/pipe/simple/visible/black, @@ -28806,6 +28236,12 @@ }, /turf/simulated/floor/tiled, /area/outpost/mining_main/refinery) +"wCH" = ( +/obj/effect/floor_decal/corner/black{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/hangar/intrepid) "wEQ" = ( /obj/machinery/light/small{ dir = 1 @@ -28861,13 +28297,10 @@ /obj/machinery/computer/guestpass{ pixel_y = 32 }, -/obj/effect/floor_decal/corner/black{ - dir = 9 - }, -/obj/effect/floor_decal/industrial/warning{ +/obj/effect/floor_decal/corner/green/full{ dir = 8 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hangar/intrepid/interstitial) "wIM" = ( /obj/machinery/artifact_harvester{ @@ -28945,8 +28378,19 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled, /area/horizon/stairwell/central) +"wLA" = ( +/obj/machinery/conveyor_switch/oneway{ + desc = "A conveyor control switch. It appears to only go in one direction. Controls the components conveyor belt."; + id = "Robocompo"; + pixel_x = -13; + pixel_y = 23 + }, +/obj/effect/floor_decal/corner/black{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/operations/lower/machinist) "wLL" = ( -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable{ icon_state = "4-8" }, @@ -28959,7 +28403,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/hallway/primary/aft) "wMB" = ( /obj/structure/cable/green{ @@ -28977,10 +28421,6 @@ }, /turf/simulated/floor/tiled, /area/hangar/intrepid) -"wMO" = ( -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/tiled/dark/full, -/area/operations/lower/machinist) "wNn" = ( /obj/structure/stairs/north, /obj/structure/railing/mapped{ @@ -28995,7 +28435,7 @@ /turf/simulated/floor/plating, /area/hangar/auxiliary) "wOP" = ( -/obj/effect/floor_decal/corner/green/full{ +/obj/effect/floor_decal/corner/lime/full{ dir = 1 }, /turf/simulated/floor/tiled/white{ @@ -29098,9 +28538,6 @@ /obj/structure/plasticflaps/airtight, /turf/simulated/floor/tiled, /area/hangar/operations) -"wSZ" = ( -/turf/simulated/floor/tiled, -/area/hangar/intrepid/interstitial) "wTM" = ( /obj/machinery/alarm{ dir = 1; @@ -29165,24 +28602,16 @@ /turf/simulated/floor/tiled, /area/hangar/intrepid) "wVB" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /obj/structure/railing/mapped{ dir = 1 }, /obj/machinery/light/small/emergency{ dir = 4 }, -/obj/effect/floor_decal/spline/plain{ - dir = 1 +/obj/effect/floor_decal/industrial/warning/cee{ + dir = 8 }, +/obj/structure/railing/mapped, /turf/simulated/floor/plating, /area/maintenance/engineering) "wVE" = ( @@ -29244,15 +28673,12 @@ /turf/simulated/floor/plating, /area/maintenance/substation/engineering/lower) "wXF" = ( -/obj/effect/floor_decal/corner/black/full{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, /obj/machinery/camera/network/first_deck{ c_tag = "First Deck - Atmospherics Entrance" }, +/obj/effect/floor_decal/corner/green/full{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/primary/aft) "wYe" = ( @@ -29271,7 +28697,7 @@ /turf/simulated/floor/plating, /area/maintenance/engineering) "wYE" = ( -/obj/effect/floor_decal/corner/green/diagonal, +/obj/effect/floor_decal/corner/lime/diagonal, /turf/simulated/floor/tiled/white{ name = "cooled white floor"; temperature = 278.15 @@ -29409,10 +28835,20 @@ /turf/simulated/floor/shuttle/dark_blue, /area/shuttle/escape_pod/pod3) "xej" = ( -/turf/simulated/floor/tiled/ramp/bottom{ +/obj/structure/railing/mapped{ + dir = 8 + }, +/obj/machinery/light/small, +/obj/effect/floor_decal/corner/lime/full, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/alarm{ + pixel_y = -28; dir = 1 }, -/area/hallway/primary/aft) +/turf/simulated/floor/tiled, +/area/medical/morgue/lower) "xff" = ( /obj/structure/sign/securearea{ icon_state = "radiation" @@ -29454,17 +28890,15 @@ /turf/simulated/floor/plating, /area/maintenance/research_port) "xgE" = ( -/obj/structure/cable/green{ - icon_state = "1-8" +/obj/effect/floor_decal/corner/lime{ + dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/effect/floor_decal/corner/green/full{ - dir = 1 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "2-8" }, /turf/simulated/floor/tiled, /area/medical/morgue/lower) @@ -29481,9 +28915,13 @@ /turf/simulated/floor/tiled, /area/hangar/intrepid) "xhE" = ( -/obj/structure/girder, -/turf/simulated/floor/plating, -/area/maintenance/operations) +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/full, +/area/maintenance/engineering) "xhL" = ( /obj/effect/floor_decal/industrial/warning, /obj/structure/tank_wall/nitrogen{ @@ -29666,10 +29104,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/effect/floor_decal/corner/green/diagonal, -/obj/structure/cable/green{ - icon_state = "2-8" - }, +/obj/effect/floor_decal/corner/lime/diagonal, /turf/simulated/floor/tiled/white{ name = "cooled white floor"; temperature = 278.15 @@ -29899,10 +29334,15 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/intrepid/crew_compartment) "xrE" = ( -/turf/simulated/floor/tiled/ramp/bottom{ - dir = 8 +/obj/structure/cable{ + icon_state = "0-4" }, -/area/maintenance/operations) +/obj/machinery/power/apc{ + dir = 1; + pixel_y = 24 + }, +/turf/simulated/floor/tiled/dark/full, +/area/tcommsat/mainlvl_tcomms__relay) "xst" = ( /obj/structure/window/shuttle/scc_space_ship, /obj/structure/grille, @@ -29957,9 +29397,6 @@ /obj/machinery/light{ dir = 4 }, -/obj/effect/floor_decal/corner/black{ - dir = 6 - }, /obj/machinery/power/apc/low{ dir = 1; name = "north bump"; @@ -29968,7 +29405,10 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/corner/green/full{ + dir = 1 + }, +/turf/simulated/floor/tiled, /area/hangar/intrepid/interstitial) "xtK" = ( /turf/simulated/wall/r_wall, @@ -30153,12 +29593,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/firedoor, -/obj/effect/floor_decal/corner/green{ +/obj/effect/floor_decal/corner/lime{ dir = 5 }, /obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/medical/morgue/lower) "xDI" = ( /obj/structure/lattice/catwalk/indoor/grate/damaged, @@ -30204,32 +29643,15 @@ /turf/simulated/floor/tiled, /area/hangar/intrepid) "xFB" = ( -/obj/structure/table/steel, -/obj/item/storage/firstaid/regular{ - empty = 1; - name = "First-Aid (empty)" - }, -/obj/item/storage/firstaid/regular{ - empty = 1; - name = "First-Aid (empty)" - }, -/obj/item/device/healthanalyzer, -/obj/item/device/healthanalyzer, -/obj/item/reagent_containers/glass/bucket{ - pixel_y = 2 - }, -/obj/item/reagent_containers/glass/bucket{ - pixel_y = 2 - }, -/obj/item/device/assembly/prox_sensor, -/obj/item/device/assembly/prox_sensor, /obj/effect/floor_decal/corner/black{ - dir = 5 + dir = 9 }, -/turf/simulated/floor/tiled/dark, -/area/operations/lower/machinist) +/turf/simulated/floor/tiled, +/area/hangar/intrepid/interstitial) "xGe" = ( -/obj/machinery/door/airlock/engineering, +/obj/machinery/door/airlock/engineering{ + name = "Operations Substation" + }, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -30272,6 +29694,31 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/dark, /area/engineering/gravity_gen) +"xHi" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/operations/lower/machinist) +"xHs" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/black{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, +/area/maintenance/engineering) "xHW" = ( /obj/machinery/atmospherics/unary/outlet_injector{ frequency = 1441; @@ -30312,15 +29759,20 @@ /turf/simulated/floor/airless, /area/engineering/atmos) "xJE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/railing/mapped{ +/obj/machinery/camera/network/engineering{ + alarm_on = 1; + c_tag = "Engineering - Deck 1 - Hangar Substation"; + dir = 4 + }, +/obj/machinery/light/small{ dir = 8 }, -/turf/simulated/floor/tiled/ramp{ - dir = 1 +/obj/machinery/power/terminal{ + dir = 4 }, -/area/operations/lower/machinist) +/obj/structure/cable, +/turf/simulated/floor/plating, +/area/maintenance/substation/hangar) "xKE" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -30351,21 +29803,18 @@ /turf/simulated/floor/tiled/dark, /area/turret_protected/ai) "xLq" = ( -/obj/structure/cable{ - icon_state = "1-8" +/obj/structure/cable/green{ + icon_state = "2-4" }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/lattice/catwalk/indoor/grate/damaged, +/obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, -/area/maintenance/operations) +/area/maintenance/engineering) "xLY" = ( /obj/machinery/door/firedoor, /obj/effect/floor_decal/industrial/hatch/yellow, @@ -30398,10 +29847,11 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/corner/black{ - dir = 9 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/sign/emergency/evacuation{ + pixel_x = -32 + }, +/obj/effect/floor_decal/corner/green/full, /turf/simulated/floor/tiled, /area/hangar/intrepid) "xMr" = ( @@ -30429,13 +29879,14 @@ /turf/simulated/floor/tiled/white, /area/rnd/xenoarch_atrium) "xNb" = ( -/obj/machinery/light/small/emergency{ - dir = 1 +/obj/effect/floor_decal/corner/lime{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled, -/area/maintenance/operations) +/area/medical/morgue/lower) "xNw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -30493,25 +29944,20 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/intrepid/engine_compartment) "xOV" = ( -/obj/effect/floor_decal/corner/brown/diagonal, -/turf/simulated/floor/tiled/dark, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, /area/hangar/intrepid) "xPc" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/railing/mapped, -/obj/effect/floor_decal/spline/plain, /obj/structure/closet/crate/bin, /obj/random/loot, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/alarm{ + pixel_y = 28 }, /turf/simulated/floor/plating, /area/maintenance/engineering) @@ -30544,15 +29990,6 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/intrepid/crew_compartment) -"xQI" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/floor_decal/corner/black{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/hallway/primary/aft) "xQU" = ( /obj/structure/shuttle/engine/heater{ dir = 1 @@ -30582,20 +30019,22 @@ /turf/simulated/floor/reinforced, /area/rnd/isolation_b) "xRP" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/machinery/door/firedoor, +/obj/structure/table/reinforced/steel, +/obj/machinery/door/window/westright{ + name = "Workshop Desk Internal"; + req_access = list(29) }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/lattice/catwalk/indoor/grate, -/obj/structure/railing/mapped{ - dir = 4 +/obj/machinery/door/window/eastleft{ + name = "Workshop Desk External" }, -/obj/structure/cable{ - icon_state = "1-4" +/obj/machinery/door/blast/shutters/open{ + dir = 4; + id = "shutters_deck1_workshopdesk"; + name = "Workshop Desk Shutter" }, -/turf/simulated/floor/plating, -/area/maintenance/operations) +/turf/simulated/floor/tiled/dark/full, +/area/operations/lower/machinist) "xSt" = ( /obj/structure/disposalpipe/segment, /obj/structure/lattice/catwalk/indoor/grate, @@ -30616,23 +30055,19 @@ /turf/simulated/floor/plating, /area/maintenance/hangar/starboard) "xTG" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" + dir = 4 }, -/turf/simulated/floor/tiled/ramp/bottom{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/ramp{ dir = 4 }, /area/maintenance/engineering) @@ -30673,7 +30108,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/janitor) "xVn" = ( /obj/structure/anomaly_container, @@ -30756,19 +30191,10 @@ /turf/simulated/floor/tiled/white, /area/rnd/isolation_a) "xXt" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/structure/railing/mapped{ dir = 1 }, -/obj/effect/floor_decal/spline/plain{ +/obj/effect/floor_decal/industrial/warning{ dir = 1 }, /turf/simulated/floor/plating, @@ -30814,14 +30240,11 @@ /turf/simulated/floor/tiled, /area/hangar/auxiliary) "yau" = ( -/obj/machinery/door/blast/shutters/open{ - dir = 2; - id = "shutters_deck1_workshopdesk"; - name = "Workshop Desk Shutter" +/obj/item/material/shard{ + icon_state = "medium" }, -/obj/effect/map_effect/window_spawner/full/reinforced/firedoor, -/turf/simulated/floor/tiled/dark/full, -/area/operations/lower/machinist) +/turf/simulated/floor/plating, +/area/maintenance/operations) "yaP" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -30859,9 +30282,6 @@ /obj/machinery/portable_atmospherics/powered/pump/filled, /turf/simulated/floor/tiled, /area/hangar/intrepid) -"ycX" = ( -/turf/simulated/floor/tiled/white, -/area/operations/lower/machinist) "ydm" = ( /obj/structure/shuttle/engine/propulsion/burst/left{ dir = 4 @@ -30869,32 +30289,38 @@ /turf/simulated/floor/plating, /area/shuttle/escape_pod/pod4) "ydI" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/corner/green{ + dir = 9 + }, +/obj/machinery/alarm{ + pixel_x = -28; + dir = 4 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/hangar/intrepid) "ydT" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/firealarm/north, -/obj/effect/floor_decal/corner/black{ - dir = 5 - }, -/obj/machinery/light{ +/obj/machinery/light/small/emergency{ dir = 1 }, -/turf/simulated/floor/tiled/dark, -/area/operations/lower/machinist) +/obj/structure/lattice/catwalk/indoor/grate, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/engineering) "yeo" = ( /obj/structure/stairs/north, /turf/simulated/floor/tiled, @@ -30931,7 +30357,7 @@ /turf/simulated/floor/plating, /area/shuttle/intrepid/cockpit) "ygx" = ( -/obj/effect/floor_decal/corner/black{ +/obj/effect/floor_decal/corner/green{ dir = 9 }, /turf/simulated/floor/tiled, @@ -30962,21 +30388,6 @@ }, /turf/simulated/floor/plating, /area/shuttle/intrepid/cargo_bay) -"yif" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/effect/floor_decal/corner/black{ - dir = 5 - }, -/turf/simulated/floor/tiled/dark, -/area/operations/lower/machinist) "yiT" = ( /obj/machinery/mineral/stacking_unit_console{ id = "stacking_w"; @@ -44236,7 +43647,7 @@ qkh qkh qkh qkh -vqU +baV gvZ yhf tMa @@ -44632,13 +44043,13 @@ rPO hQO sfj uHw -lIg +qZW jZV evA gMp fDD lIg -vqU +rPA vqU vqU gvZ @@ -44834,13 +44245,13 @@ rPO hQO wOP mst -lIg +qZW qVO qBC fDD fDD lIg -sWa +vqU vjI niw gvZ @@ -45039,10 +44450,10 @@ qEk lIg rFO cuA +qks +xej lIg -lIg -lIg -dMM +vqU dNk dNk dNk @@ -45231,7 +44642,7 @@ wXB bcG xPc nNE -bdY +mMR lIg rSe wYE @@ -45241,10 +44652,10 @@ xll iDM xgE kWx -lIg +kWx aMh -wqj -vul +iFL +vqU jUl tZY jpT @@ -45433,7 +44844,7 @@ nRQ bcG qzb nNE -bdY +mMR lIg mST mST @@ -45441,12 +44852,12 @@ qXZ rpa haN lIg -iFL -lIg -lIg +mon +pnZ +kLR mZr -uVX -vul +lIg +rPA oDv avx wPz @@ -45634,7 +45045,7 @@ gBw idS jdP bwp -gtS +nNE mTZ lIg rPO @@ -45642,13 +45053,13 @@ rPO hQO ege caN -lIg +qZW xNb -sko -lyG -aag -mZz -vul +jTl +lEQ +lEQ +lIg +vqU oDv tIS wkD @@ -45844,13 +45255,13 @@ rPO hQO sfj uHw -lIg +qZW joW +doK vif vif -vif -ifD -vul +lIg +vqU oDv tIS wkD @@ -46038,7 +45449,7 @@ eXn lTv vsY hVL -gtS +aQr qDu lIg jdm @@ -46047,12 +45458,12 @@ grm wOP rUU lIg -nnw -nnw -pFg +fmL +awf lEQ -nnw -vul +lEQ +lIg +vqU ohS rRb wkD @@ -46240,8 +45651,8 @@ xYW xYW xYW cSZ -gtS -vqW +nNE +mMR lIg lIg lIg @@ -46249,12 +45660,12 @@ lIg lIg lIg lIg -bDl -cqu -fCT -fCT -nnw -vul +lIg +lIg +lIg +lIg +lIg +vqU oDv tIS wkD @@ -46441,22 +45852,22 @@ ezW juU xWe xYW -nBK -gtS -bdY -nnw +bwp +nNE +mMR +jsV +rNH rNH rNH rNH rNH nnw -vqU twX -vqU -dpK -vqU +wqj +tJg +yau nnw -vul +vqU oDv tIS wkD @@ -46643,22 +46054,22 @@ qlv qlv oNv xYW -nBK +bwp nNE -bdY +mMR +jsV +rNH +rNH +rNH +rNH +rNH nnw +tJg +sko +wjr +rTF nnw -nnw -nnw -nnw -nnw -teb -nnw -nnw -lEQ -nnw -nnw -oFx +rPA oDv xEd pWZ @@ -46847,20 +46258,20 @@ chW xYW sBd gtS -tsv +mMR +nyY +nyY +nyY +nyY +rNH +rNH nnw fCT -pnZ -bVV -wqj -wqj -bGH -tJg -nnw +fCT dWL -mKj +bDl sRd -oFx +vqU teA tYS bKP @@ -47048,19 +46459,19 @@ qlv oNv xYW obM -gtS -nPN -emF -usP -usP -qns +edm +mMR +nyY mVX -usP -xRP -usP -pnf -okA -tTT +vpe +nyY +rNH +rNH +nnw +uqE +wqj +tJg +wqj oOk oOk oOk @@ -47251,18 +46662,18 @@ aJA xYW nBK nNE -dgl -nnw -tJg -aUC -wqj +mMR +nyY xrE +gYZ nyY -eBw -nyY -nyY -bGH -eYb +rNH +rNH +nnw +cqu +kqO +fCT +fCT oOk hPn ych @@ -47452,19 +46863,19 @@ xYW xYW xYW ars -nNE +oFx vqW -nnw +nyY +taF +nyY +nyY +jsV +jsV nnw nnw nnw sRd -nyY -uQa -doK -nyY -fmL -eYb +nnw oOk jrr lyU @@ -47642,31 +47053,31 @@ fTm awJ wYp dei -blO +rQC xnv jsV uZk rNR -rNR -rNR -rNR -rNR -rNR -rNR +dgT +dgT +dgT +dgT +dgT +teb fBg -gtS -mKo -ltM -nnw -uZe +nNE rQC -jak -nyY -vpe +ltM +paY +uZe +dgT +dgT +dgT +dgT tHk -nyY -nTm -eYb +dgT +dgT +dgT nyV lIu kkS @@ -47843,31 +47254,31 @@ eTJ gFE boB rNz -rNz +tET aWr cZi wzl kCA -nNE -nNE -gtS -gtS -gtS -gtS +pHI +pHI +pHI +pHI +pHI +pHI tpR -gtS -gtS +pHI +nTm rtJ -bdY -nnw -nnw +tTT +cSz xhE -jak -nyY -nyY -nyY -nyY -xrE +xhE +xhE +xhE +xhE +quA +rFx +rFx eYb oOk rqf @@ -48046,31 +47457,31 @@ aZd awJ vOf ubq -sPQ +xHs bfX jsV mYY -iMj +gWv bSr -qBv -abh -abh -abh -abh -qBv +ulQ +ulQ +ulQ +ulQ +ulQ +ulQ ebK bVc wVB -nnw -wqj -wqj -jak +tqT +wqs +ulQ +rLm vpa -dBd +ulQ mzR -bBg -mzR -xLq +ulQ +wjH +vjT oOk hPn qVb @@ -48247,7 +47658,7 @@ nEm nEm nEm aJB -mSk +jsV hgt jsV jsV @@ -48262,16 +47673,16 @@ arr arr arr vrm -iDw -iDw -iDw -iDw -iDw -iDw -rgo +pzg +sTu pzg pzg pzg +jsV +jsV +jsV +jsV +jsV kVn oOk oOk @@ -48463,17 +47874,17 @@ ohB leB cdT arr -ctf -kXj -mdZ -kHz -shB -ocs -iDw -aJa -nPK -uGn +lji pzg +tGE +xJE +lxQ +pzg +rNH +rNH +rNH +rNH +jsV rsk vat pIm @@ -48651,13 +48062,13 @@ vrg rSU oYp hTW -cNk +mdZ vOu -kqO +avI nMA avI -kqO -kqO +avI +avI reR xVk dbS @@ -48665,17 +48076,17 @@ non dOa bMg arr -ydT -fKw -tqT -oZj -oZj -oZj -iDw -lou -shp -quA +sOo pzg +sIC +cyS +wdT +pzg +rNH +rNH +rNH +rNH +jsV ijU nnw aDv @@ -48684,7 +48095,7 @@ txk wYe qio vpl -vqU +mSk fhF hMr ifX @@ -48849,7 +48260,7 @@ rOV fzU oYG lRh -ozx +gLs ezt mmh aJB @@ -48867,26 +48278,26 @@ fVm sLn rpK arr -yif -sPT -jWE -prv -prv -wjH +lji +pzg +pzg +pzg +ewI +pzg +iDw +iDw +iDw +iDw +iDw +iDw +iDw iDw -pzg -pzg -nTR -pzg -wuD -wuD -wuD wka wuD wuD wuD wuD -mhd +wuD wuD wuD wuD @@ -49051,9 +48462,9 @@ prb lVH oxT rOV -cYs -cYs pNf +kvq +mmG aJB iXY mlw @@ -49069,26 +48480,26 @@ cEl lNE cxG arr -jiU -wqs -vjM -vjM -cSq -tlx -uWW +xLq +nPN +mdZ +vFu +vSS +iDw +jak sYZ -thR +uAS lMS -rPA -bgA -qnL -lmf +iDw +kto +iMj +iDw udC -reE -kLR +ydI +ref xMm feW -koQ +fga xFo koQ wMB @@ -49271,26 +48682,26 @@ jiS ias aDm arr -xFB -wqs -vjM -vjM -qcC -xJE +mhN +iDw +iDw +sti +iDw +iDw tGK -mZe -mon +hqb +tZK lQI -ewI -uYi -xOV -jDq -xOV -jeS -wuD -lCX -omo -xVU +iDw +pTP +gDC +iDw +thd +oPL +mey +mKo +tYB +her xVU xVU pEO @@ -49474,24 +48885,24 @@ tes arr arr hvO -wqs -uXR -lzt -aqn iDw -iDw -iDw -izN -iDw -iDw -iDw -edm -hts -xOV +bVV +ddJ +toL +bYz nfO -hId +wLA +uVX +uVX +gFI +ocs +vrQ +dmS +wCH +oPL +usP lCX -aHY +wuD lBY kEJ kEJ @@ -49675,25 +49086,25 @@ nmQ rfR qIT arr -hYh -bSO -fga -wMO -pYD -sJJ -fqU -pEE -ifK -vSS -mPm +tMp iDw -qtm -jDq -xOV -pIf -hId -lCX -aHY +eDn +ocs +jEf +sJJ +jhg +bMO +ten +iiM +ocs +jWE +ifK +iDw +wqf +oPL +mey +ifD +wuD aUk iRC iRC @@ -49878,23 +49289,23 @@ mnr tKE arr tMp -wqs -qks -sfr -pYD -hPD -ycX -ycX -dsT -mey -ukF iDw -lwm -tbd -wqf -lWM -hId -lCX +qPw +ocs +tsv +ney +blO +ocs +cSq +ajK +ocs +hts +vsW +uWW +lmf +oPL +mey +sKZ aHY aUk iRC @@ -50079,24 +49490,24 @@ pJm tvn xqe arr -pHI -qNU -rTF -rTF -taF -gzI -ycX -aPV -eaw -jEf -wjr +tMp iDw -iDw -eKo +uXR +ocs +aUC +jFa +kYE +xHi +usF +gry +ocs +jDq +dsT +uWW fWx -wuD -wuD -jTl +oPL +mey +bFv aHY aUk iRC @@ -50281,24 +49692,24 @@ esS xvG uhE arr -gxS -nqA -vjM -vjM -pYD -dUK -kHS -plZ -aQr -pXv -prv -wpC -yau -gYZ +ydT +iDw +chY +ocs +ocs +ocs +ocs +ocs +ocs +ocs +ocs +qOx +gye +uWW voa -bMO -wuD -lCX +oPL +mey +fob aHY aUk iRC @@ -50483,24 +49894,24 @@ gcZ hZS ghw arr -qZW -rMZ -vsW -oPL -ref +tMp iDw -hMV -bRX -oys +vjM +qEh +bdY +tJb +wqd +rza +exV kzx -uqn -uqE -yau -mXP +oys +pXv +eKo +iDw gkE -coF -wuD -lCX +oPL +mey +eEm aHY dJm jgf @@ -50685,25 +50096,25 @@ arr pxY fyb arr +tlx iDw -her -dvT +uWW +uWW +uWW +iDw +uWW dvT +uWW +iDw +xRP iDw iDw -ggZ iDw -vjT -iDw -dcC -rHm -iDw -gFI -gkE -awf +mhd +oPL +mey +eEm wuD -gDC -mvq wuD aUk uKX @@ -50890,20 +50301,20 @@ ygx hDI uUZ ygx +ygx qnt -kBe pYa wIJ -baV +fXS lnt sxx +xFB uSG -uSG -wuD +uqn qVh rkQ -pjy -qwB +oPL +mey pjy hUk hId @@ -51089,23 +50500,23 @@ kzs kzs fOV ekb -ekb +sWa phs nMJ waN -xej +bDv fMM -wSZ +nPK eaO erk ftn -ney -ajK +ftn +fmV wrE jpK -hYy -hYy -hYy +kXw +jnS +mey hYy apf uOO @@ -51284,12 +50695,12 @@ pZd wIO lRH eNU -btw +vTT oDB sWB slH -xQI slH +btw slH slH rco @@ -51305,8 +50716,8 @@ jBh kmS jxj cSQ -ydI -ydI +xOV +xOV kEt hYy apf @@ -51502,12 +50913,12 @@ pYa xtH fuL ifd -fuL +vul vDj cNp -wuD +uqn jcZ -jqE +qwK bzv txa qFy @@ -52505,7 +51916,7 @@ rHK rHK tny knl -wLL +oZj jjZ wRE uIJ diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm index 2ca4053b1ab..488fb0b7e2f 100644 --- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm +++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm @@ -2,15 +2,6 @@ "aaa" = ( /turf/simulated/wall/r_wall, /area/security/warden) -"aab" = ( -/obj/machinery/atmospherics/pipe/simple/visible/black{ - dir = 10 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/engineering/engine_waste) "aac" = ( /turf/simulated/wall/r_wall, /area/security/prison) @@ -477,12 +468,15 @@ /turf/simulated/floor/tiled/dark/full, /area/engineering/lobby) "amt" = ( -/obj/machinery/atmospherics/binary/pump{ - name = "Reactor to Scrubbers"; - target_pressure = 15000 +/obj/effect/floor_decal/corner/yellow{ + dir = 6 }, -/obj/effect/landmark/engine_setup/pump_max, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/atmospherics/unary/freezer{ + icon_state = "freezer"; + dir = 8 + }, +/turf/simulated/floor/tiled/dark, /area/engineering/engine_waste) "amz" = ( /obj/effect/floor_decal/corner/mauve, @@ -848,6 +842,12 @@ }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_two/fore/port) +"asP" = ( +/obj/effect/floor_decal/corner/yellow{ + dir = 10 + }, +/turf/simulated/floor/tiled/dark, +/area/engineering/engine_waste) "ati" = ( /obj/machinery/portable_atmospherics/canister/air/airlock, /obj/machinery/atmospherics/portables_connector{ @@ -1553,19 +1553,6 @@ }, /turf/simulated/floor/wood, /area/horizon/library) -"aGH" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/obj/machinery/conveyor{ - dir = 4; - id = "sorting"; - layer = 2.9; - reversed = 1 - }, -/obj/structure/plasticflaps, -/turf/simulated/floor/plating, -/area/operations/mail_room) "aHj" = ( /obj/machinery/computer/sentencing/courtroom{ pixel_x = -29 @@ -2460,13 +2447,13 @@ /obj/structure/cable/green{ icon_state = "2-4" }, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/operations/mail_room) "bci" = ( @@ -2495,21 +2482,6 @@ /obj/effect/map_effect/window_spawner/full/borosilicate/reinforced, /turf/simulated/floor/tiled/dark/full, /area/engineering/engine_room) -"bdk" = ( -/obj/machinery/power/apc/super{ - dir = 4; - pixel_x = 24 - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/power/sensor{ - name = "Powernet Sensor - Master Grid"; - name_tag = "Master" - }, -/obj/machinery/firealarm/south, -/turf/simulated/floor/plating, -/area/engineering/engine_waste) "bdy" = ( /obj/effect/floor_decal/corner/white/diagonal, /obj/structure/table/standard, @@ -2920,16 +2892,20 @@ pixel_x = -25; req_one_access = list(11,24) }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/corner/yellow{ + dir = 9 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark, /area/engineering/engine_waste) "boU" = ( -/obj/machinery/atmospherics/pipe/simple/visible/black{ - dir = 4 +/obj/machinery/atmospherics/binary/pump{ + dir = 4; + name = "Reactor to Mix" }, -/obj/effect/floor_decal/industrial/warning/cee{ - dir = 4 - }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/corner/yellow/diagonal, +/obj/effect/floor_decal/industrial/warning/full, +/turf/simulated/floor/tiled/dark, /area/engineering/engine_waste) "boX" = ( /obj/structure/cable/green{ @@ -3071,10 +3047,11 @@ /turf/simulated/floor/tiled/white, /area/medical/exam) "bsK" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/visible/cyan, +/obj/effect/floor_decal/corner/yellow{ + dir = 9 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/engineering/engine_waste) "bsM" = ( /obj/effect/floor_decal/spline/fancy/wood{ @@ -3749,27 +3726,21 @@ /turf/simulated/floor/plating, /area/maintenance/research_port) "bHW" = ( -/obj/machinery/light{ +/obj/effect/floor_decal/corner/yellow/full{ dir = 4 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/engineering/engine_waste) "bIa" = ( /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/cable{ - icon_state = "1-8" +/obj/effect/floor_decal/corner_wide/yellow{ + dir = 6 }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/effect/floor_decal/corner_wide/yellow{ - dir = 6 - }, /turf/simulated/floor/tiled, /area/hallway/engineering) "bIi" = ( @@ -4040,14 +4011,20 @@ /turf/simulated/floor/tiled/white, /area/medical/reception) "bPB" = ( -/obj/machinery/atmospherics/unary/freezer{ - dir = 4; - icon_state = "freezer" - }, -/obj/machinery/light{ +/obj/machinery/power/apc/super{ + pixel_x = -24; dir = 8 }, -/turf/simulated/floor/plating, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/machinery/power/sensor{ + name = "Powernet Sensor - Master Grid"; + name_tag = "Master" + }, +/obj/effect/floor_decal/corner/yellow/full, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark, /area/engineering/engine_waste) "bPH" = ( /obj/effect/floor_decal/corner/blue{ @@ -4097,6 +4074,10 @@ }, /turf/simulated/floor/wood, /area/chapel/main) +"bQT" = ( +/obj/machinery/atmospherics/pipe/simple/visible/black, +/turf/simulated/floor/tiled/dark, +/area/engineering/engine_waste) "bQW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/item/device/radio/intercom{ @@ -4676,16 +4657,19 @@ /turf/simulated/floor/grass/alt, /area/hallway/primary/central_two) "cfI" = ( -/obj/machinery/atmospherics/omni/filter{ - tag_east = 2; - tag_north = 8; - tag_south = 1 +/obj/machinery/atmospherics/pipe/manifold/visible/black{ + dir = 4 }, -/obj/machinery/door/window/brigdoor/eastleft{ - req_access = null +/obj/machinery/camera/network/reactor{ + c_tag = "Engineering - Waste Handling 2"; + dir = 8 }, -/obj/effect/landmark/engine_setup/filter, -/turf/simulated/floor/plating, +/obj/machinery/meter, +/obj/effect/floor_decal/corner/yellow{ + dir = 6 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark, /area/engineering/engine_waste) "cgp" = ( /obj/effect/floor_decal/corner/pink/diagonal, @@ -5060,10 +5044,10 @@ /turf/simulated/floor/plating, /area/maintenance/substation/research) "crP" = ( -/obj/machinery/camera/network/reactor{ - c_tag = "Engineering - Waste Handling 1" +/obj/effect/floor_decal/corner/yellow/full{ + dir = 1 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/engineering/engine_waste) "csx" = ( /obj/machinery/vending/medical{ @@ -5521,14 +5505,11 @@ /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "cKa" = ( -/obj/structure/window/borosilicate/reinforced{ +/obj/machinery/atmospherics/pipe/simple/visible/black, +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4 }, -/obj/machinery/atmospherics/binary/pump{ - dir = 4; - name = "Filter Bypass Pump" - }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/engineering/engine_waste) "cKc" = ( /obj/effect/floor_decal/spline/fancy/wood{ @@ -6114,8 +6095,15 @@ /turf/simulated/floor/tiled, /area/security/prison) "cZc" = ( -/obj/machinery/portable_atmospherics/canister/empty, -/turf/simulated/floor/plating, +/obj/machinery/atmospherics/unary/freezer{ + icon_state = "freezer"; + dir = 8 + }, +/obj/effect/floor_decal/corner/yellow/full{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/dark, /area/engineering/engine_waste) "cZj" = ( /obj/machinery/camera/network/medbay{ @@ -7028,8 +7016,13 @@ /turf/simulated/floor/tiled/white, /area/medical/reception) "dvN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/universal, -/turf/simulated/floor/plating, +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 6 + }, +/obj/effect/floor_decal/corner/yellow{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/engineering/engine_waste) "dwb" = ( /obj/machinery/power/smes/buildable{ @@ -7635,16 +7628,18 @@ /obj/machinery/light{ dir = 1 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, /obj/machinery/conveyor{ dir = 4; id = "sorting"; - layer = 2.9; reversed = 1 }, -/turf/simulated/floor/plating, +/obj/structure/sign/drop{ + pixel_y = 32 + }, +/obj/effect/floor_decal/corner_wide/brown{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark/full, /area/operations/mail_room) "dLo" = ( /obj/machinery/bodyscanner, @@ -8281,7 +8276,13 @@ dir = 8; icon_state = "pipe-c" }, -/obj/effect/floor_decal/industrial/warning{ +/obj/structure/table/standard, +/obj/item/device/hand_labeler, +/obj/item/device/destTagger, +/obj/effect/floor_decal/corner/brown{ + dir = 6 + }, +/obj/effect/floor_decal/industrial/warning/corner{ dir = 1 }, /turf/simulated/floor/tiled, @@ -8730,19 +8731,7 @@ /turf/simulated/floor/tiled/full, /area/hallway/primary/central_one) "erh" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 10 - }, -/obj/structure/window/borosilicate/reinforced{ - dir = 1 - }, -/obj/structure/window/borosilicate/reinforced{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/engineering/engine_waste) "ern" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -9322,13 +9311,26 @@ /turf/simulated/open, /area/operations/office) "eGx" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 1 +/obj/effect/floor_decal/corner/purple/diagonal, +/obj/structure/sign/drop{ + pixel_x = 32; + pixel_y = 32 }, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/effect/landmark/engine_setup/empty_canister, -/turf/simulated/floor/plating, -/area/engineering/engine_waste) +/obj/structure/sign/flag/sol{ + pixel_y = 32 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/structure/table/steel, +/obj/item/material/stool/chair/folding{ + pixel_y = 20 + }, +/obj/item/material/stool/chair/folding{ + pixel_y = 22 + }, +/turf/simulated/floor/tiled/dark, +/area/maintenance/disposal) "eGS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -9438,6 +9440,8 @@ /turf/simulated/floor/tiled/white, /area/medical/pharmacy) "eMi" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/effect/floor_decal/corner/brown, /turf/simulated/floor/tiled, /area/operations/mail_room) "eMl" = ( @@ -9765,14 +9769,15 @@ /turf/simulated/floor/plating, /area/maintenance/aft) "eVm" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/black{ +/obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/floor_decal/corner/purple/diagonal, /obj/effect/floor_decal/industrial/warning{ - dir = 8 + dir = 1 }, -/turf/simulated/floor/plating, -/area/engineering/engine_waste) +/turf/simulated/floor/tiled/dark, +/area/maintenance/disposal) "eVu" = ( /turf/simulated/wall, /area/horizon/stairwell/bridge) @@ -10020,7 +10025,6 @@ dir = 8; target_pressure = 15000 }, -/obj/effect/landmark/engine_setup/pump_max, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/plating, /area/engineering/engine_room) @@ -11104,6 +11108,13 @@ /obj/machinery/recharger, /turf/simulated/floor/tiled/white, /area/rnd/research) +"fEE" = ( +/obj/effect/floor_decal/corner/yellow{ + dir = 10 + }, +/obj/machinery/light, +/turf/simulated/floor/tiled/dark, +/area/engineering/engine_waste) "fEI" = ( /obj/machinery/alarm{ dir = 8; @@ -11606,9 +11617,6 @@ /turf/simulated/floor/tiled, /area/security/brig) "fQa" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, /obj/machinery/button/remote/blast_door{ desc = "A remote control-switch for the engine control room blast doors."; id = "EngineEmitterPortWest"; @@ -11638,18 +11646,6 @@ /obj/effect/map_effect/window_spawner/full/borosilicate/reinforced/firedoor, /turf/simulated/floor/tiled/dark/full, /area/engineering/engine_room) -"fQH" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Supermatter Reactor Waste Management"; - req_one_access = list(11,24) - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/full, -/area/engineering/engine_waste) "fQM" = ( /obj/effect/floor_decal/corner/lime{ dir = 5 @@ -12117,9 +12113,6 @@ /area/turbolift/scc_ship/robotics_lift) "gao" = ( /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, /turf/simulated/floor/tiled, /area/operations/mail_room) "gax" = ( @@ -13169,9 +13162,11 @@ /turf/simulated/floor/tiled/dark, /area/horizon/bar) "gwP" = ( -/obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/corner/yellow/full{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, /area/engineering/engine_waste) "gwY" = ( /obj/effect/floor_decal/industrial/warning{ @@ -13919,13 +13914,13 @@ /turf/simulated/floor/tiled, /area/security/brig) "gNQ" = ( -/obj/machinery/atmospherics/binary/pump{ - dir = 4; - name = "Reactor to Mix"; - target_pressure = 15000 +/obj/effect/floor_decal/corner/yellow{ + dir = 6 }, -/obj/effect/landmark/engine_setup/pump_max, -/turf/simulated/floor/plating, +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/engineering/engine_waste) "gNW" = ( /obj/machinery/shieldwallgen, @@ -13953,9 +13948,6 @@ /turf/simulated/floor/tiled, /area/hallway/primary/central_two) "gON" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, @@ -14262,8 +14254,16 @@ /turf/simulated/floor/tiled, /area/horizon/hydroponics/garden) "gXu" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan, -/turf/simulated/floor/plating, +/obj/machinery/atmospherics/omni/filter{ + tag_east = 2; + tag_north = 8; + tag_south = 1 + }, +/obj/effect/floor_decal/corner/yellow{ + dir = 9 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark, /area/engineering/engine_waste) "gXy" = ( /turf/simulated/wall/shuttle/scc_space_ship/cardinal, @@ -14465,6 +14465,13 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, +/obj/structure/disposalpipe/segment, +/obj/structure/sign/electricshock{ + desc = "A caution sign which reads 'CAUTION: HEAVY MACHINERY IN USE' and 'THIS EQUIPMENT STARTS AND STOPS AUTOMATICALLY.'."; + name = "\improper CAUTION: HEAVY MACHINERY IN USE sign"; + pixel_y = 32; + pixel_x = 32 + }, /turf/simulated/floor/tiled, /area/hallway/engineering) "hdU" = ( @@ -15017,14 +15024,15 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/firealarm/south, /obj/effect/floor_decal/corner/yellow/diagonal, /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/hallway/engineering) "hpO" = ( @@ -15281,8 +15289,6 @@ /obj/machinery/alarm{ pixel_y = 28 }, -/obj/effect/floor_decal/industrial/outline/firefighting_closet, -/obj/structure/closet/firecloset, /turf/simulated/floor/tiled, /area/hallway/engineering/tesla) "hwI" = ( @@ -15516,13 +15522,12 @@ /obj/machinery/conveyor{ dir = 4; id = "sorting"; - layer = 2.9; reversed = 1 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 +/obj/effect/floor_decal/corner_wide/brown{ + dir = 5 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/operations/mail_room) "hCo" = ( /obj/structure/window/reinforced, @@ -16114,9 +16119,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/floor_decal/corner/yellow/diagonal, /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 @@ -16274,20 +16276,14 @@ /turf/simulated/floor/tiled, /area/hallway/primary/central_one) "hXN" = ( -/obj/machinery/atmospherics/pipe/simple/visible/black{ - dir = 1 +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/service{ + name = "Disposals and Recycling"; + req_one_access = list(26,67) }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/plating, -/area/engineering/engine_waste) +/turf/simulated/floor/tiled/full, +/area/maintenance/disposal) "hXW" = ( /obj/effect/floor_decal/corner/blue{ dir = 8 @@ -16779,7 +16775,10 @@ /turf/simulated/floor/reinforced, /area/horizon/kitchen/freezer) "ily" = ( -/turf/simulated/floor/plating, +/obj/machinery/atmospherics/pipe/manifold4w/visible/black, +/obj/machinery/meter, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark, /area/engineering/engine_waste) "ilB" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -16902,13 +16901,11 @@ /turf/simulated/floor/tiled/dark/full, /area/engineering/engine_monitoring) "ioS" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/black{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/universal, +/obj/effect/floor_decal/corner/yellow{ + dir = 6 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/engineering/engine_waste) "ioW" = ( /obj/structure/cable/green{ @@ -17070,10 +17067,10 @@ }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering{ - name = "Engineering Substation and Disposals Maintenance"; + name = "Engineering Substation"; req_one_access = list(11,24) }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/maintenance/substation/engineering) "iwd" = ( /obj/structure/table/standard, @@ -17243,14 +17240,17 @@ /turf/simulated/floor/tiled/dark, /area/hallway/primary/central_two) "iBC" = ( -/obj/machinery/atmospherics/unary/freezer{ +/obj/machinery/alarm{ dir = 4; - icon_state = "freezer" + pixel_x = -28 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 +/obj/effect/floor_decal/corner/yellow{ + dir = 9 }, -/turf/simulated/floor/plating, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, /area/engineering/engine_waste) "iBG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -17868,11 +17868,11 @@ "iOR" = ( /obj/machinery/conveyor_switch/oneway{ id = "sorting"; - pixel_x = -6; - pixel_y = 10 + pixel_x = -13; + pixel_y = 22 }, /obj/effect/floor_decal/industrial/warning{ - dir = 9 + dir = 1 }, /turf/simulated/floor/tiled, /area/operations/mail_room) @@ -18490,16 +18490,10 @@ /turf/simulated/floor/tiled/dark/full, /area/hallway/primary/central_one) "jgZ" = ( -/obj/machinery/door/window/brigdoor/eastleft{ - req_access = null +/obj/machinery/atmospherics/pipe/manifold/visible/black{ + dir = 1 }, -/obj/effect/landmark/engine_setup/filter, -/obj/machinery/atmospherics/omni/filter{ - tag_east = 2; - tag_north = 8; - tag_south = 1 - }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/engineering/engine_waste) "jhw" = ( /obj/machinery/computer/cryopod{ @@ -18524,14 +18518,17 @@ /turf/simulated/floor/tiled/white, /area/medical/gen_treatment) "jhZ" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /obj/machinery/camera/network/supply{ c_tag = "Operations - Mail Sorting"; - dir = 1 + dir = 8 }, /obj/machinery/firealarm/east, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/effect/floor_decal/corner/brown/full{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/operations/mail_room) "jib" = ( @@ -19398,12 +19395,17 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/telesci) +"jAZ" = ( +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/engineering/engine_waste) "jBj" = ( /obj/machinery/atmospherics/binary/pump{ dir = 4; target_pressure = 15000 }, -/obj/effect/landmark/engine_setup/pump_max, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/plating, /area/engineering/engine_room) @@ -19786,6 +19788,9 @@ dir = 8 }, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/sign/radiation{ + pixel_y = 32 + }, /turf/simulated/floor/tiled, /area/hallway/engineering) "jLM" = ( @@ -20357,6 +20362,7 @@ dir = 8; icon_state = "pipe-c" }, +/obj/effect/floor_decal/corner/brown/full, /turf/simulated/floor/tiled, /area/operations/mail_room) "kaQ" = ( @@ -20828,10 +20834,6 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/effect/floor_decal/corner/yellow/diagonal, /turf/simulated/floor/tiled, /area/hallway/engineering/tesla) @@ -21163,15 +21165,6 @@ /obj/item/device/flashlight/lamp, /turf/simulated/floor/carpet, /area/medical/psych) -"kBV" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 10 - }, -/obj/structure/window/borosilicate/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/engineering/engine_waste) "kBY" = ( /obj/structure/table/wood, /obj/item/paper_bin{ @@ -21569,7 +21562,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/turf/simulated/floor/tiled/dark/full, +/turf/simulated/floor/plating, /area/engineering/smes) "kOz" = ( /obj/effect/floor_decal/corner/paleblue{ @@ -21918,7 +21911,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/turf/simulated/floor/tiled/dark/full, +/turf/simulated/floor/plating, /area/engineering/smes) "kXm" = ( /obj/effect/floor_decal/corner_wide/grey/diagonal, @@ -22010,9 +22003,6 @@ /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -22994,9 +22984,6 @@ icon_state = "4-8" }, /obj/machinery/light, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/floor_decal/corner/yellow/diagonal, /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -23073,13 +23060,10 @@ /turf/simulated/floor/tiled/dark, /area/rnd/hallway) "lCV" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 9 +/obj/machinery/atmospherics/pipe/manifold/visible/black{ + dir = 8 }, -/obj/structure/window/borosilicate/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/engineering/engine_waste) "lDb" = ( /obj/effect/floor_decal/corner/green{ @@ -23136,9 +23120,11 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard) "lER" = ( -/obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/corner/yellow{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark, /area/engineering/engine_waste) "lFn" = ( /obj/effect/floor_decal/corner_wide/yellow{ @@ -23781,7 +23767,7 @@ /obj/structure/closet/walllocker/firecloset{ pixel_x = -32 }, -/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/outline/firefighting_closet, /turf/simulated/floor/tiled, /area/hallway/engineering) "lSV" = ( @@ -24479,6 +24465,9 @@ dir = 4 }, /obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/corner/brown{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/operations/mail_room) "mlD" = ( @@ -26628,14 +26617,20 @@ /turf/simulated/floor/wood, /area/operations/qm) "nkb" = ( -/obj/machinery/atmospherics/pipe/simple/visible/black{ - dir = 10 - }, +/obj/effect/floor_decal/corner/purple/diagonal, /obj/machinery/light{ + dir = 8 + }, +/obj/item/device/radio/intercom{ + dir = 4; + name = "Station Intercom (General)"; + pixel_x = -24 + }, +/obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/turf/simulated/floor/plating, -/area/engineering/engine_waste) +/turf/simulated/floor/tiled/dark, +/area/maintenance/disposal) "nkd" = ( /obj/structure/disposalpipe/junction{ dir = 2 @@ -26673,13 +26668,6 @@ /obj/effect/floor_decal/corner/yellow/diagonal, /turf/simulated/floor/tiled, /area/hallway/engineering) -"nld" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/engineering/engine_waste) "nlr" = ( /turf/simulated/wall/r_wall, /area/engineering/storage_hard) @@ -28472,6 +28460,17 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/full, /area/hallway/engineering) +"omQ" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 8 + }, +/obj/machinery/portable_atmospherics/canister/empty, +/obj/effect/floor_decal/corner/yellow{ + dir = 6 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark, +/area/engineering/engine_waste) "ond" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -29381,9 +29380,6 @@ /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, /turf/simulated/floor/plating, /area/engineering/engine_room) "oJT" = ( @@ -29668,9 +29664,13 @@ /turf/simulated/floor/tiled/freezer, /area/security/prison) "oRc" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/cyan, -/obj/structure/window/borosilicate/reinforced, -/turf/simulated/floor/plating, +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 9 + }, +/obj/effect/floor_decal/corner/yellow{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark, /area/engineering/engine_waste) "oRl" = ( /obj/effect/floor_decal/industrial/warning/corner{ @@ -30550,10 +30550,13 @@ /turf/simulated/floor/tiled, /area/security/warden) "plc" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 +/obj/effect/floor_decal/corner/yellow{ + dir = 5 }, -/turf/simulated/floor/plating, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, /area/engineering/engine_waste) "plf" = ( /obj/structure/railing/mapped{ @@ -30617,12 +30620,12 @@ dir = 4; target_pressure = 15000 }, -/obj/effect/landmark/engine_setup/pump_max, -/obj/machinery/status_display{ - pixel_y = -32 - }, /obj/effect/floor_decal/industrial/outline/yellow, /obj/effect/floor_decal/industrial/warning/corner, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -28 + }, /turf/simulated/floor/plating, /area/engineering/engine_room) "pmQ" = ( @@ -30650,13 +30653,15 @@ /turf/simulated/floor/tiled/dark/full, /area/rnd/xenobiology) "pnF" = ( -/obj/effect/floor_decal/corner/yellow/diagonal, /obj/structure/cable/green{ icon_state = "4-8" }, /obj/machinery/door/firedoor, -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled, +/obj/machinery/door/airlock/glass_engineering{ + name = "Engineering Hallway"; + req_access = list(10) + }, +/turf/simulated/floor/tiled/full, /area/hallway/engineering/tesla) "pnY" = ( /obj/structure/cable/green{ @@ -31203,17 +31208,10 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 - }, /obj/machinery/power/terminal, /obj/machinery/light/spot/weak{ dir = 4 }, -/obj/machinery/alarm{ - dir = 8; - pixel_x = 28 - }, /obj/machinery/power/sensor{ name = "Powernet Sensor - Supermatter Output"; name_tag = "SM Output" @@ -31464,19 +31462,19 @@ /turf/simulated/floor/plating, /area/engineering/engine_room/tesla) "pLA" = ( -/obj/structure/window/borosilicate/reinforced{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 10 + }, +/obj/effect/floor_decal/corner/yellow{ + dir = 9 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/engineering/engine_waste) "pLI" = ( /obj/effect/floor_decal/spline/fancy/wood{ @@ -31674,12 +31672,22 @@ /turf/simulated/floor/carpet/rubber, /area/rnd/xenobiology) "pPO" = ( -/obj/structure/table/rack, /obj/item/stack/wrapping_paper, -/obj/item/stack/packageWrap, -/obj/item/stack/packageWrap, -/obj/item/device/hand_labeler, -/obj/item/device/destTagger, +/obj/structure/table/standard, +/obj/item/stack/wrapping_paper, +/obj/item/stack/packageWrap{ + pixel_y = 8 + }, +/obj/item/stack/packageWrap{ + pixel_y = 8 + }, +/obj/effect/floor_decal/corner/brown/full{ + dir = 4 + }, +/obj/machinery/alarm{ + dir = 8; + pixel_x = 28 + }, /turf/simulated/floor/tiled, /area/operations/mail_room) "pQg" = ( @@ -31928,7 +31936,6 @@ /turf/simulated/wall, /area/horizon/library) "pWB" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/power/terminal{ dir = 4 }, @@ -32773,7 +32780,6 @@ name = "Cooling Array to Generators"; target_pressure = 15000 }, -/obj/effect/landmark/engine_setup/pump_max, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/plating, /area/engineering/engine_room) @@ -33112,6 +33118,13 @@ }, /turf/simulated/floor/plating, /area/engineering/engine_room/tesla) +"qCs" = ( +/obj/structure/railing/mapped{ + icon_state = "railing0-0"; + density = 0 + }, +/turf/simulated/open, +/area/maintenance/disposal) "qCy" = ( /obj/effect/floor_decal/corner_wide/yellow{ dir = 6 @@ -33401,7 +33414,6 @@ dir = 8; target_pressure = 15000 }, -/obj/effect/landmark/engine_setup/pump_max, /obj/machinery/camera/network/reactor{ c_tag = "Engineering - Supermatter Reactor 1"; dir = 1 @@ -34212,11 +34224,15 @@ /turf/simulated/floor/tiled/white, /area/medical/or1) "rcU" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 +/obj/effect/floor_decal/corner_wide/yellow{ + dir = 5 }, -/turf/simulated/floor/plating, -/area/engineering/engine_room) +/obj/structure/closet/walllocker/firecloset{ + pixel_y = 32 + }, +/obj/effect/floor_decal/industrial/outline/firefighting_closet, +/turf/simulated/floor/tiled, +/area/hallway/engineering/tesla) "rdi" = ( /obj/structure/lattice/catwalk, /obj/structure/railing/mapped{ @@ -34309,10 +34325,8 @@ /turf/simulated/floor/tiled/dark, /area/horizon/zta) "rfb" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/black{ - dir = 1 - }, -/turf/simulated/floor/plating, +/obj/machinery/atmospherics/pipe/manifold/visible/black, +/turf/simulated/floor/tiled/dark, /area/engineering/engine_waste) "rfi" = ( /obj/machinery/light{ @@ -34361,7 +34375,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/turf/simulated/floor/tiled/dark/full, +/turf/simulated/floor/plating, /area/engineering/smes) "rgH" = ( /obj/machinery/hologram/holopad, @@ -34505,11 +34519,12 @@ /turf/simulated/floor/tiled, /area/security/main) "rlf" = ( -/obj/machinery/light{ - dir = 1 - }, /obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/plating, +/obj/machinery/camera/network/reactor{ + c_tag = "Engineering - Waste Handling 1" + }, +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor/tiled/dark, /area/engineering/engine_waste) "rlj" = ( /obj/structure/cable/orange{ @@ -34671,15 +34686,6 @@ }, /turf/simulated/open/airless, /area/horizon/exterior) -"roP" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/plating, -/area/engineering/engine_waste) "roV" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -35513,9 +35519,6 @@ /turf/simulated/floor/tiled/white, /area/medical/reception) "rJu" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, @@ -35617,12 +35620,13 @@ /turf/simulated/floor/tiled/white, /area/operations/break_room) "rMf" = ( -/obj/structure/sign/radiation{ - pixel_y = 32 - }, /obj/effect/floor_decal/corner_wide/yellow{ dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/hallway/engineering) "rMw" = ( @@ -36126,26 +36130,15 @@ /turf/simulated/floor/tiled, /area/medical/first_responder) "rXD" = ( -/obj/machinery/conveyor{ - dir = 1; - id = "sorting"; - layer = 2.9; - reversed = 1 +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/corner/brown{ + dir = 9 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/warning{ +/obj/effect/floor_decal/industrial/warning/corner{ dir = 4 }, -/obj/structure/plasticflaps, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, +/obj/structure/table/standard, +/turf/simulated/floor/tiled, /area/operations/mail_room) "rXJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -36330,13 +36323,14 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "scN" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/corner_wide/yellow/full{ dir = 1 }, +/obj/structure/sign/securearea{ + desc = "A caution sign which reads 'DISPOSALS' and 'AUTHORIZED PERSONNEL ONLY'."; + name = "\improper DISPOSALS sign"; + pixel_y = 32 + }, /turf/simulated/floor/tiled, /area/hallway/engineering) "sdd" = ( @@ -37378,10 +37372,9 @@ /turf/simulated/floor/tiled/dark/full, /area/engineering/engine_room/tesla) "sKn" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/turf/simulated/floor/plating, +/obj/machinery/atmospherics/pipe/simple/visible/black, +/obj/effect/floor_decal/corner/yellow, +/turf/simulated/floor/tiled/dark, /area/engineering/engine_waste) "sKo" = ( /turf/simulated/wall/shuttle/scc_space_ship/cardinal, @@ -37623,15 +37616,6 @@ }, /turf/simulated/floor/tiled, /area/security/brig) -"sRF" = ( -/obj/machinery/atmospherics/pipe/simple/visible/black{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/engineering/engine_waste) "sSY" = ( /turf/simulated/floor/plating, /area/engineering/engine_room) @@ -39453,6 +39437,12 @@ /obj/machinery/power/emitter, /turf/simulated/floor/tiled/dark/full, /area/engineering/engine_room/tesla) +"tMR" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark, +/area/engineering/engine_waste) "tNa" = ( /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/engineering/engine_waste) @@ -39585,32 +39575,25 @@ /turf/simulated/floor/tiled/dark, /area/maintenance/wing/starboard) "tPW" = ( -/obj/machinery/atmospherics/pipe/simple/visible/black{ - dir = 9 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "2-8" }, -/obj/machinery/camera/network/reactor{ - c_tag = "Engineering - Waste Handling 2"; - dir = 1 +/obj/machinery/firealarm/east, +/obj/effect/floor_decal/corner/yellow/full{ + dir = 4 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/engineering/engine_waste) "tQk" = ( /obj/structure/disposaloutlet{ dir = 8 }, /obj/structure/disposalpipe/trunk, -/obj/structure/window/reinforced{ - layer = 5; - name = "adjusted reinforced window" - }, -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/effect/floor_decal/industrial/warning/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plating, +/obj/structure/railing/mapped, +/obj/structure/plasticflaps/airtight, +/turf/simulated/floor/tiled/dark/full, /area/operations/mail_room) "tQA" = ( /obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, @@ -39837,13 +39820,14 @@ /obj/structure/cable{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "1-8" + }, /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /turf/simulated/floor/tiled, /area/hallway/engineering) "tXJ" = ( @@ -40785,6 +40769,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/effect/floor_decal/corner/brown{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/operations/mail_room) "usj" = ( @@ -41018,13 +41005,12 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/engineering{ - name = "Engineering Substation and Disposals Maintenance"; + name = "Engineering Substation"; req_one_access = list(11,24) }, /obj/machinery/door/firedoor, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/maintenance/substation/engineering) "uxp" = ( /obj/machinery/atmospherics/unary/heater{ @@ -41071,9 +41057,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/floor_decal/corner/yellow/diagonal, /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -42367,6 +42350,21 @@ }, /turf/simulated/floor/plating, /area/horizon/kitchen) +"vgt" = ( +/obj/structure/disposaloutlet{ + spread_point = 2; + spread = 90; + dir = 1 + }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/effect/floor_decal/corner/purple/diagonal, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/maintenance/disposal) "vgz" = ( /obj/effect/floor_decal/corner/blue/full{ dir = 1 @@ -42901,10 +42899,10 @@ }, /obj/machinery/door/airlock/glass_mining{ name = "Mail Sorting"; - req_access = list(50) + req_one_access = list(26,31,67) }, /obj/machinery/door/firedoor, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/operations/mail_room) "vxK" = ( /obj/machinery/door/firedoor, @@ -44006,16 +44004,14 @@ /turf/simulated/floor/tiled, /area/turret_protected/ai_upload) "vVF" = ( -/obj/machinery/conveyor{ - dir = 10; - id = "sorting"; - layer = 2.9; - reversed = 1 +/obj/machinery/disposal/deliveryChute{ + dir = 4 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 9 - }, -/turf/simulated/floor/plating, +/obj/structure/disposalpipe/trunk, +/obj/effect/floor_decal/industrial/warning/full, +/obj/structure/railing/mapped, +/obj/structure/plasticflaps/airtight, +/turf/simulated/floor/tiled/dark/full, /area/operations/mail_room) "vVL" = ( /obj/effect/floor_decal/corner/mauve/diagonal, @@ -44155,10 +44151,6 @@ /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "vXX" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/machinery/light/small{ dir = 1 }, @@ -44759,17 +44751,21 @@ /turf/simulated/open/airless, /area/horizon/exterior) "wkN" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/black, +/obj/effect/floor_decal/corner/purple/diagonal, +/obj/machinery/firealarm/west, +/obj/structure/sign/drop{ + pixel_x = 32; + pixel_y = -32 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 + dir = 4 }, -/obj/machinery/meter, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/engineering/engine_waste) +/turf/simulated/floor/tiled/dark, +/area/maintenance/disposal) "wle" = ( /obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, /obj/structure/cable/green{ @@ -44827,11 +44823,12 @@ }, /area/horizon/kitchen/freezer) "wme" = ( -/obj/machinery/atmospherics/pipe/manifold4w/visible/black, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 +/obj/machinery/atmospherics/binary/pump{ + dir = 4; + name = "Filter Bypass Pump" }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark, /area/engineering/engine_waste) "wmi" = ( /obj/effect/landmark/entry_point/starboard{ @@ -44929,19 +44926,11 @@ /turf/simulated/open, /area/maintenance/wing/starboard) "wnW" = ( -/obj/structure/disposalpipe/trunk, -/obj/structure/window/reinforced{ - dir = 8 +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/corner/brown{ + dir = 9 }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, -/obj/machinery/disposal/deliveryChute{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/warning/full, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled, /area/operations/mail_room) "woe" = ( /obj/structure/railing/mapped{ @@ -45802,6 +45791,12 @@ /obj/structure/closet/toolcloset, /turf/simulated/floor/tiled/dark, /area/horizon/zta) +"wIz" = ( +/obj/structure/railing/mapped{ + dir = 8 + }, +/turf/simulated/open, +/area/maintenance/disposal) "wIA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -45879,9 +45874,9 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass_mining{ name = "Mail Sorting"; - req_access = list(50) + req_one_access = list(26,31,67) }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/operations/mail_room) "wLg" = ( /obj/structure/cable/green{ @@ -46484,14 +46479,14 @@ /turf/simulated/floor/tiled/full, /area/engineering/storage_hard) "wYS" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 9 +/obj/machinery/atmospherics/binary/pump{ + name = "Reactor to Scrubbers" }, -/obj/structure/window/borosilicate/reinforced, -/obj/structure/window/borosilicate/reinforced{ - dir = 4 +/obj/effect/floor_decal/corner/yellow{ + dir = 6 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark, /area/engineering/engine_waste) "wYY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -46840,6 +46835,13 @@ "xhj" = ( /turf/simulated/wall, /area/medical/surgery) +"xho" = ( +/obj/structure/railing/mapped{ + dir = 8 + }, +/obj/structure/railing/mapped, +/turf/simulated/open, +/area/maintenance/disposal) "xhs" = ( /obj/effect/landmark/entry_point/starboard{ name = "starboard, ballast aft" @@ -47155,20 +47157,17 @@ /turf/simulated/floor/tiled/dark, /area/rnd/xenobiology/xenoflora) "xqk" = ( -/obj/structure/disposaloutlet{ - dir = 8; - spread_point = 2 +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Supermatter Reactor Waste Management"; + req_one_access = list(11,24) }, -/obj/structure/disposalpipe/trunk{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor, +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/structure/sign/drop{ - pixel_y = 31 - }, -/obj/effect/floor_decal/industrial/warning/full, -/obj/structure/plasticflaps/airtight, -/turf/simulated/floor/tiled/dark/full, -/area/maintenance/disposal) +/turf/simulated/floor/tiled/full, +/area/engineering/engine_waste) "xqo" = ( /obj/structure/railing/mapped{ dir = 8 @@ -47736,7 +47735,6 @@ /turf/simulated/floor/tiled/white, /area/medical/exam) "xGT" = ( -/obj/effect/floor_decal/industrial/warning/corner, /obj/machinery/light/spot/weak{ dir = 4 }, @@ -48338,7 +48336,9 @@ /area/horizon/exterior) "xVz" = ( /obj/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/plating, +/obj/machinery/firealarm/west, +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor/tiled/dark, /area/engineering/engine_waste) "xVB" = ( /obj/structure/railing/mapped{ @@ -62564,7 +62564,7 @@ vVF rXD wnW kaP -rCR +iuP ien rZh gvG @@ -62766,7 +62766,7 @@ hCj iOR gao usd -rCR +iuP gbk oad hDg @@ -63166,11 +63166,11 @@ nQm nQm nQm iuP -aGH +hCj upn eMi jhZ -rCR +iuP dzc dDq kbc @@ -63372,7 +63372,7 @@ tQk eew pPO iuP -rCR +iuP rCR rCR jUP @@ -66159,7 +66159,7 @@ gON gON fQa rJu -rcU +sSY oJM pER qYF @@ -66760,16 +66760,16 @@ tNa gsz rlf lER -erh +tMR jgZ -lCV +bQT cKa -kBV +sKn cfI wYS ioS tPW -gsz +xqk rMf tXt pSI @@ -66962,16 +66962,16 @@ tNa gsz gsz plc -sKn -aab -sRF +erh +jAZ +erh wme -sRF -eVm -hXN -wkN -nld -fQH +fEE +iSx +iSx +iSx +iSx +iSx scN bIa omH @@ -67164,16 +67164,16 @@ tNa tNa gsz crP -ily -ily -ily -rfb -amt dvN -roP -nkb +ily +lCV +rfb +asP +iSx eGx -gsz +nkb +wkN +hXN hdG hpG nTS @@ -67367,14 +67367,14 @@ tNa gsz gsz cZc -ily -ily +amt +omQ gNQ bHW -ily -bdk -iSx iSx +wIz +xho +eVm iSx jsA lBj @@ -67573,10 +67573,10 @@ gsz gsz boU gsz -gsz -gsz iSx xZI +qCs +vgt iSx jsA uyq @@ -67775,10 +67775,10 @@ tNa tNa oXd tNa -tNa -tNa dPN -xqk +dPN +dPN +iSx iSx sen hSr @@ -69596,7 +69596,7 @@ bSK xVu vbc lMD -lnv +rcU gci ulg fnn