From 2de1738a1b6465ee6fd390b84adae6c9fd1537fb Mon Sep 17 00:00:00 2001 From: SerynEngi Date: Wed, 11 Dec 2024 01:20:55 -0800 Subject: [PATCH 01/26] Initial Commit Medical McUnfuckinstein --- _maps/map_files/Tycoon/Tycoon1.dmm | 45 +- _maps/map_files/Tycoon/Tycoon2.dmm | 4858 ++++++++++------------------ 2 files changed, 1796 insertions(+), 3107 deletions(-) diff --git a/_maps/map_files/Tycoon/Tycoon1.dmm b/_maps/map_files/Tycoon/Tycoon1.dmm index 79a0f45416e..6ae993ba53e 100644 --- a/_maps/map_files/Tycoon/Tycoon1.dmm +++ b/_maps/map_files/Tycoon/Tycoon1.dmm @@ -1636,6 +1636,7 @@ /turf/open/floor/monotile/steel, /area/ai_monitored/nuke_storage) "er" = ( +/obj/structure/extinguisher_cabinet/south, /turf/open/floor/carpet/blue, /area/hallway/nsv/deck1/hallway) "es" = ( @@ -2037,6 +2038,9 @@ /turf/open/floor/monotile/dark, /area/hallway/nsv/deck1/hallway) "fq" = ( +/obj/structure/disposalpipe/trunk/multiz/down{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/multiz/layer4{ dir = 4 }, @@ -2099,6 +2103,9 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 4 }, +/obj/structure/disposalpipe/junction/yjunction{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/nsv/deck1/central) "fy" = ( @@ -2267,8 +2274,8 @@ /obj/machinery/newscaster{ pixel_y = -32 }, -/turf/open/floor/monotile/steel, -/area/hallway/nsv/deck1/hallway) +/turf/open/floor/carpet/blue, +/area/maintenance/nsv/deck1/central) "fP" = ( /obj/structure/railing{ dir = 8 @@ -2311,8 +2318,8 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/turf/open/floor/monotile/steel, -/area/hallway/nsv/deck1/hallway) +/turf/open/floor/carpet/blue, +/area/maintenance/nsv/deck1/central) "fT" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -3239,14 +3246,11 @@ name = "Air traffic control pod" }) "hM" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = 26 - }, /obj/item/radio/intercom{ pixel_x = -26 }, /turf/open/floor/monotile/steel, -/area/hallway/nsv/deck1/hallway) +/area/maintenance/nsv/deck1/central) "hN" = ( /obj/structure/railing{ dir = 1 @@ -3745,23 +3749,18 @@ /turf/open/floor/carpet/blue, /area/nsv/briefingroom) "je" = ( -/obj/structure/disposalpipe/trunk/multiz/down{ - dir = 4 - }, /turf/open/floor/plating, /area/maintenance/nsv/deck1/central) "jf" = ( /obj/structure/cable{ icon_state = "1-2" }, -/obj/structure/disposalpipe/junction/yjunction{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/ladder, +/obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/nsv/deck1/central) "jg" = ( @@ -3780,25 +3779,23 @@ /obj/structure/cable{ icon_state = "2-4" }, -/obj/structure/disposalpipe/segment, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 8 }, +/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/nsv/deck1/central) "ji" = ( /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, @@ -3807,12 +3804,12 @@ }, /obj/machinery/door/airlock/ship/maintenance/defaultaccess, /obj/machinery/door/firedoor/border_only{ - dir = 8 + dir = 4 }, /obj/machinery/door/firedoor/border_only{ - dir = 4 + dir = 8 }, -/turf/open/floor/monotile/steel, +/turf/open/floor/plating, /area/maintenance/nsv/deck1/central) "jj" = ( /obj/structure/hull_plate/end{ diff --git a/_maps/map_files/Tycoon/Tycoon2.dmm b/_maps/map_files/Tycoon/Tycoon2.dmm index 19ecdcd1e07..9ee2c11fdfc 100644 --- a/_maps/map_files/Tycoon/Tycoon2.dmm +++ b/_maps/map_files/Tycoon/Tycoon2.dmm @@ -2,10 +2,6 @@ "aaa" = ( /turf/open/space/basic, /area/space) -"aab" = ( -/obj/structure/disposalpipe/segment, -/turf/closed/wall/ship, -/area/maintenance/central) "aac" = ( /turf/closed/wall/r_wall/ship, /area/ai_monitored/security/armory) @@ -472,16 +468,11 @@ /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) "abt" = ( -/obj/machinery/door/airlock/ship/maintenance, -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/firedoor/border_only{ - dir = 1 +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/machinery/door/firedoor/border_only, /turf/open/floor/plating, /area/maintenance/central) "abu" = ( @@ -584,13 +575,6 @@ /obj/item/stack/rods/fifty, /turf/open/floor/plating, /area/hallway/nsv/deck2/frame1/central) -"abK" = ( -/obj/structure/closet/secure_closet/personal/patient, -/obj/machinery/light_switch{ - pixel_y = 26 - }, -/turf/open/floor/carpet/ship, -/area/medical/medbay/central) "abL" = ( /turf/closed/wall/ship, /area/hallway/nsv/deck2/frame1/port) @@ -631,8 +615,16 @@ /turf/open/floor/monotile/light, /area/medical/virology) "abQ" = ( -/obj/machinery/computer/ship/viewscreen, -/turf/open/floor/carpet/ship, +/obj/machinery/door/airlock/ship/public/glass{ + name = "Patient rooms" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/turf/open/floor/monotile/steel, /area/medical/medbay/central) "abR" = ( /obj/machinery/firealarm{ @@ -877,13 +869,6 @@ }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) -"acy" = ( -/obj/machinery/airalarm/directional/north, -/obj/item/kirbyplants{ - icon_state = "plant-21" - }, -/turf/open/floor/carpet/ship, -/area/medical/medbay/central) "acA" = ( /obj/structure/chair, /obj/machinery/camera/autoname, @@ -1891,12 +1876,12 @@ /turf/open/floor/monotile/light, /area/medical/virology) "aeR" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 8 }, -/turf/open/floor/plating, -/area/hallway/nsv/deck2/frame1/central) +/turf/open/floor/monotile/light, +/area/medical/medbay/central) "aeS" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -2664,19 +2649,6 @@ }, /turf/open/floor/monotile/dark, /area/medical/virology) -"agF" = ( -/obj/machinery/door/airlock/ship/public/glass{ - name = "Paramedic Station"; - req_one_access_txt = "5" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/monotile/steel, -/area/medical/medbay/central) "agG" = ( /obj/structure/sign/ship/radiation, /turf/closed/wall/r_wall/ship, @@ -2702,20 +2674,6 @@ /obj/effect/turf_decal/tile/yellow, /turf/open/floor/monotile/steel, /area/medical/chemistry) -"agK" = ( -/obj/structure/closet/secure_closet/medical3, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/light{ - dir = 8 - }, -/turf/open/floor/monotile/steel, -/area/medical/medbay/central) "agL" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -2751,8 +2709,11 @@ /turf/open/floor/plating, /area/chapel/main) "agP" = ( -/turf/closed/wall/ship, -/area/medical/exam_room) +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/monotile/steel, +/area/medical/medbay/central) "agQ" = ( /obj/machinery/light{ dir = 8 @@ -2791,20 +2752,14 @@ /turf/open/floor/carpet/ship, /area/nsv/crew_quarters/heads/maa) "agW" = ( -/obj/machinery/button/door{ - id = "medical_traitor_murder_hole"; - name = "privacy shutters"; - pixel_y = 26 - }, -/obj/structure/table/reinforced, -/obj/item/clothing/neck/stethoscope, -/obj/machinery/light{ - dir = 1 +/obj/machinery/rnd/production/techfab/department/medical, +/obj/machinery/camera/autoname, +/obj/effect/turf_decal/tile/blue{ + dir = 8 }, -/obj/item/gun/syringe, -/obj/item/clothing/suit/straight_jacket, -/turf/open/floor/carpet/ship, -/area/medical/exam_room) +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/monotile/steel, +/area/medical/medbay/central) "agX" = ( /turf/open/floor/plating, /area/maintenance/department/medical) @@ -2890,7 +2845,14 @@ /turf/open/floor/plasteel/freezer, /area/medical/virology) "ahi" = ( -/turf/open/floor/monotile/dark, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/firealarm{ + pixel_y = 24 + }, +/turf/open/floor/monotile/steel, /area/medical/surgery) "ahj" = ( /turf/closed/wall/ship, @@ -2898,12 +2860,14 @@ name = "Intensive care unit" }) "ahk" = ( -/obj/machinery/firealarm{ - pixel_y = 24 +/obj/machinery/requests_console{ + department = "Genetics"; + name = "Genetics Requests Console"; + payment_department = "MED"; + pixel_y = -30 }, -/obj/machinery/camera/autoname, -/turf/open/floor/monotile/dark, -/area/medical/surgery) +/turf/open/floor/monotile/light, +/area/medical/medbay/central) "ahl" = ( /obj/structure/cable{ icon_state = "1-2" @@ -2936,18 +2900,20 @@ }, /turf/open/floor/monotile/light, /area/medical/virology) -"ahp" = ( -/obj/structure/chair{ - dir = 4 +"ahq" = ( +/obj/structure/table/glass, +/obj/item/storage/firstaid/brute, +/obj/item/storage/firstaid/brute, +/obj/item/storage/firstaid/brute, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 }, -/obj/item/radio/intercom{ - pixel_y = 26 +/obj/machinery/door/window/westright{ + name = "First-Aid Supplies"; + red_alert_access = 1; + req_access_txt = "5" }, -/turf/open/floor/monotile/dark, -/area/medical/surgery) -"ahq" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, +/turf/open/floor/monotile/steel, /area/medical/surgery) "ahr" = ( /obj/effect/spawner/structure/window/reinforced, @@ -2967,10 +2933,6 @@ /obj/machinery/camera/autoname, /turf/open/floor/monotile/steel, /area/hydroponics) -"aht" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/turf/open/floor/monotile/steel, -/area/medical/surgery) "ahu" = ( /obj/machinery/airalarm{ pixel_y = 26 @@ -3062,23 +3024,11 @@ name = "Munitions Projects" }) "ahE" = ( -/obj/structure/table/glass, -/obj/item/storage/firstaid/o2, -/obj/item/storage/firstaid/o2, -/obj/item/storage/firstaid/o2, -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/door/window/northleft{ - dir = 4; - name = "First-Aid Supplies"; - red_alert_access = 1; - req_access_txt = "5" +/obj/structure/disposalpipe/segment{ + dir = 10 }, -/obj/item/gun/syringe, -/obj/item/clothing/glasses/hud/health, -/obj/item/clothing/glasses/hud/health, -/obj/item/clothing/glasses/hud/health, -/turf/open/floor/monotile/steel, -/area/medical/medbay/central) +/turf/open/floor/monotile/light, +/area/medical/genetics) "ahF" = ( /obj/machinery/airalarm{ pixel_y = 23 @@ -3110,28 +3060,15 @@ }, /area/chapel/main) "ahJ" = ( -/obj/item/bedsheet/medical, -/obj/structure/bed, -/turf/open/floor/carpet/ship, +/turf/open/floor/plating, /area/medical/medbay/central) "ahK" = ( -/obj/machinery/door/airlock/ship/public/glass{ - name = "Patient Room A" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 +/obj/structure/disposalpipe/sorting/mail{ + dir = 4; + sortType = 23 }, /turf/open/floor/monotile/steel, -/area/medical/medbay/central) +/area/medical/morgue) "ahL" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/ship/preopen{ @@ -3141,17 +3078,11 @@ /turf/open/floor/plating, /area/crew_quarters/heads/hor) "ahM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 1 }, -/turf/open/floor/carpet/ship, -/area/medical/medbay/central) -"ahN" = ( -/obj/structure/chair, -/turf/open/floor/carpet/ship, +/turf/open/floor/monotile/dark, /area/medical/medbay/central) "ahO" = ( /turf/closed/wall/ship, @@ -3167,12 +3098,12 @@ /turf/open/floor/monotile/dark, /area/medical/morgue) "ahR" = ( -/obj/machinery/defibrillator_mount/loaded{ - pixel_y = 26 +/obj/structure/disposalpipe/sorting/mail{ + dir = 1; + sortType = 9 }, -/obj/structure/closet/secure_closet/medical2, -/turf/open/floor/monotile/steel, -/area/medical/surgery) +/turf/open/floor/monotile/dark, +/area/medical/medbay/central) "ahS" = ( /obj/machinery/smartfridge/chemistry/virology/preloaded, /obj/structure/disposalpipe/segment, @@ -3181,12 +3112,22 @@ /turf/open/floor/monotile/light, /area/medical/virology) "ahT" = ( -/obj/machinery/atmospherics/components/unary/cryo_cell, -/obj/effect/turf_decal/stripes/white/line{ - dir = 8 +/obj/structure/table/reinforced, +/obj/item/reagent_containers/glass/beaker/cryoxadone, +/obj/item/reagent_containers/glass/beaker/cryoxadone{ + pixel_x = 6; + pixel_y = 2 }, -/turf/open/floor/engine, -/area/medical/medbay/lobby) +/obj/item/reagent_containers/glass/beaker/cryoxadone{ + pixel_x = -2; + pixel_y = 9 + }, +/obj/item/reagent_containers/syringe/epinephrine{ + pixel_x = 3; + pixel_y = -2 + }, +/turf/open/floor/monotile/light, +/area/medical/medbay/central) "ahU" = ( /obj/machinery/computer/ship/viewscreen, /turf/open/floor/monotile/steel, @@ -3194,7 +3135,6 @@ name = "Munitions Projects" }) "ahV" = ( -/obj/machinery/computer/crew, /obj/machinery/power/apc/auto_name/north{ pixel_y = 24 }, @@ -3254,16 +3194,6 @@ }, /turf/open/floor/plasteel/dark, /area/chapel/office) -"ahZ" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, -/turf/open/floor/monotile/steel, -/area/medical/medbay/central) "aia" = ( /obj/structure/table/wood, /obj/item/candle, @@ -3283,23 +3213,14 @@ /turf/open/floor/monotile/dark, /area/medical/morgue) "aid" = ( -/obj/machinery/door/airlock/ship/public/glass{ - name = "Morgue" - }, -/obj/machinery/door/firedoor/border_only{ +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/turf/open/floor/monotile/steel, -/area/medical/morgue) -"aie" = ( -/obj/machinery/firealarm{ - pixel_y = 24 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 }, -/turf/open/floor/monotile/steel, -/area/medical/morgue) +/turf/open/floor/monotile/dark, +/area/medical/surgery) "aif" = ( /obj/structure/table/wood, /obj/effect/turf_decal/tile/neutral{ @@ -3549,29 +3470,16 @@ /turf/open/floor/plating, /area/engine/engineering/hangar) "aiT" = ( -/obj/machinery/power/apc/auto_name/north{ - pixel_y = 24 - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, +/obj/machinery/iv_drip, /turf/open/floor/monotile/steel, -/area/medical/medbay/central) +/area/medical/medbay/zone2{ + name = "Intensive care unit" + }) "aiU" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk, /turf/open/floor/monotile/steel, /area/crew_quarters/heads/chief) -"aiV" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/machinery/computer/ship/viewscreen, -/turf/open/floor/monotile/steel, -/area/medical/medbay/central) "aiW" = ( /obj/structure/cable{ icon_state = "2-8" @@ -3591,8 +3499,11 @@ }, /area/chapel/main) "aiY" = ( -/obj/effect/turf_decal/stripes/white/line, -/turf/open/floor/engine, +/obj/machinery/door/airlock/ship/public/glass{ + name = "Cryogenics"; + req_one_access_txt = "5" + }, +/turf/open/floor/monotile/light, /area/medical/genetics) "aiZ" = ( /obj/item/cigbutt, @@ -3605,44 +3516,29 @@ }, /turf/open/floor/engine, /area/medical/genetics) -"ajb" = ( -/obj/machinery/firealarm{ - pixel_y = 24 - }, -/turf/open/floor/monotile/light, -/area/medical/genetics) "ajc" = ( -/obj/machinery/atmospherics/components/unary/cryo_cell, -/obj/effect/turf_decal/stripes/white/line{ - dir = 4 - }, -/turf/open/floor/engine, -/area/medical/medbay/lobby) -"ajd" = ( -/obj/machinery/firealarm{ - pixel_y = 24 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, +/obj/machinery/holopad, +/obj/effect/landmark/nuclear_waste_spawner, /turf/open/floor/monotile/steel, /area/medical/medbay/central) -"aje" = ( -/obj/machinery/defibrillator_mount{ - pixel_y = 28 +"ajd" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, -/turf/open/floor/monotile/light, -/area/medical/medbay/lobby) -"ajf" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ +/obj/machinery/atmospherics/pipe/simple/general/hidden{ dir = 8 }, -/obj/item/radio/intercom{ - pixel_y = 26 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/floor/monotile/steel, +/turf/open/floor/monotile/light, /area/medical/medbay/central) +"ajf" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/monotile/dark, +/area/medical/morgue) "ajg" = ( /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance/three, @@ -3650,20 +3546,10 @@ /turf/open/floor/plasteel/tech/grid, /area/quartermaster/warehouse) "ajh" = ( -/obj/structure/table/glass, -/obj/item/storage/firstaid/brute, -/obj/item/storage/firstaid/brute, -/obj/item/storage/firstaid/brute, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/machinery/door/window/westright{ - name = "First-Aid Supplies"; - red_alert_access = 1; - req_access_txt = "5" - }, -/turf/open/floor/monotile/steel, -/area/medical/medbay/central) +/obj/machinery/light, +/obj/structure/bed/roller, +/turf/open/floor/monotile/light, +/area/medical/medbay/lobby) "aji" = ( /obj/structure/closet/crate/freezer, /obj/effect/turf_decal/delivery, @@ -3777,22 +3663,23 @@ /turf/open/floor/carpet/blue, /area/hallway/secondary/exit/departure_lounge) "ajD" = ( -/obj/machinery/shower{ - dir = 8 - }, -/obj/machinery/door/window/westleft{ - name = "Cloning Shower" +/obj/machinery/door/airlock/ship/public/glass{ + name = "Genetics Lab"; + req_one_access_txt = "9" }, -/obj/structure/mirror{ - pixel_x = 32 +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 }, -/turf/open/floor/engine, +/obj/structure/disposalpipe/segment, +/turf/open/floor/monotile/light, /area/medical/genetics) "ajE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/machinery/atmospherics/pipe/manifold/general/hidden{ + dir = 1 + }, /turf/open/floor/monotile/light, -/area/medical/genetics) +/area/medical/medbay/central) "ajF" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 @@ -3802,46 +3689,6 @@ }, /turf/open/floor/monotile/dark, /area/hallway/nsv/deck2/frame1/central) -"ajG" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/camera/autoname{ - dir = 8 - }, -/turf/open/floor/monotile/steel, -/area/medical/morgue) -"ajH" = ( -/obj/structure/table/glass, -/obj/item/storage/firstaid/toxin, -/obj/item/storage/firstaid/toxin, -/obj/item/storage/firstaid/toxin, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/camera/autoname{ - dir = 4 - }, -/obj/structure/window/reinforced, -/obj/machinery/door/window/eastright{ - name = "First-Aid Supplies"; - red_alert_access = 1; - req_access_txt = "5" - }, -/obj/item/storage/box/beakers{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/storage/box/bodybags{ - pixel_x = 3; - pixel_y = 3 - }, -/turf/open/floor/monotile/steel, -/area/medical/medbay/central) "ajI" = ( /obj/effect/turf_decal/tile/red{ dir = 8 @@ -3870,14 +3717,6 @@ }, /turf/open/floor/monotile/dark, /area/crew_quarters/theatre) -"ajL" = ( -/obj/effect/turf_decal/loading_area{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/monotile/dark, -/area/medical/surgery) "ajQ" = ( /obj/structure/table/reinforced, /obj/item/paicard, @@ -3903,9 +3742,11 @@ /turf/open/floor/monotile/steel, /area/crew_quarters/bar) "ajT" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/sleeper{ + dir = 8 + }, /turf/open/floor/monotile/light, -/area/medical/genetics) +/area/medical/medbay/central) "ajU" = ( /obj/machinery/chem_dispenser/drinks/beer, /obj/structure/table/reinforced, @@ -3918,31 +3759,38 @@ /turf/open/floor/monotile/steel, /area/crew_quarters/bar) "ajW" = ( -/obj/machinery/dna_scannernew, -/turf/open/floor/monotile/light, -/area/medical/genetics) -"ajX" = ( -/obj/machinery/door/airlock/ship/public/glass{ - name = "Genetics Lab"; - req_one_access_txt = "9" +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "4-8" }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 +/obj/effect/turf_decal/tile/orange, +/obj/effect/turf_decal/tile/orange{ + dir = 4 }, -/turf/open/floor/monotile/light, -/area/medical/genetics) +/turf/open/floor/monotile/steel, +/area/hallway/nsv/deck2/frame1/central) +"ajX" = ( +/obj/structure/table/wood, +/turf/open/floor/monotile/steel, +/area/medical/medbay/central) "ajY" = ( /turf/open/floor/monotile/light, /area/medical/genetics) "ajZ" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on, +/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{ + name = "Cryotube Cooler" + }, /obj/machinery/camera/autoname, /turf/open/floor/monotile/dark, -/area/medical/medbay/lobby) +/area/medical/medbay/central) "aka" = ( /turf/open/floor/carpet/ship, /area/quartermaster/qm) @@ -3980,11 +3828,14 @@ /turf/open/floor/plating, /area/quartermaster/qm) "akg" = ( -/obj/machinery/light{ +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ dir = 4 }, -/turf/open/floor/carpet/ship, -/area/medical/exam_room) +/turf/open/floor/monotile/steel, +/area/medical/medbay/central) "akh" = ( /obj/structure/table/glass, /obj/machinery/computer/ship/viewscreen, @@ -3998,17 +3849,9 @@ /turf/open/floor/monotile/light, /area/crew_quarters/heads/cmo) "aki" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, -/turf/open/floor/carpet/ship, -/area/medical/exam_room) +/obj/machinery/holopad, +/turf/open/floor/monotile/dark, +/area/medical/medbay/central) "akj" = ( /turf/open/floor/monotile/light, /area/crew_quarters/heads/cmo) @@ -4016,9 +3859,11 @@ /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 1 }, -/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/machinery/portable_atmospherics/canister/oxygen{ + name = "Cryotube o2 canister" + }, /turf/open/floor/monotile/dark, -/area/medical/medbay/lobby) +/area/medical/medbay/central) "akl" = ( /obj/machinery/light{ dir = 8 @@ -4062,35 +3907,6 @@ }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) -"akp" = ( -/obj/machinery/door/airlock/ship/public/glass{ - name = "Intensive care"; - req_one_access_txt = "5" - }, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/monotile/steel, -/area/medical/surgery) -"akq" = ( -/obj/structure/closet/secure_closet/medical3, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/machinery/light{ - dir = 4 - }, -/turf/open/floor/monotile/steel, -/area/medical/medbay/central) "akr" = ( /obj/structure/rack, /obj/effect/turf_decal/stripes/line{ @@ -4162,131 +3978,97 @@ name = "Munitions Projects" }) "akx" = ( -/obj/structure/chair{ - dir = 4 +/obj/machinery/button/door{ + id = "medical_traitor_murder_hole"; + name = "privacy shutters"; + pixel_y = 26 }, -/turf/open/floor/monotile/dark, -/area/medical/morgue) -"aky" = ( /obj/structure/table/reinforced, -/obj/item/pen, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ +/obj/machinery/light{ dir = 1 }, -/obj/machinery/door/poddoor/shutters/ship{ - dir = 4; - id = "morgue_desk" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ +/obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/effect/landmark/zebra_interlock_point, +/obj/item/screwdriver, +/obj/item/crowbar, /turf/open/floor/monotile/steel, -/area/medical/morgue) -"akz" = ( -/obj/structure/chair{ - dir = 8 +/area/medical/medbay/central) +"aky" = ( +/obj/effect/turf_decal/loading_area{ + dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/monotile/steel, +/turf/open/floor/monotile/dark, /area/medical/morgue) "akA" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/vending/medical, +/obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 +/obj/effect/turf_decal/tile/neutral{ + dir = 4 }, +/obj/effect/turf_decal/tile/neutral, /turf/open/floor/monotile/steel, -/area/medical/medbay/lobby) +/area/medical/surgery) "akB" = ( -/obj/machinery/door/airlock/ship/public/glass{ - name = "Cryogenics"; - req_one_access_txt = "9" +/obj/effect/turf_decal/tile/blue{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/general/hidden, +/turf/open/floor/monotile/light, +/area/medical/medbay/central) +"akD" = ( /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, -/turf/open/floor/monotile/light, -/area/medical/genetics) -"akC" = ( -/obj/structure/closet/crate/freezer/blood, -/obj/item/radio/intercom{ - pixel_y = 26 +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/open/floor/monotile/steel, -/area/medical/surgery) -"akD" = ( -/obj/machinery/computer/lore_terminal, -/obj/machinery/camera/autoname, -/obj/structure/closet/crate/freezer/surplus_limbs, -/turf/open/floor/monotile/steel, -/area/medical/surgery) +/turf/open/floor/plating, +/area/maintenance/port) "akE" = ( -/obj/machinery/vending/wardrobe/gene_wardrobe, +/obj/structure/bed/roller, /turf/open/floor/monotile/light, -/area/medical/genetics) +/area/medical/medbay/lobby) "akF" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/general/hidden{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/monotile/light, -/area/medical/medbay/lobby) +/area/medical/medbay/central) "akG" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible, -/obj/effect/turf_decal/stripes/white/line{ - dir = 5 +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/open/floor/engine, -/area/medical/medbay/lobby) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/monotile/light, +/area/medical/medbay/central) "akH" = ( -/obj/machinery/iv_drip/saline, -/obj/effect/turf_decal/box, -/obj/machinery/defibrillator_mount/loaded{ - pixel_y = 26 +/obj/structure/disposalpipe/segment{ + dir = 8 }, -/turf/open/floor/monotile/steel, -/area/medical/surgery) +/turf/open/floor/monotile/light, +/area/medical/genetics) "akI" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/medical/medbay/central) "akJ" = ( -/obj/structure/window/reinforced/spawner, -/obj/structure/window/reinforced/spawner/west, -/obj/machinery/clonepod/prefilled, -/turf/open/floor/engine, +/obj/structure/disposalpipe/segment, +/turf/open/floor/monotile/light, /area/medical/genetics) -"akK" = ( -/obj/structure/table/glass, -/obj/item/storage/firstaid/fire, -/obj/item/storage/firstaid/fire, -/obj/item/storage/firstaid/fire, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/structure/window/reinforced, -/obj/machinery/door/window/northleft{ - dir = 8; - name = "First-Aid Supplies"; - red_alert_access = 1; - req_access_txt = "5" - }, -/turf/open/floor/monotile/steel, -/area/medical/medbay/central) "akL" = ( /obj/structure/cable{ icon_state = "4-8" @@ -4294,21 +4076,15 @@ /turf/open/floor/plating, /area/maintenance/department/medical) "akM" = ( -/obj/effect/turf_decal/stripes/white/line, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/effect/turf_decal/tile/blue{ dir = 4 }, -/turf/open/floor/engine, -/area/medical/medbay/lobby) -"akN" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 4 +/obj/effect/turf_decal/tile/blue{ + dir = 1 }, -/turf/open/floor/engine, -/area/medical/medbay/lobby) +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/monotile/light, +/area/medical/medbay/central) "akO" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -4321,37 +4097,16 @@ /obj/effect/landmark/start/virologist, /turf/open/floor/monotile/dark, /area/medical/virology) -"akP" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/door/airlock/ship/public/glass{ - name = "Cloning Lab"; - req_access_txt = "5; 68" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 +"akQ" = ( +/obj/machinery/door/airlock/ship/maintenance{ + name = "Medbay maintenance"; + req_one_access_txt = "5" }, -/obj/effect/mapping_helpers/airlock/unres{ +/obj/structure/disposalpipe/segment{ dir = 8 }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"akQ" = ( -/obj/machinery/sleeper{ - dir = 4 - }, -/turf/open/floor/engine, -/area/medical/medbay/lobby) +/turf/open/floor/plating, +/area/medical/medbay/central) "akR" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -4362,28 +4117,6 @@ /obj/structure/lattice/catwalk/over/ship, /turf/open/floor/plating, /area/nsv/hanger/deck2) -"akS" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 - }, -/obj/machinery/door/airlock/ship/public/glass{ - name = "Cryogenics Freezer"; - req_one_access_txt = "5" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/turf/open/floor/monotile/dark, -/area/medical/medbay/lobby) "akT" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -4396,18 +4129,6 @@ }, /turf/open/floor/monotile/dark, /area/nsv/hanger/deck2) -"akU" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/monotile/light, -/area/medical/medbay/lobby) "akV" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -4459,55 +4180,31 @@ /turf/open/floor/monotile/light, /area/medical/virology) "ala" = ( -/obj/machinery/vending/wardrobe/medi_wardrobe, -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 +/obj/structure/closet/crate/freezer/blood, +/obj/item/radio/intercom{ + pixel_y = 26 }, /turf/open/floor/monotile/steel, /area/medical/medbay/central) "alb" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/monotile/steel, /area/medical/medbay/zone2{ name = "Intensive care unit" }) -"alc" = ( -/obj/structure/table/glass, -/obj/item/storage/box/monkeycubes, -/obj/item/storage/box/monkeycubes{ - pixel_x = 2; - pixel_y = -2 - }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -24 - }, -/turf/open/floor/monotile/light, -/area/medical/genetics) "ald" = ( -/obj/structure/chair/office{ - dir = 1 - }, -/obj/effect/landmark/start/geneticist, +/obj/machinery/atmospherics/pipe/simple/general/hidden, /turf/open/floor/monotile/light, -/area/medical/genetics) +/area/medical/medbay/central) "ale" = ( -/obj/structure/chair/office{ - dir = 4 - }, -/obj/effect/landmark/start/geneticist, +/obj/effect/landmark/start/paramedic, /turf/open/floor/monotile/light, /area/medical/genetics) "alf" = ( -/obj/machinery/computer/scan_consolenew{ - dir = 8 +/obj/structure/table/glass, +/obj/item/storage/box/monkeycubes, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = -24 }, /turf/open/floor/monotile/light, /area/medical/genetics) @@ -4518,27 +4215,22 @@ /turf/open/floor/monotile/light, /area/medical/virology) "alh" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 9 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/general/hidden{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/open/floor/monotile/light, -/area/medical/genetics) +/area/medical/medbay/central) "ali" = ( -/obj/machinery/vending/medical, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 +/obj/machinery/power/apc/auto_name/north{ + pixel_y = 24 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 +/obj/structure/cable{ + icon_state = "0-2" }, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/monotile/steel, +/turf/open/floor/monotile/dark, /area/medical/medbay/central) "alj" = ( /obj/structure/table/glass, @@ -4554,27 +4246,28 @@ /obj/machinery/computer/security/telescreen/cmo{ pixel_y = 26 }, +/obj/item/extrapolator, /turf/open/floor/carpet/ship, /area/crew_quarters/heads/cmo) "alm" = ( -/obj/machinery/airalarm/directional/east, -/obj/machinery/computer/cloning{ - dir = 8 - }, -/obj/machinery/light{ - dir = 4 +/obj/structure/disposalpipe/segment{ + dir = 9 }, -/turf/open/floor/engine, +/turf/open/floor/monotile/light, /area/medical/genetics) "aln" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/carpet/ship, /area/crew_quarters/dorms) "alo" = ( -/obj/effect/landmark/event_spawn, -/obj/machinery/dna_scannernew, -/turf/open/floor/engine, -/area/medical/genetics) +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/general/hidden{ + dir = 5 + }, +/turf/open/floor/monotile/light, +/area/medical/medbay/central) "alp" = ( /obj/structure/closet/secure_closet/medical3, /obj/effect/turf_decal/tile/neutral{ @@ -4586,38 +4279,19 @@ /turf/open/floor/monotile/steel, /area/medical/medbay/central) "alq" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/navbeacon{ - codes_txt = "patrol;next_patrol=loc12"; - location = "loc11" - }, -/turf/open/floor/monotile/dark, -/area/medical/medbay/central) -"alr" = ( -/obj/machinery/door/airlock/ship/public/glass{ - name = "Medbay Lobby"; - req_one_access_txt = "5" - }, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ +/obj/structure/chair/office{ dir = 4 }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, +/obj/effect/landmark/start/geneticist, /turf/open/floor/monotile/light, -/area/medical/medbay/lobby) +/area/medical/medbay/central) "als" = ( /obj/structure/table/glass, /obj/item/folder/blue, /obj/item/stamp/cmo, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/cmo) "alt" = ( @@ -4640,11 +4314,10 @@ /turf/open/floor/monotile/dark, /area/medical/virology) "alv" = ( -/obj/structure/table/glass, -/obj/machinery/camera/autoname{ - dir = 8 +/obj/machinery/defibrillator_mount{ + pixel_y = 28 }, -/turf/open/floor/engine, +/turf/open/floor/monotile/light, /area/medical/genetics) "alw" = ( /obj/structure/cable{ @@ -4772,11 +4445,7 @@ /area/crew_quarters/heads/cmo) "alI" = ( /obj/machinery/camera/autoname, -/obj/effect/turf_decal/tile/orange, /obj/machinery/computer/ship/viewscreen, -/obj/effect/turf_decal/tile/orange{ - dir = 8 - }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) "alJ" = ( @@ -4797,10 +4466,14 @@ /turf/open/floor/monotile/dark, /area/science/xenobiology) "alL" = ( -/obj/structure/chair, /obj/structure/sign/nanotrasen{ pixel_y = 26 }, +/obj/machinery/fax{ + fax_name = "Medical"; + name = "Medical Cryo Fax Machine" + }, +/obj/structure/table/reinforced, /turf/open/floor/monotile/light, /area/medical/medbay/lobby) "alM" = ( @@ -4833,14 +4506,6 @@ /obj/structure/curtain/obscuring/grey, /turf/open/floor/carpet/ship, /area/crew_quarters/heads/cmo) -"alP" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/monotile/dark, -/area/medical/surgery) "alQ" = ( /obj/machinery/computer/crew{ dir = 4 @@ -4887,23 +4552,12 @@ /turf/open/floor/monotile/dark, /area/medical/virology) "alU" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/obj/machinery/firealarm{ + pixel_y = 24 }, +/obj/machinery/camera/autoname, /turf/open/floor/monotile/dark, /area/medical/medbay/central) -"alV" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/monotile/light, -/area/medical/medbay/lobby) "alW" = ( /turf/open/floor/monotile/dark, /area/hydroponics) @@ -4928,56 +4582,18 @@ /turf/open/floor/monotile/dark, /area/science/nanite) "ama" = ( -/obj/machinery/door/airlock/ship/public/glass{ - name = "Medbay Lobby"; - req_one_access_txt = "5" - }, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/turf/open/floor/monotile/light, -/area/medical/medbay/lobby) -"amb" = ( -/obj/structure/chair{ +/obj/machinery/computer/ship/viewscreen, +/obj/effect/turf_decal/loading_area{ dir = 8 }, -/turf/open/floor/monotile/light, -/area/medical/medbay/lobby) +/turf/open/floor/monotile/dark, +/area/medical/morgue) "amc" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, +/obj/machinery/stasis, /turf/open/floor/monotile/light, -/area/medical/medbay/lobby) +/area/medical/medbay/central) "amd" = ( -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, +/obj/effect/landmark/start/paramedic, /turf/open/floor/monotile/steel, /area/medical/medbay/lobby) "ame" = ( @@ -4994,24 +4610,27 @@ /turf/open/floor/monotile/steel, /area/hydroponics) "amg" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/monotile/dark, +/obj/machinery/firealarm{ + pixel_y = 24 + }, +/turf/open/floor/monotile/light, /area/medical/medbay/central) "amh" = ( -/obj/machinery/light{ +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ dir = 8 }, -/obj/machinery/holopad, -/obj/machinery/requests_console{ - department = "Medbay Clinic"; - departmentType = 1; - name = "Medbay RC"; - payment_department = "MED"; - pixel_x = -32 +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 4 }, -/turf/open/floor/engine, -/area/medical/medbay/lobby) +/obj/machinery/door/airlock/ship/public/glass{ + name = "Cryogenics Freezer"; + req_one_access_txt = "5" + }, +/turf/open/floor/monotile/dark, +/area/medical/medbay/central) "ami" = ( /turf/closed/wall/ship, /area/crew_quarters/dorms) @@ -5147,41 +4766,37 @@ }, /turf/open/floor/monotile/steel, /area/crew_quarters/theatre) -"amK" = ( -/obj/effect/turf_decal/box, -/obj/machinery/smartfridge/organ, -/turf/open/floor/monotile/steel, -/area/medical/surgery) "amL" = ( -/obj/structure/chair{ - dir = 4 +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 10 }, /turf/open/floor/monotile/dark, /area/medical/surgery) "amM" = ( /turf/open/floor/monotile/steel, /area/medical/surgery) -"amN" = ( -/obj/machinery/power/apc/auto_name/north{ - pixel_y = 24 - }, -/obj/structure/cable{ - icon_state = "0-2" - }, -/turf/open/floor/monotile/dark, -/area/medical/surgery) "amO" = ( -/obj/machinery/door/airlock/ship/public/glass{ - name = "Surgery"; - req_one_access_txt = "5" - }, -/obj/machinery/door/firedoor/border_only{ +/obj/structure/table/glass, +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/fire, +/obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 +/obj/effect/turf_decal/tile/neutral{ + dir = 1 }, -/turf/open/floor/monotile/dark, +/obj/structure/window/reinforced, +/obj/machinery/door/window/northleft{ + dir = 8; + name = "First-Aid Supplies"; + red_alert_access = 1; + req_access_txt = "5" + }, +/turf/open/floor/monotile/steel, /area/medical/surgery) "amP" = ( /obj/structure/sink/kitchen{ @@ -5197,12 +4812,6 @@ }, /turf/open/floor/monotile/dark, /area/hallway/secondary/service) -"amQ" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/turf/open/floor/carpet/blue, -/area/medical/medbay/lobby) "amR" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -5224,43 +4833,38 @@ /turf/open/floor/monotile/steel, /area/crew_quarters/bar) "amT" = ( -/obj/effect/turf_decal/loading_area{ - dir = 4 +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/open/floor/monotile/steel, -/area/medical/surgery) -"amU" = ( -/obj/structure/table/optable, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/structure/disposalpipe/sorting/mail{ + dir = 1; + sortType = 10 }, -/turf/open/floor/monotile/dark, -/area/medical/surgery) +/turf/open/floor/plating, +/area/maintenance/department/medical) "amV" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 }, -/turf/open/floor/monotile/dark, +/obj/item/radio/intercom{ + pixel_y = 26 + }, +/turf/open/floor/monotile/steel, /area/medical/surgery) "amW" = ( -/obj/structure/table/glass, -/obj/item/storage/bag/tray{ - desc = "A metal tray to lay bits on."; - name = "surgical tray" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 5 +/obj/effect/turf_decal/loading_area{ + dir = 4 }, -/turf/open/floor/monotile/dark, -/area/medical/surgery) +/turf/open/floor/monotile/steel, +/area/medical/medbay/central) "amX" = ( -/obj/structure/table/glass, -/obj/item/storage/bag/tray{ - desc = "A metal tray to lay bits on."; - name = "surgical tray" +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/effect/turf_decal/stripes/line{ - dir = 9 +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 }, /turf/open/floor/monotile/dark, /area/medical/surgery) @@ -5666,9 +5270,11 @@ /turf/open/floor/monotile/dark, /area/medical/virology) "aok" = ( -/obj/effect/landmark/start/paramedic, +/obj/machinery/atmospherics/pipe/simple/general/hidden{ + dir = 8 + }, /turf/open/floor/monotile/light, -/area/medical/medbay/lobby) +/area/medical/medbay/central) "aol" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -5851,15 +5457,6 @@ }, /turf/open/floor/monotile/dark, /area/medical/virology) -"aoH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/monotile/steel, -/area/medical/medbay/central) "aoJ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 @@ -5902,15 +5499,14 @@ /turf/open/floor/monotile/dark, /area/medical/virology) "aoO" = ( -/obj/structure/table/optable, -/obj/machinery/camera/autoname{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/machinery/firealarm{ + dir = 8; + pixel_x = 24 }, -/turf/open/floor/monotile/dark, -/area/medical/surgery) +/turf/open/floor/monotile/steel, +/area/medical/medbay/zone2{ + name = "Intensive care unit" + }) "aoP" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -6167,15 +5763,6 @@ }, /turf/open/floor/plating, /area/engine/engineering/hangar) -"apF" = ( -/obj/machinery/power/apc/auto_name/north{ - pixel_y = 24 - }, -/obj/structure/cable{ - icon_state = "0-2" - }, -/turf/open/floor/monotile/steel, -/area/medical/morgue) "apG" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 @@ -6242,12 +5829,14 @@ /turf/open/floor/monotile/dark, /area/crew_quarters/theatre) "apT" = ( -/obj/machinery/light{ +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/monotile/dark, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/monotile/light, /area/medical/medbay/central) "apU" = ( /obj/machinery/firealarm/directional/north, @@ -8408,11 +7997,6 @@ }, /turf/open/floor/monotile/steel, /area/engine/engineering) -"ayI" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk, -/turf/open/floor/monotile/steel, -/area/medical/medbay/central) "ayJ" = ( /turf/closed/wall/r_wall/ship, /area/engine/engineering/reactor_control) @@ -8629,8 +8213,10 @@ /turf/open/floor/durasteel, /area/engine/engineering) "azf" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/monotile/steel, +/obj/structure/window/reinforced/spawner, +/obj/structure/window/reinforced/spawner/west, +/obj/machinery/clonepod/prefilled, +/turf/open/floor/engine, /area/medical/medbay/central) "azg" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, @@ -8926,17 +8512,12 @@ }, /area/maintenance/starboard/fore) "aAc" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 +/obj/effect/landmark/start/paramedic, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/effect/landmark/zebra_interlock_point, -/turf/open/floor/plating, -/area/maintenance/department/medical) +/turf/open/floor/monotile/light, +/area/medical/genetics) "aAd" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -9142,20 +8723,21 @@ /obj/machinery/camera/autoname, /turf/open/floor/circuit/telecomms/mainframe, /area/tcommsat/server) -"aAG" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/monotile/steel, -/area/medical/medbay/central) "aAH" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/disposalpipe/segment{ +/obj/structure/disposalpipe/junction/flip{ dir = 4 }, -/turf/open/floor/plating, -/area/medical/medbay/central) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/monotile/dark, +/area/hallway/nsv/deck2/frame1/port) "aAI" = ( /obj/structure/cable{ icon_state = "1-2" @@ -9678,15 +9260,9 @@ /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame2/port) "aBK" = ( -/obj/machinery/computer/scan_consolenew, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/atmospherics/components/unary/cryo_cell, /turf/open/floor/monotile/light, -/area/medical/genetics) +/area/medical/medbay/central) "aBL" = ( /obj/structure/table/reinforced, /obj/item/paper_bin, @@ -9756,18 +9332,8 @@ /turf/closed/wall/r_wall/ship, /area/engine/atmospherics_engine) "aCf" = ( -/obj/effect/mapping_helpers/airlock/unres{ - dir = 1 - }, -/obj/machinery/door/airlock/ship/public/glass{ - name = "Cloning Lab"; - req_access_txt = "5; 68" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/monotile/light, +/obj/structure/sign/ship/medical, +/turf/closed/wall/ship, /area/medical/genetics) "aCg" = ( /obj/effect/mapping_helpers/airlock/locked, @@ -12252,24 +11818,17 @@ /turf/open/floor/monotile/steel, /area/security/brig) "aHR" = ( -/obj/machinery/door/airlock/ship/public/glass{ - name = "Medbay Lobby Access" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/effect/landmark/zebra_interlock_point, -/turf/open/floor/monotile/dark, -/area/hallway/nsv/deck2/frame1/central) +/turf/open/floor/monotile/light, +/area/crew_quarters/heads/cmo) "aHS" = ( /obj/machinery/computer/security, /turf/open/floor/carpet/red, @@ -13668,16 +13227,6 @@ }, /turf/open/floor/monotile/dark, /area/nsv/weapons/fore) -"aLj" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/monotile/steel, -/area/medical/medbay/central) "aLk" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -14213,14 +13762,11 @@ name = "Prototype munitions bay" }) "aMs" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "1-2" +/obj/structure/disposalpipe/segment{ + dir = 8 }, /turf/open/floor/monotile/light, -/area/medical/medbay/lobby) +/area/medical/medbay/central) "aMt" = ( /obj/structure/chair/fancy{ dir = 8 @@ -14310,11 +13856,18 @@ /turf/open/floor/durasteel, /area/engine/engineering) "aMD" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 1 +/obj/structure/closet/secure_closet/medical3, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 }, -/turf/open/floor/monotile/dark, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/monotile/steel, /area/medical/surgery) "aME" = ( /obj/structure/table/reinforced, @@ -14431,11 +13984,6 @@ /obj/structure/table, /turf/open/floor/monotile/dark, /area/crew_quarters/dorms) -"aMO" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/curtain/obscuring/grey, -/turf/open/floor/plating, -/area/medical/genetics) "aMP" = ( /obj/effect/turf_decal/tile/purple{ dir = 4 @@ -14457,15 +14005,17 @@ /turf/closed/wall/r_wall/ship, /area/science/xenobiology) "aMR" = ( -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ - dir = 8 +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/effect/turf_decal/tile/green{ +/obj/structure/disposalpipe/segment, +/obj/effect/landmark/zebra_interlock_point, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ dir = 1 }, -/turf/open/floor/monotile/steel, -/area/medical/medbay/lobby) +/turf/open/floor/plating, +/area/maintenance/department/medical) "aMS" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -15681,12 +15231,10 @@ /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame2/port) "aPs" = ( -/obj/structure/chair{ - dir = 4 - }, -/obj/machinery/camera/autoname{ - dir = 4 +/obj/structure/chair/office{ + dir = 1 }, +/obj/effect/landmark/start/geneticist, /turf/open/floor/monotile/light, /area/medical/medbay/central) "aPt" = ( @@ -16149,27 +15697,18 @@ /turf/open/floor/monotile/steel, /area/engine/engineering) "aQG" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/door/airlock/ship/maintenance{ + name = "Medbay maintenance"; + req_one_access_txt = "5" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/door/firedoor/border_only{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/door/firedoor/border_only{ dir = 8 }, -/turf/open/floor/monotile/steel, -/area/medical/medbay/central) +/turf/open/floor/plating, +/area/maintenance/port) "aQH" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -16239,14 +15778,12 @@ /turf/open/floor/carpet/green, /area/engine/engineering/reactor_control) "aQR" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 10 +/obj/structure/disposalpipe/trunk{ + dir = 2 }, -/turf/open/floor/monotile/dark, -/area/medical/medbay/central) +/obj/machinery/disposal/bin, +/turf/open/floor/monotile/light, +/area/medical/medbay/lobby) "aQS" = ( /obj/effect/turf_decal/stripes/corner, /obj/machinery/power/apc/auto_name/north{ @@ -16548,10 +16085,21 @@ /turf/open/floor/carpet/ship, /area/crew_quarters/dorms) "aRD" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plating, -/area/medical/medbay/lobby) +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/monotile/dark, +/area/hallway/nsv/deck2/frame1/central) "aRE" = ( /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow{ @@ -17383,61 +16931,35 @@ /obj/item/storage/firstaid/fire, /obj/machinery/light, /turf/open/floor/monotile/light, -/area/medical/medbay/lobby) +/area/medical/medbay/central) "aTK" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ +/obj/machinery/atmospherics/pipe/manifold/general/visible{ dir = 4 }, /turf/open/floor/monotile/dark, -/area/medical/medbay/lobby) +/area/medical/medbay/central) "aTL" = ( -/obj/structure/chair{ +/obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/machinery/airalarm{ - dir = 4; - pixel_x = -22 - }, -/turf/open/floor/carpet/ship, -/area/medical/exam_room) -"aTM" = ( -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, /turf/open/floor/monotile/steel, +/area/medical/medbay/central) +"aTM" = ( +/obj/structure/table/reinforced, +/turf/open/floor/monotile/light, /area/medical/medbay/lobby) "aTN" = ( -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, +/obj/machinery/airalarm/directional/east, /turf/open/floor/monotile/steel, /area/medical/medbay/lobby) "aTO" = ( -/obj/machinery/computer/crew{ - dir = 1 - }, -/turf/open/floor/carpet/blue, -/area/medical/medbay/lobby) +/obj/effect/turf_decal/tile/orange, +/turf/open/floor/monotile/steel, +/area/hallway/nsv/deck2/frame1/central) "aTP" = ( -/obj/machinery/computer/med_data{ - dir = 1 - }, -/turf/open/floor/carpet/blue, -/area/medical/medbay/lobby) -"aTQ" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/solgovcup, +/obj/structure/table/glass, /turf/open/floor/monotile/light, -/area/medical/medbay/lobby) +/area/medical/medbay/central) "aTU" = ( /obj/structure/cable{ icon_state = "1-2" @@ -17450,12 +16972,12 @@ /turf/open/floor/monotile/steel, /area/engine/engineering) "aTV" = ( -/obj/structure/table/glass, -/obj/item/wrench/medical, -/obj/item/storage/box/bodybags, /obj/machinery/airalarm/directional/south, +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 5 + }, /turf/open/floor/monotile/dark, -/area/medical/medbay/lobby) +/area/medical/medbay/central) "aTW" = ( /obj/structure/cable{ icon_state = "1-2" @@ -17491,11 +17013,15 @@ /turf/open/floor/monotile/light, /area/medical/genetics) "aUa" = ( -/obj/structure/sign/departments/medbay/alt{ - name = "\improper INTENSIVE CARE UNIT"; - pixel_y = 26 +/obj/structure/table/glass, +/obj/item/storage/bag/tray{ + desc = "A metal tray to lay bits on."; + name = "surgical tray" }, -/turf/open/floor/monotile/steel, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/monotile/dark, /area/medical/medbay/central) "aUb" = ( /obj/effect/turf_decal/stripes/line, @@ -17515,24 +17041,9 @@ /area/medical/medbay/zone2{ name = "Intensive care unit" }) -"aUd" = ( -/obj/structure/chair{ - dir = 4 - }, -/turf/open/floor/monotile/light, -/area/medical/medbay/central) "aUe" = ( /turf/open/floor/monotile/light, /area/medical/medbay/central) -"aUf" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/monotile/dark, -/area/medical/morgue) "aUg" = ( /obj/machinery/door/airlock/ship/public/glass{ name = "Paramedic Station"; @@ -17555,55 +17066,17 @@ name = "Intensive care unit" }) "aUh" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/engine, -/area/medical/medbay/lobby) -"aUi" = ( -/obj/machinery/door/airlock/ship/public/glass{ - name = "Genetics Lab"; - req_one_access_txt = "9" - }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ +/obj/effect/turf_decal/tile/blue{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/general/hidden, /turf/open/floor/monotile/light, -/area/medical/genetics) +/area/medical/medbay/central) "aUj" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/medical/genetics) -"aUk" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/door/poddoor/shutters/ship{ - dir = 4; - id = "morgue_desk" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/effect/landmark/zebra_interlock_point, -/turf/open/floor/monotile/steel, -/area/medical/morgue) "aUl" = ( -/obj/structure/closet/secure_closet/medical3, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, @@ -17654,37 +17127,44 @@ name = "Intensive care unit" }) "aUq" = ( -/obj/structure/chair{ - dir = 8 - }, -/turf/open/floor/monotile/dark, +/obj/effect/turf_decal/box, +/obj/machinery/smartfridge/organ, +/turf/open/floor/monotile/steel, /area/medical/medbay/zone2{ name = "Intensive care unit" }) "aUr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -24 +/obj/machinery/iv_drip/saline, +/obj/effect/turf_decal/box, +/obj/machinery/defibrillator_mount/loaded{ + pixel_y = 26 }, /turf/open/floor/monotile/steel, /area/medical/medbay/zone2{ name = "Intensive care unit" }) "aUs" = ( -/obj/machinery/holopad, -/turf/open/floor/monotile/dark, +/obj/item/clothing/suit/toggle/labcoat/paramedic, +/obj/item/clothing/suit/toggle/labcoat/paramedic, +/obj/item/clothing/head/soft/paramedic, +/obj/item/clothing/head/soft/paramedic, +/obj/structure/rack, +/obj/item/defibrillator/loaded, +/obj/item/clothing/suit/toggle/labcoat/paramedic, +/obj/machinery/airalarm{ + pixel_y = 26 + }, +/obj/item/roller, +/turf/open/floor/carpet/ship, /area/medical/surgery) "aUt" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/turf/open/floor/monotile/steel, -/area/medical/morgue) +/obj/structure/table/glass, +/obj/item/wrench/medical, +/obj/item/storage/box/bodybags, +/turf/open/floor/monotile/dark, +/area/medical/medbay/central) "aUu" = ( -/obj/machinery/rnd/production/techfab/department/medical, +/obj/effect/landmark/nuclear_waste_spawner, /turf/open/floor/monotile/steel, /area/medical/medbay/central) "aUv" = ( @@ -17704,67 +17184,35 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) -"aUx" = ( -/obj/structure/table/optable{ - name = "autopsy table" - }, -/turf/open/floor/monotile/dark, -/area/medical/morgue) "aUy" = ( -/obj/machinery/computer/operating{ - dir = 1 - }, -/turf/open/floor/monotile/dark, -/area/medical/morgue) -"aUz" = ( -/obj/structure/closet/secure_closet/personal/patient, -/turf/open/floor/monotile/steel, -/area/medical/morgue) -"aUA" = ( -/obj/structure/chair, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/turf/open/floor/carpet/ship, -/area/medical/medbay/central) -"aUB" = ( -/obj/structure/chair{ - dir = 1 - }, -/turf/open/floor/carpet/ship, -/area/medical/medbay/central) -"aUC" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/machinery/camera/autoname, -/turf/open/floor/monotile/steel, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/monotile/light, /area/medical/medbay/central) -"aUD" = ( -/obj/machinery/computer/operating{ - dir = 4 +"aUz" = ( +/obj/structure/bodycontainer/morgue{ + dir = 8 }, /turf/open/floor/monotile/dark, -/area/medical/surgery) +/area/medical/morgue) +"aUB" = ( +/obj/effect/landmark/start/chief_medical_officer, +/turf/open/floor/monotile/light, +/area/crew_quarters/heads/cmo) "aUE" = ( -/obj/machinery/light, -/turf/open/floor/carpet/ship, +/obj/machinery/door/airlock/ship/maintenance{ + name = "Morgue maintenance"; + req_one_access_txt = "6" + }, +/turf/open/floor/plating, /area/medical/medbay/central) "aUF" = ( -/obj/item/storage/backpack/duffelbag/med/surgery, -/obj/structure/table/glass, -/obj/item/book/manual/wiki/surgery, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/monotile/dark, +/turf/open/space/basic, /area/medical/surgery) "aUG" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -17776,19 +17224,12 @@ /area/medical/medbay/zone2{ name = "Intensive care unit" }) -"aUH" = ( -/obj/machinery/computer/operating{ - dir = 8 - }, -/turf/open/floor/monotile/dark, -/area/medical/surgery) "aUI" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/structure/chair{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 +/obj/item/radio/intercom{ + pixel_y = 26 }, /turf/open/floor/monotile/dark, /area/medical/medbay/central) @@ -17801,10 +17242,22 @@ /turf/open/floor/monotile/light, /area/medical/virology) "aUK" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/structure/table/glass, +/obj/item/storage/firstaid/o2, +/obj/item/storage/firstaid/o2, +/obj/item/storage/firstaid/o2, +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/door/window/northleft{ + dir = 4; + name = "First-Aid Supplies"; + red_alert_access = 1; + req_access_txt = "5" }, -/turf/open/floor/monotile/dark, +/obj/item/gun/syringe, +/obj/item/clothing/glasses/hud/health, +/obj/item/clothing/glasses/hud/health, +/obj/item/clothing/glasses/hud/health, +/turf/open/floor/monotile/steel, /area/medical/surgery) "aUL" = ( /obj/structure/table/glass, @@ -17826,10 +17279,6 @@ /turf/open/floor/monotile/dark, /area/medical/virology) "aUN" = ( -/obj/machinery/computer/pandemic{ - layer = 2.5; - pixel_x = -2 - }, /obj/machinery/camera/autoname{ dir = 4 }, @@ -17879,7 +17328,7 @@ /turf/open/floor/monotile/dark, /area/medical/virology) "aUS" = ( -/turf/closed/wall/ship, +/turf/open/space/basic, /area/medical/virology) "aUT" = ( /obj/effect/turf_decal/stripes/line, @@ -17919,10 +17368,6 @@ }, /turf/open/floor/monotile/dark, /area/medical/virology) -"aUW" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/monotile/steel, -/area/medical/morgue) "aUZ" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -18167,12 +17612,18 @@ /turf/open/floor/monotile/dark, /area/tcommsat/computer) "aVy" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ +/obj/structure/closet/secure_closet/medical3, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/machinery/light{ + dir = 4 + }, /turf/open/floor/monotile/steel, -/area/medical/morgue) +/area/medical/surgery) "aVz" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -18268,9 +17719,12 @@ /turf/open/floor/monotile/steel, /area/medical/medbay/central) "aVM" = ( -/obj/structure/closet/secure_closet/medical1, -/turf/open/floor/monotile/steel, -/area/medical/medbay/lobby) +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/open/floor/monotile/light, +/area/medical/genetics) "aVN" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -18312,10 +17766,6 @@ /area/crew_quarters/cafeteria{ name = "Mess hall" }) -"aVQ" = ( -/obj/effect/landmark/nuclear_waste_spawner, -/turf/open/floor/monotile/steel, -/area/medical/medbay/lobby) "aVR" = ( /obj/structure/table/reinforced, /obj/machinery/door/poddoor/shutters/ship/preopen{ @@ -19116,19 +18566,13 @@ /turf/open/floor/monotile/dark, /area/tcommsat/computer) "aXw" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, /obj/machinery/light{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 6 +/obj/structure/cable{ + icon_state = "2-8" }, -/turf/open/floor/plating, +/turf/open/space/basic, /area/maintenance/department/medical) "aXy" = ( /obj/effect/turf_decal/delivery, @@ -19240,13 +18684,8 @@ /turf/open/floor/monotile/steel, /area/security/brig) "aXN" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating, +/obj/structure/disposalpipe/segment, +/turf/open/floor/monotile/dark, /area/maintenance/department/medical) "aXO" = ( /obj/effect/spawner/structure/window/reinforced, @@ -19593,15 +19032,6 @@ /obj/effect/spawner/structure/window/reinforced/ship, /turf/open/floor/plating, /area/maintenance/department/cargo) -"aYJ" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/junction{ - dir = 4 - }, -/turf/open/floor/monotile/steel, -/area/medical/medbay/central) "aYK" = ( /obj/structure/cable{ icon_state = "1-2" @@ -19708,51 +19138,28 @@ /area/maintenance/starboard/secondary{ name = "Munitions Projects" }) -"aYZ" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/disposalpipe/sorting/mail{ - dir = 4; - sortType = 10 - }, -/turf/open/floor/monotile/steel, -/area/medical/medbay/central) "aZa" = ( /turf/closed/wall/r_wall/ship, /area/maintenance/department/medical) "aZb" = ( -/obj/structure/closet/secure_closet/personal/patient, -/obj/machinery/power/apc/auto_name/north{ - pixel_y = 24 - }, -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -24 - }, -/turf/open/floor/carpet/ship, -/area/medical/exam_room) +/obj/structure/closet/secure_closet/medical3, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/monotile/steel, +/area/medical/medbay/central) "aZc" = ( -/obj/structure/cable{ - icon_state = "1-8" +/obj/machinery/light{ + dir = 8 }, -/obj/structure/cable{ - icon_state = "4-8" +/mob/living/simple_animal/bot/cleanbot{ + name = "Scrubs, MD"; + trash = 1 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +/obj/effect/turf_decal/tile/blue{ dir = 4 }, -/turf/open/floor/carpet/ship, -/area/medical/exam_room) +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/monotile/steel, +/area/medical/medbay/central) "aZd" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/airlock/ship/security/glass{ @@ -19782,10 +19189,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/disposalpipe/sorting/mail{ - dir = 4; - sortType = 23 - }, /turf/open/floor/monotile/dark, /area/medical/medbay/central) "aZh" = ( @@ -19801,18 +19204,18 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/monotile/steel, /area/medical/medbay/central) "aZj" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, /turf/open/floor/plating, /area/maintenance/port) "aZk" = ( @@ -20106,22 +19509,8 @@ /turf/open/floor/plating, /area/maintenance/department/medical) "aZM" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/turf/open/floor/monotile/dark, -/area/medical/medbay/central) -"aZN" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/machinery/computer/operating{ + dir = 1 }, /turf/open/floor/monotile/dark, /area/medical/medbay/central) @@ -20145,18 +19534,6 @@ /obj/effect/turf_decal/ship/delivery/yellow, /turf/open/floor/monotile/dark, /area/hallway/nsv/deck2/frame1/central) -"aZT" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/monotile/dark, -/area/medical/medbay/central) "aZV" = ( /obj/structure/cable{ icon_state = "2-8" @@ -20177,7 +19554,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/turf/open/floor/monotile/dark, +/turf/open/floor/monotile/steel, /area/medical/medbay/central) "aZZ" = ( /obj/structure/cable{ @@ -20448,22 +19825,16 @@ /turf/open/floor/monotile/steel, /area/nsv/weapons/fore) "bay" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 + dir = 5 }, -/obj/structure/cable{ - icon_state = "2-4" +/obj/structure/disposalpipe/junction/yjunction{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 + dir = 5 }, -/turf/open/floor/monotile/dark, +/turf/open/floor/plating, /area/hallway/nsv/deck2/frame1/central) "baz" = ( /obj/structure/disposalpipe/segment, @@ -20489,24 +19860,20 @@ /turf/open/floor/plating, /area/maintenance/department/medical) "baF" = ( -/obj/machinery/door/airlock/ship/maintenance{ - name = "Medbay maintenance"; - req_one_access_txt = "5" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/door/firedoor/border_only{ +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/green{ dir = 8 }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/department/medical) +/obj/structure/disposalpipe/segment, +/turf/open/floor/monotile/steel, +/area/hallway/nsv/deck2/frame1/port) "baG" = ( -/obj/structure/disposalpipe/junction{ - dir = 4 +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/structure/disposalpipe/sorting/mail{ + dir = 4; + sortType = 15 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -20515,9 +19882,9 @@ dir = 1 }, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "1-4" }, -/turf/open/floor/monotile/dark, +/turf/open/floor/plating, /area/hallway/nsv/deck2/frame1/central) "baH" = ( /obj/effect/turf_decal/tile/neutral, @@ -20610,60 +19977,56 @@ /turf/open/floor/monotile/dark, /area/medical/medbay/central) "baS" = ( -/obj/machinery/door/airlock/ship/public/glass{ - name = "Patient rooms" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/turf/open/floor/monotile/dark, +/area/medical/medbay/central) +"baT" = ( +/obj/machinery/airalarm/directional/east, +/obj/machinery/computer/cloning{ dir = 8 }, -/obj/machinery/door/firedoor/border_only{ +/obj/machinery/light{ dir = 4 }, -/obj/machinery/door/firedoor/border_only{ +/obj/machinery/camera/autoname{ dir = 8 }, -/turf/open/floor/monotile/steel, +/turf/open/floor/engine, /area/medical/medbay/central) -"baT" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ +"baU" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ dir = 1 }, -/turf/open/floor/monotile/steel, +/turf/open/floor/monotile/light, /area/medical/medbay/central) -"baU" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating, -/area/medical/genetics) "baV" = ( -/obj/machinery/door/airlock/ship/maintenance{ - name = "Hangar maintenance" - }, -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, -/turf/open/floor/monotile/steel, -/area/maintenance/port) -"baW" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plating, +/area/maintenance/port) +"baW" = ( +/obj/item/storage/backpack/duffelbag/med/surgery, +/obj/structure/table/glass, +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, -/turf/open/floor/monotile/steel, +/obj/machinery/light, +/turf/open/floor/monotile/dark, /area/medical/medbay/central) "baX" = ( /obj/effect/spawner/structure/window/reinforced, @@ -20675,12 +20038,12 @@ name = "Intensive care unit" }) "baY" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/turf/open/floor/monotile/dark, +/obj/structure/disposalpipe/segment, +/turf/open/floor/monotile/steel, /area/medical/medbay/central) "baZ" = ( /obj/effect/turf_decal/stripes/line{ @@ -20690,28 +20053,11 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/monotile/dark, /area/nsv/hanger/deck2) -"bba" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/turf/open/floor/monotile/steel, -/area/medical/morgue) "bbb" = ( -/obj/machinery/door/airlock/ship/public/glass{ - name = "Morgue" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/turf/open/floor/monotile/light, -/area/medical/morgue) +/obj/machinery/light, +/obj/structure/table/wood, +/turf/open/floor/monotile/steel, +/area/medical/medbay/central) "bbc" = ( /obj/structure/cable{ icon_state = "1-2" @@ -20735,19 +20081,6 @@ /obj/machinery/light/small, /turf/open/floor/plasteel/tech/grid, /area/nsv/weapons/fore) -"bbe" = ( -/obj/structure/closet/wardrobe/white, -/obj/machinery/power/apc/auto_name/north{ - pixel_y = 24 - }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/structure/extinguisher_cabinet{ - pixel_x = -27 - }, -/turf/open/floor/engine, -/area/medical/medbay/lobby) "bbg" = ( /obj/machinery/dna_scannernew, /obj/structure/cable{ @@ -20755,19 +20088,6 @@ }, /turf/open/floor/monotile/light, /area/medical/genetics) -"bbh" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/mob/living/simple_animal/bot/cleanbot{ - name = "Scrubs, MD"; - trash = 1 - }, -/turf/open/floor/monotile/steel, -/area/medical/medbay/lobby) "bbi" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -20780,12 +20100,6 @@ }, /turf/open/floor/monotile/dark, /area/crew_quarters/theatre) -"bbj" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/open/floor/monotile/light, -/area/medical/genetics) "bbl" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -20797,15 +20111,7 @@ /turf/open/floor/monotile/dark, /area/crew_quarters/theatre) "bbm" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, +/obj/machinery/light, /turf/open/floor/monotile/dark, /area/medical/medbay/central) "bbn" = ( @@ -20827,19 +20133,16 @@ /turf/open/floor/plating, /area/maintenance/central) "bbp" = ( -/obj/effect/spawner/structure/window/reinforced, /obj/structure/disposalpipe/segment, -/turf/open/floor/plating, -/area/medical/medbay/lobby) +/turf/open/floor/monotile/light, +/area/medical/medbay/central) "bbq" = ( -/obj/machinery/camera/autoname, -/turf/open/floor/monotile/steel, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/monotile/dark, /area/medical/medbay/central) "bbr" = ( -/obj/structure/disposalpipe/sorting/mail{ - dir = 4; - sortType = 15 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, @@ -20849,7 +20152,17 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/monotile/dark, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/airlock/ship/maintenance, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/turf/open/floor/plating, /area/hallway/nsv/deck2/frame1/central) "bbt" = ( /obj/machinery/vending/assist, @@ -20871,9 +20184,12 @@ /turf/open/floor/plating, /area/maintenance/department/cargo) "bbx" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 4 +/obj/machinery/computer/scan_consolenew, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/light{ + dir = 1 }, /turf/open/floor/monotile/light, /area/medical/medbay/central) @@ -20960,7 +20276,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/monotile/dark, +/turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) "bbG" = ( /obj/effect/turf_decal/tile/neutral, @@ -20975,19 +20291,8 @@ /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) "bbH" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/sign/departments/medbay/alt{ - name = "\improper INTENSIVE CARE UNIT"; - pixel_y = 26 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, +/obj/machinery/camera/autoname, +/obj/machinery/computer/scan_consolenew, /turf/open/floor/monotile/light, /area/medical/medbay/central) "bbJ" = ( @@ -21151,10 +20456,8 @@ /turf/open/floor/plasteel/freezer, /area/crew_quarters/kitchen/coldroom) "bbW" = ( -/obj/structure/disposalpipe/junction{ - dir = 4 - }, -/turf/open/floor/monotile/steel, +/obj/machinery/vending/wardrobe/gene_wardrobe, +/turf/open/floor/monotile/light, /area/medical/medbay/central) "bbX" = ( /obj/structure/kitchenspike, @@ -21195,15 +20498,12 @@ /turf/open/floor/monotile/dark, /area/hallway/nsv/deck2/frame1/central) "bcb" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/junction, -/obj/effect/turf_decal/tile/orange{ - dir = 8 +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 }, -/obj/effect/turf_decal/tile/orange, -/turf/open/floor/monotile/steel, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plating, /area/hallway/nsv/deck2/frame1/central) "bcc" = ( /obj/machinery/smartfridge/drying_rack, @@ -21255,6 +20555,10 @@ id = "tycoon_munitions"; next_id = "tycoon_dorms" }, +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=loc12"; + location = "loc11" + }, /turf/open/floor/monotile/dark, /area/hallway/nsv/deck2/frame1/central) "bcg" = ( @@ -21317,30 +20621,29 @@ /turf/open/floor/monotile/steel, /area/crew_quarters/theatre) "bcm" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 }, -/obj/structure/cable{ - icon_state = "2-4" +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating, -/area/maintenance/department/medical) +/obj/machinery/door/airlock/ship/public/glass{ + name = "Cryogenics"; + req_one_access_txt = "5" + }, +/obj/effect/landmark/zebra_interlock_point, +/turf/open/floor/monotile/light, +/area/medical/genetics) "bcn" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/fore) "bco" = ( -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/structure/chair{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /turf/open/floor/monotile/dark, /area/medical/medbay/central) "bcq" = ( @@ -21642,28 +20945,20 @@ /turf/open/floor/monotile/dark, /area/medical/medbay/central) "bcT" = ( -/obj/machinery/stasis, -/obj/structure/disposalpipe/segment, -/turf/open/floor/monotile/steel, +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/computer/ship/viewscreen, +/turf/open/floor/monotile/light, /area/medical/medbay/lobby) "bcU" = ( -/obj/machinery/stasis, -/turf/open/floor/monotile/steel, -/area/medical/medbay/lobby) +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/monotile/light, +/area/medical/medbay/central) "bcV" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/obj/effect/turf_decal/tile/orange{ - dir = 4 - }, -/obj/effect/turf_decal/tile/orange{ - dir = 1 - }, -/turf/open/floor/monotile/steel, +/obj/structure/disposalpipe/segment, +/obj/machinery/portable_atmospherics/canister/air, +/turf/open/floor/plating, /area/hallway/nsv/deck2/frame1/central) "bcW" = ( /obj/effect/turf_decal/stripes/line, @@ -21677,23 +20972,12 @@ /turf/open/floor/plasteel/grid/steel, /area/quartermaster/storage) "bcX" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/tile/orange{ - dir = 4 - }, -/obj/effect/turf_decal/tile/orange{ - dir = 1 +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/open/floor/monotile/steel, +/turf/open/floor/plating, /area/hallway/nsv/deck2/frame1/central) "bcY" = ( /obj/effect/turf_decal/stripes/line{ @@ -21756,18 +21040,6 @@ }, /turf/open/floor/monotile/steel, /area/hallway/secondary/exit) -"bdc" = ( -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/obj/effect/turf_decal/tile/orange{ - dir = 4 - }, -/obj/effect/turf_decal/tile/orange{ - dir = 1 - }, -/turf/open/floor/monotile/steel, -/area/hallway/nsv/deck2/frame1/central) "bdd" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -21818,11 +21090,8 @@ /area/quartermaster/storage) "bdh" = ( /obj/machinery/holopad, -/obj/effect/landmark/patrol_node{ - id = "tycoon_med"; - next_id = "tycoon_munitions" - }, -/turf/open/floor/monotile/steel, +/obj/structure/table/reinforced, +/turf/open/floor/monotile/light, /area/medical/medbay/lobby) "bdi" = ( /obj/effect/turf_decal/tile/purple{ @@ -22045,20 +21314,24 @@ /turf/open/floor/monotile/steel, /area/science) "bdB" = ( -/obj/machinery/firealarm{ - pixel_y = 24 +/obj/machinery/door/airlock/ship/public/glass{ + name = "Medbay Fabrication" }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/door/poddoor/shutters/ship/preopen{ + dir = 4; + id = "medical_traitor_murder_hole" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/floor/monotile/steel, -/area/medical/medbay/lobby) +/turf/open/floor/carpet/ship, +/area/medical/medbay/central) "bdC" = ( /obj/machinery/atmospherics/pipe/multiz/layer4{ dir = 1 @@ -22351,23 +21624,13 @@ }, /turf/open/floor/monotile/steel, /area/crew_quarters/heads/hos) -"beb" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/turf/open/floor/monotile/dark, -/area/medical/medbay/lobby) "bed" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible, -/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/machinery/portable_atmospherics/canister/oxygen{ + name = "Cryotube o2 canister" + }, /turf/open/floor/monotile/dark, -/area/medical/medbay/lobby) +/area/medical/medbay/central) "bef" = ( /obj/structure/cable{ icon_state = "1-2" @@ -22678,28 +21941,13 @@ /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) "beH" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/glass/beaker/cryoxadone, -/obj/structure/disposalpipe/segment, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = -2; - pixel_y = 9 - }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = 5; - pixel_y = 9 - }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = 6; - pixel_y = 2 - }, -/obj/item/reagent_containers/syringe/epinephrine{ - pixel_x = 3; - pixel_y = -2 +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, -/obj/item/reagent_containers/dropper, -/turf/open/floor/engine, -/area/medical/medbay/lobby) +/obj/structure/disposalpipe/segment, +/turf/open/floor/monotile/light, +/area/medical/medbay/central) "beI" = ( /obj/machinery/computer/crew, /obj/structure/cable{ @@ -22918,22 +22166,10 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/manifold/general/visible{ dir = 8 }, /turf/open/floor/monotile/dark, -/area/medical/medbay/lobby) -"bfg" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/monotile/dark, /area/medical/medbay/central) "bfi" = ( /obj/structure/table/glass, @@ -22970,6 +22206,9 @@ dir = 1; pixel_y = -26 }, +/obj/structure/cable{ + icon_state = "1-8" + }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/cmo) "bfl" = ( @@ -22999,13 +22238,12 @@ /turf/open/floor/monotile/steel, /area/security/brig) "bfn" = ( -/obj/effect/turf_decal/stripes/white/line, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/effect/turf_decal/tile/blue{ dir = 4 }, /obj/structure/disposalpipe/segment, -/turf/open/floor/engine, -/area/medical/medbay/lobby) +/turf/open/floor/monotile/light, +/area/medical/medbay/central) "bfo" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -23058,59 +22296,47 @@ /obj/machinery/airalarm{ pixel_y = 26 }, -/obj/effect/turf_decal/tile/orange{ - dir = 8 +/obj/item/radio/intercom{ + pixel_y = -2; + pixel_x = -34 }, -/obj/effect/turf_decal/tile/orange, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) "bfu" = ( -/obj/machinery/airalarm{ - dir = 1; - pixel_y = -22 +/obj/machinery/atmospherics/pipe/simple/general/hidden{ + dir = 9 }, /turf/open/floor/monotile/light, -/area/medical/genetics) +/area/medical/medbay/central) "bfv" = ( -/obj/machinery/iv_drip, -/obj/machinery/airalarm{ - pixel_y = 26 - }, -/turf/open/floor/monotile/steel, -/area/medical/surgery) +/turf/open/space/basic, +/area/maintenance/department/medical) "bfw" = ( -/obj/effect/turf_decal/loading_area{ +/obj/machinery/door/airlock/ship/public/glass{ + name = "Surgery"; + req_one_access_txt = "5" + }, +/obj/machinery/door/firedoor/border_only{ dir = 8 }, -/obj/machinery/airalarm{ - pixel_y = 26 +/obj/machinery/door/firedoor/border_only{ + dir = 4 }, /turf/open/floor/monotile/dark, -/area/medical/morgue) +/area/medical/medbay/central) "bfx" = ( -/obj/item/clothing/suit/toggle/labcoat/paramedic, -/obj/item/clothing/suit/toggle/labcoat/paramedic, -/obj/item/clothing/head/soft/paramedic, -/obj/item/clothing/head/soft/paramedic, -/obj/structure/rack, -/obj/item/defibrillator/loaded, -/obj/item/clothing/suit/toggle/labcoat/paramedic, -/obj/machinery/airalarm{ - pixel_y = 26 - }, -/obj/item/roller, -/turf/open/floor/carpet/ship, +/turf/open/space/basic, /area/medical/medbay/zone2{ name = "Intensive care unit" }) "bfy" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/airalarm{ - pixel_y = 26 +/obj/item/storage/backpack/duffelbag/med/surgery, +/obj/structure/table/glass, +/obj/item/book/manual/wiki/surgery, +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, -/turf/open/floor/monotile/steel, +/turf/open/floor/monotile/dark, /area/medical/medbay/central) "bfz" = ( /obj/effect/turf_decal/tile/neutral{ @@ -23675,11 +22901,16 @@ /turf/open/floor/monotile/steel, /area/nsv/hanger/deck2) "bgG" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/camera/autoname{ +/obj/machinery/shower{ dir = 8 }, -/turf/open/floor/monotile/steel, +/obj/machinery/door/window/westleft{ + name = "Cloning Shower" + }, +/obj/structure/mirror{ + pixel_x = 32 + }, +/turf/open/floor/engine, /area/medical/medbay/central) "bgI" = ( /obj/structure/cable{ @@ -23717,10 +22948,15 @@ /turf/open/floor/monotile/dark, /area/nsv/weapons/fore) "bgO" = ( -/obj/structure/disposalpipe/segment, /obj/effect/landmark/start/paramedic, +/obj/machinery/atmospherics/pipe/simple/general/hidden{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/monotile/light, -/area/medical/medbay/lobby) +/area/medical/medbay/central) "bgP" = ( /obj/machinery/light{ dir = 8 @@ -23795,16 +23031,9 @@ /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) "bgZ" = ( -/obj/structure/table/reinforced, -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/fax{ - fax_name = "Medical"; - name = "Medical Cryo Fax Machine" - }, -/turf/open/floor/engine, -/area/medical/medbay/lobby) +/obj/structure/bodycontainer/morgue, +/turf/open/floor/monotile/dark, +/area/maintenance/department/medical) "bha" = ( /obj/structure/cable{ icon_state = "4-8" @@ -23833,26 +23062,16 @@ }, /turf/open/floor/monotile/light, /area/medical/medbay/lobby) -"bhc" = ( -/obj/structure/chair/office{ - dir = 4 - }, -/obj/machinery/light{ - dir = 1 - }, -/turf/open/floor/carpet/blue, -/area/medical/medbay/lobby) "bhd" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 1 +/obj/structure/table/glass, +/obj/item/reagent_containers/glass/beaker/cryoxadone{ + pixel_x = 5; + pixel_y = 9 }, -/obj/machinery/camera/autoname, +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/glass/beaker/cryoxadone, /turf/open/floor/monotile/light, -/area/medical/genetics) +/area/medical/medbay/central) "bhe" = ( /obj/effect/turf_decal/tile/red{ dir = 8 @@ -23867,43 +23086,30 @@ /turf/open/floor/monotile/steel, /area/security/brig) "bhf" = ( -/obj/structure/table/reinforced, -/obj/item/storage/backpack/duffelbag/med/surgery, -/obj/item/storage/box/bodybags, -/obj/machinery/light, -/turf/open/floor/monotile/dark, -/area/medical/morgue) -"bhg" = ( -/obj/machinery/light, -/turf/open/floor/monotile/steel, +/obj/effect/turf_decal/tile/blue, +/obj/structure/disposalpipe/segment, +/turf/open/floor/monotile/light, /area/medical/medbay/central) "bhh" = ( -/obj/machinery/light, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/sign/departments/medbay/alt{ + name = "\improper INTENSIVE CARE UNIT"; + pixel_y = 26 + }, /turf/open/floor/monotile/dark, /area/medical/surgery) "bhi" = ( -/obj/item/storage/backpack/duffelbag/med/surgery, -/obj/structure/table/glass, -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/machinery/requests_console{ + department = "Surgery"; + departmentType = 1; + name = "Medbay RC"; + payment_department = "MED"; + pixel_y = -30 }, -/obj/machinery/light, /turf/open/floor/monotile/dark, -/area/medical/surgery) -"bhj" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/monotile/steel, /area/medical/medbay/central) "bhk" = ( /obj/structure/window/reinforced, @@ -24129,15 +23335,6 @@ }, /turf/open/floor/carpet/ship, /area/crew_quarters/dorms/nsv/dorms_2) -"bhK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/monotile/light, -/area/medical/medbay/lobby) "bhO" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -24188,29 +23385,19 @@ /turf/open/floor/monotile/steel, /area/security/brig) "bhT" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/machinery/airalarm{ + dir = 1; + pixel_y = -22 }, /turf/open/floor/monotile/light, -/area/medical/medbay/lobby) +/area/medical/medbay/central) "bhU" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/manifold/general/hidden, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/engine, -/area/medical/medbay/lobby) +/turf/open/floor/monotile/light, +/area/medical/medbay/central) "bhW" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -24375,29 +23562,33 @@ /turf/open/floor/plasteel/techmaint, /area/janitor) "bim" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/effect/turf_decal/loading_area{ + dir = 8 }, -/obj/machinery/light{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 6 }, -/turf/open/floor/monotile/steel, -/area/medical/medbay/central) +/turf/open/floor/monotile/dark, +/area/maintenance/department/medical) "bin" = ( -/obj/structure/chair/office, -/obj/machinery/firealarm{ - pixel_y = 24 - }, /obj/machinery/light{ dir = 8 }, -/turf/open/floor/carpet/blue, +/obj/structure/chair{ + dir = 4 + }, +/turf/open/floor/monotile/light, /area/medical/medbay/lobby) "bio" = ( -/obj/machinery/light{ - dir = 1 +/obj/structure/table/glass, +/obj/item/storage/bag/tray{ + desc = "A metal tray to lay bits on."; + name = "surgical tray" }, -/turf/open/floor/monotile/steel, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/monotile/dark, /area/medical/medbay/central) "bip" = ( /turf/open/floor/monotile/dark, @@ -24625,10 +23816,6 @@ /obj/machinery/status_display/evac{ pixel_y = 26 }, -/obj/effect/turf_decal/tile/orange{ - dir = 8 - }, -/obj/effect/turf_decal/tile/orange, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) "biP" = ( @@ -24935,17 +24122,10 @@ /turf/open/floor/plasteel/techmaint, /area/medical/chemistry) "bjt" = ( -/obj/item/radio/intercom{ - pixel_y = 26 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/turf_decal/tile/orange{ - dir = 8 +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/effect/turf_decal/tile/orange, -/turf/open/floor/monotile/steel, +/turf/open/floor/plating, /area/hallway/nsv/deck2/frame1/central) "bju" = ( /obj/machinery/light{ @@ -24954,20 +24134,11 @@ /turf/open/floor/plasteel/techmaint, /area/janitor) "bjw" = ( -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 }, -/turf/open/floor/monotile/steel, -/area/medical/medbay/lobby) +/turf/open/floor/monotile/dark, +/area/medical/medbay/central) "bjx" = ( /obj/item/radio/intercom{ pixel_x = 26 @@ -25476,16 +24647,19 @@ /turf/open/floor/plating, /area/maintenance/department/medical) "bkC" = ( -/obj/machinery/stasis, +/obj/structure/window/reinforced{ + dir = 4; + layer = 2.9 + }, +/obj/structure/table/reinforced, /turf/open/floor/monotile/light, -/area/medical/medbay/lobby) +/area/medical/medbay/central) "bkD" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 1 +/obj/structure/table/optable{ + name = "autopsy table" }, -/turf/open/floor/engine, -/area/medical/medbay/lobby) +/turf/open/floor/monotile/dark, +/area/medical/medbay/central) "bkE" = ( /obj/effect/turf_decal/tile/brown{ dir = 8 @@ -25556,18 +24730,10 @@ /turf/open/floor/monotile/steel, /area/security/brig) "bkK" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/monotile/light, -/area/medical/medbay/lobby) +/obj/effect/landmark/event_spawn, +/obj/machinery/dna_scannernew, +/turf/open/floor/engine, +/area/medical/medbay/central) "bkL" = ( /obj/structure/cable{ icon_state = "4-8" @@ -25661,16 +24827,16 @@ /area/chapel/office) "bkS" = ( /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 +/obj/structure/cable{ + icon_state = "2-4" }, -/turf/open/floor/monotile/light, -/area/medical/medbay/lobby) +/turf/open/floor/plating, +/area/maintenance/department/medical) "bkU" = ( /obj/effect/turf_decal/tile/brown{ dir = 1 @@ -25735,26 +24901,39 @@ /turf/open/floor/monotile/dark, /area/security/detectives_office) "blb" = ( -/obj/machinery/door/airlock/ship/command/glass{ - name = "Chief Medical Officer"; - req_one_access_txt = "40" +/obj/machinery/door/airlock/ship/public/glass{ + name = "Surgery"; + req_one_access_txt = "5" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, /obj/machinery/door/firedoor/border_only{ - dir = 1 + dir = 8 }, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/monotile/light, -/area/crew_quarters/heads/cmo) +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/turf/open/floor/monotile/dark, +/area/medical/medbay/central) "blc" = ( /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 5 + }, +/obj/structure/cable{ + icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/monotile/light, /area/crew_quarters/heads/cmo) "bld" = ( @@ -25768,11 +24947,8 @@ /turf/open/floor/monotile/light, /area/crew_quarters/heads/cmo) "ble" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/item/kirbyplants{ - icon_state = "plant-21" +/obj/machinery/firealarm{ + pixel_y = 24 }, /turf/open/floor/monotile/light, /area/medical/medbay/lobby) @@ -26077,21 +25253,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/carpet/red, /area/security/warden) -"blQ" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/turf/open/floor/monotile/light, -/area/medical/medbay/lobby) "blR" = ( /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/disposalpipe/junction{ - dir = 4 - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/structure/disposalpipe/segment, /turf/open/floor/monotile/steel, /area/medical/medbay/central) "blS" = ( @@ -28622,9 +27789,10 @@ /turf/open/floor/carpet/ship, /area/crew_quarters/heads/hor) "bqY" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/port) @@ -29224,10 +28392,8 @@ /turf/open/floor/plating, /area/maintenance/starboard) "bsm" = ( -/obj/structure/disposalpipe/segment{ - dir = 9 - }, /obj/structure/ladder, +/obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/central) "bsn" = ( @@ -30872,138 +30038,54 @@ /turf/open/floor/monotile/dark, /area/hallway/nsv/deck2/frame1/central) "bvk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/sign/departments/medbay/alt{ + name = "\improper INTENSIVE CARE UNIT"; + pixel_y = 26 + }, /turf/open/floor/monotile/light, /area/medical/medbay/lobby) "bvl" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/monotile/light, -/area/medical/medbay/lobby) -"bvm" = ( -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/computer/med_data{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/monotile/steel, +/turf/open/floor/monotile/light, /area/medical/medbay/lobby) "bvn" = ( -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/monotile/steel, -/area/medical/medbay/lobby) +/turf/open/floor/monotile/dark, +/area/maintenance/department/medical) "bvp" = ( -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, +/obj/machinery/disposal/bin, /turf/open/floor/monotile/steel, -/area/medical/medbay/lobby) +/area/medical/medbay/central) "bvq" = ( -/obj/machinery/door/airlock/ship/public/glass{ - name = "Medical Storage"; - req_one_access_txt = "5" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 +/obj/machinery/iv_drip, +/obj/machinery/airalarm{ + pixel_y = 26 }, /turf/open/floor/monotile/steel, /area/medical/medbay/central) "bvr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 +/obj/machinery/defibrillator_mount/loaded{ + pixel_y = 26 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/structure/closet/secure_closet/medical2, /turf/open/floor/monotile/steel, /area/medical/medbay/central) -"bvs" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/extinguisher_cabinet{ - pixel_x = -27 - }, -/turf/open/floor/monotile/steel, -/area/medical/medbay/zone2{ - name = "Intensive care unit" - }) "bvu" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/monotile/steel, -/area/medical/medbay/central) -"bvw" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/holopad, -/turf/open/floor/monotile/dark, -/area/medical/medbay/central) -"bvx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/monotile/dark, /area/medical/medbay/central) -"bvy" = ( -/obj/structure/table/reinforced, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/carpet/ship, +"bvw" = ( +/turf/open/space/basic, /area/medical/medbay/central) "bvA" = ( /obj/structure/disposalpipe/segment, @@ -31035,25 +30117,45 @@ /turf/open/floor/monotile/dark, /area/medical/medbay/central) "bvD" = ( -/obj/structure/cable{ - icon_state = "1-8" +/obj/structure/table/glass, +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/toxin, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 10 +/obj/effect/turf_decal/tile/neutral{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/camera/autoname{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 +/obj/structure/window/reinforced, +/obj/machinery/door/window/eastright{ + name = "First-Aid Supplies"; + red_alert_access = 1; + req_access_txt = "5" }, -/turf/open/floor/monotile/dark, +/obj/item/storage/box/beakers{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/storage/box/bodybags{ + pixel_x = 3; + pixel_y = 3 + }, +/turf/open/floor/monotile/steel, /area/medical/surgery) "bvE" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +/obj/machinery/vending/wardrobe/medi_wardrobe, +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, -/turf/open/floor/monotile/dark, +/turf/open/floor/monotile/steel, /area/medical/surgery) "bvF" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -31099,103 +30201,67 @@ }, /turf/open/floor/monotile/steel, /area/medical/virology) -"bvJ" = ( -/obj/machinery/door/airlock/ship/public/glass{ - name = "Surgery"; - req_one_access_txt = "5" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, +"bvM" = ( /obj/machinery/door/firedoor/border_only{ dir = 8 }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/turf/open/floor/monotile/dark, -/area/medical/surgery) -"bvK" = ( -/obj/structure/table/reinforced, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/machinery/door/airlock/ship/maintenance{ + name = "Medbay maintenance"; + req_one_access_txt = "5" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/turf/open/floor/plating, +/area/maintenance/central) +"bvN" = ( +/obj/structure/cable{ + icon_state = "1-8" }, -/turf/open/floor/carpet/ship, -/area/medical/medbay/central) -"bvL" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/structure/disposalpipe/segment{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/turf/open/floor/monotile/steel, -/area/medical/medbay/central) -"bvM" = ( -/obj/machinery/airalarm/directional/north, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 + dir = 8 }, -/turf/open/floor/carpet/ship, +/turf/open/floor/monotile/dark, /area/medical/medbay/central) -"bvN" = ( -/obj/structure/chair{ +"bvP" = ( +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/turf/open/floor/carpet/ship, -/area/medical/medbay/central) -"bvO" = ( -/obj/item/kirbyplants{ - icon_state = "plant-21" +/obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/ship/command/glass{ + name = "Chief Medical Officer"; + req_one_access_txt = "40" }, -/turf/open/floor/carpet/ship, -/area/medical/medbay/central) -"bvP" = ( -/obj/machinery/light, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/effect/landmark/xeno_spawn, -/turf/open/floor/carpet/ship, -/area/medical/medbay/central) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/monotile/light, +/area/crew_quarters/heads/cmo) "bvQ" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/turf/open/floor/monotile/steel, -/area/medical/medbay/central) -"bvR" = ( -/obj/machinery/computer/ship/viewscreen, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +/obj/structure/chair{ dir = 4 }, -/turf/open/floor/carpet/ship, -/area/medical/medbay/central) +/turf/open/floor/monotile/light, +/area/medical/medbay/lobby) "bvS" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 +/obj/effect/turf_decal/tile/blue{ + dir = 8 }, -/turf/open/floor/monotile/dark, -/area/medical/morgue) +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/general/hidden, +/turf/open/floor/monotile/light, +/area/medical/medbay/central) "bvT" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -31205,145 +30271,93 @@ /turf/open/floor/monotile/steel, /area/medical/medbay/central) "bvU" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/general/hidden{ + dir = 9 }, -/turf/open/floor/monotile/steel, -/area/medical/morgue) -"bvV" = ( -/obj/effect/spawner/structure/window/reinforced, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/turf/open/floor/monotile/light, +/area/medical/genetics) +"bvV" = ( +/obj/structure/table/optable, +/obj/machinery/camera/autoname{ dir = 8 }, -/turf/open/floor/plating, -/area/medical/morgue) -"bvX" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/monotile/dark, -/area/medical/medbay/lobby) -"bvZ" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 +/area/medical/medbay/central) +"bvX" = ( +/obj/machinery/stasis, +/obj/machinery/defibrillator_mount/loaded{ + pixel_y = -5; + pixel_x = -31 }, -/turf/open/floor/monotile/dark, +/turf/open/floor/monotile/light, /area/medical/medbay/central) -"bwa" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 +"bvZ" = ( +/obj/effect/turf_decal/loading_area{ + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/monotile/light, -/area/crew_quarters/heads/cmo) +/turf/open/floor/monotile/dark, +/area/medical/medbay/central) "bwb" = ( /obj/structure/table/reinforced, /obj/item/storage/firstaid/regular, /obj/machinery/camera/autoname{ dir = 1 }, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/open/floor/monotile/light, -/area/medical/medbay/lobby) +/area/medical/medbay/central) "bwc" = ( /obj/structure/chair/office, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/structure/cable{ - icon_state = "1-2" - }, /turf/open/floor/monotile/light, /area/crew_quarters/heads/cmo) -"bwe" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/engine, -/area/medical/medbay/lobby) "bwf" = ( -/obj/machinery/door/airlock/ship/public/glass{ - name = "Cryogenics"; - req_one_access_txt = "5" - }, /obj/effect/mapping_helpers/airlock/unres{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, -/turf/open/floor/monotile/light, -/area/medical/medbay/lobby) -"bwg" = ( /obj/machinery/door/airlock/ship/public/glass{ - name = "Reception"; + name = "Cryogenics"; req_one_access_txt = "5" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/monotile/light, /area/medical/medbay/lobby) "bwh" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 +/obj/effect/turf_decal/tile/orange{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/carpet/blue, -/area/medical/medbay/lobby) +/turf/open/floor/monotile/steel, +/area/hallway/nsv/deck2/frame1/central) "bwi" = ( -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/open/floor/engine, -/area/medical/medbay/lobby) -"bwj" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/turf/open/floor/monotile/light, -/area/medical/genetics) +/turf/open/floor/monotile/steel, +/area/hallway/nsv/deck2/frame1/central) "bwk" = ( /obj/structure/chair/stool, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -31353,46 +30367,22 @@ /turf/open/floor/monotile/dark, /area/security/brig) "bwl" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=4"; + location = "Medbay"; + name = "navigation beacon (Medbay Delivery)" }, +/obj/effect/turf_decal/bot, /turf/open/floor/monotile/light, /area/medical/medbay/lobby) "bwm" = ( -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/obj/effect/turf_decal/tile/green, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/monotile/steel, -/area/medical/medbay/lobby) -"bwn" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, -/turf/open/floor/monotile/steel, -/area/medical/medbay/lobby) +/obj/effect/landmark/event_spawn, +/turf/open/floor/plating, +/area/maintenance/department/medical) "bwo" = ( -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ +/obj/structure/chair/office{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/monotile/steel, /area/medical/medbay/lobby) "bwq" = ( @@ -31401,12 +30391,20 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) "bwr" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/monotile/steel, -/area/medical/medbay/lobby) +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/airlock/ship/public/glass{ + name = "Reception"; + req_one_access_txt = "5" + }, +/turf/open/floor/plating, +/area/medical/genetics) "bws" = ( /obj/effect/turf_decal/tile/green, /obj/effect/turf_decal/tile/green{ @@ -32694,12 +31692,6 @@ /obj/structure/chair/office{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/effect/landmark/start/chief_medical_officer, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/cmo) @@ -33074,12 +32066,10 @@ /turf/open/space/basic, /area/engine/engineering/reactor_core) "bzM" = ( -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ - dir = 8 +/obj/machinery/computer/crew{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/monotile/steel, +/turf/open/floor/monotile/light, /area/medical/medbay/lobby) "bzN" = ( /obj/effect/turf_decal/tile/neutral{ @@ -33191,7 +32181,18 @@ /turf/open/floor/monotile/dark, /area/science/xenobiology) "bzX" = ( -/obj/effect/landmark/nuclear_waste_spawner, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/monotile/steel, /area/medical/surgery) "bzY" = ( @@ -33730,27 +32731,25 @@ /turf/open/floor/monotile/steel, /area/nsv/hanger/deck2) "bBi" = ( -/obj/effect/turf_decal/tile/green{ +/obj/machinery/light{ dir = 4 }, -/obj/effect/turf_decal/tile/green, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 +/obj/item/radio/intercom{ + pixel_x = 26 }, +/obj/structure/table/reinforced, +/obj/item/reagent_containers/food/drinks/solgovcup, /turf/open/floor/monotile/steel, /area/medical/medbay/lobby) "bBj" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 +/obj/machinery/requests_console{ + department = "Genetics"; + name = "Genetics Requests Console"; + payment_department = "MED"; + pixel_y = 29 }, -/turf/open/floor/monotile/dark, +/obj/machinery/dna_scannernew, +/turf/open/floor/monotile/light, /area/medical/medbay/central) "bBk" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -34221,14 +33220,14 @@ /turf/open/floor/monotile/dark, /area/shuttle/turbolift/secondary) "bCh" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 +/obj/machinery/door/airlock/ship/public/glass{ + name = "Cryogenics"; + req_one_access_txt = "5" }, -/turf/open/floor/monotile/dark, -/area/medical/morgue) +/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment, +/turf/open/floor/monotile/light, +/area/medical/medbay/central) "bCi" = ( /obj/machinery/camera/autoname{ dir = 4 @@ -34266,8 +33265,15 @@ /turf/open/floor/monotile/steel, /area/medical/medbay/central) "bCl" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -34278,12 +33284,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/turf/open/floor/monotile/dark, -/area/medical/medbay/central) +/turf/open/floor/monotile/steel, +/area/medical/surgery) "bCm" = ( -/obj/structure/disposalpipe/junction/flip{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 }, @@ -34322,33 +33325,63 @@ /obj/machinery/power/apc/auto_name/south{ pixel_y = -24 }, -/obj/structure/cable, +/obj/structure/cable{ + icon_state = "0-4" + }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/cmo) "bCr" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/turf/open/floor/monotile/light, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 + }, +/obj/machinery/door/airlock/ship/public/glass{ + name = "Cloning Lab"; + req_access_txt = "5; 68" + }, +/obj/machinery/atmospherics/pipe/simple/general/hidden{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plasteel/white, /area/medical/genetics) "bCs" = ( -/obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/monotile/light, -/area/medical/medbay/lobby) +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/closet/firecloset, +/obj/item/storage/toolbox/emergency, +/turf/open/floor/plating, +/area/maintenance/port) "bCt" = ( /obj/structure/lattice, /turf/open/space, /area/space/nearstation) "bCu" = ( -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ +/obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/machinery/camera/autoname, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/monotile/steel, -/area/hallway/nsv/deck2/frame1/port) +/area/medical/surgery) "bCv" = ( /obj/structure/cable{ icon_state = "4-8" @@ -35179,19 +34212,6 @@ /obj/machinery/door/airlock/turbolift/ship, /turf/open/floor/monotile/dark, /area/shuttle/turbolift/shaft) -"bDZ" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/turf/open/floor/monotile/dark, -/area/hallway/nsv/deck2/frame1/port) "bEa" = ( /obj/structure/cable{ icon_state = "4-8" @@ -35200,9 +34220,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /turf/open/floor/monotile/dark, /area/hallway/nsv/deck2/frame1/port) "bEb" = ( @@ -35268,22 +34286,6 @@ }, /turf/open/floor/monotile/dark, /area/hallway/nsv/deck2/frame1/central) -"bEf" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/turf/open/floor/monotile/dark, -/area/hallway/nsv/deck2/frame1/central) "bEg" = ( /obj/machinery/computer/security/hos{ dir = 4 @@ -36082,13 +35084,6 @@ /obj/structure/lattice/catwalk, /turf/open/space, /area/engine/atmos) -"bFy" = ( -/obj/structure/chair{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/monotile/light, -/area/medical/medbay/lobby) "bFz" = ( /obj/machinery/status_display/evac{ pixel_x = 32 @@ -36105,6 +35100,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/central) "bFC" = ( @@ -36117,43 +35113,23 @@ /turf/open/floor/plating, /area/maintenance/central) "bFE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/plating, -/area/maintenance/central) -"bFF" = ( /obj/structure/cable{ - icon_state = "1-2" + icon_state = "2-4" + }, +/obj/structure/disposalpipe/segment{ + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/plating, /area/maintenance/central) -"bFG" = ( -/obj/machinery/door/airlock/ship/maintenance, +"bFF" = ( /obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/border_only{ - dir = 1 + icon_state = "1-8" }, -/obj/machinery/door/firedoor/border_only, /turf/open/floor/plating, /area/maintenance/central) -"bFH" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/monotile/steel, -/area/hallway/nsv/deck2/frame1/central) "bFI" = ( /obj/structure/cable{ icon_state = "4-8" @@ -36177,14 +35153,6 @@ /obj/effect/turf_decal/stripes/corner, /turf/open/floor/monotile/steel, /area/engine/engineering) -"bFL" = ( -/obj/structure/sign/departments/medbay/alt{ - name = "\improper INTENSIVE CARE UNIT"; - pixel_y = 26 - }, -/obj/structure/bed/roller, -/turf/open/floor/monotile/light, -/area/medical/medbay/lobby) "bFM" = ( /turf/open/floor/circuit/green/telecomms/mainframe, /area/tcommsat/server) @@ -36253,6 +35221,9 @@ dir = 4; pixel_x = -22 }, +/obj/structure/chair{ + dir = 4 + }, /turf/open/floor/monotile/light, /area/medical/medbay/lobby) "bFW" = ( @@ -36366,16 +35337,13 @@ /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame2/port) "bGk" = ( -/obj/machinery/door/airlock/ship/maintenance{ - name = "Morgue maintenance"; - req_one_access_txt = "6" - }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 +/obj/effect/landmark/patrol_node{ + id = "tycoon_med"; + next_id = "tycoon_munitions" }, -/turf/open/floor/plating, -/area/maintenance/department/medical) +/obj/effect/turf_decal/tile/ship/full/blue, +/turf/open/floor/monotile/steel, +/area/medical/medbay/lobby) "bGl" = ( /obj/structure/cable{ icon_state = "1-2" @@ -36504,15 +35472,11 @@ /turf/open/floor/monotile/steel, /area/security/warden) "bGy" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/computer/operating{ dir = 8 }, -/obj/machinery/camera/autoname, -/turf/open/floor/monotile/steel, -/area/medical/medbay/lobby) +/turf/open/floor/monotile/dark, +/area/medical/medbay/central) "bGz" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -37014,55 +35978,38 @@ /turf/open/floor/monotile/steel, /area/ai_monitored/security/armory) "bHz" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/item/radio/intercom{ - pixel_y = 26 +/obj/structure/table/optable, +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/turf/open/floor/monotile/steel, +/turf/open/floor/monotile/dark, /area/medical/medbay/central) "bHA" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/computer/operating{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /turf/open/floor/monotile/dark, /area/medical/medbay/central) "bHB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/monotile/dark, -/area/medical/medbay/central) -"bHC" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/turf/open/floor/monotile/steel, -/area/medical/medbay/central) -"bHD" = ( -/obj/machinery/light{ - dir = 8 +/obj/machinery/door/airlock/ship/maintenance, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/open/floor/monotile/steel, -/area/medical/medbay/zone2{ - name = "Intensive care unit" - }) -"bHE" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 +/turf/open/floor/plating, +/area/hallway/nsv/deck2/frame1/central) +"bHC" = ( +/obj/structure/table/glass, +/obj/item/storage/box/monkeycubes{ + pixel_x = 2; + pixel_y = -2 }, -/obj/structure/bed/roller, -/obj/machinery/iv_drip, -/turf/open/floor/monotile/dark, -/area/medical/medbay/zone2{ - name = "Intensive care unit" - }) +/turf/open/floor/monotile/light, +/area/medical/medbay/central) "bHF" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 @@ -37211,13 +36158,6 @@ }, /turf/open/floor/carpet/green, /area/chapel/main) -"bIb" = ( -/obj/machinery/camera/autoname, -/obj/item/radio/intercom{ - pixel_y = 26 - }, -/turf/open/floor/monotile/steel, -/area/medical/medbay/central) "bIc" = ( /obj/item/radio/intercom{ pixel_y = 26 @@ -38661,12 +37601,6 @@ }) "bLK" = ( /obj/machinery/light, -/obj/effect/turf_decal/tile/orange{ - dir = 1 - }, -/obj/effect/turf_decal/tile/orange{ - dir = 4 - }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) "bLL" = ( @@ -39281,12 +38215,20 @@ name = "CIC" }) "bZl" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 5 +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/general/hidden{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/effect/landmark/start/paramedic, /turf/open/floor/monotile/light, -/area/medical/medbay/lobby) +/area/medical/medbay/central) "bZm" = ( /obj/structure/chair/stool, /obj/effect/landmark/start/warden, @@ -39330,11 +38272,6 @@ }, /turf/open/floor/monotile/dark, /area/nsv/hanger/deck2) -"bZs" = ( -/obj/structure/chair, -/obj/machinery/computer/ship/viewscreen, -/turf/open/floor/monotile/light, -/area/medical/medbay/lobby) "bZR" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -39833,10 +38770,6 @@ /obj/structure/sign/nanotrasen{ pixel_y = 26 }, -/obj/effect/turf_decal/tile/orange{ - dir = 8 - }, -/obj/effect/turf_decal/tile/orange, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) "cfx" = ( @@ -40317,10 +39250,6 @@ /area/bridge{ name = "CIC" }) -"cNV" = ( -/obj/effect/spawner/room/fivexfour, -/turf/template_noop, -/area/maintenance/department/medical) "cOg" = ( /obj/effect/turf_decal/bot, /obj/machinery/navbeacon{ @@ -41031,24 +39960,6 @@ }, /turf/open/floor/monotile/dark, /area/engine/engineering) -"dXv" = ( -/obj/machinery/door/airlock/ship/public/glass{ - name = "Patient Room B" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/turf/open/floor/monotile/steel, -/area/medical/medbay/central) "dXJ" = ( /obj/structure/cable{ icon_state = "1-2" @@ -41325,15 +40236,20 @@ /turf/open/floor/plating, /area/crew_quarters/dorms) "eoI" = ( -/obj/machinery/requests_console{ - department = "Surgery"; - departmentType = 1; - name = "Medbay RC"; - payment_department = "MED"; - pixel_y = -30 +/obj/machinery/door/airlock/ship/public/glass{ + name = "Morgue" }, -/turf/open/floor/monotile/dark, -/area/medical/surgery) +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/space/basic, +/area/medical/morgue) "eoU" = ( /obj/structure/cable{ icon_state = "1-2" @@ -41363,11 +40279,8 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "eqv" = ( -/obj/structure/rack, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/spawner/lootdrop/maintenance/two, -/turf/open/floor/plating, -/area/maintenance/department/medical) +/turf/open/space/basic, +/area/maintenance/port) "eqA" = ( /obj/structure/table, /obj/item/clothing/suit/hazardvest, @@ -41819,18 +40732,13 @@ /turf/open/floor/plating, /area/maintenance/nsv/hangar) "eWa" = ( -/obj/machinery/door/airlock/ship/public/glass{ - name = "Intensive Care Access" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/effect/landmark/zebra_interlock_point, -/turf/open/floor/monotile/dark, -/area/medical/medbay/central) +/obj/machinery/computer/lore_terminal, +/obj/machinery/camera/autoname, +/obj/structure/closet/crate/freezer/surplus_limbs, +/turf/open/floor/monotile/steel, +/area/medical/medbay/zone2{ + name = "Intensive care unit" + }) "eXm" = ( /obj/structure/closet/secure_closet/genpop, /obj/effect/turf_decal/ship/delivery/yellow, @@ -42806,19 +41714,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/maintenance/department/science) -"gCz" = ( -/obj/machinery/door/airlock/ship/public/glass{ - name = "Medbay Lobby Access" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/effect/landmark/zebra_interlock_point, -/turf/open/floor/monotile/steel, -/area/medical/medbay/lobby) "gCM" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8; @@ -42964,30 +41859,14 @@ /turf/open/floor/plasteel/techmaint, /area/maintenance/department/medical) "gJJ" = ( -/obj/machinery/door/airlock/ship/public/glass{ - name = "Examination Room" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/door/poddoor/shutters/ship/preopen{ - dir = 4; - id = "medical_traitor_murder_hole" - }, -/obj/machinery/door/firedoor/border_only{ +/obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 +/obj/effect/turf_decal/tile/blue{ + dir = 1 }, -/turf/open/floor/carpet/ship, -/area/medical/exam_room) +/turf/open/floor/monotile/steel, +/area/medical/medbay/central) "gJU" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 @@ -43006,15 +41885,6 @@ /obj/effect/landmark/zebra_interlock_point, /turf/open/floor/plating, /area/maintenance/starboard/fore) -"gMn" = ( -/obj/machinery/requests_console{ - department = "Medbay"; - departmentType = 1; - name = "Medbay RC"; - payment_department = "MED" - }, -/turf/closed/wall/ship, -/area/medical/medbay/central) "gMB" = ( /obj/machinery/photocopier{ pixel_y = 3 @@ -43551,10 +42421,20 @@ /turf/open/floor/monotile/dark, /area/engine/engineering) "hxL" = ( -/obj/machinery/light/small, -/turf/open/floor/plating{ - icon_state = "platingdmg1" +/obj/machinery/door/airlock/ship/maintenance{ + name = "Morgue maintenance"; + req_one_access_txt = "6" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 }, +/turf/open/floor/monotile/dark, /area/maintenance/department/medical) "hxW" = ( /obj/structure/sign/directions/medical{ @@ -43612,11 +42492,9 @@ /turf/open/floor/monotile/dark, /area/gateway) "hAC" = ( -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 +/obj/machinery/light/small{ + dir = 8 }, -/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/plating, /area/maintenance/department/medical) "hBe" = ( @@ -44218,10 +43096,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/item/computer_hardware/hard_drive/role/medical, /obj/item/computer_hardware/hard_drive/role/medical{ pixel_x = 6; @@ -44281,10 +43155,10 @@ /turf/open/floor/plating, /area/nsv/weapons/gauss) "iDJ" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/newscaster{ pixel_x = 32 }, +/obj/structure/closet/firecloset, /turf/open/floor/monotile/light, /area/medical/medbay/lobby) "iDR" = ( @@ -44846,9 +43720,21 @@ /turf/open/floor/durasteel/techfloor, /area/nsv/hanger/deck2) "jqT" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating, -/area/maintenance/department/medical) +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/machinery/holopad, +/turf/open/floor/monotile/dark, +/area/medical/surgery) "jrd" = ( /obj/machinery/atmospherics/pipe/manifold/brown/hidden{ dir = 1 @@ -44907,27 +43793,6 @@ /obj/machinery/vending/wardrobe/muni_wardrobe, /turf/open/floor/monotile/dark, /area/nsv/weapons/fore) -"juI" = ( -/obj/machinery/door/airlock/ship/public/glass{ - name = "Intensive Care Access" - }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/effect/landmark/zebra_interlock_point, -/turf/open/floor/monotile/steel, -/area/medical/medbay/central) -"jve" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating, -/area/maintenance/port) "jvE" = ( /obj/effect/spawner/lootdrop, /obj/effect/decal/cleanable/dirt, @@ -46083,21 +44948,9 @@ /turf/template_noop, /area/maintenance/department/medical) "lca" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, /obj/machinery/door/firedoor/border_only, -/obj/machinery/door/airlock/ship/public/glass{ - name = "Medical Central"; - req_one_access_txt = "5" - }, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 1 - }, -/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/monotile/steel, /area/medical/medbay/central) "lcf" = ( @@ -46278,23 +45131,20 @@ /turf/open/floor/plating, /area/maintenance/department/engine) "llI" = ( -/obj/machinery/door/airlock/ship/maintenance/defaultaccess{ - req_one_access_txt = "12;5" - }, -/obj/machinery/door/firedoor/border_only{ +/obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 +/turf/open/floor/plating{ + icon_state = "platingdmg1" }, -/turf/open/floor/plating, /area/maintenance/department/medical) "lmR" = ( -/obj/structure/closet/firecloset, /obj/structure/cable{ icon_state = "1-4" }, -/obj/item/storage/toolbox/emergency, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plating, /area/maintenance/port) "lmX" = ( @@ -46403,16 +45253,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, /area/engine/engineering/hangar) -"lvt" = ( -/obj/machinery/firealarm{ - pixel_y = 24 - }, -/obj/effect/turf_decal/tile/orange{ - dir = 8 - }, -/obj/effect/turf_decal/tile/orange, -/turf/open/floor/monotile/steel, -/area/hallway/nsv/deck2/frame1/central) "lwA" = ( /obj/machinery/ship_weapon/vls, /obj/effect/turf_decal/stripes/line, @@ -46767,16 +45607,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/engine) -"lVV" = ( -/obj/structure/chair{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/light{ - dir = 4 - }, -/turf/open/floor/monotile/light, -/area/medical/medbay/lobby) "lVZ" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -46904,17 +45734,8 @@ /turf/open/floor/plating, /area/engine/engineering/reactor_control) "mib" = ( -/obj/machinery/airalarm{ - dir = 4; - pixel_x = -22 - }, -/obj/effect/turf_decal/bot, -/obj/machinery/navbeacon{ - codes_txt = "delivery;dir=4"; - location = "Medbay"; - name = "navigation beacon (Medbay Delivery)" - }, -/turf/open/floor/monotile/light, +/obj/effect/turf_decal/tile/ship/full/blue, +/turf/open/floor/monotile/steel, /area/medical/medbay/lobby) "miE" = ( /obj/structure/cable/yellow{ @@ -46927,7 +45748,7 @@ /obj/structure/disposalpipe/trunk/multiz{ dir = 4 }, -/turf/closed/wall/ship, +/turf/open/floor/plating, /area/medical/medbay/lobby) "mlC" = ( /obj/machinery/atmospherics/pipe/simple/dark/visible{ @@ -47195,9 +46016,10 @@ }, /area/maintenance/department/medical) "mCU" = ( -/obj/machinery/light/small{ - dir = 8 +/obj/machinery/door/firedoor/border_only{ + dir = 1 }, +/obj/machinery/door/firedoor/border_only, /turf/open/floor/plating{ icon_state = "platingdmg1" }, @@ -48073,14 +46895,11 @@ /turf/open/floor/plasteel/grid/steel, /area/hallway/secondary/exit) "nNn" = ( -/obj/structure/grille{ - layer = 3.001 - }, -/obj/item/reagent_containers/food/snacks/canned/beans, -/turf/open/floor/plating{ - icon_state = "platingdmg2" +/obj/structure/disposalpipe/segment{ + dir = 8 }, -/area/maintenance/department/medical) +/turf/open/floor/plating, +/area/medical/medbay/central) "nNs" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk, @@ -48243,12 +47062,6 @@ }, /turf/open/floor/wood, /area/library) -"nZA" = ( -/obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, -/obj/item/clothing/glasses/meson, -/turf/open/floor/plating, -/area/maintenance/department/medical) "obp" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 @@ -48756,22 +47569,7 @@ /turf/open/floor/plasteel/freezer, /area/medical/virology) "oWy" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/airlock/ship/maintenance/defaultaccess{ - req_one_access_txt = "12;5" - }, -/turf/open/floor/plating, +/turf/open/floor/monotile/dark, /area/maintenance/department/medical) "oXH" = ( /obj/machinery/camera{ @@ -48836,25 +47634,9 @@ /turf/open/floor/plating, /area/maintenance/department/engine) "pdT" = ( -/obj/machinery/door/airlock/ship/public/glass{ - name = "Cryogenics"; - req_one_access_txt = "5" - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 1 - }, -/turf/open/floor/monotile/dark, -/area/medical/medbay/lobby) +/obj/structure/table/reinforced, +/turf/open/floor/monotile/light, +/area/medical/medbay/central) "per" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -49478,14 +48260,6 @@ }, /turf/open/floor/plasteel/ridged/steel, /area/engine/engineering/reactor_control) -"qdo" = ( -/obj/machinery/button/door{ - id = "morgue_desk"; - name = "desk shutter control"; - pixel_x = 24 - }, -/turf/open/floor/monotile/dark, -/area/medical/morgue) "qeW" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/simple/purple/visible{ @@ -49575,18 +48349,9 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/airlock/ship/public/glass{ - name = "Medical Central"; - req_one_access_txt = "5" - }, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 9 }, -/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/monotile/dark, /area/medical/medbay/central) "qqk" = ( @@ -49812,10 +48577,13 @@ /turf/open/floor/plasteel/ridged/steel, /area/engine/engineering) "qIe" = ( +/obj/structure/disposalpipe/trunk/multiz{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/multiz/layer4{ dir = 4 }, -/turf/closed/wall/ship, +/turf/open/floor/plating, /area/medical/medbay/lobby) "qIl" = ( /obj/structure/table/reinforced, @@ -50580,7 +49348,6 @@ }) "rGm" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/portable_atmospherics/canister/air, /obj/machinery/atmospherics/pipe/multiz/layer2{ dir = 4 }, @@ -50696,11 +49463,10 @@ /turf/open/floor/monotile/dark, /area/science/nanite) "rNb" = ( -/obj/structure/closet/crate{ - opened = 1 +/obj/structure/disposalpipe/segment{ + dir = 9 }, -/obj/effect/spawner/lootdrop/maintenance/four, -/turf/open/floor/plating, +/turf/open/floor/monotile/dark, /area/maintenance/department/medical) "rNN" = ( /obj/machinery/atmospherics/pipe/layer_manifold/visible, @@ -50799,16 +49565,7 @@ /turf/open/floor/wood, /area/library) "scS" = ( -/obj/machinery/door/airlock/ship/public/glass{ - name = "Intensive Care Access" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/effect/landmark/zebra_interlock_point, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/monotile/steel, /area/medical/medbay/zone2{ name = "Intensive care unit" @@ -50902,6 +49659,10 @@ /obj/machinery/newscaster{ pixel_y = -32 }, +/obj/machinery/computer/pandemic{ + layer = 2.5; + pixel_x = -2 + }, /turf/open/floor/monotile/steel, /area/medical/chemistry) "sgN" = ( @@ -50951,15 +49712,15 @@ /turf/open/floor/plating, /area/engine/engineering/hangar) "snt" = ( -/obj/machinery/door/airlock/ship/maintenance{ - name = "Deck 1 access maintenance" - }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/machinery/door/airlock/ship/maintenance{ + name = "Deck 1 access maintenance" + }, /turf/open/floor/monotile/steel, /area/maintenance/central) "sny" = ( @@ -51519,14 +50280,12 @@ /turf/open/floor/plasteel/techmaint, /area/maintenance/starboard) "tiu" = ( -/obj/machinery/requests_console{ - department = "Genetics"; - name = "Genetics Requests Console"; - payment_department = "MED"; - pixel_y = -30 - }, -/turf/open/floor/monotile/light, -/area/medical/genetics) +/obj/structure/table/reinforced, +/obj/item/storage/backpack/duffelbag/med/surgery, +/obj/item/storage/box/bodybags, +/obj/machinery/light, +/turf/open/floor/monotile/dark, +/area/maintenance/department/medical) "tjC" = ( /obj/machinery/door/airlock/ship/external/glass{ req_one_access_txt = "13" @@ -51732,6 +50491,9 @@ /area/hallway/nsv/deck2/frame1/central) "txH" = ( /obj/machinery/holopad, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/cmo) "tyr" = ( @@ -51864,15 +50626,14 @@ /turf/open/floor/monotile/dark, /area/engine/engineering) "tDB" = ( -/obj/machinery/sleeper{ - dir = 4 +/obj/machinery/airalarm{ + pixel_y = 26 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -24 +/obj/effect/turf_decal/loading_area{ + dir = 4 }, -/turf/open/floor/engine, -/area/medical/medbay/lobby) +/turf/open/floor/monotile/dark, +/area/medical/morgue) "tDG" = ( /obj/machinery/conveyor/slow{ id = "torp" @@ -52051,18 +50812,6 @@ }, /turf/open/floor/monotile/steel, /area/engine/engine_room) -"tRQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/airlock/ship/public/glass{ - name = "Medbay Lobby Access" - }, -/obj/effect/landmark/zebra_interlock_point, -/turf/open/floor/monotile/light, -/area/medical/medbay/lobby) "tSY" = ( /obj/structure/disposalpipe/segment, /obj/item/trash/chips, @@ -52187,24 +50936,6 @@ }, /turf/open/floor/durasteel/techfloor, /area/nsv/weapons/fore) -"udN" = ( -/obj/machinery/door/airlock/ship/public/glass{ - name = "Medbay Central"; - req_one_access_txt = "5" - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/obj/effect/mapping_helpers/airlock/unres, -/turf/open/floor/monotile/dark, -/area/medical/medbay/lobby) "udX" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -52588,18 +51319,6 @@ }, /turf/open/floor/monotile/dark, /area/science/nanite) -"uOk" = ( -/obj/machinery/door/airlock/ship/public/glass{ - name = "Medbay Lobby Access" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/effect/landmark/zebra_interlock_point, -/turf/open/floor/monotile/steel, -/area/medical/medbay/lobby) "uOT" = ( /obj/structure/table/glass, /obj/item/computer_hardware/hard_drive/role/lawyer, @@ -52667,13 +51386,7 @@ /turf/open/floor/monotile/steel, /area/engine/engineering/reactor_core) "uWe" = ( -/obj/structure/chair{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/obj/item/radio/intercom{ - pixel_x = 26 - }, +/obj/structure/closet/emcloset, /turf/open/floor/monotile/light, /area/medical/medbay/lobby) "uYj" = ( @@ -53852,13 +52565,6 @@ }, /turf/open/floor/monotile/dark, /area/engine/engineering) -"wQJ" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, -/turf/open/floor/monotile/steel, -/area/medical/surgery) "wRj" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 4 @@ -54045,11 +52751,7 @@ /turf/open/floor/monotile/steel, /area/nsv/weapons/fore) "xgT" = ( -/obj/effect/turf_decal/loading_area{ - dir = 8 - }, -/obj/machinery/computer/ship/viewscreen, -/turf/open/floor/monotile/dark, +/turf/open/space/basic, /area/medical/morgue) "xhI" = ( /obj/effect/spawner/lootdrop/maintenance/six, @@ -54088,16 +52790,6 @@ }, /turf/open/floor/monotile/steel, /area/engine/engineering/reactor_core) -"xlL" = ( -/obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/spawner/lootdrop/glowstick, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/department/medical) "xmr" = ( /obj/machinery/space_heater, /turf/open/floor/plating{ @@ -76174,7 +74866,7 @@ aZa pHV pHV eBC -cNV +pHV aZa few bCZ @@ -77444,20 +76136,20 @@ anb bYd ykh agX -aLW -nZA -dLp -xlL -eqv -aLW -afw -afw -afw -afw -afw -afw -afw -afw +agX +agX +bwm +agX +agX +agX +agX +bfv +bfv +bfv +bfv +bfv +bfv +bfv iyN afw aZa @@ -77701,20 +76393,20 @@ bKQ aZa akL agX -afw -ahm -ahm -ahm -ahm -ahm -ahm -ahP -ahP -aGL -ahP -ahP -ahP -afw +agX +ahJ +ahJ +ahJ +ahJ +ahJ +ahJ +xgT +xgT +xgT +xgT +xgT +xgT +bfv akL tLu aLW @@ -77958,32 +76650,32 @@ aaa aZa lUI agX -afw -abK +agX +ahJ +ahJ +ahJ +ahJ ahJ -ahm -abK ahJ -ahm xgT -ahQ -ahQ -ahQ -ahQ -ahQ -afw +xgT +xgT +xgT +xgT +xgT +bfv aXw +bkS aZL aZL aZL -bcm -aZL aZL -aAc +aMR +baC aZL fEH aZL -aZL +amT xwM aZL raN @@ -78215,25 +76907,25 @@ jLQ aZa akL agX -afw -abQ -bvP +agX +ahm +ahm +ahm ahm -bvR aUE ahm -bIc -aic -aic -aic -aic -aic -bGk -aXN +ahO +ahO +ahO +ahO +ahO +ahO +afw +afw hxL afw afw -baF +afw afw afw afw @@ -78472,32 +77164,32 @@ jLQ aZa akL agX -afw -acy -ahM -ahm -bvM -bvO +agX ahm +aTX +aTX +aTX +aTX +aTX +ahO ahP ahP -aic -bvS -aic -bhf -afw -aXN -uqx +ahP +ahP +aGL +bgZ +oWy +bvn afw aZb aZc aTL -afV +ahm bed bff akk -afV -aLW +ahm +nNn acF all akl @@ -78728,32 +77420,32 @@ aaa jLQ aZa akL -jqT -afw -ahm -ahK -ahm -dXv -ahm +agX +agX ahm -bfw +aTX +aTX +aTX +aTX +ajX +ahO +ama ahQ -aic -bCh -aic -aUx -afw +ahQ +ahQ +ahQ +bim aXN rNb afw agW aki akg -afV +ahm ajZ aTK aTV -afV +ahm nNn acF alt @@ -78985,33 +77677,33 @@ aaa jLQ aZa wmn -jqT -afw +agX +agX +ahm aTX -aoH -bvQ -aoH aTX -ahm +aTX +aTX +ajX +ahO +bIc aic aic -akx -aUf -qdo -aUy -afw +aic +aic +bvn oWy +tiu afw -afw -agP +akx gJJ agP -afV -afV -akS -afV -afV -afV +ahm +aUt +aTY +baS +ahm +nNn acF acF alO @@ -79243,31 +77935,31 @@ aZa aZa akL agX -afw -bIb -aUA -bvy -bvN -aTX +agX ahm -aid +aoB +aTX +aTX +aTX +bbb ahO +tDB aky -aUk -ahO -ahO -ahO -aYJ -azf -baT -afV +aky +aky +aky +ajf +aTY +bkD +ahm +ahm bdB -aVM -afV -bbe -bwe +ahm +ahm +ahm +ahm amh -tDB +ahm akQ acF akh @@ -79500,34 +78192,34 @@ aZa uqx akL roC -afw -aoB -ahN -bvK -aUB -bhg +bfv ahm -aie -aku -akz -aUt -aku -aUz +aTX +aTX +aTX +aTX +bvp ahO -aYZ +aUz +aUz +aUz +aUz +aUz +ajf +aTY aZM -bfg -udN -beb +ahm +aUe +aUe bvX pdT -akU +pdT amc +aok +aUe aMs -bkK -aMs -blb -bwa +aiR +akj bwc iBz byY @@ -79757,40 +78449,40 @@ aZa mut wQi loC -afw -ayI -aAG -bvL -aTX -aTX +bfv +ahm +ahm +akI +abQ +akI ahm -apF -ajG -bba -bvU -aUW -aVy ahO -aUC -aZN -aTX -afV -bGy -aVQ -afV -ahT -akG +ahO +ahO +ahO +ahO +ahO +eoI +ahm +ahm +ahm +aUe +aUe +aUe +aUe +aUe +aUe aok -bhK -ahf -aiR +aUe +akG +bvP blc -akj +aHR als txH bfk acF -acx +bge bCS aOP aeb @@ -80016,33 +78708,33 @@ aYU afw afw ahm -aAH -baS -akI -ahm -ahm -ahO -ahO -bbb -bvV -ahO -ahO -ahO +aTX +aTX +aTX +aTX +aTX +aku +aku +aku +aku +aku +aku +ahK blR baY -azf +bCh +bbp bbp -akA -bcT bbp +bhf beH bfn bgO -bhT +aUe bwb aiR bld -akj +aUB alM bJm atj @@ -80275,27 +78967,27 @@ eCP baQ aAI bvC -baQ +ahR baQ bCo bCn baQ bbc -bCl +bcS baQ baQ qoc aZg -aZT -bhg -aKh -bbh +beA +akI +aUe +aUe bcU -aKh -bgZ +aUy +aTX akM -aok -bwl +ajd +aUe aTJ acF acF @@ -80304,7 +78996,7 @@ acF acF acF acF -acx +bHX bCS aOP aed @@ -80544,24 +79236,24 @@ bvA lca aZi aZX -ahc -ahc -ahc -ahc -ahc +aiY +aUe +aUe +aeR +aTX ajc -akN +aTX bZl -bwl +aUe bkC -aKh +bJd sHl bFU -afV +bvQ bin -aTO +ahf afV -bHX +bge bCS aOP hjP @@ -80786,39 +79478,39 @@ aUU aoM uEb aUS -aaK -ahq -bvJ -ahq -aaK +aUF +aUF +aUF +aUF +aUF aaK ahm ahm aQC -akI ahm ahm +akI +blb +akI ahm -bfy -bbm ahc -aTZ -alc -alS -ahc -aje -ahf +aBK +ald +alo +apT +aTX +baU akF -bkS -bvk +aUe +aUe bwf -bvk -alV -bwg -bwh -amQ -afV -bge +ahf +ame +ame +ame +ahf +aKh +acx bCS afK aaB @@ -81042,39 +79734,39 @@ abY bHp apa bne -bne -amN +eqv +aUF aUK bvD -aLf +bCl aMD -aaK -ahE -ajH -aQG -agK -ali +akA alp +bvw +bvw ahm -ajd -bbm -aUj -bbg -bwj +ali +baQ +bvN +aUv +ahM +ahc +ahT +aUe ajE akB -aUh +bvS aUh bhU -bwi -bkD +aUe +aUe aKh -bhb -bhK -afV -bhc -aTP -bJd +ahf +ame +mib +ame +ahf +tsM acx bCS aOP @@ -81299,40 +79991,40 @@ bHp bHp pJP lay -bne -ahk +eqv +aUF ahi bvE -ahi +jqT bhh -aaK -ahZ -aTY -bvw -bvx -alU +aid aMx +bvw +bvw ahm -aiT +alU +aTY +bjw +aTY bbm -aUj +ahc aBK ald bfu -ahc -ahc -pSV -akP -hzd -ahc -ahc -alr -ama -afV -aBL -aTQ -afV -byC +aUe +aUe +aUe +alh +aUe +aUe +bcm +bhb +ame +bGk +ame +ahf +aKh +acx bCS bmP bnd @@ -81556,39 +80248,39 @@ lrR vFo fuW ojM -bne -ahp -amL +eqv +aUF +amV aUs amL -amL -aaK -ajf -aTY -aQR -aUv -aUI +aLf +amX aVF -gMn -bim +bvw +bvw +ahm +aUI +bco +aki +bco bco -baU -bhd -ajY -tiu ahc -ahC +bhd +aUe +aUe +ajT +aTP ajT alh -ajY -sCC +aUe +aTP aCf ahf -bhK +ame mib -amb +ame ahf -ssH +tsM bCy bCR bmQ @@ -81813,39 +80505,39 @@ pxF vFo pJP xRR -bne -ahq +eqv +aUF ahq amO -ahq -ahq -aaK -ajh -akK -baW -akq -bhj +bCu +aVy +bzX aVL +bvw +bvw ahm -aiV -bcS -ajX -bbj -ale -ajY -aUi -aiY -ajY +akI +akI +bfw +akI +akI +ahc +ahc +aUj +aUj +ahc +ahc +pSV bCr -ajY -ajY -aMO +hzd +ahc +ahc ble -bvm +ame amd -aMR -ahf -tsM +ame +akE +aKh bws bCz bmQ @@ -82070,39 +80762,39 @@ jCX qzT fuW uhJ -bne -bfv -amM -amT -amU -aUD +eqv +aUF +aUF +aUF +aUF +aUF aaK ahj ahr baX ahm bvq -ahm -ahm +aTX +amW bHz bHA -aUj -akE +ahc +aTZ alf -ajW -aUj -aja -ajY -ajY -ajY +alS +aVM +ahc +ahC +bvU ajY -aCf +sCC +ahc +bcT ahf -bvn -ame -aTM +bwl ahf -tsM +ajh +afV acx bDn bmR @@ -82327,40 +81019,40 @@ bsW bsW die ebT -bne -ahR -amM -amM -amV -eoI +eqv +aUF +aUF +aUF +aUF +aUF aaK ahV aRL aUn -agF +ahm bvr aTX -ahm +aTX bbq -beA -ahc -aUj -aUj -aUj +bhi ahc -ajb +bbg ajY ajY +akH +aUj +aja +aAc ajY ajY ahc -bZs -bvn +afV +aBL bdh aTM -ahf -aKh -acx +afV +afV +bge bDp bmQ aaB @@ -82584,41 +81276,41 @@ bCf bsW fuW mOc -bne -akC -bzX -amM -amW -bhi +eqv +aUF +aUF +aUF +aUF +aUF aaK bfx aUc aUl -akI +ahm ala aUu -ahm +aTX bio -beA -akI +baW +ahm bbx aPs -aUd -ahc +aUe +ahE ajD akJ alm -alo +ajY alv ahc alL -bjw -bwr +ahf +ahf bzM -bCs -aRD -bCu -bDZ +afV +ssH +acx +bDp bmS laZ laZ @@ -82841,39 +81533,39 @@ bCf bLH pJP uqe -bne -akD -amM -amM -amX +eqv +aUF +aUF +aUF +aUF aUF aaK ahr aUg ahr ahj -ahj -ahj -ahj +eWa +aiT +alb aUa -beA +bfy ahm bbH aUe -aUe -ahc -ahc -ahc -ahc -ahc -ahc -ahc -bFL -bvp -bwn +ahk +ajY +aUj +ajY +ale +ajY +ajY +bwr +ahf +ame +ame bwo bvl -tRQ +aKh bwq bEa xMG @@ -83098,41 +81790,41 @@ ced bLH fuW jzy -bne -akH +eqv +aUF +aUF +aUF +aUF +aUF amM -aht -alP -ajL -akp alb aUm aUp -bHD +ahj aUr -bvs +alb scS bvu bvZ -eWa +ahm bBj alq -bHB -amg -amg -amg -apT -amg +aUe +bhT +ahm amg -gCz +aUe +aUe +aUe +afV bvk -bwm +ame bBi aTN -ahf -tsM -acx -bDp +aQR +aKh +baF +aAH bmQ laZ pzR @@ -83355,38 +82047,38 @@ rEt bsV brm xab -bne -amK -amM -wQJ -aoO -aUH +eqv +aUF +aUF +aUF +aUF +aUF aaK aUo aUo aUG -bHE -aUq +ahj aUq -ahr -aTX -aTX -juI +alb +aoO +bvV +bGy +ahm bbW -aLj +aUe bHC -azf -azf +aUe +ahm bgG azf -azf -azf -uOk +baT +bkK +afV iDJ uWe -lVV -bFy -blQ +afV +afV +afV afV afS bDp @@ -83612,27 +82304,27 @@ keI bsV aAt bne +eqv +eqv +eqv +eqv +eqv +eqv bne bne bne bne bne bne +aQG bne bne bne bne -bne -bne -bne -bne -bne -bne -bne -aeR -aHR -abq -aae +aad +aad +aad +bvM aae aae aae @@ -83641,7 +82333,7 @@ aae afV afV afV -mjx +afV mjx qIe afV @@ -83889,7 +82581,7 @@ baV bcb bay bcV -aab +asv rGm bbo asv @@ -83901,9 +82593,9 @@ asv bsm bFB bFE -aad -aeT -bEe +bHB +bwi +aRD bmU laZ asF @@ -84139,10 +82831,10 @@ bVl bVl mTV cer +bCs cer -jve lmR -bHp +akD bjt baG bcX @@ -84158,9 +82850,9 @@ aZZ aZZ bFC bFF -bFG -bFH -bEf +aae +aeT +bEe bmU laZ asF @@ -84400,9 +83092,9 @@ bBu bBu rix bBu -lvt +aad bbr -bdc +aad aad aad aad @@ -84659,7 +83351,7 @@ bKF bBu bft bbF -aMv +bKR aad abj acK @@ -84916,7 +83608,7 @@ bKG bBu biO bbF -kYm +bKR aaf abk acL @@ -85430,7 +84122,7 @@ wxB bBu cfq bbF -kYm +bKR aaf abk adG @@ -85685,9 +84377,9 @@ bBe bCe bKH bKI -jRa -bbF -kYm +aTO +ajW +bwh aad abp adQ From 6ba36235456dce96fca8203161180bc1c63de256 Mon Sep 17 00:00:00 2001 From: SerynEngi Date: Fri, 13 Dec 2024 13:35:45 -0800 Subject: [PATCH 02/26] Medical Mostly Complete --- _maps/map_files/Tycoon/Tycoon1.dmm | 915 ++--- _maps/map_files/Tycoon/Tycoon2.dmm | 5967 +++++++++++----------------- 2 files changed, 2772 insertions(+), 4110 deletions(-) diff --git a/_maps/map_files/Tycoon/Tycoon1.dmm b/_maps/map_files/Tycoon/Tycoon1.dmm index 6ae993ba53e..1a589feec83 100644 --- a/_maps/map_files/Tycoon/Tycoon1.dmm +++ b/_maps/map_files/Tycoon/Tycoon1.dmm @@ -50,54 +50,29 @@ /turf/open/floor/engine/airless, /area/space/nearstation) "ak" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/turf/open/floor/engine/airless, -/area/space/nearstation) -"al" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/engine/airless, -/area/space/nearstation) -"am" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/turf/open/floor/engine/airless, -/area/space/nearstation) +/turf/open/floor/carpet/blue, +/area/hallway/nsv/deck1/hallway) "an" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/engine/airless, -/area/space/nearstation) -"ao" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/open/floor/engine/airless, -/area/space/nearstation) -"ap" = ( -/obj/machinery/power/apc/auto_name/north{ - pixel_y = 24 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 }, -/obj/structure/cable{ - icon_state = "0-4" +/obj/structure/chair/fancy/shuttle{ + color = "#696969"; + name = "comfortable chair" }, +/turf/open/floor/carpet/blue, +/area/hallway/nsv/deck1/hallway) +"ao" = ( +/obj/machinery/computer/ship/viewscreen, /obj/structure/cable{ - icon_state = "2-4" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -105,9 +80,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, -/obj/structure/cable{ - icon_state = "4-8" - }, /turf/open/floor/monotile/dark, /area/nsv/hanger/deck3{ name = "Air traffic control pod" @@ -115,12 +87,6 @@ "aq" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /turf/open/floor/engine/airless, /area/space/nearstation) "as" = ( @@ -132,14 +98,13 @@ name = "Air traffic control pod" }) "at" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 +/obj/structure/chair/fancy/shuttle{ + color = "#696969"; + dir = 4; + name = "comfortable chair" }, -/turf/open/floor/engine/airless, -/area/space/nearstation) +/turf/open/floor/carpet/blue, +/area/hallway/nsv/deck1/hallway) "au" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -147,15 +112,18 @@ /turf/open/floor/engine/airless, /area/space/nearstation) "av" = ( -/obj/machinery/computer/ship/viewscreen, -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/multiz/layer2{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/pipe/multiz/layer4{ + dir = 8 }, -/turf/open/floor/monotile/dark, +/obj/item/kirbyplants{ + icon_state = "plant-21"; + pixel_x = -3; + pixel_y = 3 + }, +/turf/open/floor/monotile/steel, /area/nsv/hanger/deck3{ name = "Air traffic control pod" }) @@ -212,17 +180,44 @@ /turf/open/floor/engine/airless, /area/space/nearstation) "aE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/engine/airless, -/area/space/nearstation) +/obj/machinery/power/apc/auto_name/north{ + pixel_y = 24 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/monotile/dark, +/area/nsv/hanger/deck3{ + name = "Air traffic control pod" + }) "aF" = ( /obj/machinery/light, /turf/open/floor/monotile/steel, /area/nsv/briefingroom) "aG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/engine/airless, -/area/space/nearstation) +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/chair/fancy/shuttle{ + color = "#696969"; + name = "comfortable chair"; + dir = 1 + }, +/turf/open/floor/carpet/blue, +/area/hallway/nsv/deck1/hallway) "aI" = ( /turf/closed/wall/r_wall/ship, /area/space/nearstation) @@ -236,19 +231,16 @@ /turf/open/floor/engine/airless, /area/space/nearstation) "aL" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/engine/airless, -/area/space/nearstation) -"aM" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/engine/airless, -/area/space/nearstation) +/turf/open/floor/carpet/blue, +/area/hallway/nsv/deck1/hallway) "aN" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/engine/airless, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/monotile/dark/airless, /area/space/nearstation) "aO" = ( /obj/structure/table/reinforced, @@ -401,19 +393,18 @@ /turf/open/floor/carpet/blue, /area/crew_quarters/heads/captain) "bl" = ( +/obj/structure/table/glass, /obj/structure/cable{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/item/folder/white{ + pixel_x = 4; + pixel_y = -3 }, -/turf/open/floor/monotile/dark, -/area/nsv/hanger/deck3{ - name = "Air traffic control pod" - }) +/turf/open/floor/carpet/blue, +/area/hallway/nsv/deck1/hallway) "bm" = ( /obj/machinery/computer/ship/viewscreen, /obj/structure/dresser, @@ -465,18 +456,27 @@ /obj/machinery/modular_computer/console/preset/command{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/captain) "bt" = ( /obj/machinery/computer/communications{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/captain) "bu" = ( /obj/machinery/computer/security{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/captain) "bv" = ( @@ -537,6 +537,15 @@ "bD" = ( /obj/structure/table/reinforced, /obj/machinery/keycard_auth, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/captain) "bE" = ( @@ -614,21 +623,13 @@ /turf/closed/wall/ship, /area/hallway/nsv/deck1/hallway) "bO" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/requests_console{ - department = "Pilot Ready Room"; - payment_department = "MUN"; - pixel_x = 30 +/obj/structure/chair/fancy/shuttle{ + color = "#696969"; + dir = 8; + name = "comfortable chair" }, -/turf/open/floor/monotile/steel, -/area/nsv/hanger/deck3{ - name = "Air traffic control pod" - }) +/turf/open/floor/carpet/blue, +/area/hallway/nsv/deck1/hallway) "bP" = ( /obj/structure/table/reinforced, /obj/item/storage/box/squad_lanyards, @@ -637,26 +638,12 @@ name = "Executive officer's Office" }) "bQ" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/plating, -/area/maintenance/central) +/obj/structure/grille, +/turf/open/floor/engine/airless, +/area/space/nearstation) "bR" = ( /turf/closed/wall/r_wall/ship, /area/shuttle/turbolift/shaft) -"bS" = ( -/obj/structure/cable{ - icon_state = "2-32" - }, -/obj/machinery/atmospherics/pipe/multiz/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/multiz/layer4{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/central) "bT" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -705,9 +692,6 @@ /turf/open/floor/carpet/ship, /area/crew_quarters/heads/captain) "bY" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, /obj/effect/turf_decal/tile/yellow{ dir = 1 }, @@ -717,20 +701,18 @@ /turf/open/floor/monotile/dark/airless, /area/space/nearstation) "bZ" = ( -/obj/structure/railing, -/turf/open/floor/monotile/dark, -/area/hallway/nsv/deck1/hallway) -"ca" = ( -/obj/structure/railing, -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/firealarm{ - pixel_y = 24; - pixel_z = -1 +/obj/structure/cable{ + icon_state = "2-32" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 +/obj/machinery/atmospherics/pipe/multiz/layer2, +/obj/machinery/atmospherics/pipe/multiz/layer4, +/turf/open/floor/plating, +/area/maintenance/central) +"ca" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "1-2" }, /turf/open/floor/monotile/dark, /area/hallway/nsv/deck1/hallway) @@ -752,12 +734,6 @@ }, /turf/open/floor/monotile/dark/airless, /area/space/nearstation) -"cg" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/engine/airless, -/area/space/nearstation) "ch" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -789,8 +765,9 @@ /turf/open/openspace, /area/hallway/nsv/deck1/hallway) "cl" = ( -/obj/structure/railing{ - dir = 8 +/obj/machinery/firealarm/directional/east, +/obj/machinery/light{ + dir = 4 }, /turf/open/floor/monotile/dark, /area/hallway/nsv/deck1/hallway) @@ -821,10 +798,15 @@ /turf/open/floor/monotile, /area/crew_quarters/heads/captain) "co" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/table/glass, +/obj/structure/cable{ + icon_state = "1-2" + }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/monotile/dark/airless, -/area/space/nearstation) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/item/megaphone/command, +/turf/open/floor/carpet/blue, +/area/hallway/nsv/deck1/hallway) "cp" = ( /obj/machinery/lazylift_button, /turf/closed/wall/r_wall/ship, @@ -1064,10 +1046,6 @@ /turf/open/floor/monotile/dark, /area/hallway/nsv/deck1/hallway) "cW" = ( -/obj/machinery/door/airlock/ship{ - dir = 4; - name = "Deck 2" - }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -1075,6 +1053,10 @@ dir = 8 }, /obj/effect/landmark/zebra_interlock_point, +/obj/machinery/door/airlock/ship/command{ + name = "Briefing Room"; + req_one_access_txt = "19" + }, /turf/open/floor/monotile, /area/hallway/nsv/deck1/hallway) "cX" = ( @@ -1142,9 +1124,18 @@ /turf/open/floor/monotile/steel, /area/crew_quarters/heads/captain) "di" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/closed/wall/r_wall/ship, -/area/maintenance/central) +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/requests_console{ + department = "Pilot Ready Room"; + payment_department = "MUN"; + pixel_x = 30 + }, +/turf/open/floor/monotile/steel, +/area/nsv/hanger/deck3{ + name = "Air traffic control pod" + }) "dj" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -1161,9 +1152,6 @@ /turf/open/floor/monotile/dark/airless, /area/space/nearstation) "dl" = ( -/obj/structure/railing{ - dir = 8 - }, /obj/machinery/light{ dir = 4 }, @@ -1188,13 +1176,6 @@ }, /turf/open/floor/plating, /area/crew_quarters/heads/captain) -"do" = ( -/obj/machinery/camera/autoname{ - dir = 8 - }, -/obj/effect/turf_decal/delivery/red, -/turf/open/floor/monotile/dark/airless, -/area/space/nearstation) "dp" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -1208,26 +1189,18 @@ /turf/open/floor/monotile/dark/airless, /area/space/nearstation) "dq" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/structure/railing/corner, /obj/structure/sign/nanotrasen{ pixel_y = 26 }, +/obj/item/kirbyplants/random, /turf/open/floor/monotile/dark, /area/hallway/nsv/deck1/hallway) "ds" = ( /obj/machinery/camera/autoname, -/obj/structure/railing/corner{ - dir = 8 - }, /obj/structure/sign/nanotrasen{ pixel_y = 26 }, +/obj/item/kirbyplants/random, /turf/open/floor/monotile/dark, /area/hallway/nsv/deck1/hallway) "dt" = ( @@ -1292,23 +1265,11 @@ /turf/open/floor/durasteel/eris_techfloor_alt, /area/ai_monitored/turret_protected/aisat) "dC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/closed/wall/r_wall/ship, +/turf/open/floor/plating, /area/maintenance/central) "dD" = ( -/obj/machinery/door/airlock/ship/command{ - name = "Captain's Office"; - req_one_access_txt = "20" - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/monotile/dark, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/carpet/blue, /area/crew_quarters/heads/captain) "dE" = ( /obj/structure/disposalpipe/junction{ @@ -1609,12 +1570,6 @@ }, /turf/open/floor/monotile/dark, /area/ai_monitored/turret_protected/ai_upload) -"en" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/central) "eo" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -1916,9 +1871,7 @@ /obj/machinery/camera/autoname{ dir = 1 }, -/obj/structure/railing/corner{ - dir = 1 - }, +/obj/item/kirbyplants/random, /turf/open/floor/monotile/dark, /area/hallway/nsv/deck1/hallway) "fb" = ( @@ -2027,7 +1980,11 @@ /turf/open/floor/plating, /area/hallway/nsv/deck1/hallway) "fn" = ( -/obj/machinery/light, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/monotile/steel, /area/crew_quarters/heads/captain) "fo" = ( @@ -2468,12 +2425,6 @@ /turf/open/floor/monotile/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) "gl" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/structure/chair/stool, /mob/living/simple_animal/hostile/retaliate/goose, /obj/machinery/computer/ship/viewscreen, @@ -2565,29 +2516,13 @@ }, /turf/open/floor/monotile/dark, /area/hallway/primary/aft) -"gu" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/carpet/blue, -/area/crew_quarters/heads/captain) "gv" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/monotile/steel, -/area/crew_quarters/heads/captain) +/obj/structure/hull_plate/end, +/obj/structure/grille, +/turf/open/floor/monotile/dark/airless, +/area/space/nearstation) "gw" = ( -/obj/machinery/door/airlock/ship/command{ - name = "Captain's Office"; - req_one_access_txt = "20" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, +/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/monotile/dark, /area/crew_quarters/heads/captain) "gx" = ( @@ -2604,38 +2539,26 @@ /turf/open/floor/monotile/dark, /area/nsv/briefingroom) "gy" = ( -/obj/structure/railing, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/turf/open/floor/monotile/dark, -/area/hallway/nsv/deck1/hallway) -"gz" = ( -/obj/structure/railing{ - dir = 4 - }, /obj/structure/cable{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/carpet/blue, +/area/crew_quarters/heads/captain) +"gz" = ( /obj/item/radio/intercom{ pixel_x = -26 }, +/obj/machinery/light{ + dir = 8 + }, /turf/open/floor/monotile/dark, /area/hallway/nsv/deck1/hallway) "gA" = ( -/obj/structure/railing{ - dir = 4 - }, /obj/machinery/light{ dir = 8 }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/monotile/dark, /area/hallway/nsv/deck1/hallway) "gB" = ( @@ -2752,18 +2675,10 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, /obj/machinery/status_display/ai{ pixel_x = -32 }, -/obj/structure/railing/corner{ - dir = 4 - }, +/obj/item/kirbyplants/random, /turf/open/floor/monotile/dark, /area/hallway/nsv/deck1/hallway) "gO" = ( @@ -2823,12 +2738,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -2894,17 +2803,19 @@ /turf/open/floor/monotile/steel, /area/hallway/nsv/deck1/hallway) "gY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 +/obj/structure/table/glass, +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/item/folder/white{ + pixel_x = 4; + pixel_y = -3 }, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/nsv/hanger/deck3{ - name = "Air traffic control pod" - }) +/obj/item/reagent_containers/food/drinks/solgovcup, +/turf/open/floor/carpet/blue, +/area/hallway/nsv/deck1/hallway) "gZ" = ( /obj/machinery/door/poddoor/preopen{ id = "xoshutters"; @@ -2928,12 +2839,6 @@ name = "Executive officer's Office" }) "hb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/item/kirbyplants{ icon_state = "plant-10" }, @@ -2942,12 +2847,6 @@ name = "Air traffic control pod" }) "hc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/structure/chair/stool, /mob/living/simple_animal/hostile/retaliate/goose{ name = "Maverick" @@ -2957,9 +2856,6 @@ name = "Air traffic control pod" }) "hd" = ( -/obj/machinery/door/airlock/ship{ - name = "Deck 2 Access" - }, /obj/structure/cable{ icon_state = "1-2" }, @@ -2970,39 +2866,37 @@ dir = 1 }, /obj/effect/landmark/zebra_interlock_point, +/obj/machinery/door/airlock/ship/command{ + name = "Briefing Room"; + req_one_access_txt = "19" + }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck1/hallway) "he" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 + dir = 6 + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/structure/cable{ + icon_state = "2-8" }, /turf/open/floor/monotile/dark, /area/hallway/nsv/deck1/hallway) "hf" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/ship/delivery{ - color = "#8B0000" +/obj/structure/hull_plate/end{ + dir = 10 }, +/obj/structure/grille, /turf/open/floor/monotile/dark/airless, -/area/nsv/hanger/deck3{ - name = "Air traffic control pod" - }) +/area/space/nearstation) "hh" = ( /obj/machinery/computer/ship/dradis/minor{ dir = 1 @@ -3012,14 +2906,15 @@ name = "Air traffic control pod" }) "hi" = ( -/obj/machinery/door/airlock/ship{ - name = "Deck 2 Access" - }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/effect/landmark/zebra_interlock_point, +/obj/machinery/door/airlock/ship/command{ + name = "Briefing Room"; + req_one_access_txt = "19" + }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck1/hallway) "hj" = ( @@ -3185,12 +3080,6 @@ name = "Air traffic control pod" }) "hG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/machinery/light{ dir = 1 }, @@ -3229,12 +3118,6 @@ /turf/open/floor/monotile/dark/airless, /area/space/nearstation) "hL" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/structure/chair/stool, /obj/structure/mirror{ desc = "For those who think the world of themselves"; @@ -3252,9 +3135,6 @@ /turf/open/floor/monotile/steel, /area/maintenance/nsv/deck1/central) "hN" = ( -/obj/structure/railing{ - dir = 1 - }, /obj/machinery/light, /obj/structure/cable{ icon_state = "4-8" @@ -3262,8 +3142,14 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/structure/cable{ + icon_state = "1-8" }, /turf/open/floor/monotile/dark, /area/hallway/nsv/deck1/hallway) @@ -3272,9 +3158,6 @@ /turf/open/floor/engine/airless, /area/space/nearstation) "hP" = ( -/obj/structure/railing{ - dir = 1 - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -3365,13 +3248,14 @@ /turf/open/floor/engine/airless, /area/space/nearstation) "ih" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plating, -/area/nsv/hanger/deck3{ - name = "Air traffic control pod" - }) +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/camera/autoname{ + dir = 8 + }, +/turf/open/floor/monotile/dark/airless, +/area/space/nearstation) "ij" = ( /obj/effect/turf_decal/ship/delivery{ color = "#8B0000" @@ -3548,14 +3432,18 @@ /obj/structure/disposalpipe/junction{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/item/radio/intercom{ pixel_y = -26 }, /obj/structure/cable{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, /turf/open/floor/monotile/dark, /area/hallway/primary/aft) "iK" = ( @@ -3624,23 +3512,11 @@ /turf/open/floor/plating, /area/maintenance/nsv/deck1/central) "iR" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 +/obj/structure/cable{ + icon_state = "2-8" }, /turf/open/floor/monotile/dark, /area/hallway/nsv/deck1/hallway) @@ -4549,14 +4425,12 @@ /turf/open/floor/monotile/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) "ky" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 +/obj/structure/cable{ + icon_state = "4-8" }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/captain) @@ -4779,16 +4653,19 @@ /turf/open/floor/carpet/ship, /area/crew_quarters/heads/captain) "kX" = ( -/obj/structure/railing{ +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/structure/cable{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/monotile/dark, -/area/hallway/nsv/deck1/hallway) +/area/nsv/hanger/deck3{ + name = "Air traffic control pod" + }) "kY" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 @@ -5193,11 +5070,20 @@ name = "Air traffic control pod" }) "lS" = ( -/obj/structure/sign/directions/command{ - dir = 4; - pixel_y = 3 +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 }, -/turf/closed/wall/r_wall/ship, +/obj/machinery/door/airlock/ship/command{ + name = "Captain's Office"; + req_one_access_txt = "20" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/monotile/dark, /area/crew_quarters/heads/captain) "lT" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -5388,9 +5274,8 @@ name = "Air traffic control pod" }) "mo" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 }, /turf/open/floor/monotile/steel, /area/nsv/hanger/deck3{ @@ -5401,7 +5286,7 @@ dir = 1 }, /obj/machinery/airalarm/directional/north, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/monotile/steel, @@ -5409,10 +5294,13 @@ name = "Air traffic control pod" }) "mq" = ( +/obj/machinery/computer/ship/viewscreen, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/machinery/computer/ship/viewscreen, /turf/open/floor/monotile/steel, /area/nsv/hanger/deck3{ name = "Air traffic control pod" @@ -6707,7 +6595,9 @@ pixel_y = 26 }, /turf/closed/wall/r_wall/ship, -/area/maintenance/central) +/area/nsv/hanger/deck3{ + name = "Air traffic control pod" + }) "yG" = ( /obj/machinery/power/apc/auto_name/east, /obj/structure/cable{ @@ -6870,11 +6760,11 @@ /turf/open/floor/circuit, /area/ai_monitored/turret_protected/aisat) "CH" = ( -/obj/machinery/light{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/turf/open/floor/monotile/dark/airless, -/area/space/nearstation) +/turf/open/floor/carpet/blue, +/area/hallway/nsv/deck1/hallway) "CJ" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -7270,13 +7160,6 @@ /turf/open/floor/monotile/dark, /area/quartermaster/miningdock) "IR" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/status_display/evac{ pixel_x = -32 }, @@ -35286,8 +35169,8 @@ ac ac ac ac -ac -ac +id +au ba cf ax @@ -35543,13 +35426,13 @@ ac ac ac ac -ac af +hD bY -cj -CH -db -do +aN +ax +ih +dd ax ax ax @@ -35800,9 +35683,8 @@ ac ac ac ac -ac af -cf +hJ ax aC im @@ -35811,6 +35693,7 @@ dd dd dd dd +dd Mt ax ax @@ -36057,9 +35940,8 @@ ac ac ac ac -ac af -cf +hJ ax aC in @@ -36068,6 +35950,7 @@ cc cc cc cc +aC Mt Mt Mt @@ -36314,17 +36197,17 @@ ac ac ac ac -ac -af +ig +Xd Xd Xd -aC lQ -aC +cc cm cM cm cc +aC Mt ax hU @@ -36366,12 +36249,12 @@ jD eG ie iC -no -ax -ax -it -ac -ac +gv +Xp +Xp +bQ +bQ +bQ ac ac ac @@ -36572,16 +36455,16 @@ ac ac ac ac -af Xd ag -aC -ap +Xd +aE cc cm cm cm cc +aC Mt ax hX @@ -36623,12 +36506,12 @@ jG eG eG iC -no -ax -ax -it -ac -ac +gv +aI +aI +aI +aI +bQ ac ac ac @@ -36827,16 +36710,16 @@ ad ad ad ac -ak -aE -aM -dC -bQ +ac +ac +Xd dC -av +Xd +ao cc cp PJ +cc aC aC aC @@ -36880,12 +36763,12 @@ kn jM gZ iC -no -ax -ax -it -ac -ac +gv +Xp +Xp +bQ +aI +bQ ac ac ac @@ -37084,14 +36967,14 @@ ad ad lw ac -al ac -af +ac Xd -bS +bZ FC -bl +kX ho +qS cH Ba nw @@ -37140,9 +37023,9 @@ iC no ax ax -it -ac -ac +bQ +aI +bQ ac ac ac @@ -37341,13 +37224,13 @@ ad ad ad ac -am -aG -aN -di -en +ac +ac +Xd +dC +Xd di -bO +hC hC cL hC @@ -37397,9 +37280,9 @@ eG nq no ax -it -ac -ac +bQ +aI +bQ ac ac ac @@ -37598,11 +37481,11 @@ ac ac ac aC -gY +hn +aC aC aC aC -Xd yF aC hn @@ -37654,9 +37537,9 @@ gZ iC no ax -iu -Ew -ac +bQ +aI +bQ ac ac ac @@ -37911,9 +37794,9 @@ gZ iC no ax -ax -iu -Ew +Xp +aI +bQ ac ac ac @@ -38168,9 +38051,9 @@ eG eG iC no -ax -ax -it +Xp +aI +bQ ac ac ac @@ -38407,7 +38290,7 @@ Ya dq gz IR -kX +iT gA iR gN @@ -38425,9 +38308,9 @@ fM gZ iC iC -ns -ax -it +hf +Xp +bQ ac ac ac @@ -38656,17 +38539,17 @@ iC aQ aV aZ -bq -ky -gu -gv dD -gy -ck -ck -ck -ck -ck +ky +aZ +aV +gw +iT +CH +at +at +at +aL he hd hj @@ -38681,7 +38564,7 @@ fj eY gZ iC -Xp +iC no ax it @@ -38915,15 +38798,15 @@ aV aZ bh bD -aZ +gy fn lS ca -ck -ck -ck -ck -ck +an +bl +co +gY +aG hN iF kJ @@ -39175,12 +39058,12 @@ bs aZ aV gw -bZ -ck -ck -ck -ck -ck +iT +aL +bO +bO +bO +ak hP hi jZ @@ -39397,7 +39280,7 @@ ad ad ad aC -gY +hn aC aC aC @@ -39433,11 +39316,11 @@ aZ aV Ya ds +iT cl -cl -cl +iT dl -cl +iT fa bN kE @@ -39684,17 +39567,17 @@ iC aQ bC aZ -aZ +bq bu aZ cI Ya iF iF -iF +yZ cW fY -cW +iF iD bN iF @@ -39911,7 +39794,7 @@ ac ac ac ac -ao +af bR bR aJ @@ -40168,7 +40051,7 @@ ac ac ac ac -ao +af bR bR aJ @@ -40425,7 +40308,7 @@ ac ac ac ac -ao +af bR bR aJ @@ -40682,7 +40565,7 @@ ac ac ac ac -ao +af bR bR aJ @@ -40939,7 +40822,7 @@ ac ac ac ac -ao +af bR bR aJ @@ -41196,7 +41079,7 @@ ac ac ac ac -ao +af bR bR aJ @@ -41710,7 +41593,7 @@ ac ac ac ac -ao +af bR bR aJ @@ -41967,7 +41850,7 @@ ac ac ac ac -ao +af bR bR aJ @@ -42224,7 +42107,7 @@ ac ac ac ac -ao +af bR bR aJ @@ -42481,7 +42364,7 @@ ac ac ac ac -ao +af bR bR aJ @@ -42738,7 +42621,7 @@ ac ac ac ac -ao +af bR bR aJ @@ -42995,7 +42878,7 @@ ac ac ac ac -ao +af bR bR aJ @@ -43509,7 +43392,7 @@ ac ac ac ac -ao +af bR bR bR @@ -43766,7 +43649,7 @@ ac ac ac ac -an +ac aK bT bT @@ -44023,7 +43906,7 @@ ac ac ac ac -an +ac ac bW aK @@ -44280,7 +44163,7 @@ ac ac ac ac -an +ac ac ac af @@ -44537,7 +44420,7 @@ ac ac ac ac -an +ac ac ac af @@ -44794,7 +44677,7 @@ ac ac ac ac -an +ac ac ac af @@ -45051,7 +44934,7 @@ ac ac ac ac -an +ac ac ac af @@ -45308,14 +45191,14 @@ ac ac ac ac -at -aL -aL -cg -co -co -hf -ih +ac +ac +ac +af +ax +ax +ij +hn mo ms cX @@ -46087,7 +45970,7 @@ ax ax ij hn -hB +av qX lj hH diff --git a/_maps/map_files/Tycoon/Tycoon2.dmm b/_maps/map_files/Tycoon/Tycoon2.dmm index 9ee2c11fdfc..0365b138d60 100644 --- a/_maps/map_files/Tycoon/Tycoon2.dmm +++ b/_maps/map_files/Tycoon/Tycoon2.dmm @@ -12,17 +12,18 @@ /turf/closed/wall/ship, /area/maintenance/central) "aaf" = ( -/obj/machinery/door/airlock/ship/command{ - name = "Briefing Room"; - req_one_access_txt = "69;19" - }, -/obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/ship/public{ + name = "Custodial Closet"; + req_one_access_txt = "26" + }, /obj/effect/landmark/zebra_interlock_point, +/obj/structure/disposalpipe/segment, /turf/open/floor/monotile/dark, -/area/hallway/nsv/deck2/frame1/central) +/area/janitor) "aag" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/stripes/line{ @@ -173,8 +174,7 @@ /obj/machinery/firealarm{ pixel_y = 24 }, -/obj/machinery/camera/autoname, -/turf/open/floor/monotile/steel, +/turf/closed/wall/ship, /area/hallway/nsv/deck2/frame1/central) "aaz" = ( /obj/effect/turf_decal/tile/ship/half/yellow{ @@ -328,9 +328,9 @@ /turf/open/floor/monotile/dark, /area/nsv/hanger/deck2) "aaS" = ( -/obj/structure/disposalpipe/segment, -/turf/closed/wall/r_wall/ship, -/area/medical/virology) +/obj/effect/spawner/room/fivexthree, +/turf/template_noop, +/area/maintenance/department/medical) "aaT" = ( /obj/structure/cable{ icon_state = "1-2" @@ -344,12 +344,9 @@ /turf/open/floor/monotile/dark, /area/hallway/nsv/deck2/frame1/central) "aaU" = ( -/obj/effect/spawner/structure/window/reinforced/ship, -/obj/structure/cable{ - icon_state = "0-8" - }, -/turf/open/floor/plating, -/area/medical/virology) +/obj/structure/lattice, +/turf/open/space/basic, +/area/space) "aaV" = ( /turf/closed/wall/ship, /area/security/brig) @@ -391,15 +388,6 @@ "abd" = ( /turf/closed/wall/ship, /area/crew_quarters/bar) -"abg" = ( -/obj/machinery/firealarm{ - pixel_y = 24 - }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/turf/open/floor/monotile/light, -/area/medical/virology) "abh" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -408,36 +396,43 @@ /turf/open/floor/monotile/dark, /area/nsv/hanger/deck2) "abj" = ( -/obj/item/kirbyplants/random, /obj/machinery/firealarm{ pixel_y = 24 }, /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, -/turf/open/floor/monotile/dark, -/area/hallway/nsv/deck2/frame1/central) +/obj/effect/turf_decal/tile/green, +/obj/structure/closet/crate{ + opened = 1 + }, +/obj/item/storage/box/mousetraps{ + pixel_x = -3; + pixel_y = 8 + }, +/obj/item/storage/box/lights/mixed{ + pixel_x = 6; + pixel_y = 8 + }, +/obj/item/storage/box/lights/mixed{ + pixel_x = 6; + pixel_y = 8 + }, +/turf/open/floor/monotile/steel, +/area/janitor) "abk" = ( /turf/open/floor/monotile/dark, /area/hallway/nsv/deck2/frame1/central) -"abl" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/monotile/light, -/area/medical/virology) "abn" = ( /obj/machinery/light{ dir = 1 }, -/obj/structure/sign/nanotrasen{ - pixel_y = 26 +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/green{ + dir = 8 }, -/turf/open/floor/monotile/dark, -/area/hallway/nsv/deck2/frame1/central) +/turf/open/floor/monotile/steel, +/area/janitor) "abo" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ @@ -448,12 +443,15 @@ /turf/open/floor/monotile/dark, /area/nsv/weapons/fore) "abp" = ( -/obj/item/kirbyplants/random, /obj/structure/cable{ icon_state = "0-2" }, -/turf/open/floor/monotile/dark, -/area/hallway/nsv/deck2/frame1/central) +/obj/machinery/power/apc/auto_name/north, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/turf/open/floor/monotile/steel, +/area/janitor) "abq" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -606,17 +604,11 @@ /turf/open/floor/monotile/steel, /area/nsv/hanger/deck2) "abP" = ( -/obj/structure/disposalpipe/junction{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/monotile/light, -/area/medical/virology) +/turf/closed/wall/r_wall/ship, +/area/maintenance/department/security) "abQ" = ( /obj/machinery/door/airlock/ship/public/glass{ - name = "Patient rooms" + name = "Medical Lounge" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -624,8 +616,11 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/open/floor/monotile/steel, -/area/medical/medbay/central) +/area/medical/break_room) "abR" = ( /obj/machinery/firealarm{ pixel_y = 24 @@ -694,8 +689,9 @@ /turf/open/floor/monotile/dark, /area/ai_monitored/security/armory) "abY" = ( -/turf/closed/wall/r_wall/ship, -/area/medical/virology) +/obj/structure/grille, +/turf/open/space/basic, +/area/space) "abZ" = ( /turf/closed/wall/ship, /area/crew_quarters/cafeteria{ @@ -707,16 +703,10 @@ /turf/closed/wall/ship, /area/nsv/weapons/fore) "acb" = ( -/obj/machinery/airalarm{ - pixel_y = 26 - }, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/monotile/light, -/area/medical/virology) +/obj/structure/closet/firecloset, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/durasteel/padded, +/area/maintenance/department/medical) "acc" = ( /turf/open/floor/monotile/dark, /area/hallway/secondary/exit) @@ -730,30 +720,31 @@ /turf/open/floor/monotile/steel, /area/hallway/secondary/exit) "ace" = ( -/obj/effect/turf_decal/tile/neutral{ +/obj/machinery/airalarm{ + pixel_y = 26 + }, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 +/obj/structure/cable{ + icon_state = "4-8" }, +/obj/machinery/light, +/turf/open/floor/plating, +/area/maintenance/department/medical) +"acf" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 + dir = 4 }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/lattice/catwalk/over/ship, +/obj/machinery/computer/ship/viewscreen, /turf/open/floor/monotile/dark, -/area/medical/virology) -"acf" = ( -/obj/structure/disposalpipe/trunk, -/obj/structure/disposaloutlet{ - dir = 1 - }, -/turf/open/floor/plating/airless, -/area/space/nearstation) +/area/bridge{ + name = "CIC" + }) "acg" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -863,10 +854,10 @@ /turf/open/floor/carpet/ship, /area/chapel/office) "acx" = ( -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ +/obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/effect/turf_decal/tile/blue, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) "acA" = ( @@ -925,14 +916,14 @@ /turf/open/floor/carpet/ship, /area/chapel/office) "acH" = ( -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, /obj/machinery/firealarm{ pixel_y = 24 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) "acI" = ( @@ -943,14 +934,20 @@ /obj/machinery/status_display/evac{ pixel_x = -32 }, -/turf/open/floor/monotile/dark, -/area/hallway/nsv/deck2/frame1/central) +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/machinery/vending/wardrobe/jani_wardrobe, +/turf/open/floor/monotile/steel, +/area/janitor) "acL" = ( -/obj/effect/landmark/start/head_of_personnel{ - name = "Executive Officer" +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 }, -/turf/open/floor/carpet/blue, -/area/hallway/nsv/deck2/frame1/central) +/obj/structure/disposalpipe/segment, +/turf/open/floor/monotile/dark, +/area/janitor) "acM" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp, @@ -1058,32 +1055,12 @@ }, /turf/open/floor/monotile/steel, /area/nsv/weapons/fore) -"acZ" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, +"ada" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, /turf/open/floor/monotile/dark, -/area/medical/virology) -"ada" = ( -/obj/structure/chair/fancy, -/turf/open/floor/carpet/blue, -/area/hallway/nsv/deck2/frame1/central) +/area/janitor) "adb" = ( /obj/structure/table, /obj/item/radio/intercom{ @@ -1109,15 +1086,6 @@ /obj/item/ammo_box/c9mm, /turf/open/floor/monotile/dark, /area/ai_monitored/security/armory) -"ade" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/holopad, -/turf/open/floor/monotile/dark, -/area/medical/virology) "adf" = ( /obj/structure/spirit_board, /turf/open/floor/carpet/ship, @@ -1142,18 +1110,6 @@ }, /turf/open/floor/plasteel/techmaint, /area/quartermaster/warehouse) -"adk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/monotile/light, -/area/medical/virology) "adl" = ( /obj/structure/table, /obj/item/radio/intercom{ @@ -1854,27 +1810,17 @@ /turf/open/floor/monotile/dark, /area/nsv/weapons/fore) "aeQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ +/obj/effect/turf_decal/tile/green{ dir = 8 }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock/ship/public/glass{ - name = "Virology"; - req_one_access_txt = "39" +/obj/effect/turf_decal/tile/green{ + dir = 1 }, -/turf/open/floor/monotile/light, -/area/medical/virology) +/obj/effect/turf_decal/box, +/obj/vehicle/ridden/janicart, +/obj/item/key/janitor, +/turf/open/floor/monotile/steel, +/area/janitor) "aeR" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -2081,9 +2027,10 @@ /turf/open/floor/monotile/steel, /area/medical/chemistry) "afn" = ( -/obj/structure/closet/l3closet/janitor, -/obj/structure/sign/warning/biohazard{ - pixel_y = 26 +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/green{ + dir = 8 }, /turf/open/floor/monotile/steel, /area/janitor) @@ -2164,24 +2111,13 @@ /turf/open/floor/wood, /area/library) "afy" = ( -/obj/structure/table, -/obj/item/reagent_containers/spray/cleaner, -/obj/item/grenade/chem_grenade/cleaner, -/obj/item/grenade/chem_grenade/cleaner, -/obj/item/grenade/chem_grenade/cleaner, -/obj/item/reagent_containers/glass/bucket, -/obj/item/mop, -/obj/structure/sink{ - pixel_y = 32 - }, /obj/machinery/camera/autoname, /turf/open/floor/monotile/steel, -/area/janitor) +/area/hallway/nsv/deck2/frame1/port) "afz" = ( -/obj/machinery/vending/wardrobe/jani_wardrobe, /obj/machinery/computer/ship/viewscreen, /turf/open/floor/monotile/steel, -/area/janitor) +/area/hallway/nsv/deck2/frame1/port) "afA" = ( /obj/machinery/door/airlock/ship/maintenance/defaultaccess, /obj/machinery/door/firedoor/border_only{ @@ -2192,14 +2128,11 @@ /area/hallway/nsv/deck2/frame1/port) "afB" = ( /obj/machinery/portable_atmospherics/canister/water_vapor, -/obj/structure/sign/warning/biohazard{ - pixel_y = 26 - }, /obj/item/radio/intercom{ pixel_x = 26 }, /turf/open/floor/monotile/steel, -/area/janitor) +/area/hallway/nsv/deck2/frame1/port) "afC" = ( /obj/effect/turf_decal/box, /obj/machinery/firealarm{ @@ -2207,13 +2140,16 @@ pixel_x = 24 }, /turf/open/floor/monotile/steel, -/area/janitor) +/area/hallway/nsv/deck2/frame1/port) "afD" = ( /turf/open/floor/plasteel/grid/steel, -/area/janitor) +/area/hallway/nsv/deck2/frame1/port) "afE" = ( -/turf/open/floor/monotile/steel, -/area/janitor) +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plating, +/area/maintenance/central) "afF" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -2229,16 +2165,16 @@ }, /area/chapel/main) "afH" = ( -/obj/effect/turf_decal/tile/green{ +/obj/machinery/light, +/obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/obj/effect/turf_decal/tile/green{ +/obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/machinery/light, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) "afI" = ( @@ -2252,13 +2188,13 @@ /turf/open/floor/monotile/dark, /area/tcommsat/computer) "afK" = ( -/obj/effect/turf_decal/tile/green{ +/obj/machinery/light, +/obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/effect/turf_decal/tile/green{ +/obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/machinery/light, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) "afL" = ( @@ -2296,30 +2232,23 @@ /obj/item/key/janitor, /obj/effect/turf_decal/box, /turf/open/floor/monotile/steel, -/area/janitor) +/area/hallway/nsv/deck2/frame1/port) "afQ" = ( /obj/structure/janitorialcart{ dir = 4 }, /turf/open/floor/monotile/steel, -/area/janitor) +/area/hallway/nsv/deck2/frame1/port) "afR" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/turf/open/floor/monotile/dark, -/area/medical/virology) +/obj/item/grown/bananapeel, +/turf/open/floor/plating, +/area/maintenance/department/security) "afS" = ( -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ +/obj/machinery/computer/ship/viewscreen, +/obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/machinery/computer/ship/viewscreen, +/obj/effect/turf_decal/tile/blue, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) "afT" = ( @@ -2342,14 +2271,14 @@ icon_state = "0-2" }, /turf/open/floor/monotile/steel, -/area/janitor) +/area/hallway/nsv/deck2/frame1/port) "afV" = ( /turf/closed/wall/ship, /area/medical/medbay/lobby) "afW" = ( /obj/machinery/computer/ship/viewscreen, /turf/open/floor/plasteel/grid/steel, -/area/janitor) +/area/hallway/nsv/deck2/frame1/port) "afX" = ( /obj/structure/closet/emcloset, /obj/structure/sign/poster/contraband/rebels_unite{ @@ -2359,7 +2288,7 @@ dir = 8 }, /turf/open/floor/plasteel/techmaint, -/area/janitor) +/area/hallway/nsv/deck2/frame1/port) "afY" = ( /turf/open/floor/plasteel/chapel{ dir = 8 @@ -2368,22 +2297,6 @@ "afZ" = ( /turf/open/floor/plasteel/chapel, /area/chapel/main) -"aga" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/open/floor/monotile/dark, -/area/medical/virology) "agb" = ( /obj/machinery/door/airlock/ship{ name = "Spare Fighter Supplies Storage"; @@ -2474,30 +2387,6 @@ "agm" = ( /turf/closed/wall/r_wall/ship, /area/nsv/weapons/fore) -"agn" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/monotile/dark, -/area/medical/virology) "ago" = ( /turf/closed/wall/ship, /area/nsv/weapons/fore) @@ -2575,20 +2464,14 @@ pixel_y = 24 }, /turf/open/floor/plasteel/techmaint, -/area/janitor) +/area/hallway/nsv/deck2/frame1/port) "agy" = ( /turf/open/floor/monotile/dark, /area/nsv/weapons/fore) "agz" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/monotile/dark, -/area/medical/virology) +/obj/item/shard, +/turf/open/space/basic, +/area/space) "agA" = ( /obj/machinery/door/airlock/ship/public{ name = "Bunk 1-A" @@ -2635,20 +2518,18 @@ /turf/open/floor/monotile/steel, /area/medical/chemistry) "agE" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/tile/green{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/obj/effect/turf_decal/tile/green{ + dir = 1 }, -/turf/open/floor/monotile/dark, -/area/medical/virology) +/obj/machinery/portable_atmospherics/canister/water_vapor, +/turf/open/floor/monotile/steel, +/area/janitor) "agG" = ( /obj/structure/sign/ship/radiation, /turf/closed/wall/r_wall/ship, @@ -2719,16 +2600,16 @@ dir = 8 }, /turf/open/floor/monotile/steel, -/area/janitor) +/area/hallway/nsv/deck2/frame1/port) "agR" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 8 }, /turf/open/floor/plasteel/techmaint, -/area/janitor) +/area/hallway/nsv/deck2/frame1/port) "agS" = ( /turf/open/floor/plasteel/techmaint, -/area/janitor) +/area/hallway/nsv/deck2/frame1/port) "agT" = ( /obj/structure/chair/fancy/sofa/old/right{ dir = 4 @@ -2741,11 +2622,13 @@ pixel_x = -22 }, /turf/open/floor/monotile/steel, -/area/janitor) +/area/hallway/nsv/deck2/frame1/port) "agU" = ( -/mob/living/carbon/monkey, -/turf/open/floor/plasteel/freezer, -/area/medical/virology) +/obj/structure/closet/crate/secure/loot, +/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/durasteel/padded, +/area/maintenance/department/medical) "agV" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk, @@ -2841,24 +2724,9 @@ }, /turf/open/floor/monotile/steel, /area/ai_monitored/security/armory) -"ahh" = ( -/turf/open/floor/plasteel/freezer, -/area/medical/virology) "ahi" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, -/turf/open/floor/monotile/steel, -/area/medical/surgery) -"ahj" = ( /turf/closed/wall/ship, -/area/medical/medbay/zone2{ - name = "Intensive care unit" - }) +/area/medical/storage) "ahk" = ( /obj/machinery/requests_console{ department = "Genetics"; @@ -2867,7 +2735,7 @@ pixel_y = -30 }, /turf/open/floor/monotile/light, -/area/medical/medbay/central) +/area/medical/genetics) "ahl" = ( /obj/structure/cable{ icon_state = "1-2" @@ -2894,33 +2762,23 @@ /turf/open/floor/monotile/dark, /area/chapel/main) "aho" = ( -/obj/structure/rack, -/obj/machinery/airalarm{ - pixel_y = 26 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 }, -/turf/open/floor/monotile/light, -/area/medical/virology) -"ahq" = ( -/obj/structure/table/glass, -/obj/item/storage/firstaid/brute, -/obj/item/storage/firstaid/brute, -/obj/item/storage/firstaid/brute, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/landmark/start/janitor, +/turf/open/floor/monotile/dark, +/area/janitor) +"ahr" = ( +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/machinery/door/window/westright{ - name = "First-Aid Supplies"; - red_alert_access = 1; - req_access_txt = "5" +/obj/effect/turf_decal/tile/blue{ + dir = 1 }, +/obj/item/kirbyplants/random, /turf/open/floor/monotile/steel, -/area/medical/surgery) -"ahr" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/medical/medbay/zone2{ - name = "Intensive care unit" - }) +/area/medical/break_room) "ahs" = ( /obj/machinery/vending/hydronutrients, /obj/effect/turf_decal/tile/green, @@ -2942,9 +2800,18 @@ name = "Munitions Projects" }) "ahv" = ( -/obj/structure/bed/roller, -/turf/open/floor/plasteel/freezer, -/area/medical/virology) +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/camera/autoname{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/monotile/dark, +/area/space/nearstation) "ahw" = ( /obj/structure/closet/crate/coffin, /turf/open/floor/plating, @@ -3008,11 +2875,11 @@ /obj/structure/cable{ icon_state = "2-4" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 +/obj/structure/disposalpipe/segment{ + dir = 6 }, -/turf/open/floor/monotile/dark, -/area/medical/virology) +/turf/open/floor/durasteel, +/area/medical) "ahC" = ( /obj/machinery/atmospherics/components/unary/cryo_cell, /obj/effect/turf_decal/stripes/white/line, @@ -3060,15 +2927,22 @@ }, /area/chapel/main) "ahJ" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/airlock/ship/maintenance/defaultaccess, /turf/open/floor/plating, -/area/medical/medbay/central) +/area/maintenance/department/medical) "ahK" = ( /obj/structure/disposalpipe/sorting/mail{ dir = 4; sortType = 23 }, /turf/open/floor/monotile/steel, -/area/medical/morgue) +/area/medical) "ahL" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/ship/preopen{ @@ -3083,7 +2957,7 @@ dir = 1 }, /turf/open/floor/monotile/dark, -/area/medical/medbay/central) +/area/medical/surgery) "ahO" = ( /turf/closed/wall/ship, /area/medical/morgue) @@ -3098,19 +2972,15 @@ /turf/open/floor/monotile/dark, /area/medical/morgue) "ahR" = ( -/obj/structure/disposalpipe/sorting/mail{ - dir = 1; - sortType = 9 +/obj/structure/disposalpipe/junction/flip{ + dir = 1 }, /turf/open/floor/monotile/dark, -/area/medical/medbay/central) +/area/medical) "ahS" = ( -/obj/machinery/smartfridge/chemistry/virology/preloaded, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/monotile/light, -/area/medical/virology) +/obj/effect/spawner/room/threexthree, +/turf/template_noop, +/area/maintenance/department/medical) "ahT" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/glass/beaker/cryoxadone, @@ -3134,17 +3004,6 @@ /area/maintenance/starboard/secondary{ name = "Munitions Projects" }) -"ahV" = ( -/obj/machinery/power/apc/auto_name/north{ - pixel_y = 24 - }, -/obj/structure/cable{ - icon_state = "0-2" - }, -/turf/open/floor/carpet/ship, -/area/medical/medbay/zone2{ - name = "Intensive care unit" - }) "ahW" = ( /obj/structure/table/wood, /obj/effect/turf_decal/tile/neutral{ @@ -3212,15 +3071,6 @@ "aic" = ( /turf/open/floor/monotile/dark, /area/medical/morgue) -"aid" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/turf/open/floor/monotile/dark, -/area/medical/surgery) "aif" = ( /obj/structure/table/wood, /obj/effect/turf_decal/tile/neutral{ @@ -3232,17 +3082,6 @@ }, /turf/open/floor/monotile/dark, /area/chapel/main) -"aig" = ( -/obj/machinery/door/airlock/ship/public/glass{ - name = "Test Subject Storage"; - req_one_access_txt = "39" - }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/turf/open/floor/monotile/light, -/area/medical/virology) "aih" = ( /turf/closed/wall/ship, /area/maintenance/department/cargo) @@ -3369,16 +3208,6 @@ /obj/structure/disposalpipe/trunk, /turf/open/floor/monotile/dark, /area/lawoffice) -"aiC" = ( -/obj/structure/rack, -/obj/item/crowbar/red, -/obj/item/wrench, -/obj/item/restraints/handcuffs, -/obj/machinery/requests_console{ - pixel_y = 26 - }, -/turf/open/floor/monotile/light, -/area/medical/virology) "aiE" = ( /obj/machinery/atmospherics/pipe/simple/dark/visible{ dir = 8 @@ -3469,12 +3298,6 @@ }, /turf/open/floor/plating, /area/engine/engineering/hangar) -"aiT" = ( -/obj/machinery/iv_drip, -/turf/open/floor/monotile/steel, -/area/medical/medbay/zone2{ - name = "Intensive care unit" - }) "aiU" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk, @@ -3504,7 +3327,7 @@ req_one_access_txt = "5" }, /turf/open/floor/monotile/light, -/area/medical/genetics) +/area/medical/medbay/central) "aiZ" = ( /obj/item/cigbutt, /turf/open/floor/plating, @@ -3616,16 +3439,15 @@ "ajs" = ( /turf/closed/wall/ship, /area/quartermaster/qm) -"aju" = ( -/turf/open/floor/monotile/light, -/area/medical/virology) "ajv" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/rack, +/obj/effect/spawner/lootdrop/maintenance/three, /turf/open/floor/plating, -/area/medical/virology) +/area/maintenance/central) "ajw" = ( /obj/structure/sign/poster/official/fruit_bowl{ pixel_y = -6 @@ -3778,9 +3600,16 @@ /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) "ajX" = ( -/obj/structure/table/wood, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/light, +/obj/structure/chair/fancy/sofa/old{ + dir = 1 + }, /turf/open/floor/monotile/steel, -/area/medical/medbay/central) +/area/medical/break_room) "ajY" = ( /turf/open/floor/monotile/light, /area/medical/genetics) @@ -3795,11 +3624,8 @@ /turf/open/floor/carpet/ship, /area/quartermaster/qm) "akb" = ( -/obj/structure/disposalpipe/segment{ - dir = 6 - }, /turf/open/floor/plating, -/area/maintenance/port) +/area/maintenance/central) "akd" = ( /obj/machinery/computer/cargo{ dir = 4 @@ -3939,9 +3765,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/monotile/dark, /area/crew_quarters/nsv/observation) -"aku" = ( -/turf/open/floor/monotile/steel, -/area/medical/morgue) "akv" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/tile/green{ @@ -4000,17 +3823,6 @@ }, /turf/open/floor/monotile/dark, /area/medical/morgue) -"akA" = ( -/obj/machinery/vending/medical, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/monotile/steel, -/area/medical/surgery) "akB" = ( /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -4027,7 +3839,7 @@ icon_state = "1-2" }, /turf/open/floor/plating, -/area/maintenance/port) +/area/maintenance/central) "akE" = ( /obj/structure/bed/roller, /turf/open/floor/monotile/light, @@ -4086,23 +3898,20 @@ /turf/open/floor/monotile/light, /area/medical/medbay/central) "akO" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ +/mob/living/carbon/monkey, +/turf/open/floor/plating, +/area/maintenance/department/security) +"akQ" = ( +/obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/structure/chair/office/light, -/obj/effect/landmark/start/virologist, -/turf/open/floor/monotile/dark, -/area/medical/virology) -"akQ" = ( -/obj/machinery/door/airlock/ship/maintenance{ - name = "Medbay maintenance"; - req_one_access_txt = "5" +/obj/machinery/door/airlock/ship/maintenance/defaultaccess{ + req_one_access_txt = "12;5" }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ dir = 8 }, /turf/open/floor/plating, @@ -4155,42 +3964,24 @@ /turf/open/floor/monotile/steel, /area/medical/chemistry) "akX" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/monotile/light, -/area/medical/virology) -"akY" = ( -/obj/structure/table/glass, -/obj/machinery/microwave{ - pixel_x = -3; - pixel_y = 6 - }, -/obj/machinery/airalarm{ - pixel_y = 26 - }, -/turf/open/floor/monotile/light, -/area/medical/virology) +/obj/effect/mob_spawn/human/corpse/assistant, +/turf/open/space/basic, +/area/space) "akZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/computer/ship/viewscreen, -/turf/open/floor/monotile/light, -/area/medical/virology) +/obj/structure/grille, +/turf/open/floor/plating, +/area/maintenance/department/security) "ala" = ( /obj/structure/closet/crate/freezer/blood, /obj/item/radio/intercom{ pixel_y = 26 }, /turf/open/floor/monotile/steel, -/area/medical/medbay/central) +/area/medical/surgery) "alb" = ( -/turf/open/floor/monotile/steel, -/area/medical/medbay/zone2{ - name = "Intensive care unit" - }) +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/plating, +/area/maintenance/central) "ald" = ( /obj/machinery/atmospherics/pipe/simple/general/hidden, /turf/open/floor/monotile/light, @@ -4209,11 +4000,8 @@ /turf/open/floor/monotile/light, /area/medical/genetics) "alg" = ( -/obj/machinery/computer/med_data{ - dir = 4 - }, -/turf/open/floor/monotile/light, -/area/medical/virology) +/turf/closed/wall/ship, +/area/medical/break_room) "alh" = ( /obj/machinery/atmospherics/pipe/simple/general/hidden{ dir = 4 @@ -4231,7 +4019,7 @@ icon_state = "0-2" }, /turf/open/floor/monotile/dark, -/area/medical/medbay/central) +/area/medical/surgery) "alj" = ( /obj/structure/table/glass, /obj/item/flashlight/lamp, @@ -4269,22 +4057,22 @@ /turf/open/floor/monotile/light, /area/medical/medbay/central) "alp" = ( -/obj/structure/closet/secure_closet/medical3, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/structure/extinguisher_cabinet{ - pixel_x = -27 +/obj/effect/turf_decal/tile/blue, +/obj/structure/disposalpipe/segment{ + dir = 10 }, -/turf/open/floor/monotile/steel, -/area/medical/medbay/central) +/turf/open/floor/monotile/light, +/area/medical/storage) "alq" = ( /obj/structure/chair/office{ dir = 4 }, /obj/effect/landmark/start/geneticist, /turf/open/floor/monotile/light, -/area/medical/medbay/central) +/area/medical/genetics) "als" = ( /obj/structure/table/glass, /obj/item/folder/blue, @@ -4299,20 +4087,9 @@ /turf/open/floor/carpet/ship, /area/crew_quarters/heads/cmo) "alu" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/open/floor/monotile/dark, -/area/medical/virology) +/obj/structure/lattice, +/turf/closed/wall/r_wall/ship, +/area/maintenance/nsv/weapons) "alv" = ( /obj/machinery/defibrillator_mount{ pixel_y = 28 @@ -4320,107 +4097,60 @@ /turf/open/floor/monotile/light, /area/medical/genetics) "alw" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "2-4" +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, -/turf/open/floor/monotile/dark, -/area/medical/virology) +/obj/structure/disposalpipe/segment, +/turf/open/floor/monotile/light, +/area/medical/storage) "alx" = ( /obj/structure/table/reinforced, /obj/item/restraints/handcuffs, /turf/open/floor/monotile/steel, /area/security/prison) -"aly" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/monotile/dark, -/area/medical/virology) "alz" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/monotile/light, -/area/medical/virology) -"alA" = ( -/obj/machinery/door/firedoor/border_only{ - dir = 4 +/obj/structure/sign/warning/vacuum/external{ + pixel_y = 31 }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock/ship/public/glass{ - name = "Virology"; - req_one_access_txt = "39" +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/turf/open/floor/monotile/light, -/area/medical/virology) +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/durasteel, +/area/medical) "alB" = ( -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/effect/turf_decal/stripes/line, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/doorButtons/airlock_controller{ - idExterior = "virology_airlock_exterior"; - idInterior = "virology_airlock_interior"; - idSelf = "virology_airlock_control"; - name = "Virology Access Console"; - pixel_x = -26; - pixel_y = -26; - req_access_txt = "39" - }, -/turf/open/floor/monotile/light, -/area/medical/virology) +/obj/structure/closet/crate/trashcart, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/spawner/lootdrop/maintenance, +/obj/item/trash/boritos, +/obj/item/trash/plate, +/turf/open/floor/durasteel/padded, +/area/maintenance/department/medical) "alC" = ( -/obj/structure/shuttle/engine/heater{ - dir = 8 +/obj/structure/closet/crate{ + opened = 1 }, -/turf/closed/wall/r_wall/ship, -/area/medical/virology) +/obj/effect/spawner/lootdrop/maintenance/two, +/obj/item/reagent_containers/food/drinks/coffee{ + list_reagents = list(/datum/reagent/consumable/coffee = 10,/datum/reagent/toxin/mutagen = 30,/datum/reagent/toxin/mindbreaker = 10); + name = "Cursed Pumpkin Spice Latte"; + desc = "This drink gives you an uneasy feeling." + }, +/turf/open/floor/plating, +/area/maintenance/department/medical) "alD" = ( -/obj/machinery/camera/autoname, -/turf/open/floor/plasteel/freezer, -/area/medical/virology) +/obj/structure/closet/toolcloset, +/obj/item/clothing/head/hardhat/orange, +/turf/open/floor/plating, +/area/maintenance/department/medical) "alE" = ( -/obj/structure/chair/office/light{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/monotile/dark, -/area/medical/virology) +/obj/structure/closet/firecloset, +/obj/item/storage/toolbox/emergency, +/turf/open/floor/plating, +/area/maintenance/central) "alF" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 @@ -4449,15 +4179,12 @@ /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) "alJ" = ( +/obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/monotile/dark, -/area/medical/virology) +/turf/closed/wall/ship, +/area/hallway/nsv/deck2/frame1/central) "alK" = ( /obj/machinery/camera/autoname, /obj/machinery/atmospherics/components/unary/tank/air{ @@ -4513,17 +4240,9 @@ /turf/open/floor/carpet/blue, /area/crew_quarters/heads/cmo) "alR" = ( -/obj/structure/table/glass, -/obj/item/folder/white{ - pixel_x = 4; - pixel_y = -3 - }, -/obj/item/pen/red, -/obj/machinery/camera/autoname{ - dir = 4 - }, -/turf/open/floor/monotile/light, -/area/medical/virology) +/obj/machinery/holopad, +/turf/open/floor/monotile/dark, +/area/medical/surgery) "alS" = ( /obj/structure/table/glass, /obj/item/storage/pill_bottle/mannitol, @@ -4535,29 +4254,24 @@ /turf/open/floor/monotile/light, /area/medical/genetics) "alT" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 +/obj/effect/turf_decal/tile/blue{ + dir = 8 }, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/camera/autoname{ + dir = 5 }, -/turf/open/floor/monotile/dark, -/area/medical/virology) +/turf/open/floor/monotile/steel, +/area/medical/break_room) "alU" = ( /obj/machinery/firealarm{ pixel_y = 24 }, /obj/machinery/camera/autoname, /turf/open/floor/monotile/dark, -/area/medical/medbay/central) +/area/medical/surgery) "alW" = ( /turf/open/floor/monotile/dark, /area/hydroponics) @@ -4614,7 +4328,7 @@ pixel_y = 24 }, /turf/open/floor/monotile/light, -/area/medical/medbay/central) +/area/medical/genetics) "amh" = ( /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -4698,9 +4412,18 @@ /turf/closed/wall/r_wall/ship, /area/engine/gravity_generator) "amy" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/on, -/turf/open/floor/plating/airless, -/area/space/nearstation) +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/camera/autoname, +/obj/machinery/firealarm{ + pixel_y = 24 + }, +/turf/open/floor/monotile/steel, +/area/hallway/nsv/deck2/frame1/central) "amz" = ( /turf/closed/wall/r_wall/ship, /area/tcommsat/server) @@ -4740,22 +4463,6 @@ }, /turf/open/floor/monotile/steel, /area/security/brig) -"amI" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/airlock/ship/public/glass{ - name = "Virology Decontamination"; - req_one_access_txt = "39" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/monotile/dark, -/area/medical/virology) "amJ" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -4766,38 +4473,9 @@ }, /turf/open/floor/monotile/steel, /area/crew_quarters/theatre) -"amL" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/turf/open/floor/monotile/dark, -/area/medical/surgery) "amM" = ( /turf/open/floor/monotile/steel, /area/medical/surgery) -"amO" = ( -/obj/structure/table/glass, -/obj/item/storage/firstaid/fire, -/obj/item/storage/firstaid/fire, -/obj/item/storage/firstaid/fire, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/structure/window/reinforced, -/obj/machinery/door/window/northleft{ - dir = 8; - name = "First-Aid Supplies"; - red_alert_access = 1; - req_access_txt = "5" - }, -/turf/open/floor/monotile/steel, -/area/medical/surgery) "amP" = ( /obj/structure/sink/kitchen{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; @@ -4842,32 +4520,24 @@ }, /turf/open/floor/plating, /area/maintenance/department/medical) -"amV" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/item/radio/intercom{ - pixel_y = 26 - }, -/turf/open/floor/monotile/steel, -/area/medical/surgery) "amW" = ( /obj/effect/turf_decal/loading_area{ dir = 4 }, /turf/open/floor/monotile/steel, -/area/medical/medbay/central) +/area/medical/surgery) "amX" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/structure/table/reinforced, +/obj/item/defibrillator/loaded{ + pixel_y = 1; + pixel_x = -1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 +/obj/item/defibrillator/loaded{ + pixel_y = 6; + pixel_x = 5 }, -/turf/open/floor/monotile/dark, -/area/medical/surgery) +/turf/open/floor/monotile/steel, +/area/medical/storage) "amY" = ( /obj/item/reagent_containers/food/drinks/beer, /obj/structure/table, @@ -4902,8 +4572,13 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/monotile/steel, -/area/medical/virology) +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/plating{ + icon_state = "panelscorched" + }, +/area/medical) "anj" = ( /turf/closed/wall/r_wall/ship, /area/engine/engineering/hangar) @@ -4969,7 +4644,7 @@ }, /obj/machinery/door/firedoor/border_only, /turf/open/floor/plating, -/area/maintenance/port) +/area/maintenance/central) "anv" = ( /obj/machinery/computer/security/telescreen{ desc = "Used for watching Prison Wing holding areas."; @@ -5037,14 +4712,6 @@ "anD" = ( /turf/open/floor/carpet/blue, /area/lawoffice) -"anE" = ( -/obj/structure/table/glass, -/obj/item/paper_bin{ - pixel_x = -2; - pixel_y = 9 - }, -/turf/open/floor/monotile/light, -/area/medical/virology) "anG" = ( /obj/machinery/computer/station_alert{ dir = 4 @@ -5212,63 +4879,6 @@ }, /turf/open/floor/carpet/ship, /area/crew_quarters/dorms) -"aof" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/monotile/dark, -/area/medical/virology) -"aog" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/monotile/dark, -/area/medical/virology) -"aoh" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/monotile/dark, -/area/medical/virology) -"aoi" = ( -/obj/structure/table/glass, -/obj/item/storage/box/beakers{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/storage/box/syringes, -/obj/structure/reagent_dispensers/virusfood{ - pixel_x = -32 - }, -/turf/open/floor/monotile/light, -/area/medical/virology) -"aoj" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/structure/chair/office/light, -/obj/effect/landmark/start/virologist, -/turf/open/floor/monotile/dark, -/area/medical/virology) "aok" = ( /obj/machinery/atmospherics/pipe/simple/general/hidden{ dir = 8 @@ -5285,109 +4895,67 @@ }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame2/port) -"aom" = ( -/obj/structure/table/glass, -/obj/item/radio/headset/headset_med, -/obj/item/hand_labeler, -/obj/machinery/requests_console{ - department = "Virology"; - name = "Virology Requests Console"; - payment_department = "MED"; - pixel_x = 29; - receive_ore_updates = 1 - }, -/turf/open/floor/monotile/light, -/area/medical/virology) -"aon" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/monotile/light, -/area/medical/virology) "aoo" = ( -/obj/structure/table/glass, -/obj/item/paper_bin{ - pixel_x = -2; - pixel_y = 9 +/obj/structure/table/wood, +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, -/obj/item/pen, -/turf/open/floor/monotile/light, -/area/medical/virology) -"aop" = ( -/obj/machinery/light{ - dir = 1 +/obj/effect/turf_decal/tile/blue{ + dir = 8 }, -/mob/living/carbon/monkey, -/turf/open/floor/plasteel/freezer, -/area/medical/virology) -"aoq" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/monotile/light, -/area/medical/virology) -"aor" = ( -/obj/machinery/light{ +/obj/effect/turf_decal/tile/blue{ dir = 1 }, -/turf/open/floor/monotile/light, -/area/medical/virology) -"aos" = ( -/obj/structure/table/glass, -/obj/item/clothing/gloves/color/latex, -/obj/item/healthanalyzer, -/obj/item/clothing/glasses/science, -/turf/open/floor/monotile/light, -/area/medical/virology) -"aot" = ( -/obj/effect/spawner/structure/window/reinforced, +/obj/item/reagent_containers/food/drinks/coffee/empty, +/obj/item/reagent_containers/food/drinks/coffee/empty, +/obj/item/reagent_containers/food/drinks/coffee/empty, +/obj/item/reagent_containers/food/drinks/coffee/empty, +/turf/open/floor/monotile/steel, +/area/medical/break_room) +"aop" = ( +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/structure/grille, /turf/open/floor/plating, -/area/medical/virology) +/area/space/nearstation) +"aoq" = ( +/obj/effect/spawner/room/threexthree, +/turf/template_noop, +/area/maintenance/central) "aou" = ( -/obj/machinery/door/airlock/ship/public/glass{ - name = "Isolation A"; - req_one_access_txt = "39" +/obj/structure/cable{ + icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/door/airlock/ship/maintenance/defaultaccess, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/freezer, -/area/medical/virology) +/turf/open/floor/monotile/dark, +/area/hallway/nsv/deck2/frame1/central) "aov" = ( /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/monotile/dark, -/area/medical/virology) +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/medical) "aow" = ( -/obj/structure/bed, -/obj/item/bedsheet/medical, -/turf/open/floor/plasteel/freezer, -/area/medical/virology) -"aox" = ( -/obj/structure/table/glass, -/obj/item/radio/intercom{ - pixel_y = 26 +/turf/closed/wall/r_wall/ship, +/area/medical/break_room) +"aoz" = ( +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, -/obj/item/reagent_containers/food/snacks/sosjerky, -/turf/open/floor/monotile/light, -/area/medical/virology) -"aoy" = ( -/obj/structure/chair/office/light{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 6 }, -/turf/open/floor/monotile/light, -/area/medical/virology) -"aoz" = ( -/obj/structure/bed/dogbed/vector, -/mob/living/simple_animal/pet/hamster/vector, -/turf/open/floor/monotile/light, -/area/medical/virology) +/turf/open/floor/monotile/steel, +/area/medical/break_room) "aoA" = ( /obj/machinery/modular_computer/console/preset/research, /obj/machinery/firealarm{ @@ -5399,89 +4967,28 @@ /obj/machinery/airalarm{ pixel_y = 26 }, +/obj/structure/table/wood, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/item/reagent_containers/glass/coffeepot, /turf/open/floor/monotile/steel, -/area/medical/medbay/central) +/area/medical/break_room) "aoC" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/tcommsat/server) "aoD" = ( -/obj/item/radio/intercom{ - pixel_y = 26 - }, -/obj/structure/closet/l3closet/virology, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/camera/autoname, -/turf/open/floor/monotile/dark, -/area/medical/virology) -"aoE" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/monotile/steel, -/area/medical/virology) -"aoF" = ( -/obj/machinery/shower{ - dir = 8; - name = "emergency shower" - }, -/obj/structure/sign/warning/biohazard{ - pixel_y = 26 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/turf/open/floor/monotile/dark, -/area/medical/virology) -"aoG" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/open/floor/monotile/dark, -/area/medical/virology) +/obj/effect/decal/cleanable/dirt/dust, +/turf/template_noop, +/area/maintenance/department/medical) "aoJ" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/monotile/dark, -/area/medical/virology) -"aoK" = ( -/obj/machinery/shower{ - dir = 8; - name = "emergency shower" - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, +/obj/structure/table/wood, /turf/open/floor/monotile/dark, -/area/medical/virology) +/area/medical/break_room) "aoL" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 1 @@ -5496,17 +5003,15 @@ dir = 4; sortType = 27 }, -/turf/open/floor/monotile/dark, -/area/medical/virology) +/turf/open/floor/durasteel, +/area/medical) "aoO" = ( /obj/machinery/firealarm{ dir = 8; pixel_x = 24 }, /turf/open/floor/monotile/steel, -/area/medical/medbay/zone2{ - name = "Intensive care unit" - }) +/area/medical/surgery) "aoP" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -5520,39 +5025,34 @@ /obj/machinery/washing_machine, /turf/open/floor/monotile/steel, /area/security/prison) -"aoR" = ( -/obj/structure/table/glass, -/obj/item/reagent_containers/dropper, -/obj/item/reagent_containers/syringe, -/obj/item/reagent_containers/glass/beaker, -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/open/floor/plasteel/freezer, -/area/medical/virology) "aoS" = ( -/obj/machinery/power/apc/auto_name/north{ - pixel_y = 24 - }, -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ dir = 4 }, -/turf/open/floor/monotile/light, -/area/medical/virology) +/turf/open/floor/monotile/steel, +/area/medical/break_room) "aoT" = ( -/obj/machinery/light, -/turf/open/floor/monotile/light, -/area/medical/virology) +/obj/machinery/vending/wardrobe/medi_wardrobe, +/turf/open/floor/monotile/steel, +/area/medical/storage) "aoU" = ( +/obj/structure/window/reinforced{ + dir = 8; + layer = 2.9 + }, /obj/structure/table/glass, -/obj/structure/cable{ - icon_state = "2-8" +/obj/item/storage/firstaid/regular{ + pixel_y = -3; + pixel_x = -3 }, -/turf/open/floor/plasteel/freezer, -/area/medical/virology) +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/regular{ + pixel_y = 3; + pixel_x = 3 + }, +/turf/open/floor/monotile/light, +/area/medical/storage) "aoV" = ( /obj/docking_port/stationary{ dwidth = 1; @@ -5576,14 +5076,11 @@ /turf/open/floor/plating, /area/maintenance/department/engine) "apa" = ( -/obj/machinery/door/airlock/ship/maintenance{ - name = "Virology maintenance" - }, /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/door/airlock/ship/maintenance{ + name = "Virology maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -5591,8 +5088,8 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, -/turf/open/floor/monotile/steel, -/area/maintenance/port) +/turf/open/floor/plating, +/area/maintenance/department/medical) "apb" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -6173,7 +5670,7 @@ sortType = 32 }, /turf/open/floor/plating, -/area/maintenance/port) +/area/maintenance/central) "aqV" = ( /turf/open/floor/carpet/blue, /area/crew_quarters/theatre) @@ -6786,14 +6283,16 @@ /turf/open/floor/monotile/dark, /area/engine/engine_room) "asK" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/tile/green{ + dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 9 +/obj/effect/turf_decal/tile/green{ + dir = 4 }, -/turf/open/floor/plating, -/area/maintenance/port) +/turf/open/floor/monotile/steel, +/area/janitor) "asL" = ( /turf/closed/wall/r_wall/ship, /area/maintenance/department/engine) @@ -7770,17 +7269,21 @@ /turf/open/indestructible/sound/pool/spentfuel/wall, /area/engine/engineering/reactor_core) "awv" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/effect/turf_decal/tile/green{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/effect/turf_decal/tile/green{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/structure/sink{ + pixel_y = 32 }, -/turf/open/floor/monotile/light, -/area/medical/virology) +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, +/turf/open/floor/monotile/steel, +/area/janitor) "awD" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/simple/purple/visible{ @@ -8217,7 +7720,7 @@ /obj/structure/window/reinforced/spawner/west, /obj/machinery/clonepod/prefilled, /turf/open/floor/engine, -/area/medical/medbay/central) +/area/medical/genetics) "azg" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/structure/cable{ @@ -8645,15 +8148,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/airlock/ship/maintenance/defaultaccess, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, /turf/open/floor/plating, -/area/maintenance/port) +/area/maintenance/central) "aAu" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -8742,11 +8238,9 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, +/obj/structure/disposalpipe/segment, /turf/open/floor/monotile/dark, -/area/medical/medbay/central) +/area/medical) "aAJ" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -8785,27 +8279,12 @@ /turf/open/floor/monotile/dark, /area/engine/storage_shared) "aAN" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/airlock/ship/public/glass{ - name = "Virology Decontamination"; - req_one_access_txt = "39" +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 1 }, -/turf/open/floor/monotile/dark, -/area/medical/virology) +/turf/open/floor/monotile/light, +/area/medical/storage) "aAO" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -9331,10 +8810,6 @@ /obj/machinery/atmospherics/pipe/simple/general/visible, /turf/closed/wall/r_wall/ship, /area/engine/atmospherics_engine) -"aCf" = ( -/obj/structure/sign/ship/medical, -/turf/closed/wall/ship, -/area/medical/genetics) "aCg" = ( /obj/effect/mapping_helpers/airlock/locked, /obj/effect/mapping_helpers/airlock/cyclelink_helper, @@ -9397,11 +8872,10 @@ /turf/open/floor/engine, /area/engine/atmospherics_engine) "aCo" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/monotile/light, -/area/medical/virology) +/obj/structure/grille, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space) "aCp" = ( /obj/machinery/door/airlock/ship/hatch{ name = "Network Administration"; @@ -12088,25 +11562,6 @@ }, /turf/open/floor/monotile/dark, /area/engine/engineering) -"aIC" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/open/floor/monotile/dark, -/area/medical/virology) "aID" = ( /obj/item/cardboard_cutout{ desc = "They seem to be ignoring you... Typical."; @@ -12149,25 +11604,9 @@ /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) "aIL" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/effect/mapping_helpers/airlock/locked, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/airlock/ship/medical{ - autoclose = 0; - frequency = 1449; - id_tag = "virology_airlock_interior"; - name = "Virology Interior Airlock"; - req_access_txt = "39" - }, -/turf/open/floor/monotile/dark, -/area/medical/virology) +/obj/structure/girder, +/turf/open/floor/plating, +/area/space) "aIM" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -12475,26 +11914,9 @@ /turf/open/floor/monotile/dark, /area/science/robotics) "aJF" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/doorButtons/access_button{ - idDoor = "virology_airlock_interior"; - idSelf = "virology_airlock_control"; - name = "Virology Access Button"; - pixel_x = -26; - pixel_y = 28; - req_access_txt = "39" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/open/floor/monotile/dark, -/area/medical/virology) +/obj/structure/girder/reinforced, +/turf/open/floor/plating, +/area/space/nearstation) "aJG" = ( /obj/item/cardboard_cutout{ desc = "They seem to be ignoring you... Typical."; @@ -13802,17 +13224,8 @@ /turf/open/floor/monotile/steel, /area/hydroponics) "aMx" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/turf/open/floor/monotile/steel, -/area/medical/medbay/central) +/turf/closed/wall/ship, +/area/maintenance/department/security) "aMy" = ( /obj/machinery/atmospherics/pipe/manifold/dark/visible{ dir = 4 @@ -13856,19 +13269,12 @@ /turf/open/floor/durasteel, /area/engine/engineering) "aMD" = ( -/obj/structure/closet/secure_closet/medical3, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/light{ - dir = 8 - }, -/turf/open/floor/monotile/steel, -/area/medical/surgery) +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/monotile/light, +/area/medical/storage) "aME" = ( /obj/structure/table/reinforced, /obj/item/ship_weapon/parts/missile/propulsion_system, @@ -14890,13 +14296,13 @@ name = "Munitions Projects" }) "aON" = ( -/obj/effect/turf_decal/tile/green{ +/obj/effect/turf_decal/tile/purple{ dir = 4 }, -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ +/obj/effect/turf_decal/tile/purple{ dir = 1 }, +/obj/effect/turf_decal/tile/purple, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) "aOO" = ( @@ -14910,10 +14316,10 @@ /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) "aOP" = ( -/obj/effect/turf_decal/tile/green{ +/obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/effect/turf_decal/tile/green{ +/obj/effect/turf_decal/tile/blue{ dir = 4 }, /turf/open/floor/monotile/steel, @@ -14949,18 +14355,18 @@ dir = 4 }, /turf/open/floor/monotile/steel, -/area/janitor) +/area/hallway/nsv/deck2/frame1/port) "aOU" = ( -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, /obj/machinery/power/apc/auto_name/north{ pixel_y = 24 }, /obj/structure/cable{ icon_state = "0-8" }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) "aOV" = ( @@ -15040,8 +14446,13 @@ dir = 4; pixel_x = -22 }, -/turf/open/floor/monotile/dark, -/area/hallway/nsv/deck2/frame1/central) +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/structure/closet/l3closet/janitor, +/turf/open/floor/monotile/steel, +/area/janitor) "aPb" = ( /obj/structure/table/reinforced, /obj/item/storage/bag/tray, @@ -15090,11 +14501,10 @@ /turf/open/floor/plasteel/grid/steel, /area/quartermaster/storage) "aPf" = ( -/obj/structure/chair/fancy{ - dir = 4 - }, -/turf/open/floor/carpet/blue, -/area/hallway/nsv/deck2/frame1/central) +/obj/structure/disposalpipe/segment, +/mob/living/simple_animal/kalo, +/turf/open/floor/monotile/dark, +/area/janitor) "aPg" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -15236,7 +14646,7 @@ }, /obj/effect/landmark/start/geneticist, /turf/open/floor/monotile/light, -/area/medical/medbay/central) +/area/medical/genetics) "aPt" = ( /obj/item/kirbyplants{ icon_state = "plant-21" @@ -15346,20 +14756,13 @@ /area/engine/break_room) "aPE" = ( /obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/sorting/mail{ - dir = 1; - sortType = 9 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 + icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 +/obj/item/shard, +/turf/open/floor/plating{ + icon_state = "panelscorched" }, -/turf/open/floor/monotile/steel, -/area/medical/medbay/central) +/area/space/nearstation) "aPF" = ( /obj/structure/cable{ icon_state = "1-2" @@ -15627,31 +15030,6 @@ /obj/item/pen/red, /turf/open/floor/monotile/dark, /area/engine/engine_smes) -"aQC" = ( -/obj/machinery/door/airlock/ship/public/glass{ - name = "Medical Storage"; - req_one_access_txt = "5" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/turf/open/floor/monotile/steel, -/area/medical/medbay/central) "aQD" = ( /obj/machinery/door/airlock/ship/command{ name = "Gravity Generator"; @@ -15697,16 +15075,15 @@ /turf/open/floor/monotile/steel, /area/engine/engineering) "aQG" = ( -/obj/machinery/door/airlock/ship/maintenance{ - name = "Medbay maintenance"; - req_one_access_txt = "5" - }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/machinery/door/airlock/ship/maintenance/defaultaccess{ + req_one_access_txt = "12;5" + }, /turf/open/floor/plating, /area/maintenance/port) "aQH" = ( @@ -16175,25 +15552,14 @@ /turf/open/floor/monotile/steel, /area/crew_quarters/dorms) "aRL" = ( -/obj/structure/chair{ +/obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, -/turf/open/floor/carpet/ship, -/area/medical/medbay/zone2{ - name = "Intensive care unit" - }) +/turf/open/floor/monotile/light, +/area/medical/storage) "aRM" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, @@ -16484,13 +15850,14 @@ /turf/open/floor/monotile/steel, /area/engine/gravity_generator) "aSx" = ( -/obj/structure/table/glass, -/obj/item/folder/white{ - pixel_x = 4; - pixel_y = -3 - }, -/turf/open/floor/carpet/blue, -/area/hallway/nsv/deck2/frame1/central) +/obj/structure/table, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/reagent_containers/food/drinks/beer/light, +/turf/open/floor/monotile/dark, +/area/janitor) "aSy" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -16512,11 +15879,9 @@ /turf/open/floor/monotile/dark, /area/nsv/weapons/fore) "aSA" = ( -/obj/structure/chair/fancy{ - dir = 8 - }, -/turf/open/floor/carpet/blue, -/area/hallway/nsv/deck2/frame1/central) +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/medical/storage) "aSB" = ( /obj/structure/cable{ icon_state = "1-2" @@ -16524,18 +15889,25 @@ /obj/machinery/camera/autoname{ dir = 8 }, -/turf/open/floor/monotile/dark, -/area/hallway/nsv/deck2/frame1/central) -"aSC" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 +/obj/effect/turf_decal/tile/green{ + dir = 8 }, -/obj/effect/turf_decal/tile/ship/blue{ +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/obj/structure/rack, +/obj/item/storage/box/lights/mixed, +/obj/item/clothing/suit/hazardvest, +/turf/open/floor/monotile/steel, +/area/janitor) +"aSC" = ( +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/effect/turf_decal/tile/ship/blue, +/obj/structure/disposalpipe/segment, /turf/open/floor/monotile/steel, -/area/hallway/nsv/deck2/frame1/central) +/area/medical/break_room) "aSD" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -16613,44 +15985,52 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/turf/open/floor/monotile/dark, -/area/hallway/nsv/deck2/frame1/central) -"aSN" = ( -/obj/structure/chair/fancy{ +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/green{ dir = 4 }, +/turf/open/floor/monotile/steel, +/area/janitor) +"aSN" = ( /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/carpet/blue, -/area/hallway/nsv/deck2/frame1/central) +/obj/structure/disposalpipe/segment, +/turf/open/floor/monotile/dark, +/area/janitor) "aSO" = ( -/obj/structure/table/glass, -/obj/item/megaphone/command, /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/carpet/blue, -/area/hallway/nsv/deck2/frame1/central) +/obj/structure/table, +/obj/item/mop, +/obj/item/reagent_containers/glass/bucket, +/turf/open/floor/monotile/dark, +/area/janitor) "aSP" = ( -/obj/structure/chair/fancy{ - dir = 8 - }, /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/turf/open/floor/carpet/blue, -/area/hallway/nsv/deck2/frame1/central) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/monotile/dark, +/area/janitor) "aSQ" = ( /obj/structure/cable{ icon_state = "1-8" }, -/turf/open/floor/monotile/dark, -/area/hallway/nsv/deck2/frame1/central) +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/obj/structure/janitorialcart{ + dir = 4 + }, +/obj/item/reagent_containers/glass/bucket, +/obj/item/mop, +/turf/open/floor/monotile/steel, +/area/janitor) "aSR" = ( /obj/effect/turf_decal/ship/delivery/yellow, /obj/machinery/light{ @@ -17022,7 +16402,7 @@ dir = 9 }, /turf/open/floor/monotile/dark, -/area/medical/medbay/central) +/area/medical/surgery) "aUb" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/computer/turbine_computer{ @@ -17031,40 +16411,30 @@ /turf/open/floor/plasteel/ridged/steel, /area/engine/engineering/reactor_core) "aUc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/structure/table/glass, +/obj/item/storage/firstaid/o2{ + pixel_x = -3; + pixel_y = -3 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/item/storage/firstaid/o2, +/obj/item/storage/firstaid/o2{ + pixel_x = 3; + pixel_y = 3 }, -/turf/open/floor/carpet/ship, -/area/medical/medbay/zone2{ - name = "Intensive care unit" - }) +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/machinery/door/window/northleft{ + dir = 8; + name = "Medical Supplies"; + red_alert_access = 1; + req_access_txt = "5" + }, +/turf/open/floor/monotile/light, +/area/medical/storage) "aUe" = ( /turf/open/floor/monotile/light, /area/medical/medbay/central) -"aUg" = ( -/obj/machinery/door/airlock/ship/public/glass{ - name = "Paramedic Station"; - req_one_access_txt = "5" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/turf/open/floor/monotile/steel, -/area/medical/medbay/zone2{ - name = "Intensive care unit" - }) "aUh" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -17077,86 +16447,59 @@ /turf/open/floor/plating, /area/medical/genetics) "aUl" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/turf/open/floor/carpet/ship, -/area/medical/medbay/zone2{ - name = "Intensive care unit" - }) -"aUm" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 +/obj/structure/table/glass, +/obj/item/storage/firstaid/radbgone, +/obj/item/storage/firstaid/radbgone{ + pixel_x = 3; + pixel_y = 3 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 +/obj/structure/window/reinforced{ + dir = 8; + layer = 2.9 }, -/turf/open/floor/monotile/steel, -/area/medical/medbay/zone2{ - name = "Intensive care unit" - }) +/turf/open/floor/monotile/light, +/area/medical/storage) +"aUm" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/plating, +/area/maintenance/central) "aUn" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/camera/autoname{ - dir = 4 +/obj/structure/table/glass, +/obj/item/storage/box/syringes, +/obj/item/gun/syringe, +/obj/machinery/door/window/northleft{ + name = "Portable Ranged Injection"; + req_one_access_txt = "5" }, -/turf/open/floor/carpet/ship, -/area/medical/medbay/zone2{ - name = "Intensive care unit" - }) +/turf/open/floor/monotile/light, +/area/medical/storage) "aUo" = ( -/obj/effect/turf_decal/box, -/obj/structure/bed/roller, -/turf/open/floor/monotile/dark, -/area/medical/medbay/zone2{ - name = "Intensive care unit" - }) -"aUp" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating{ + icon_state = "platingdmg3" }, -/turf/open/floor/monotile/steel, -/area/medical/medbay/zone2{ - name = "Intensive care unit" - }) +/area/maintenance/central) +"aUp" = ( +/obj/structure/closet/wardrobe/grey, +/turf/open/floor/plating, +/area/maintenance/central) "aUq" = ( /obj/effect/turf_decal/box, /obj/machinery/smartfridge/organ, /turf/open/floor/monotile/steel, -/area/medical/medbay/zone2{ - name = "Intensive care unit" - }) +/area/medical/surgery) "aUr" = ( /obj/machinery/iv_drip/saline, /obj/effect/turf_decal/box, -/obj/machinery/defibrillator_mount/loaded{ - pixel_y = 26 - }, /turf/open/floor/monotile/steel, -/area/medical/medbay/zone2{ - name = "Intensive care unit" - }) -"aUs" = ( -/obj/item/clothing/suit/toggle/labcoat/paramedic, -/obj/item/clothing/suit/toggle/labcoat/paramedic, -/obj/item/clothing/head/soft/paramedic, -/obj/item/clothing/head/soft/paramedic, -/obj/structure/rack, -/obj/item/defibrillator/loaded, -/obj/item/clothing/suit/toggle/labcoat/paramedic, -/obj/machinery/airalarm{ - pixel_y = 26 - }, -/obj/item/roller, -/turf/open/floor/carpet/ship, /area/medical/surgery) +"aUs" = ( +/obj/effect/spawner/room/threexfive, +/turf/template_noop, +/area/maintenance/department/medical) "aUt" = ( /obj/structure/table/glass, /obj/item/wrench/medical, @@ -17166,11 +16509,7 @@ "aUu" = ( /obj/effect/landmark/nuclear_waste_spawner, /turf/open/floor/monotile/steel, -/area/medical/medbay/central) -"aUv" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/monotile/dark, -/area/medical/medbay/central) +/area/medical/surgery) "aUw" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -17205,25 +16544,26 @@ /turf/open/floor/monotile/light, /area/crew_quarters/heads/cmo) "aUE" = ( -/obj/machinery/door/airlock/ship/maintenance{ - name = "Morgue maintenance"; - req_one_access_txt = "6" +/obj/machinery/door/airlock/ship/maintenance/defaultaccess{ + req_one_access_txt = "12;5" }, /turf/open/floor/plating, -/area/medical/medbay/central) +/area/medical/break_room) "aUF" = ( -/turf/open/space/basic, -/area/medical/surgery) -"aUG" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 8; + layer = 2.9 }, -/obj/structure/bed/roller, -/obj/machinery/iv_drip, -/turf/open/floor/monotile/dark, -/area/medical/medbay/zone2{ - name = "Intensive care unit" - }) +/obj/structure/table/glass, +/obj/item/storage/firstaid/advanced, +/turf/open/floor/monotile/light, +/area/medical/storage) +"aUG" = ( +/obj/structure/grille/broken, +/obj/effect/spawner/lootdrop/maintenance, +/turf/open/floor/plating, +/area/maintenance/central) "aUI" = ( /obj/structure/chair{ dir = 4 @@ -17232,70 +16572,52 @@ pixel_y = 26 }, /turf/open/floor/monotile/dark, -/area/medical/medbay/central) -"aUJ" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, -/turf/open/floor/monotile/light, -/area/medical/virology) +/area/medical/surgery) "aUK" = ( +/obj/structure/window/reinforced, /obj/structure/table/glass, -/obj/item/storage/firstaid/o2, -/obj/item/storage/firstaid/o2, -/obj/item/storage/firstaid/o2, -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/door/window/northleft{ - dir = 4; - name = "First-Aid Supplies"; - red_alert_access = 1; - req_access_txt = "5" +/obj/item/storage/firstaid/fire{ + pixel_x = -3; + pixel_y = -3 }, -/obj/item/gun/syringe, -/obj/item/clothing/glasses/hud/health, -/obj/item/clothing/glasses/hud/health, -/obj/item/clothing/glasses/hud/health, -/turf/open/floor/monotile/steel, -/area/medical/surgery) -"aUL" = ( -/obj/structure/table/glass, -/obj/item/storage/box/donkpockets{ +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/fire{ pixel_x = 3; pixel_y = 3 }, /turf/open/floor/monotile/light, -/area/medical/virology) -"aUM" = ( -/obj/structure/closet/l3closet/virology, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral, +/area/medical/storage) +"aUL" = ( /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/monotile/dark, -/area/medical/virology) -"aUN" = ( -/obj/machinery/camera/autoname{ - dir = 4 +/obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/locked, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 }, -/turf/open/floor/monotile/light, -/area/medical/virology) -"aUO" = ( -/obj/effect/spawner/structure/window/reinforced/ship, -/obj/structure/cable, -/turf/open/floor/plating, -/area/medical/virology) +/obj/machinery/door/airlock/ship/medical{ + autoclose = 0; + frequency = 1449; + id_tag = "virology_airlock_exterior"; + name = "Virology Exterior Airlock"; + req_access_txt = "39" + }, +/obj/structure/barricade/wooden/crude, +/turf/open/floor/monotile/dark, +/area/maintenance/department/medical) "aUP" = ( -/obj/effect/spawner/structure/window/reinforced/ship, +/obj/effect/turf_decal/stripes/line, /obj/structure/cable{ - icon_state = "0-4" + icon_state = "1-2" }, -/turf/open/floor/plating, -/area/medical/virology) +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/monotile/dark, +/area/space/nearstation) "aUQ" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -17312,50 +16634,21 @@ /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame2/port) "aUR" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/camera/autoname{ - dir = 8 - }, -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/open/floor/monotile/dark, -/area/medical/virology) +/turf/closed/wall/r_wall/ship, +/area/space/nearstation) "aUS" = ( -/turf/open/space/basic, -/area/medical/virology) +/turf/closed/wall/r_wall/ship, +/area/medical) "aUT" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/open/floor/monotile/dark, -/area/medical/virology) +/turf/open/floor/monotile/steel, +/area/medical/break_room) "aUU" = ( -/obj/structure/sign/warning/biohazard{ - pixel_y = 26 - }, -/obj/machinery/light{ - dir = 1 - }, +/obj/effect/decal/cleanable/dirt/dust, /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/monotile/steel, -/area/medical/virology) +/turf/open/floor/plating, +/area/medical) "aUV" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -17363,11 +16656,14 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/sign/warning/biohazard{ + pixel_y = 32 + }, /obj/structure/disposalpipe/segment{ - dir = 5 + dir = 4 }, -/turf/open/floor/monotile/dark, -/area/medical/virology) +/turf/open/floor/durasteel, +/area/medical) "aUZ" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -17612,18 +16908,8 @@ /turf/open/floor/monotile/dark, /area/tcommsat/computer) "aVy" = ( -/obj/structure/closet/secure_closet/medical3, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/machinery/light{ - dir = 4 - }, /turf/open/floor/monotile/steel, -/area/medical/surgery) +/area/medical/storage) "aVz" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -17668,21 +16954,6 @@ }, /turf/open/floor/monotile/steel, /area/hallway/secondary/service) -"aVF" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/turf/open/floor/monotile/steel, -/area/medical/medbay/central) "aVG" = ( /obj/structure/closet/crate/trashcart, /obj/item/stack/sheet/mineral/copper, @@ -17709,15 +16980,11 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "aVL" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 8 +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating{ + icon_state = "panelscorched" }, -/turf/open/floor/monotile/steel, -/area/medical/medbay/central) +/area/space) "aVM" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -17878,13 +17145,13 @@ pixel_y = 8 }, /turf/open/floor/monotile/steel, -/area/janitor) +/area/hallway/nsv/deck2/frame1/port) "aWd" = ( /obj/item/stack/sheet/mineral/copper, /obj/item/stack/sheet/mineral/copper, /obj/structure/closet/crate/trashcart, /turf/open/floor/monotile/steel, -/area/janitor) +/area/hallway/nsv/deck2/frame1/port) "aWe" = ( /obj/structure/chair/fancy/sofa/old{ dir = 4 @@ -17897,7 +17164,7 @@ }, /mob/living/simple_animal/kalo, /turf/open/floor/monotile/steel, -/area/janitor) +/area/hallway/nsv/deck2/frame1/port) "aWf" = ( /obj/machinery/computer/ship/viewscreen, /obj/effect/turf_decal/tile/neutral, @@ -17996,14 +17263,12 @@ /obj/structure/cable{ icon_state = "1-8" }, +/obj/effect/decal/cleanable/dirt/dust, /obj/structure/disposalpipe/segment{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 + dir = 4 }, -/turf/open/floor/monotile/dark, -/area/medical/virology) +/turf/open/floor/durasteel, +/area/medical) "aWr" = ( /obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple{ @@ -18566,13 +17831,13 @@ /turf/open/floor/monotile/dark, /area/tcommsat/computer) "aXw" = ( -/obj/machinery/light{ - dir = 1 - }, /obj/structure/cable{ icon_state = "2-8" }, -/turf/open/space/basic, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plating, /area/maintenance/department/medical) "aXy" = ( /obj/effect/turf_decal/delivery, @@ -18686,7 +17951,7 @@ "aXN" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/monotile/dark, -/area/maintenance/department/medical) +/area/medical/morgue) "aXO" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/disposalpipe/segment, @@ -19088,20 +18353,12 @@ name = "Munitions Projects" }) "aYU" = ( -/obj/machinery/door/airlock/ship/maintenance{ - name = "Virology maintenance" - }, /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/turf/open/floor/monotile/steel, -/area/maintenance/department/medical) +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/medical) "aYW" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 @@ -19183,14 +18440,10 @@ name = "Prototype munitions bay" }) "aZg" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/monotile/dark, -/area/medical/medbay/central) +/obj/structure/closet/cardboard, +/obj/effect/spawner/lootdrop/maintenance/five, +/turf/open/floor/plating, +/area/maintenance/central) "aZh" = ( /obj/structure/cable{ icon_state = "2-4" @@ -19200,24 +18453,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard) -"aZi" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/monotile/steel, -/area/medical/medbay/central) -"aZj" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/turf/open/floor/plating, -/area/maintenance/port) "aZk" = ( /obj/machinery/conveyor/slow{ id = "torp" @@ -19513,7 +18748,7 @@ dir = 1 }, /turf/open/floor/monotile/dark, -/area/medical/medbay/central) +/area/medical/morgue) "aZS" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -19549,13 +18784,8 @@ name = "Munitions Projects" }) "aZX" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /turf/open/floor/monotile/steel, -/area/medical/medbay/central) +/area/medical) "aZZ" = ( /obj/structure/cable{ icon_state = "1-2" @@ -19835,15 +19065,10 @@ dir = 5 }, /turf/open/floor/plating, -/area/hallway/nsv/deck2/frame1/central) +/area/maintenance/central) "baz" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/turf/open/floor/monotile/dark, -/area/medical/virology) +/turf/open/floor/durasteel, +/area/medical) "baA" = ( /obj/machinery/button/door{ id = "gaussgang"; @@ -19860,11 +19085,11 @@ /turf/open/floor/plating, /area/maintenance/department/medical) "baF" = ( -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/blue, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) "baG" = ( @@ -19885,7 +19110,7 @@ icon_state = "1-4" }, /turf/open/floor/plating, -/area/hallway/nsv/deck2/frame1/central) +/area/maintenance/central) "baH" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -19904,16 +19129,6 @@ /obj/item/gun/ballistic/shotgun/doublebarrel, /turf/open/floor/monotile/steel, /area/crew_quarters/bar) -"baJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/camera/autoname{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/turf/open/floor/monotile/light, -/area/medical/virology) "baK" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -19975,7 +19190,7 @@ icon_state = "1-2" }, /turf/open/floor/monotile/dark, -/area/medical/medbay/central) +/area/medical/surgery) "baS" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 4 @@ -19994,7 +19209,7 @@ dir = 8 }, /turf/open/floor/engine, -/area/medical/medbay/central) +/area/medical/genetics) "baU" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -20018,7 +19233,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, -/area/maintenance/port) +/area/maintenance/central) "baW" = ( /obj/item/storage/backpack/duffelbag/med/surgery, /obj/structure/table/glass, @@ -20027,24 +19242,18 @@ }, /obj/machinery/light, /turf/open/floor/monotile/dark, -/area/medical/medbay/central) +/area/medical/surgery) "baX" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/medical/medbay/zone2{ - name = "Intensive care unit" - }) +/obj/structure/table/glass, +/obj/item/clothing/glasses/hud/health, +/obj/item/clothing/glasses/hud/health, +/obj/item/clothing/glasses/hud/health, +/turf/open/floor/monotile/light, +/area/medical/storage) "baY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /turf/open/floor/monotile/steel, -/area/medical/medbay/central) +/area/medical) "baZ" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -20054,22 +19263,21 @@ /turf/open/floor/monotile/dark, /area/nsv/hanger/deck2) "bbb" = ( -/obj/machinery/light, -/obj/structure/table/wood, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/chair/fancy/sofa/old/right{ + dir = 1 + }, /turf/open/floor/monotile/steel, -/area/medical/medbay/central) +/area/medical/break_room) "bbc" = ( /obj/structure/cable{ icon_state = "1-2" }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/open/floor/monotile/dark, -/area/medical/medbay/central) +/turf/open/floor/plating, +/area/maintenance/department/security) "bbd" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -20113,7 +19321,7 @@ "bbm" = ( /obj/machinery/light, /turf/open/floor/monotile/dark, -/area/medical/medbay/central) +/area/medical/surgery) "bbn" = ( /obj/structure/cable{ icon_state = "1-2" @@ -20136,12 +19344,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/monotile/light, /area/medical/medbay/central) -"bbq" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/monotile/dark, -/area/medical/medbay/central) "bbr" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -20169,12 +19371,21 @@ /turf/open/floor/plating, /area/hallway/nsv/deck2/frame1/central) "bbu" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/camera/autoname{ dir = 4 }, -/turf/open/floor/monotile/dark, -/area/hallway/nsv/deck2/frame1/central) +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/machinery/requests_console{ + department = "Custodial Closet"; + departmentType = 3; + payment_department = "CIV"; + pixel_x = -28 + }, +/turf/open/floor/monotile/steel, +/area/janitor) "bbv" = ( /turf/template_noop, /area/maintenance/department/science) @@ -20192,7 +19403,7 @@ dir = 1 }, /turf/open/floor/monotile/light, -/area/medical/medbay/central) +/area/medical/genetics) "bbz" = ( /obj/machinery/door/airlock/ship/command/glass{ name = "Officer's Mess" @@ -20294,7 +19505,7 @@ /obj/machinery/camera/autoname, /obj/machinery/computer/scan_consolenew, /turf/open/floor/monotile/light, -/area/medical/medbay/central) +/area/medical/genetics) "bbJ" = ( /obj/structure/cable{ icon_state = "4-8" @@ -20458,7 +19669,7 @@ "bbW" = ( /obj/machinery/vending/wardrobe/gene_wardrobe, /turf/open/floor/monotile/light, -/area/medical/medbay/central) +/area/medical/genetics) "bbX" = ( /obj/structure/kitchenspike, /obj/machinery/power/apc/auto_name/north{ @@ -20498,13 +19709,12 @@ /turf/open/floor/monotile/dark, /area/hallway/nsv/deck2/frame1/central) "bcb" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 +/obj/structure/bed/roller, +/obj/effect/turf_decal/tile/blue{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plating, -/area/hallway/nsv/deck2/frame1/central) +/turf/open/floor/monotile/light, +/area/medical/storage) "bcc" = ( /obj/machinery/smartfridge/drying_rack, /obj/machinery/power/apc/auto_name/north{ @@ -20620,21 +19830,6 @@ }, /turf/open/floor/monotile/steel, /area/crew_quarters/theatre) -"bcm" = ( -/obj/effect/mapping_helpers/airlock/unres{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/airlock/ship/public/glass{ - name = "Cryogenics"; - req_one_access_txt = "5" - }, -/obj/effect/landmark/zebra_interlock_point, -/turf/open/floor/monotile/light, -/area/medical/genetics) "bcn" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -20645,7 +19840,7 @@ dir = 4 }, /turf/open/floor/monotile/dark, -/area/medical/medbay/central) +/area/medical/surgery) "bcq" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -20933,17 +20128,9 @@ /turf/open/floor/monotile/steel, /area/crew_quarters/theatre) "bcS" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/monotile/dark, -/area/medical/medbay/central) +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/medical/break_room) "bcT" = ( /obj/machinery/light{ dir = 1 @@ -20959,7 +20146,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/portable_atmospherics/canister/air, /turf/open/floor/plating, -/area/hallway/nsv/deck2/frame1/central) +/area/maintenance/central) "bcW" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/disposalpipe/segment{ @@ -20978,7 +20165,7 @@ icon_state = "1-2" }, /turf/open/floor/plating, -/area/hallway/nsv/deck2/frame1/central) +/area/maintenance/central) "bcY" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -21862,14 +21049,8 @@ /turf/open/floor/carpet/ship, /area/security/detectives_office) "beA" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /turf/open/floor/monotile/dark, -/area/medical/medbay/central) +/area/medical) "beB" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -21990,12 +21171,6 @@ }, /turf/open/floor/carpet/ship, /area/quartermaster/qm) -"beN" = ( -/obj/structure/disposalpipe/junction{ - dir = 1 - }, -/turf/open/floor/plating, -/area/maintenance/central) "beO" = ( /obj/structure/cable{ icon_state = "1-2" @@ -22004,9 +21179,6 @@ icon_state = "1-4" }, /obj/structure/disposalpipe/segment, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/open/floor/plating, /area/maintenance/central) "beP" = ( @@ -22172,14 +21344,11 @@ /turf/open/floor/monotile/dark, /area/medical/medbay/central) "bfi" = ( -/obj/structure/table/glass, -/obj/item/folder/white{ - pixel_x = 4; - pixel_y = -3 - }, -/obj/item/reagent_containers/food/drinks/solgovcup, -/turf/open/floor/carpet/blue, -/area/hallway/nsv/deck2/frame1/central) +/obj/structure/table, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, +/turf/open/floor/monotile/dark, +/area/janitor) "bfj" = ( /obj/machinery/firealarm{ pixel_y = 24 @@ -22309,7 +21478,10 @@ /turf/open/floor/monotile/light, /area/medical/medbay/central) "bfv" = ( -/turf/open/space/basic, +/obj/structure/closet/radiation, +/obj/item/tank/internals/oxygen/yellow, +/obj/item/clothing/mask/gas, +/turf/open/floor/plating, /area/maintenance/department/medical) "bfw" = ( /obj/machinery/door/airlock/ship/public/glass{ @@ -22323,12 +21495,30 @@ dir = 4 }, /turf/open/floor/monotile/dark, -/area/medical/medbay/central) +/area/medical/surgery) "bfx" = ( -/turf/open/space/basic, -/area/medical/medbay/zone2{ - name = "Intensive care unit" - }) +/obj/structure/window/reinforced{ + dir = 8; + layer = 2.9 + }, +/obj/structure/table/glass, +/obj/item/storage/firstaid/toxin{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/toxin{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/monotile/light, +/area/medical/storage) "bfy" = ( /obj/item/storage/backpack/duffelbag/med/surgery, /obj/structure/table/glass, @@ -22337,7 +21527,7 @@ dir = 8 }, /turf/open/floor/monotile/dark, -/area/medical/medbay/central) +/area/medical/surgery) "bfz" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -22351,16 +21541,13 @@ /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) "bfA" = ( -/obj/structure/table/glass, -/obj/item/book/manual/wiki/infections{ - pixel_y = 7 +/obj/machinery/door/firedoor/border_only{ + dir = 1 }, -/obj/item/reagent_containers/syringe/antiviral, -/obj/item/reagent_containers/dropper, -/obj/item/reagent_containers/spray/cleaner, -/obj/machinery/light, -/turf/open/floor/monotile/light, -/area/medical/virology) +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/ship/maintenance/defaultaccess, +/turf/open/floor/plating, +/area/maintenance/central) "bfB" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -22521,12 +21708,9 @@ /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame2/port) "bfQ" = ( -/obj/structure/chair/fancy{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/carpet/blue, -/area/hallway/nsv/deck2/frame1/central) +/turf/open/floor/monotile/dark, +/area/janitor) "bfR" = ( /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow{ @@ -22628,11 +21812,11 @@ /turf/open/floor/plasteel/techmaint, /area/medical/chemistry) "bge" = ( -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ +/obj/machinery/camera/autoname, +/obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/machinery/camera/autoname, +/obj/effect/turf_decal/tile/blue, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) "bgf" = ( @@ -22911,7 +22095,7 @@ pixel_x = 32 }, /turf/open/floor/engine, -/area/medical/medbay/central) +/area/medical/genetics) "bgI" = ( /obj/structure/cable{ icon_state = "1-2" @@ -23030,10 +22214,6 @@ }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) -"bgZ" = ( -/obj/structure/bodycontainer/morgue, -/turf/open/floor/monotile/dark, -/area/maintenance/department/medical) "bha" = ( /obj/structure/cable{ icon_state = "4-8" @@ -23090,17 +22270,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/monotile/light, /area/medical/medbay/central) -"bhh" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/sign/departments/medbay/alt{ - name = "\improper INTENSIVE CARE UNIT"; - pixel_y = 26 - }, -/turf/open/floor/monotile/dark, -/area/medical/surgery) "bhi" = ( /obj/machinery/requests_console{ department = "Surgery"; @@ -23110,7 +22279,7 @@ pixel_y = -30 }, /turf/open/floor/monotile/dark, -/area/medical/medbay/central) +/area/medical/surgery) "bhk" = ( /obj/structure/window/reinforced, /obj/effect/turf_decal/tile/ship/half/yellow{ @@ -23390,7 +22559,7 @@ pixel_y = -22 }, /turf/open/floor/monotile/light, -/area/medical/medbay/central) +/area/medical/genetics) "bhU" = ( /obj/machinery/atmospherics/pipe/manifold/general/hidden, /obj/structure/disposalpipe/segment{ @@ -23560,7 +22729,7 @@ }, /obj/machinery/light, /turf/open/floor/plasteel/techmaint, -/area/janitor) +/area/hallway/nsv/deck2/frame1/port) "bim" = ( /obj/effect/turf_decal/loading_area{ dir = 8 @@ -23569,7 +22738,7 @@ dir = 6 }, /turf/open/floor/monotile/dark, -/area/maintenance/department/medical) +/area/medical/morgue) "bin" = ( /obj/machinery/light{ dir = 8 @@ -23589,7 +22758,7 @@ dir = 5 }, /turf/open/floor/monotile/dark, -/area/medical/medbay/central) +/area/medical/surgery) "bip" = ( /turf/open/floor/monotile/dark, /area/shuttle/turbolift/shaft) @@ -23738,14 +22907,24 @@ /turf/open/floor/monotile/dark, /area/nsv/weapons/fore) "biH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "1-2" +/obj/structure/table/glass, +/obj/item/storage/firstaid/brute, +/obj/item/storage/firstaid/brute{ + pixel_x = 3; + pixel_y = 3 }, -/obj/structure/lattice/catwalk/over/ship, -/turf/open/floor/monotile/dark, -/area/hallway/nsv/deck2/frame1/central) +/obj/item/storage/firstaid/brute{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/machinery/door/window/southleft{ + base_state = "right"; + icon_state = "right"; + name = "Medical Supplies"; + req_one_access_txt = "5" + }, +/turf/open/floor/monotile/light, +/area/medical/storage) "biI" = ( /obj/machinery/computer/ship/viewscreen, /obj/structure/lattice/catwalk/over/ship, @@ -23879,12 +23058,15 @@ name = "CIC" }) "biU" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/status_display/ai{ pixel_x = -32 }, -/turf/open/floor/monotile/dark, -/area/hallway/nsv/deck2/frame1/central) +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/turf/open/floor/monotile/steel, +/area/janitor) "biV" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 @@ -23892,16 +23074,13 @@ /turf/open/floor/monotile/steel, /area/engine/atmos) "biW" = ( -/obj/structure/chair/fancy{ - dir = 1 - }, -/turf/open/floor/carpet/blue, -/area/hallway/nsv/deck2/frame1/central) +/turf/open/floor/monotile/dark, +/area/janitor) "biX" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/carpet/blue, -/area/hallway/nsv/deck2/frame1/central) +/turf/open/floor/monotile/dark, +/area/janitor) "biY" = ( /obj/machinery/holopad, /obj/effect/turf_decal/tile/ship/blue, @@ -24012,19 +23191,14 @@ /turf/open/floor/carpet/blue, /area/hallway/secondary/exit) "bjk" = ( -/obj/machinery/door/airlock/ship/public/glass{ - name = "Isolation B"; - req_one_access_txt = "39" - }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 4 }, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "4-8" }, -/turf/open/floor/plasteel/freezer, -/area/medical/virology) +/turf/open/floor/plating, +/area/maintenance/department/medical) "bjl" = ( /obj/machinery/light, /turf/open/floor/plasteel/chapel{ @@ -24121,24 +23295,12 @@ }, /turf/open/floor/plasteel/techmaint, /area/medical/chemistry) -"bjt" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plating, -/area/hallway/nsv/deck2/frame1/central) "bju" = ( /obj/machinery/light{ dir = 4 }, /turf/open/floor/plasteel/techmaint, -/area/janitor) -"bjw" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/turf/open/floor/monotile/dark, -/area/medical/medbay/central) +/area/hallway/nsv/deck2/frame1/port) "bjx" = ( /obj/item/radio/intercom{ pixel_x = 26 @@ -24378,42 +23540,16 @@ dir = 4 }, /turf/open/floor/monotile/steel, -/area/janitor) -"bjW" = ( -/obj/structure/table/glass, -/obj/machinery/reagentgrinder{ - pixel_y = 8 - }, -/obj/machinery/light, -/turf/open/floor/monotile/light, -/area/medical/virology) +/area/hallway/nsv/deck2/frame1/port) "bjX" = ( -/obj/structure/table/glass, -/obj/item/folder/white{ - pixel_y = 4 - }, -/obj/item/pen/red, -/obj/machinery/light, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/freezer, -/area/medical/virology) -"bjY" = ( -/obj/structure/table/glass, -/obj/item/reagent_containers/dropper, -/obj/machinery/light, -/obj/structure/cable{ - icon_state = "1-4" - }, +/obj/machinery/atmospherics/pipe/multiz/layer4, +/obj/machinery/atmospherics/pipe/multiz/layer2, +/obj/effect/turf_decal/ship/shutoff, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "2-16" }, -/turf/open/floor/plasteel/freezer, -/area/medical/virology) +/turf/open/floor/plating, +/area/maintenance/nsv/weapons) "bjZ" = ( /obj/structure/closet/wardrobe/green, /obj/effect/turf_decal/tile/neutral{ @@ -24659,7 +23795,7 @@ name = "autopsy table" }, /turf/open/floor/monotile/dark, -/area/medical/medbay/central) +/area/medical/morgue) "bkE" = ( /obj/effect/turf_decal/tile/brown{ dir = 8 @@ -24733,7 +23869,7 @@ /obj/effect/landmark/event_spawn, /obj/machinery/dna_scannernew, /turf/open/floor/engine, -/area/medical/medbay/central) +/area/medical/genetics) "bkL" = ( /obj/structure/cable{ icon_state = "4-8" @@ -24901,30 +24037,21 @@ /turf/open/floor/monotile/dark, /area/security/detectives_office) "blb" = ( -/obj/machinery/door/airlock/ship/public/glass{ - name = "Surgery"; - req_one_access_txt = "5" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/machinery/door/airlock/ship/public/glass{ + name = "Surgery"; + req_one_access_txt = "5" + }, /turf/open/floor/monotile/dark, -/area/medical/medbay/central) +/area/medical/surgery) "blc" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -25253,25 +24380,30 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/carpet/red, /area/security/warden) -"blR" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/structure/disposalpipe/segment, -/turf/open/floor/monotile/steel, -/area/medical/medbay/central) "blS" = ( +/obj/structure/disposalpipe/trunk/multiz{ + dir = 4 + }, /obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 1 +/obj/effect/turf_decal/tile/green{ + dir = 4 }, -/turf/open/floor/monotile/dark, -/area/hallway/nsv/deck2/frame1/central) +/turf/open/floor/monotile/steel, +/area/janitor) "blT" = ( /obj/machinery/light, -/turf/open/floor/monotile/dark, -/area/hallway/nsv/deck2/frame1/central) +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/structure/closet/crate{ + opened = 1 + }, +/obj/item/storage/box/donkpockets, +/turf/open/floor/monotile/steel, +/area/janitor) "blU" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -25301,13 +24433,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/monotile/dark, /area/hallway/nsv/deck2/frame1/central) -"bma" = ( -/obj/effect/spawner/structure/window/reinforced/ship, -/obj/structure/cable{ - icon_state = "0-2" - }, -/turf/open/floor/plating, -/area/medical/virology) "bmb" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 10 @@ -25442,21 +24567,17 @@ /turf/open/floor/monotile/steel, /area/security/brig) "bmo" = ( -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, /obj/machinery/camera/autoname, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) "bmp" = ( -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, /obj/structure/cable{ icon_state = "1-2" }, @@ -25466,6 +24587,10 @@ /obj/structure/cable{ icon_state = "1-4" }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) "bmq" = ( @@ -25712,37 +24837,28 @@ /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) "bmP" = ( -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green{ +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/effect/turf_decal/stripes/line, -/obj/structure/disposalpipe/segment{ - dir = 6 +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) "bmQ" = ( -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/obj/effect/turf_decal/tile/green{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ dir = 4 }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) "bmR" = ( -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, /obj/effect/turf_decal/stripes/line, /obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/segment{ @@ -25750,19 +24866,25 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/monotile/steel, -/area/hallway/nsv/deck2/frame1/port) -"bmS" = ( -/obj/effect/turf_decal/tile/green{ +/obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/effect/turf_decal/tile/green{ +/obj/effect/turf_decal/tile/blue{ dir = 4 }, +/turf/open/floor/monotile/steel, +/area/hallway/nsv/deck2/frame1/port) +"bmS" = ( /obj/machinery/light, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) "bmT" = ( @@ -25869,7 +24991,7 @@ }, /obj/effect/landmark/zebra_interlock_point, /turf/open/floor/monotile/steel, -/area/janitor) +/area/hallway/nsv/deck2/frame1/port) "bne" = ( /turf/closed/wall/ship, /area/maintenance/port) @@ -25915,15 +25037,13 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/monotile/steel, -/area/janitor) +/area/hallway/nsv/deck2/frame1/port) "bno" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/lattice/catwalk/over/ship, /turf/open/floor/monotile/dark, /area/hallway/nsv/deck2/frame1/central) @@ -26060,7 +25180,7 @@ "bnF" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/grid/steel, -/area/janitor) +/area/hallway/nsv/deck2/frame1/port) "bnG" = ( /obj/structure/table, /obj/item/stack/wrapping_paper, @@ -26471,13 +25591,13 @@ }, /obj/effect/landmark/zebra_interlock_point, /turf/open/floor/monotile/steel, -/area/janitor) +/area/hallway/nsv/deck2/frame1/port) "boA" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/monotile/steel, -/area/janitor) +/area/hallway/nsv/deck2/frame1/port) "boB" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -26486,7 +25606,7 @@ dir = 1 }, /turf/open/floor/monotile/steel, -/area/janitor) +/area/hallway/nsv/deck2/frame1/port) "boC" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -26569,7 +25689,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/monotile/steel, -/area/janitor) +/area/hallway/nsv/deck2/frame1/port) "boL" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -26615,7 +25735,7 @@ /obj/item/storage/box/lights/mixed, /obj/item/clothing/suit/hazardvest, /turf/open/floor/plasteel/techmaint, -/area/janitor) +/area/hallway/nsv/deck2/frame1/port) "boR" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -26645,7 +25765,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel/grid/steel, -/area/janitor) +/area/hallway/nsv/deck2/frame1/port) "boV" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -26782,7 +25902,7 @@ dir = 1 }, /turf/open/floor/monotile/steel, -/area/janitor) +/area/hallway/nsv/deck2/frame1/port) "bph" = ( /obj/structure/cable{ icon_state = "4-8" @@ -26791,7 +25911,7 @@ dir = 4 }, /turf/open/floor/plasteel/grid/steel, -/area/janitor) +/area/hallway/nsv/deck2/frame1/port) "bpi" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 8 @@ -26803,7 +25923,7 @@ dir = 4 }, /turf/open/floor/plasteel/techmaint, -/area/janitor) +/area/hallway/nsv/deck2/frame1/port) "bpj" = ( /obj/structure/cable{ icon_state = "4-8" @@ -26812,7 +25932,7 @@ dir = 4 }, /turf/open/floor/plasteel/techmaint, -/area/janitor) +/area/hallway/nsv/deck2/frame1/port) "bpk" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -26824,7 +25944,7 @@ dir = 10 }, /turf/open/floor/plasteel/techmaint, -/area/janitor) +/area/hallway/nsv/deck2/frame1/port) "bpl" = ( /obj/machinery/door/airlock/ship/public{ name = "Janitorial Storage"; @@ -26840,7 +25960,7 @@ dir = 8 }, /turf/open/floor/plating, -/area/maintenance/starboard) +/area/hallway/nsv/deck2/frame1/port) "bpm" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -27001,7 +26121,7 @@ pixel_x = 26 }, /turf/open/floor/plasteel/techmaint, -/area/janitor) +/area/hallway/nsv/deck2/frame1/port) "bpC" = ( /obj/machinery/door/airlock/ship{ name = "Experimental munitions"; @@ -27127,18 +26247,18 @@ /obj/item/mop, /obj/item/reagent_containers/glass/bucket, /turf/open/floor/plasteel/grid/steel, -/area/janitor) +/area/hallway/nsv/deck2/frame1/port) "bpM" = ( /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plasteel/techmaint, -/area/janitor) +/area/hallway/nsv/deck2/frame1/port) "bpN" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ dir = 1 }, /turf/open/floor/plasteel/techmaint, -/area/janitor) +/area/hallway/nsv/deck2/frame1/port) "bpO" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -27795,7 +26915,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, -/area/maintenance/port) +/area/maintenance/central) "bqZ" = ( /obj/machinery/shower{ dir = 4 @@ -27938,14 +27058,14 @@ /turf/open/floor/plating, /area/maintenance/disposal) "brm" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 5 + }, +/obj/structure/cable{ + icon_state = "1-4" }, /turf/open/floor/plating, -/area/maintenance/port) +/area/maintenance/central) "bro" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -28545,8 +27665,12 @@ /area/maintenance/disposal) "bsy" = ( /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, -/area/maintenance/port) +/area/maintenance/central) "bsz" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/stripes/line, @@ -28716,9 +27840,14 @@ /turf/open/floor/plating, /area/maintenance/disposal) "bsR" = ( -/obj/item/kirbyplants/random, -/turf/open/floor/monotile/dark, -/area/hallway/nsv/deck2/frame1/central) +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/obj/vehicle/ridden/janicart, +/obj/effect/turf_decal/box, +/obj/item/key/janitor, +/turf/open/floor/monotile/steel, +/area/janitor) "bsU" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -28730,10 +27859,14 @@ /turf/open/floor/plasteel/grid/steel, /area/hallway/secondary/exit) "bsV" = ( -/turf/closed/wall/ship, -/area/maintenance/starboard/secondary{ - name = "Munitions Projects" - }) +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/plating, +/area/maintenance/central) "bsW" = ( /turf/closed/wall/r_wall/ship, /area/shuttle/turbolift/secondary) @@ -29826,6 +28959,9 @@ /obj/effect/turf_decal/tile/ship/blue{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) "buR" = ( @@ -29975,10 +29111,6 @@ /turf/open/floor/monotile/dark, /area/hallway/nsv/deck2/frame1/central) "bve" = ( -/obj/machinery/door/airlock/ship/command{ - name = "Briefing Room"; - req_one_access_txt = "69;19" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor/border_only, @@ -29986,15 +29118,23 @@ dir = 1 }, /obj/effect/landmark/zebra_interlock_point, +/obj/machinery/door/airlock/ship/public{ + name = "Custodial Closet"; + req_one_access_txt = "26" + }, +/obj/machinery/door/airlock/ship/public{ + name = "Custodial Closet"; + req_one_access_txt = "26" + }, /turf/open/floor/monotile/dark, -/area/hallway/nsv/deck2/frame1/central) +/area/janitor) "bvf" = ( /obj/structure/sign/directions/command{ dir = 8; pixel_y = 3 }, /turf/closed/wall/ship, -/area/hallway/nsv/deck2/frame1/central) +/area/janitor) "bvg" = ( /obj/machinery/airalarm{ dir = 4; @@ -30045,162 +29185,88 @@ /turf/open/floor/monotile/light, /area/medical/medbay/lobby) "bvl" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/computer/med_data{ dir = 1 }, /turf/open/floor/monotile/light, /area/medical/medbay/lobby) -"bvn" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/monotile/dark, -/area/maintenance/department/medical) "bvp" = ( /obj/machinery/disposal/bin, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/open/floor/monotile/steel, -/area/medical/medbay/central) +/area/medical/break_room) "bvq" = ( /obj/machinery/iv_drip, /obj/machinery/airalarm{ pixel_y = 26 }, +/obj/machinery/iv_drip, /turf/open/floor/monotile/steel, -/area/medical/medbay/central) +/area/medical/surgery) "bvr" = ( /obj/machinery/defibrillator_mount/loaded{ pixel_y = 26 }, /obj/structure/closet/secure_closet/medical2, /turf/open/floor/monotile/steel, -/area/medical/medbay/central) +/area/medical/surgery) "bvu" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/monotile/dark, -/area/medical/medbay/central) +/area/medical/surgery) "bvw" = ( -/turf/open/space/basic, -/area/medical/medbay/central) +/obj/structure/closet/l3closet/virology, +/turf/open/floor/monotile/light, +/area/medical/storage) "bvA" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/monotile/steel, -/area/medical/medbay/central) -"bvB" = ( -/obj/structure/disposalpipe/junction/flip{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/monotile/steel, -/area/medical/medbay/central) -"bvC" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /turf/open/floor/monotile/dark, -/area/medical/medbay/central) -"bvD" = ( -/obj/structure/table/glass, -/obj/item/storage/firstaid/toxin, -/obj/item/storage/firstaid/toxin, -/obj/item/storage/firstaid/toxin, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/camera/autoname{ - dir = 4 - }, +/area/janitor) +"bvB" = ( /obj/structure/window/reinforced, -/obj/machinery/door/window/eastright{ - name = "First-Aid Supplies"; - red_alert_access = 1; - req_access_txt = "5" - }, -/obj/item/storage/box/beakers{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/storage/box/bodybags{ - pixel_x = 3; - pixel_y = 3 - }, -/turf/open/floor/monotile/steel, -/area/medical/surgery) -"bvE" = ( -/obj/machinery/vending/wardrobe/medi_wardrobe, -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ +/obj/structure/bed/roller, +/obj/effect/turf_decal/tile/blue{ dir = 8 }, -/turf/open/floor/monotile/steel, -/area/medical/surgery) -"bvF" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +/obj/effect/turf_decal/tile/blue{ dir = 1 }, -/turf/open/floor/monotile/dark, -/area/medical/virology) -"bvG" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/turf/open/floor/monotile/light, +/area/medical/storage) +"bvC" = ( +/turf/closed/wall/ship, +/area/medical) +"bvD" = ( +/obj/machinery/atmospherics/pipe/multiz/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/open/floor/monotile/steel, -/area/medical/virology) -"bvH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/multiz/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/open/floor/monotile/dark, -/area/medical/virology) +/turf/open/floor/plating, +/area/maintenance/nsv/hangar) +"bvE" = ( +/obj/structure/closet/secure_closet/medical3, +/turf/open/floor/monotile/light, +/area/medical/storage) "bvI" = ( -/obj/machinery/light, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "0-2" }, -/turf/open/floor/monotile/steel, -/area/medical/virology) +/obj/structure/grille, +/turf/open/floor/plating, +/area/maintenance/department/medical) "bvM" = ( /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -30208,27 +29274,17 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/obj/machinery/door/airlock/ship/maintenance{ - name = "Medbay maintenance"; - req_one_access_txt = "5" +/obj/machinery/door/airlock/ship/maintenance/defaultaccess{ + req_one_access_txt = "12;5" }, /turf/open/floor/plating, -/area/maintenance/central) +/area/medical/genetics) "bvN" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /turf/open/floor/monotile/dark, -/area/medical/medbay/central) +/area/medical/surgery) "bvP" = ( /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -30263,13 +29319,11 @@ /turf/open/floor/monotile/light, /area/medical/medbay/central) "bvT" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/monotile/steel, -/area/medical/medbay/central) +/area/medical) "bvU" = ( /obj/machinery/atmospherics/pipe/simple/general/hidden{ dir = 9 @@ -30287,8 +29341,12 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/defibrillator_mount/loaded{ + pixel_y = -3; + pixel_x = 31 + }, /turf/open/floor/monotile/dark, -/area/medical/medbay/central) +/area/medical/surgery) "bvX" = ( /obj/machinery/stasis, /obj/machinery/defibrillator_mount/loaded{ @@ -30298,13 +29356,8 @@ /turf/open/floor/monotile/light, /area/medical/medbay/central) "bvZ" = ( -/obj/effect/turf_decal/loading_area{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/monotile/dark, -/area/medical/medbay/central) +/area/medical/surgery) "bwb" = ( /obj/structure/table/reinforced, /obj/item/storage/firstaid/regular, @@ -30376,9 +29429,9 @@ /turf/open/floor/monotile/light, /area/medical/medbay/lobby) "bwm" = ( -/obj/effect/landmark/event_spawn, +/obj/structure/girder/reinforced, /turf/open/floor/plating, -/area/maintenance/department/medical) +/area/space) "bwo" = ( /obj/structure/chair/office{ dir = 8 @@ -30386,14 +29439,15 @@ /turf/open/floor/monotile/steel, /area/medical/medbay/lobby) "bwq" = ( -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/chair/fancy/sofa/old/left{ + dir = 1 + }, /turf/open/floor/monotile/steel, -/area/hallway/nsv/deck2/frame1/port) +/area/medical/break_room) "bwr" = ( /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -30404,13 +29458,13 @@ req_one_access_txt = "5" }, /turf/open/floor/plating, -/area/medical/genetics) +/area/medical/medbay/lobby) "bws" = ( -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/effect/turf_decal/tile/blue, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) "bwt" = ( @@ -30870,13 +29924,13 @@ dir = 6 }, /turf/open/floor/plasteel/grid/steel, -/area/janitor) +/area/hallway/nsv/deck2/frame1/port) "bxm" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plasteel/grid/steel, -/area/janitor) +/area/hallway/nsv/deck2/frame1/port) "bxn" = ( /obj/machinery/light/small{ dir = 4 @@ -30892,13 +29946,13 @@ dir = 1 }, /turf/open/floor/plasteel/grid/steel, -/area/janitor) +/area/hallway/nsv/deck2/frame1/port) "bxp" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plasteel/grid/steel, -/area/janitor) +/area/hallway/nsv/deck2/frame1/port) "bxq" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -30906,7 +29960,7 @@ dir = 4 }, /turf/open/floor/plasteel/grid/steel, -/area/janitor) +/area/hallway/nsv/deck2/frame1/port) "bxr" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -30914,7 +29968,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel/grid/steel, -/area/janitor) +/area/hallway/nsv/deck2/frame1/port) "bxs" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -30924,7 +29978,7 @@ dir = 1 }, /turf/open/floor/monotile/steel, -/area/janitor) +/area/hallway/nsv/deck2/frame1/port) "bxt" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -31459,13 +30513,13 @@ /turf/open/floor/carpet/ship, /area/security/detectives_office) "byC" = ( -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, /obj/structure/extinguisher_cabinet{ pixel_y = 26 }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) "byD" = ( @@ -32181,20 +31235,9 @@ /turf/open/floor/monotile/dark, /area/science/xenobiology) "bzX" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, +/obj/machinery/vending/medical, /turf/open/floor/monotile/steel, -/area/medical/surgery) +/area/medical/storage) "bzY" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/disposalpipe/segment, @@ -32750,7 +31793,7 @@ }, /obj/machinery/dna_scannernew, /turf/open/floor/monotile/light, -/area/medical/medbay/central) +/area/medical/genetics) "bBk" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/monotile/steel, @@ -33229,98 +32272,43 @@ /turf/open/floor/monotile/light, /area/medical/medbay/central) "bCi" = ( -/obj/machinery/camera/autoname{ +/obj/structure/table/wood, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ dir = 4 }, -/turf/open/floor/plasteel/freezer, -/area/medical/virology) -"bCj" = ( -/obj/machinery/shower{ - dir = 8; - name = "emergency shower" - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/open/floor/monotile/dark, -/area/medical/virology) -"bCk" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/junction{ +/obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/obj/item/storage/box/donkpockets, +/obj/machinery/microwave, /turf/open/floor/monotile/steel, -/area/medical/medbay/central) -"bCl" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/area/medical/break_room) +"bCj" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/turf/open/floor/monotile/steel, -/area/medical/surgery) -"bCm" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/monotile/steel, -/area/medical/medbay/central) +/obj/structure/lattice/catwalk/over/ship, +/turf/open/floor/monotile/dark, +/area/hallway/nsv/deck2/frame1/central) +"bCl" = ( +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/monotile/light, +/area/medical/storage) "bCn" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 +/obj/structure/disposalpipe/sorting/mail{ + dir = 1; + sortType = 9 }, /turf/open/floor/monotile/dark, -/area/medical/medbay/central) +/area/medical) "bCo" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/turf/open/floor/monotile/dark, -/area/medical/medbay/central) -"bCp" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/monotile/steel, -/area/medical/medbay/central) +/turf/open/floor/monotile/dark, +/area/medical) "bCq" = ( /obj/machinery/power/apc/auto_name/south{ pixel_y = -24 @@ -33358,30 +32346,17 @@ }, /turf/open/floor/plasteel/white, /area/medical/genetics) -"bCs" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/closet/firecloset, -/obj/item/storage/toolbox/emergency, -/turf/open/floor/plating, -/area/maintenance/port) "bCt" = ( /obj/structure/lattice, /turf/open/space, /area/space/nearstation) "bCu" = ( -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/monotile/steel, -/area/medical/surgery) +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/monotile/light, +/area/medical/storage) "bCv" = ( /obj/structure/cable{ icon_state = "4-8" @@ -33429,11 +32404,11 @@ /turf/open/floor/monotile/dark, /area/hallway/nsv/deck2/frame1/port) "bCy" = ( -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/effect/turf_decal/tile/blue, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) "bCz" = ( @@ -33457,7 +32432,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/monotile/steel, -/area/janitor) +/area/hallway/nsv/deck2/frame1/port) "bCB" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -33473,7 +32448,7 @@ dir = 1 }, /turf/open/floor/monotile/steel, -/area/janitor) +/area/hallway/nsv/deck2/frame1/port) "bCC" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -33484,7 +32459,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/monotile/steel, -/area/janitor) +/area/hallway/nsv/deck2/frame1/port) "bCD" = ( /obj/effect/turf_decal/tile/red{ dir = 8 @@ -34179,7 +33154,7 @@ }, /obj/machinery/door/firedoor/border_only, /turf/open/floor/plating, -/area/maintenance/department/medical) +/area/maintenance/department/security) "bDV" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -34213,16 +33188,10 @@ /turf/open/floor/monotile/dark, /area/shuttle/turbolift/shaft) "bEa" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/turf/open/floor/monotile/dark, -/area/hallway/nsv/deck2/frame1/port) +/obj/structure/lattice, +/obj/structure/grille, +/turf/open/space/basic, +/area/space) "bEb" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ @@ -35157,14 +34126,11 @@ /turf/open/floor/circuit/green/telecomms/mainframe, /area/tcommsat/server) "bFN" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/machinery/airalarm{ dir = 4; pixel_x = -22 }, -/turf/open/floor/plating, +/turf/closed/wall/ship, /area/maintenance/department/medical) "bFO" = ( /obj/machinery/airalarm{ @@ -35207,13 +34173,13 @@ /turf/open/floor/plating, /area/maintenance/department/engine) "bFT" = ( -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, /obj/machinery/airalarm{ pixel_y = 26 }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) "bFU" = ( @@ -35476,14 +34442,14 @@ dir = 8 }, /turf/open/floor/monotile/dark, -/area/medical/medbay/central) +/area/medical/surgery) "bGz" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/holopad, /turf/open/floor/plasteel/grid/steel, -/area/janitor) +/area/hallway/nsv/deck2/frame1/port) "bGA" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/holopad, @@ -35597,16 +34563,12 @@ /turf/open/floor/monotile/steel, /area/hallway/secondary/exit) "bGL" = ( -/obj/structure/table/glass, -/obj/item/trash/popcorn, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, -/obj/machinery/camera/autoname{ - dir = 4 +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/green{ + dir = 8 }, -/turf/open/floor/monotile/light, -/area/medical/virology) +/turf/open/floor/monotile/steel, +/area/janitor) "bGM" = ( /obj/structure/chair{ dir = 8 @@ -35631,36 +34593,6 @@ }, /turf/open/floor/plasteel/grid/steel, /area/hallway/secondary/exit) -"bGO" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/obj/machinery/doorButtons/access_button{ - idDoor = "virology_airlock_exterior"; - idSelf = "virology_airlock_control"; - name = "Virology Access Button"; - pixel_x = -26; - pixel_y = -8; - req_access_txt = "39" - }, -/obj/effect/mapping_helpers/airlock/locked, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/airlock/ship/medical{ - autoclose = 0; - frequency = 1449; - id_tag = "virology_airlock_exterior"; - name = "Virology Exterior Airlock"; - req_access_txt = "39" - }, -/turf/open/floor/monotile/dark, -/area/medical/virology) "bGS" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -35671,6 +34603,7 @@ /obj/machinery/camera/autoname{ dir = 4 }, +/obj/machinery/vending/wardrobe/viro_wardrobe, /turf/open/floor/monotile/steel, /area/medical/chemistry) "bGT" = ( @@ -35867,8 +34800,14 @@ /turf/closed/wall/ship, /area/hallway/nsv/deck2/frame2/port) "bHp" = ( -/turf/closed/wall/r_wall/ship, -/area/maintenance/port) +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/open/floor/durasteel, +/area/maintenance/department/medical) "bHq" = ( /obj/structure/cable{ icon_state = "4-8" @@ -35983,13 +34922,13 @@ dir = 1 }, /turf/open/floor/monotile/dark, -/area/medical/medbay/central) +/area/medical/surgery) "bHA" = ( /obj/machinery/computer/operating{ dir = 4 }, /turf/open/floor/monotile/dark, -/area/medical/medbay/central) +/area/medical/surgery) "bHB" = ( /obj/machinery/door/airlock/ship/maintenance, /obj/machinery/door/firedoor/border_only, @@ -36009,7 +34948,7 @@ pixel_y = -2 }, /turf/open/floor/monotile/light, -/area/medical/medbay/central) +/area/medical/genetics) "bHF" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 @@ -36121,13 +35060,13 @@ /turf/open/floor/monotile/dark, /area/ai_monitored/security/armory) "bHX" = ( -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, /obj/item/radio/intercom{ pixel_y = 26 }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) "bHY" = ( @@ -36165,11 +35104,18 @@ /turf/open/floor/monotile/dark, /area/medical/morgue) "bId" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 +/obj/structure/table/glass, +/obj/item/storage/box/beakers{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/box/medipens, +/obj/item/storage/box/bodybags{ + pixel_x = -3; + pixel_y = -3 }, /turf/open/floor/monotile/light, -/area/medical/virology) +/area/medical/storage) "bIe" = ( /obj/machinery/door/airlock/ship/external/glass{ name = "Auxiliary Shuttle Dock" @@ -36827,10 +35773,6 @@ /obj/machinery/door/poddoor/incinerator_atmos_aux, /turf/open/floor/engine/vacuum, /area/engine/atmospherics_engine) -"bJK" = ( -/obj/machinery/atmospherics/pipe/layer_manifold, -/turf/closed/wall/r_wall/ship, -/area/medical/virology) "bJM" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/monotile/dark, @@ -36845,12 +35787,9 @@ /turf/open/floor/engine, /area/science/xenobiology) "bJP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/monotile/light, -/area/medical/virology) +/obj/structure/disposalpipe/segment, +/turf/open/floor/monotile/steel, +/area/hallway/nsv/deck2/frame1/central) "bJQ" = ( /obj/structure/disposalpipe/segment, /turf/closed/wall/r_wall/ship, @@ -36860,32 +35799,16 @@ /obj/machinery/atmospherics/pipe/simple/yellow/visible, /turf/open/space, /area/engine/atmos) -"bJS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/monotile/light, -/area/medical/virology) -"bJT" = ( -/obj/machinery/atmospherics/pipe/layer_manifold, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/monotile/light, -/area/medical/virology) "bJU" = ( -/obj/machinery/light{ - dir = 4 +/obj/structure/bed/roller, +/obj/effect/turf_decal/tile/blue{ + dir = 8 }, -/obj/machinery/atmospherics/components/unary/tank/air{ +/obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/structure/cable{ - icon_state = "4-8" - }, /turf/open/floor/monotile/light, -/area/medical/virology) +/area/medical/storage) "bJW" = ( /obj/structure/cable{ icon_state = "2-4" @@ -36894,12 +35817,8 @@ dir = 4; pixel_x = -26 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/monotile/steel, /area/maintenance/starboard/secondary{ name = "Munitions Projects" @@ -37600,9 +36519,15 @@ name = "CIC" }) "bLK" = ( -/obj/machinery/light, -/turf/open/floor/monotile/steel, -/area/hallway/nsv/deck2/frame1/central) +/obj/structure/fans/tiny/invisible, +/obj/docking_port/stationary{ + dwidth = 1; + height = 4; + roundstart_template = /datum/map_template/shuttle/escape_pod/default; + width = 3 + }, +/turf/open/floor/plating, +/area/maintenance/department/medical) "bLL" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/effect/turf_decal/tile/orange{ @@ -37684,9 +36609,14 @@ /turf/open/floor/monotile/dark, /area/nsv/weapons/gauss) "bLU" = ( -/obj/machinery/computer/ship/viewscreen, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, /turf/open/floor/monotile/steel, -/area/hallway/nsv/deck2/frame1/central) +/area/medical/break_room) "bLY" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -37888,9 +36818,13 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /obj/structure/grille, +/obj/effect/spawner/lootdrop/maintenance/three, /turf/open/floor/plating, -/area/maintenance/port) +/area/maintenance/central) "bVw" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -38676,7 +37610,7 @@ icon_state = "1-2" }, /turf/open/floor/plating, -/area/maintenance/port) +/area/maintenance/central) "ces" = ( /obj/structure/cable{ icon_state = "2-4" @@ -39074,10 +38008,9 @@ /area/crew_quarters/bar) "cAn" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/effect/landmark/start/janitor, /turf/open/floor/monotile/dark, -/area/medical/virology) +/area/janitor) "cAo" = ( /obj/structure/cable{ icon_state = "1-2" @@ -39123,15 +38056,12 @@ /turf/open/floor/plasteel/ridged/steel, /area/engine/engineering/reactor_core) "cCS" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/structure/cable{ + icon_state = "0-4" }, +/obj/structure/grille/broken, /turf/open/floor/plating, -/area/medical/virology) +/area/space/nearstation) "cDF" = ( /turf/open/floor/plating, /area/quartermaster/storage) @@ -39521,18 +38451,9 @@ /turf/open/indestructible/sound/pool/spentfuel/wall, /area/engine/engineering/reactor_core) "die" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/airalarm{ - pixel_y = 26 - }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/maintenance/port) +/turf/closed/wall/ship, +/area/maintenance/department/medical) "diS" = ( /obj/structure/lattice/catwalk, /obj/machinery/computer/ship/viewscreen, @@ -39544,7 +38465,7 @@ }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, -/area/maintenance/department/medical) +/area/maintenance/department/security) "dlA" = ( /obj/structure/ladder, /turf/open/floor/plating, @@ -39732,6 +38653,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/machinery/camera/autoname{ + dir = 1 + }, /turf/open/floor/monotile/steel, /area/maintenance/starboard/secondary{ name = "Munitions Projects" @@ -39961,13 +38885,17 @@ /turf/open/floor/monotile/dark, /area/engine/engineering) "dXJ" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/effect/turf_decal/tile/yellow{ + dir = 1 }, -/turf/open/floor/plating{ - icon_state = "platingdmg2" +/obj/effect/turf_decal/tile/yellow{ + dir = 4 }, -/area/maintenance/department/medical) +/obj/machinery/camera/autoname{ + dir = 1 + }, +/turf/open/floor/monotile/dark, +/area/engine/engineering) "dXK" = ( /obj/machinery/light{ dir = 8 @@ -39995,9 +38923,12 @@ /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) "ebT" = ( -/obj/structure/closet/wardrobe/grey, -/turf/open/floor/durasteel/padded, -/area/maintenance/port) +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/landmark/event_spawn, +/turf/open/floor/plating, +/area/maintenance/department/medical) "ebV" = ( /obj/machinery/camera/autoname{ dir = 1 @@ -40279,8 +39210,8 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "eqv" = ( -/turf/open/space/basic, -/area/maintenance/port) +/turf/template_noop, +/area/maintenance/central) "eqA" = ( /obj/structure/table, /obj/item/clothing/suit/hazardvest, @@ -40334,13 +39265,13 @@ /turf/closed/wall/ship, /area/nsv/weapons/fore) "evj" = ( -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, /obj/machinery/light{ dir = 1 }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) "evG" = ( @@ -40411,8 +39342,8 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/template_noop, -/area/maintenance/department/medical) +/turf/open/floor/plating, +/area/maintenance/department/security) "eCb" = ( /obj/machinery/button/door{ id = "agcnr_purge"; @@ -40464,17 +39395,10 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/airlock/ship/public/glass{ - name = "Virology"; - req_one_access_txt = "5" - }, -/obj/effect/landmark/zebra_interlock_point, -/turf/open/floor/monotile/dark, -/area/medical/virology) +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/medical) "eDI" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -40530,12 +39454,6 @@ initial_gas_mix = "TEMP=2.7" }, /area/engine/atmos) -"eHi" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/closed/wall/r_wall/ship, -/area/maintenance/nsv/weapons) "eHZ" = ( /obj/structure/chair/fancy{ dir = 4 @@ -40591,20 +39509,12 @@ /turf/open/floor/wood, /area/library) "eLS" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/ship/public/glass{ name = "Virology"; req_one_access_txt = "5" }, -/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/monotile/steel, -/area/medical/virology) +/area/medical) "eNG" = ( /obj/structure/closet/cardboard, /obj/effect/turf_decal/stripes/line{ @@ -40637,13 +39547,6 @@ /obj/effect/decal/remains/human, /turf/open/floor/engine, /area/engine/engine_room) -"ePo" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/turf/open/floor/monotile/light, -/area/medical/virology) "ePH" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 @@ -40736,9 +39639,7 @@ /obj/machinery/camera/autoname, /obj/structure/closet/crate/freezer/surplus_limbs, /turf/open/floor/monotile/steel, -/area/medical/medbay/zone2{ - name = "Intensive care unit" - }) +/area/medical/surgery) "eXm" = ( /obj/structure/closet/secure_closet/genpop, /obj/effect/turf_decal/ship/delivery/yellow, @@ -41021,14 +39922,13 @@ /turf/open/floor/monotile/dark, /area/crew_quarters/dorms) "fuW" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/door/firedoor/border_only{ + dir = 1 }, -/turf/open/floor/durasteel, -/area/maintenance/port) +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/ship/maintenance/defaultaccess, +/turf/open/floor/plating, +/area/maintenance/department/medical) "fvp" = ( /obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/monotile/steel, @@ -41109,12 +40009,6 @@ }, /turf/open/floor/monotile/steel, /area/engine/engineering/reactor_core) -"fCB" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/freezer, -/area/medical/virology) "fCZ" = ( /obj/machinery/atmospherics/pipe/layer_manifold/visible{ dir = 4 @@ -41196,8 +40090,9 @@ /obj/structure/cable{ icon_state = "0-2" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plating, -/area/maintenance/port) +/area/maintenance/central) "fLt" = ( /obj/structure/table, /turf/open/floor/plating, @@ -41485,12 +40380,6 @@ /obj/effect/landmark/zebra_interlock_point, /turf/open/floor/monotile/dark, /area/crew_quarters/dorms) -"giV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/turf/closed/wall/r_wall/ship, -/area/maintenance/nsv/weapons) "gjm" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/effect/turf_decal/stripes/line{ @@ -41705,9 +40594,14 @@ /turf/open/floor/plating, /area/engine/engineering/hangar) "gBG" = ( -/obj/effect/spawner/lootdrop/grille_or_trash, +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/plating, -/area/maintenance/department/medical) +/area/maintenance/central) "gCo" = ( /obj/structure/mopbucket, /obj/item/mop, @@ -41908,11 +40802,9 @@ /turf/open/floor/wood, /area/library) "gOn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/turf/closed/wall/ship, -/area/maintenance/nsv/weapons) +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/medical/surgery) "gOD" = ( /obj/machinery/status_display/evac, /turf/closed/wall/ship, @@ -42186,7 +41078,7 @@ dir = 4 }, /turf/open/floor/monotile/steel, -/area/janitor) +/area/hallway/nsv/deck2/frame1/port) "hjm" = ( /obj/machinery/portable_atmospherics/canister/air, /turf/open/floor/plating, @@ -42421,10 +41313,6 @@ /turf/open/floor/monotile/dark, /area/engine/engineering) "hxL" = ( -/obj/machinery/door/airlock/ship/maintenance{ - name = "Morgue maintenance"; - req_one_access_txt = "6" - }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, @@ -42434,8 +41322,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/door/airlock/ship/maintenance/defaultaccess{ + req_one_access_txt = "12;5" + }, /turf/open/floor/monotile/dark, -/area/maintenance/department/medical) +/area/medical/morgue) "hxW" = ( /obj/structure/sign/directions/medical{ dir = 8 @@ -43070,17 +41961,15 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/ship/maintenance/defaultaccess{ - req_one_access_txt = "12;5" - }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/machinery/door/airlock/ship/maintenance/defaultaccess, /turf/open/floor/plating, -/area/maintenance/department/medical) +/area/maintenance/department/security) "izj" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -43295,13 +42184,6 @@ /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/space/nearstation) -"iLE" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plating, -/area/maintenance/nsv/weapons) "iMe" = ( /obj/effect/turf_decal/tile/purple{ dir = 4 @@ -43448,7 +42330,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/nsv/weapons) "iUA" = ( @@ -43560,14 +42441,12 @@ /turf/open/floor/plating, /area/maintenance/department/engine) "jcy" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/machinery/door/airlock/ship/public/glass{ + name = "Medical Equipment"; + req_one_access_txt = "5" }, -/turf/closed/wall/ship, -/area/maintenance/nsv/weapons) +/turf/open/floor/monotile/steel, +/area/medical/storage) "jeX" = ( /obj/structure/cable, /obj/structure/cable{ @@ -43720,21 +42599,9 @@ /turf/open/floor/durasteel/techfloor, /area/nsv/hanger/deck2) "jqT" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/holopad, -/turf/open/floor/monotile/dark, -/area/medical/surgery) +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/maintenance/department/medical) "jrd" = ( /obj/machinery/atmospherics/pipe/manifold/brown/hidden{ dir = 1 @@ -43819,9 +42686,8 @@ /obj/machinery/light{ dir = 8 }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating, -/area/maintenance/port) +/turf/closed/wall/ship, +/area/maintenance/central) "jyj" = ( /obj/structure/cable{ icon_state = "1-2" @@ -43830,10 +42696,19 @@ /turf/template_noop, /area/maintenance/department/science) "jzy" = ( -/obj/structure/grille, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/maintenance/port) +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/structure/closet/crate/trashcart, +/obj/item/stack/sheet/mineral/copper, +/turf/open/floor/monotile/steel, +/area/janitor) "jAE" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -43857,13 +42732,17 @@ /turf/open/space/basic, /area/engine/atmos) "jCX" = ( -/obj/structure/closet/toolcloset, -/obj/item/clothing/head/hardhat/orange, -/obj/item/clothing/head/hardhat/orange, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/bot, -/turf/open/floor/durasteel/padded, -/area/maintenance/port) +/obj/machinery/door/airlock/ship/maintenance/defaultaccess, +/obj/effect/mapping_helpers/airlock/locked, +/obj/structure/barricade/wooden/crude, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/plating, +/area/maintenance/department/medical) "jEa" = ( /obj/machinery/atmospherics/pipe/simple/orange/visible/layer2{ dir = 4 @@ -43875,12 +42754,6 @@ initial_gas_mix = "TEMP=2.7" }, /area/engine/atmos) -"jHw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/turf/closed/wall/r_wall/ship, -/area/maintenance/nsv/weapons) "jHA" = ( /obj/machinery/atmospherics/components/binary/stormdrive_reactor{ base_power = 47500; @@ -44218,14 +43091,6 @@ }, /turf/open/floor/plating, /area/hallway/secondary/exit) -"keI" = ( -/obj/machinery/camera/autoname{ - dir = 1 - }, -/turf/open/floor/monotile/steel, -/area/maintenance/starboard/secondary{ - name = "Munitions Projects" - }) "keK" = ( /obj/structure/cable{ icon_state = "1-2" @@ -44502,12 +43367,20 @@ /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) "krf" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/structure/table/wood, +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, -/obj/effect/spawner/lootdrop/maintenance/two, -/turf/open/floor/plating, -/area/maintenance/port) +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/item/storage/box/coffeepack, +/obj/item/coffee_cartridge, +/obj/item/coffee_cartridge, +/obj/item/coffee_cartridge, +/obj/item/coffee_cartridge, +/turf/open/floor/monotile/steel, +/area/medical/break_room) "krH" = ( /obj/structure/table, /obj/item/tank/internals/air, @@ -44710,6 +43583,9 @@ /obj/item/clothing/glasses/science{ pixel_y = 8 }, +/obj/structure/reagent_dispensers/virusfood{ + pixel_x = 30 + }, /turf/open/floor/monotile/steel, /area/medical/chemistry) "kGv" = ( @@ -44931,10 +43807,9 @@ name = "Prototype munitions bay" }) "lay" = ( -/obj/structure/closet/firecloset, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/durasteel/padded, -/area/maintenance/port) +/obj/machinery/door/airlock/ship/maintenance/defaultaccess, +/turf/open/floor/plating, +/area/maintenance/department/medical) "laZ" = ( /turf/closed/wall/ship, /area/maintenance/starboard) @@ -44942,17 +43817,17 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/cable{ - icon_state = "1-8" +/mob/living/carbon/monkey/angry{ + name = "Jeff" }, -/turf/template_noop, -/area/maintenance/department/medical) +/turf/open/floor/plating, +/area/maintenance/department/security) "lca" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/border_only, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/open/floor/monotile/steel, -/area/medical/medbay/central) +/area/medical) "lcf" = ( /obj/structure/table/wood, /obj/item/camera, @@ -44980,7 +43855,7 @@ }, /obj/machinery/door/airlock/ship/maintenance/defaultaccess, /turf/open/floor/plating, -/area/maintenance/department/medical) +/area/maintenance/department/security) "lff" = ( /obj/structure/extinguisher_cabinet{ pixel_y = -27 @@ -45137,7 +44012,7 @@ /turf/open/floor/plating{ icon_state = "platingdmg1" }, -/area/maintenance/department/medical) +/area/medical/medbay/central) "lmR" = ( /obj/structure/cable{ icon_state = "1-4" @@ -45146,7 +44021,7 @@ icon_state = "1-2" }, /turf/open/floor/plating, -/area/maintenance/port) +/area/maintenance/central) "lmX" = ( /obj/structure/cable{ icon_state = "4-8" @@ -45236,7 +44111,7 @@ /obj/item/weldingtool, /obj/item/wirecutters, /turf/open/floor/durasteel/padded, -/area/maintenance/port) +/area/maintenance/department/medical) "ltH" = ( /obj/machinery/light, /turf/open/floor/monotile/dark, @@ -45413,24 +44288,21 @@ /turf/open/floor/plating, /area/maintenance/starboard) "lJZ" = ( -/obj/machinery/door/airlock/ship/maintenance{ - name = "Briefing room maintenance"; - req_one_access_txt = "19" - }, /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/machinery/door/airlock/ship/public{ + name = "Janitorial Storage"; + req_one_access_txt = "26" + }, /turf/open/floor/plating, -/area/maintenance/central) +/area/janitor) "lKg" = ( /obj/structure/cable{ icon_state = "1-2" @@ -45580,9 +44452,8 @@ /area/engine/atmos) "lUI" = ( /obj/structure/cable{ - icon_state = "4-8" + icon_state = "2-4" }, -/obj/structure/girder, /turf/open/floor/plating, /area/maintenance/department/medical) "lUM" = ( @@ -45776,15 +44647,7 @@ /turf/open/space, /area/engine/atmos) "mmh" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/structure/closet/radiation, -/obj/item/tank/internals/oxygen/yellow, -/obj/item/clothing/mask/gas, +/obj/structure/fans/tiny/invisible, /turf/open/floor/plating, /area/maintenance/department/medical) "mmu" = ( @@ -45845,11 +44708,6 @@ /obj/machinery/atmospherics/pipe/manifold/cyan/visible, /turf/open/floor/plasteel/ridged/steel, /area/engine/engineering/reactor_core) -"mpX" = ( -/obj/effect/spawner/lootdrop/maintenance, -/obj/structure/reagent_dispensers/fueltank, -/turf/open/floor/plating, -/area/maintenance/department/medical) "mrB" = ( /obj/structure/sign/poster/official/science, /turf/closed/wall/ship, @@ -46014,12 +44872,13 @@ /turf/open/floor/plating{ icon_state = "platingdmg3" }, -/area/maintenance/department/medical) +/area/maintenance/department/security) "mCU" = ( /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/plating{ icon_state = "platingdmg1" }, @@ -46153,7 +45012,7 @@ /turf/open/floor/plating{ icon_state = "panelscorched" }, -/area/maintenance/department/medical) +/area/maintenance/department/security) "mMg" = ( /obj/machinery/atmospherics/components/binary/valve, /turf/open/floor/durasteel/techfloor{ @@ -46185,14 +45044,6 @@ icon_state = "panelscorched" }, /area/maintenance/starboard) -"mOc" = ( -/obj/structure/closet/crate/trashcart, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/spawner/lootdrop/maintenance, -/obj/item/trash/boritos, -/obj/item/trash/plate, -/turf/open/floor/durasteel/padded, -/area/maintenance/port) "mOp" = ( /obj/machinery/firealarm{ dir = 4; @@ -46310,10 +45161,14 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/spawner/lootdrop/maintenance/five, -/obj/structure/closet/cardboard, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/ship/maintenance/defaultaccess, /turf/open/floor/plating, -/area/maintenance/port) +/area/maintenance/central) "mTN" = ( /obj/machinery/firealarm/directional/south, /turf/open/floor/monotile/steel, @@ -46328,8 +45183,9 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt/dust, +/obj/structure/disposalpipe/segment, /turf/open/floor/plating, -/area/maintenance/port) +/area/maintenance/central) "mUv" = ( /obj/machinery/atmospherics/pipe/simple/dark/visible/layer2{ dir = 4 @@ -46665,6 +45521,8 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/nsv/weapons) "nwU" = ( @@ -46692,18 +45550,13 @@ }, /area/maintenance/starboard) "nxK" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/door/airlock/ship/maintenance/defaultaccess{ - req_one_access_txt = "12;5" - }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/machinery/door/airlock/ship/maintenance/defaultaccess, /turf/open/floor/plating, -/area/maintenance/department/medical) +/area/maintenance/department/security) "nyJ" = ( /obj/structure/lattice/catwalk, /obj/machinery/camera/autoname{ @@ -47178,12 +46031,6 @@ /obj/machinery/newscaster/directional/west, /turf/open/floor/monotile/dark, /area/science/xenobiology) -"ojM" = ( -/obj/structure/closet/crate/secure/loot, -/obj/effect/spawner/lootdrop/maintenance/two, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/durasteel/padded, -/area/maintenance/port) "okI" = ( /obj/effect/turf_decal/delivery, /obj/machinery/light{ @@ -47468,7 +46315,7 @@ "oMj" = ( /obj/machinery/space_heater, /turf/open/floor/plating, -/area/maintenance/department/medical) +/area/maintenance/department/security) "oMJ" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -47498,15 +46345,11 @@ /turf/open/floor/durasteel, /area/engine/break_room) "oPR" = ( -/obj/structure/grille, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/machinery/light/small{ + dir = 8 }, -/turf/open/floor/plating, -/area/maintenance/nsv/weapons) +/turf/template_noop, +/area/maintenance/department/medical) "oQy" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/junction{ dir = 1 @@ -47559,18 +46402,13 @@ }, /turf/open/floor/monotile/steel, /area/engine/engineering/hangar) -"oVf" = ( -/obj/machinery/camera/autoname{ - dir = 4 - }, +"oWy" = ( +/obj/effect/spawner/structure/window/reinforced/ship, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "0-4" }, -/turf/open/floor/plasteel/freezer, -/area/medical/virology) -"oWy" = ( -/turf/open/floor/monotile/dark, -/area/maintenance/department/medical) +/turf/open/floor/plating, +/area/space/nearstation) "oXH" = ( /obj/machinery/camera{ c_tag = "Atmospherics Tank - Toxins"; @@ -47616,9 +46454,6 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/plating, /area/maintenance/nsv/weapons) "pcI" = ( @@ -47809,12 +46644,15 @@ /turf/open/floor/monotile/steel, /area/nsv/weapons/fore) "psx" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 }, -/obj/machinery/light, -/turf/open/floor/monotile/light, -/area/medical/virology) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/turf/open/floor/plating, +/area/maintenance/central) "psH" = ( /obj/machinery/atmospherics/pipe/simple/purple/visible/layer2{ dir = 4 @@ -47883,14 +46721,21 @@ /turf/closed/wall/ship, /area/quartermaster/qm) "pxF" = ( -/obj/structure/table, -/obj/item/storage/box/lights/tubes, -/obj/effect/spawner/lootdrop/glowstick, -/obj/machinery/light/small{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 }, -/turf/open/floor/durasteel/padded, -/area/maintenance/port) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/sorting/mail{ + dir = 4; + sortType = 22 + }, +/turf/open/floor/monotile/steel, +/area/hallway/nsv/deck2/frame1/central) "pxL" = ( /obj/structure/cable{ icon_state = "4-8" @@ -47943,12 +46788,6 @@ }, /turf/open/floor/engine, /area/engine/engine_room) -"pCo" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/department/medical) "pCv" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -48051,15 +46890,15 @@ /turf/open/floor/monotile/steel, /area/engine/engineering/reactor_core) "pJP" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, +/obj/effect/decal/cleanable/dirt/dust, /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 9 + }, +/obj/structure/cable{ + icon_state = "1-8" }, -/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/durasteel, -/area/maintenance/port) +/area/maintenance/department/medical) "pJY" = ( /obj/effect/spawner/structure/window/plasma/reinforced, /obj/machinery/door/poddoor/shutters/ship/preopen{ @@ -48346,14 +47185,11 @@ /turf/open/floor/monotile/dark, /area/engine/atmospherics_engine) "qoc" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment{ - dir = 9 +/obj/structure/disposalpipe/junction/yjunction{ + dir = 1 }, /turf/open/floor/monotile/dark, -/area/medical/medbay/central) +/area/medical) "qqk" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ @@ -48391,7 +47227,7 @@ }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, -/area/maintenance/department/medical) +/area/maintenance/department/security) "qsp" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -48453,9 +47289,17 @@ /turf/open/floor/durasteel/techfloor, /area/nsv/weapons/fore) "qzT" = ( -/obj/effect/turf_decal/loading_area, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, /turf/open/floor/durasteel, -/area/maintenance/port) +/area/maintenance/department/medical) "qAP" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -48597,12 +47441,6 @@ }, /turf/open/floor/durasteel/lino, /area/engine/engineering/reactor_control) -"qIN" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/plating, -/area/maintenance/nsv/weapons) "qJv" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -48646,13 +47484,12 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/door/airlock/ship/maintenance/defaultaccess, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/nsv/hangar) "qNS" = ( @@ -48691,7 +47528,7 @@ pixel_x = -28 }, /turf/open/floor/monotile/steel, -/area/janitor) +/area/hallway/nsv/deck2/frame1/port) "qOd" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -48842,7 +47679,7 @@ dir = 10 }, /turf/open/floor/plating, -/area/maintenance/port) +/area/maintenance/central) "rbT" = ( /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /obj/effect/turf_decal/bot_red, @@ -49209,15 +48046,10 @@ /area/maintenance/nsv/hangar) "ryW" = ( /obj/structure/cable{ - icon_state = "2-16" - }, -/obj/effect/turf_decal/ship/shutoff, -/obj/machinery/atmospherics/pipe/multiz/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/multiz/layer2{ - dir = 8 + icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ icon_state = "panelscorched" }, @@ -49322,13 +48154,16 @@ /turf/open/floor/engine, /area/engine/engine_room) "rEt" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/structure/table/wood, +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/machinery/coffeemaker, /turf/open/floor/monotile/steel, -/area/maintenance/starboard/secondary{ - name = "Munitions Projects" - }) +/area/medical/break_room) "rFe" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor/border_only{ @@ -49467,7 +48302,7 @@ dir = 9 }, /turf/open/floor/monotile/dark, -/area/maintenance/department/medical) +/area/medical/morgue) "rNN" = ( /obj/machinery/atmospherics/pipe/layer_manifold/visible, /obj/machinery/meter, @@ -49564,12 +48399,6 @@ /obj/structure/bookcase/random/reference, /turf/open/floor/wood, /area/library) -"scS" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/turf/open/floor/monotile/steel, -/area/medical/medbay/zone2{ - name = "Intensive care unit" - }) "sdw" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 10 @@ -49895,14 +48724,6 @@ /obj/machinery/atmospherics/pipe/layer_manifold/visible, /turf/open/space/basic, /area/engine/engineering/reactor_core) -"svh" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/spawner/lootdrop/maintenance/three, -/obj/structure/rack, -/turf/open/floor/plating, -/area/maintenance/port) "svo" = ( /obj/machinery/light{ dir = 4 @@ -50099,10 +48920,9 @@ name = "CIC" }) "sRd" = ( -/obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, -/area/maintenance/port) +/area/maintenance/central) "sRj" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 @@ -50131,13 +48951,6 @@ }, /turf/open/floor/monotile/steel, /area/engine/engineering/reactor_core) -"sYJ" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/light/broken{ - dir = 8 - }, -/turf/open/floor/plating, -/area/maintenance/port) "sYQ" = ( /obj/structure/chair/office/light{ dir = 1 @@ -50285,7 +49098,7 @@ /obj/item/storage/box/bodybags, /obj/machinery/light, /turf/open/floor/monotile/dark, -/area/maintenance/department/medical) +/area/medical/morgue) "tjC" = ( /obj/machinery/door/airlock/ship/external/glass{ req_one_access_txt = "13" @@ -50728,7 +49541,7 @@ }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, -/area/maintenance/department/medical) +/area/maintenance/department/security) "tNt" = ( /obj/machinery/door/airlock/ship/station/mining{ name = "Cargo Bay"; @@ -50813,10 +49626,15 @@ /turf/open/floor/monotile/steel, /area/engine/engine_room) "tSY" = ( -/obj/structure/disposalpipe/segment, -/obj/item/trash/chips, -/turf/open/floor/plating, -/area/maintenance/port) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/airlock/ship/public/glass{ + name = "Medical Equipment"; + req_one_access_txt = "5" + }, +/turf/open/floor/monotile/steel, +/area/medical/storage) "tTM" = ( /obj/structure/lattice/catwalk, /obj/machinery/camera/autoname{ @@ -50971,11 +49789,8 @@ /turf/open/floor/monotile/steel, /area/crew_quarters/fitness/recreation) "ueI" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating, +/turf/closed/wall/ship, /area/maintenance/department/medical) "ufc" = ( /obj/machinery/light{ @@ -51045,11 +49860,6 @@ }, /turf/open/floor/plating, /area/hallway/secondary/exit) -"uhJ" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/closet/emcloset, -/turf/open/floor/durasteel/padded, -/area/maintenance/port) "uir" = ( /turf/open/floor/monotile/dark, /area/shuttle/turbolift/tertiary) @@ -51098,17 +49908,6 @@ }, /turf/open/floor/monotile/dark, /area/nsv/weapons/fore) -"uqe" = ( -/obj/structure/closet/crate{ - opened = 1 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/spawner/lootdrop/maintenance/four, -/obj/machinery/light, -/turf/open/floor/plating{ - icon_state = "platingdmg3" - }, -/area/maintenance/port) "uqx" = ( /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating, @@ -51182,20 +49981,11 @@ }, /turf/open/floor/monotile/dark, /area/shuttle/turbolift/shaft) -"uBx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plating, -/area/maintenance/nsv/weapons) "uEb" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/obj/machinery/camera/autoname{ - dir = 1 +/turf/open/floor/plating{ + icon_state = "panelscorched" }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/monotile/dark, -/area/medical/virology) +/area/medical) "uFW" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer{ dir = 4; @@ -51590,16 +50380,12 @@ /turf/open/floor/plasteel/ridged/steel, /area/engine/engineering/reactor_core) "vlk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/airlock/ship/maintenance/defaultaccess{ name = "Flight Deck Access" }, @@ -51757,8 +50543,14 @@ /area/maintenance/department/science) "vFo" = ( /obj/effect/decal/cleanable/dirt/dust, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/durasteel, -/area/maintenance/port) +/area/maintenance/department/medical) "vFu" = ( /obj/machinery/airalarm{ pixel_y = 26 @@ -52187,13 +50979,16 @@ /turf/open/floor/monotile/steel, /area/security/warden) "wmn" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, +/obj/structure/table, +/obj/item/storage/box/lights/tubes, +/obj/effect/spawner/lootdrop/glowstick, /obj/machinery/light/small{ dir = 1 }, -/turf/open/floor/plating, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/durasteel/padded, /area/maintenance/department/medical) "woq" = ( /obj/effect/turf_decal/stripes/corner{ @@ -52536,12 +51331,19 @@ /turf/open/floor/monotile/steel, /area/engine/engineering/reactor_core) "wQi" = ( +/obj/machinery/door/airlock/ship/maintenance{ + name = "Virology maintenance" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plating{ - icon_state = "platingdmg3" - }, +/turf/open/floor/monotile/steel, /area/maintenance/department/medical) "wQk" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -52613,7 +51415,6 @@ "wWN" = ( /obj/item/cigbutt, /obj/item/clothing/head/cone, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/nsv/weapons) "wXi" = ( @@ -52679,12 +51480,6 @@ }, /turf/open/floor/monotile/dark, /area/crew_quarters/nsv/observation) -"xab" = ( -/obj/effect/spawner/lootdrop/maintenance, -/obj/structure/grille/broken, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/durasteel/padded, -/area/maintenance/port) "xbj" = ( /obj/structure/cable{ icon_state = "1-4" @@ -52751,8 +51546,10 @@ /turf/open/floor/monotile/steel, /area/nsv/weapons/fore) "xgT" = ( -/turf/open/space/basic, -/area/medical/morgue) +/obj/structure/reagent_dispensers/fueltank, +/obj/effect/spawner/lootdrop/maintenance, +/turf/open/floor/plating, +/area/maintenance/department/medical) "xhI" = ( /obj/effect/spawner/lootdrop/maintenance/six, /turf/open/floor/plating, @@ -52886,16 +51683,9 @@ }, /turf/open/floor/plating, /area/maintenance/nsv/hangar) -"xsw" = ( -/obj/machinery/vending/wardrobe/viro_wardrobe, -/turf/open/floor/monotile/light, -/area/medical/virology) "xue" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/template_noop, -/area/maintenance/department/medical) +/turf/open/floor/plating, +/area/maintenance/department/security) "xui" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -53111,18 +51901,18 @@ /turf/open/floor/plating, /area/maintenance/nsv/hangar) "xMG" = ( -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/structure/extinguisher_cabinet{ pixel_y = -27 }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) "xOP" = ( @@ -53198,10 +51988,6 @@ /obj/effect/landmark/xeno_spawn, /turf/open/floor/engine/plasma, /area/engine/atmos) -"xRR" = ( -/obj/structure/reagent_dispensers/fueltank, -/turf/open/floor/durasteel/padded, -/area/maintenance/port) "xSZ" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance, @@ -53397,13 +52183,6 @@ initial_gas_mix = "TEMP=2.7" }, /area/engine/atmos) -"ykh" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating, -/area/maintenance/department/medical) "ykz" = ( /obj/effect/turf_decal/delivery/red, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -73065,10 +71844,10 @@ aac jLQ jLQ jLQ -aZa -aLW -aLW -aZa +abP +akZ +akZ +abP agk bas aFP @@ -73322,10 +72101,10 @@ aac jLQ aaa jLQ -aZa +abP mCz djJ -aZa +abP bfC bas aFP @@ -73579,9 +72358,9 @@ aac jLQ jLQ jLQ -aZa +abP tMn -baC +bbc bDU bDW bat @@ -73836,10 +72615,10 @@ aac jLQ aaa jLQ -aZa +abP qrP -agX -aZa +xue +abP aFD bas aFP @@ -74093,10 +72872,10 @@ bIH jLQ jLQ jLQ -aZa -akL +abP +eBC oMj -aZa +abP bDX beh aGC @@ -74327,13 +73106,13 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +abY +abY +abY +abY +abY +abY +abY aaa aaa aaa @@ -74350,10 +73129,10 @@ jLQ aaa jLQ aaa -aZa -akL +abP +eBC mLR -aZa +abP acX bEb aHe @@ -74584,13 +73363,13 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +abY +bKQ +bKQ +bKQ +bKQ +bKQ +abY aaa aaJ aaJ @@ -74605,12 +73384,12 @@ aEE aac jLQ aaa -aZa -aZa -aZa +abP +abP +abP leE -afw -aZa +aMx +abP bgu bei aGE @@ -74837,17 +73616,17 @@ aaa aaa aaa aaa +bAe aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +abY +bKQ +abY +abY +abY +bEa +abY aaa aaJ aaJ @@ -74862,12 +73641,12 @@ aac aac jLQ jLQ -aZa -pHV -pHV +abP +akO +xue eBC -pHV -aZa +xue +abP few bCZ aQM @@ -75098,12 +73877,12 @@ aaa aaa aaa aaa -bAe -aaa -aaa -aaa +abY +bKQ +abY aaa aaa +aaU aaa aaa aaJ @@ -75119,12 +73898,12 @@ jLQ jLQ jLQ aaa -aZa -pHV -pHV +abP +xue +akO eBC -pHV -aZa +afR +abP ayX bEc bEg @@ -75355,11 +74134,11 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa +abY bKQ +bEa +aaU +aaU bKQ bKQ aZa @@ -75376,12 +74155,12 @@ aZa aZa aZa aZa -aZa -pHV -pHV +abP +afR +afR eBC -pHV -aZa +xue +abP bJj bej aHh @@ -75612,33 +74391,33 @@ aaa aaa aaa aaa -aaa -aaa -aaa +abY +bKQ +abY aaJ aaJ aaJ -anb -gBG +aaJ +agX mmh +jqT +agX ueI -baC -ueI -baC -dXJ -baC -baC -baC +oPR +pHV +pHV +pHV +aUs bFN -ueI -ueI -baC +aoD +aoD +ahS nxK xue xue lbt -pHV -aZa +akO +abP aFF bej aGK @@ -75859,43 +74638,43 @@ aaa aaa aaJ aaJ -fPU aaJ aaJ -fPU aaJ aaJ -fPU aaJ aaJ -fPU aaJ aaJ -fPU +aaJ +aaJ +mLQ +oUI +mLQ +aaJ aaJ aaJ aaJ -aoV -bYc -akL -agX -agX -agX -agX -agX agX -aLW -aLW -gBG -pCo +bLK +bYc agX -mpX +fuW +pHV +pHV +pHV +pHV +pHV afw pHV pHV -eBC pHV -aZa +aMx +xue +akO +eBC +afR +abP aFG bel aHi @@ -76127,32 +74906,32 @@ aaJ aaJ aaJ aaJ +jLQ aaJ aaJ aaJ aaJ aaJ -anb bYd -ykh -agX -agX -agX -bwm -agX -agX +mmh agX agX -bfv -bfv -bfv -bfv -bfv -bfv -bfv -iyN afw -aZa +pHV +pHV +pHV +pHV +pHV +afw +pHV +pHV +pHV +aMx +aMx +aMx +iyN +aMx +abP aZa aZa aZa @@ -76371,106 +75150,125 @@ aaa aaa aaa aaa -aaJ -aaJ -aaJ -aaJ -aaJ -aaJ -aaJ -aaJ -aaJ -aaJ -aaJ -aaJ -aaJ -aaJ -aaJ -aaa -bKQ -bKQ -bKQ -aZa -akL -agX -agX -ahJ -ahJ -ahJ -ahJ -ahJ -ahJ -xgT -xgT -xgT -xgT -xgT -xgT -bfv -akL -tLu -aLW -aLW -agX -bYd -mCU -hAC -bFO -nJZ -dLp -gmV -qZd -mnn -etE -lLK -hnE -oUH -afw -bmo -bCS -aON -aOL -bgh -aaI -aOO -aaI -abL -afM -rSI -vDb -bcO -bpw -acs -xwC -bls -bFW -aah -mRi -brt -bbv -lTI -aah -gCo -mPw -aXi -aMc -bHP -aXi -aXi -aXi -aXi -aXi -jLQ -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aaJ +aaJ +aaJ +aaJ +aaJ +aaJ +aaJ +aaJ +aaJ +aaJ +aaJ +aaJ +aaJ +jLQ +jLQ +aaU +aaU +bKQ +bKQ +aZa +agX +agX +agX +afw +afw +afw +ahJ +afw +afw +afw +afw +ahJ +afw +afw +xgT +agX +akL +tLu +aLW +aLW +agX +bYd +mCU +hAC +bFO +nJZ +dLp +gmV +qZd +mnn +etE +lLK +hnE +oUH +afw +bmo +bCS +aON +aOL +bgh +aaI +aOO +aaI +abL +afM +rSI +vDb +bcO +bpw +acs +xwC +bls +bFW +aah +mRi +brt +bbv +lTI +aah +gCo +mPw +aXi +aMc +bHP +aXi +aXi +aXi +aXi +aXi +jLQ +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -76522,6 +75320,8 @@ aaa aaa aaa aaa +"} +(91,1,1) = {" aaa aaa aaa @@ -76541,8 +75341,6 @@ aaa aaa aaa aaa -"} -(91,1,1) = {" aaa aaa aaa @@ -76628,42 +75426,23 @@ aaa aaa aaa aaa -abY -alC -abY -abY -alC -abY -abY -alC -abY -abY -alC -abY -abY -alC -abY -aaa -aaa -aaa -aaa aZa lUI -agX -agX -ahJ -ahJ -ahJ -ahJ -ahJ -ahJ -xgT -xgT -xgT -xgT -xgT -xgT -bfv +ebT +baC +baC +baC +baC +baC +baC +baC +baC +baC +baC +baC +baC +baC +baC aXw bkS aZL @@ -76671,7 +75450,7 @@ aZL aZL aZL aMR -baC +aZL aZL fEH aZL @@ -76885,21 +75664,21 @@ aaa aaa aaa aaa -abY -agU -agU -ahv -abY -aiC -alg -alR -anE -aju -aot -aow -bCi -aoR -aUO +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +bAe +aaa +aaa +aaa +aaa jLQ jLQ jLQ @@ -76907,31 +75686,31 @@ jLQ aZa akL agX -agX -ahm -ahm -ahm -ahm +alD +aow +alg +alg +alg aUE -ahm +alg +ahO +ahO ahO ahO ahO ahO ahO ahO -afw -afw hxL -afw -afw -afw -afw -afw -afw -afw -afw -afw +ahm +ahm +ahm +ahm +ahm +ahm +ahm +ahm +ahm llI aZa aZa @@ -77055,41 +75834,79 @@ aaa aaa aaa aaa -"} -(93,1,1) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +"} +(93,1,1) = {" +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -77120,67 +75937,29 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -abY -ahh -ahh -ahh -aot -aor -alu -alE -aof -aon -aou -fCB -fCB -bjX -aUO -aaa jLQ aaa jLQ aZa akL agX -agX -ahm -aTX -aTX -aTX -aTX -aTX +agU +aow +aoo +bLU +alT +bLU +ahr ahO ahP ahP ahP ahP aGL -bgZ -oWy -bvn -afw +ahP +aic +ajf +ahm aZb aZc aTL @@ -77399,21 +76178,21 @@ aaa aaa aaa aaa -abY -aop -ahh -ahh -aig -akX -ace -bvF -aog -aoT -abY -abY -abY -abY -abY +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +agz +aaa +aaa aaa jLQ aaa @@ -77421,13 +76200,13 @@ jLQ aZa akL agX -agX -ahm -aTX -aTX -aTX -aTX -ajX +mut +aow +krf +aUT +aoJ +aUT +bwq ahO ama ahQ @@ -77437,7 +76216,7 @@ ahQ bim aXN rNb -afw +ahm agW aki akg @@ -77656,21 +76435,21 @@ aaa aaa aaa aaa -abY -alD -ahh -ahh -aot -aor -acZ -alJ -aoh -aon -bjk -fCB -oVf -bjY -aUO +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +agz +aaa +aaa +aaa +aaa +aaa +aaa jLQ jLQ aaa @@ -77678,12 +76457,12 @@ jLQ aZa wmn agX -agX -ahm -aTX -aTX -aTX -aTX +loC +aow +rEt +aUT +aoJ +aUT ajX ahO bIc @@ -77691,10 +76470,10 @@ aic aic aic aic -bvn -oWy +ajf +aic tiu -afw +ahm akx gJJ agP @@ -77913,21 +76692,21 @@ aaa aaa aaa aaa -abY -agU -agU -ahv -abY -aho -adk -aju -aju -aju -aot -aow -ahh -aoU -aUO +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +bKQ aaa jLQ jLQ @@ -77935,12 +76714,12 @@ aZa aZa akL agX -agX -ahm +alB +aow aoB -aTX -aTX -aTX +aUT +aoJ +aUT bbb ahO tDB @@ -77949,7 +76728,7 @@ aky aky aky ajf -aTY +aic bkD ahm ahm @@ -78170,21 +76949,21 @@ aaa aaa aaa aaa -abY -abY -abY -abY -abY -abY -aeQ -abY -abY -abY -abY -abY -abY -abY -abY +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +bwm aaa jLQ aaa @@ -78193,11 +76972,11 @@ uqx akL roC bfv -ahm -aTX -aTX -aTX -aTX +aow +bCi +aoS +aoz +aSC bvp ahO aUz @@ -78206,7 +76985,7 @@ aUz aUz aUz ajf -aTY +aic aZM ahm aUe @@ -78430,32 +77209,32 @@ aaa aaa aaa aaa -acf -aaS -abg -adk -aUN -aoi -aoo -abY -aox -bGL -aUJ -abY aaa -jLQ aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +bKQ +aaa +jLQ +akX +aZa aZa -mut wQi -loC -bfv -ahm -ahm -akI +aZa +aZa +aow +alg +bcS abQ -akI -ahm +bcS +alg ahO ahO ahO @@ -78463,8 +77242,8 @@ ahO ahO ahO eoI -ahm -ahm +ahO +ahO ahm aUe aUe @@ -78688,39 +77467,39 @@ aaa aaa aaa aaa -bma -abl -agn -agE -akO -bfA -aot -aoy -aoJ -aju -abY -jLQ -jLQ -jLQ +aaa +aaa +aaa +aaa +aaa +aaa +aaa +agz +aaa +sdB +sdB +cCS +aop +oWy aZa -afw +alz aYU -afw -afw -ahm -aTX -aTX -aTX -aTX -aTX -aku -aku -aku -aku -aku -aku +baz +eLS +aZX +aZX +aZX +lca +aZX +aZX +aZX +aZX +aZX +aZX +aZX +aZX ahK -blR +baY baY bCh bbp @@ -78945,39 +77724,39 @@ aaa aaa aaa aaa -bma -abP -alT -ade +aaa +aaa +aaa +aaa agz -ahS -ajv -aoq -cAn -psx -abY -aUP -aUP +aaa +aaa +aaa +aaa +sdB +aVL +aPE +ahv aUP -abY +aUL anh ahB aov eCP -baQ aAI -bvC +aAI +bCo ahR -baQ +bCo bCo bCn -baQ -bbc -bcS -baQ -baQ +bCo +bCo +bCo +bCo +bCo qoc -aZg +beA beA akI aUe @@ -79202,39 +77981,39 @@ aaa aaa aaa aaa -bma -abl -aly -afR -aoj -bjW -aot -aoz -bvH -alB +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +sdB aIL aJF aUR -aUT -bGO +aUR +aZa aUV aWq baz eLS -bvA -bvB -bCk -bvA -bvA -bCp +aZX +aZX +aZX +aZX +aZX +aZX bvT -bvA -aPE -bCm -bvA -bvA +aZX +aZX +aZX +aZX +aZX lca -aZi +aZX aZX aiY aUe @@ -79458,42 +78237,42 @@ aaa aaa aaa aaa -amy -bJK -acb -bJP -ePo -aom -aos -abY -akY -awv -aUL -abY -abY -abY -abY -abY +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +sdB +jLQ +aaJ +aaJ +aZa aUU aoM uEb aUS -aUF -aUF -aUF -aUF -aUF +bvC +ahi +ahi +ahi +jcy +aSA +tSY +ahi +ahi aaK -ahm -ahm -aQC -ahm -ahm -akI +aaK +gOn blb -akI +gOn +aaK ahm -ahc aBK ald alo @@ -79513,19 +78292,19 @@ aKh acx bCS afK -aaB -aaB -aaB -aaB -aaB -aaB -aaB -aaB -aaB -aaB -aaB -aaB -laZ +abL +abL +abL +abL +abL +abL +abL +abL +abL +abL +abL +abL +abL laZ laZ laZ @@ -79716,41 +78495,41 @@ aaa aaa aaa aaa -abY -aot -alA -cCS -abY -abY -abY -abY -aAN -abY -abY -jLQ -jLQ +aaa +aaa +aaa +aaa +aaa +agz +aaa +aaa +aaa +aaa +aaa +aaJ +aaJ jLQ -abY -bHp +aZa +aZa apa -bne -eqv -aUF -aUK -bvD +aZa +aZa +afw +ahi +bvE bCl aMD -akA +aMD alp -bvw -bvw -ahm +alw +aAN +aaK ali baQ bvN -aUv +aLf ahM -ahc +ahm ahT aUe ajE @@ -79770,19 +78549,19 @@ tsM acx bCS aOP -aaB -afn +abL +aOH qOb agQ afP hiP -aaB +abL afU aWe agT aOT aWc -laZ +abL bqx xdT ssf @@ -79973,41 +78752,41 @@ aaa aaa aaa aaa +aaa abY -akZ -bJS -baJ -aju -xsw abY -aoD -aIC -aUM -aUO +abY +abY +abY +abY +abY +abY +abY +aaa jLQ aaa -bHp -bHp +aZa +aZa bHp pJP lay -eqv -aUF +agX +acb ahi bvE -jqT -bhh -aid -aMx -bvw +bCu +aVy +aVy +aVy +aRL bvw -ahm +aaK alU -aTY -bjw -aTY +bvZ +bvZ +bvZ bbm -ahc +ahm aBK ald bfu @@ -80017,7 +78796,7 @@ aUe alh aUe aUe -bcm +bwf bhb ame bGk @@ -80037,9 +78816,9 @@ bCB bCC bxs bpg -afE +aOH aWd -laZ +abL gWm aZh oES @@ -80230,41 +79009,41 @@ aaa aaa aaa aaa +aaa abY -aoS -aoG -aga -alw -alz -amI -aoE -bvG -bvI -aUO +bKQ +bKQ +bKQ +bKQ +bKQ +bKQ +bKQ +aCo +aaU jLQ -aaa -bHp +aaU +aZa lrR vFo -fuW -ojM -eqv -aUF -amV -aUs -amL -aLf +afw +afw +afw +afw +ahi +bvE +bCu +aVy amX -aVF -bvw -bvw -ahm +aVy +aRL +aoU +aaK aUI bco -aki +alR bco bco -ahc +ahm bhd aUe aUe @@ -80274,7 +79053,7 @@ ajT alh aUe aTP -aCf +bJd ahf ame mib @@ -80283,20 +79062,20 @@ ahf tsM bCy bCR -bmQ -aaB +aOP +abL afy afD bGz bxm boA -aaB +abL afW afD bph afD bpL -laZ +abL wCS mMv riN @@ -80487,40 +79266,40 @@ aaa aaa aaa aaa +aaa +abY +abY abY -bId -bJT -bJU aCo -aju abY -aoF -bCj -aoK -aUO -jLQ +abY +aCo +aCo +abY aaa -bHp -pxF +aZa +aZa +aZa +aZa vFo -pJP -xRR -eqv -aUF -ahq -amO +ueI +pHV +pHV +aaS +ahi +bvw bCu aVy bzX -aVL -bvw -bvw -ahm -akI -akI +aVy +aRL +bId +aaK +gOn +gOn bfw -akI -akI +gOn +gOn ahc ahc aUj @@ -80531,7 +79310,7 @@ pSV bCr hzd ahc -ahc +afV ble ame amd @@ -80540,20 +79319,20 @@ akE aKh bws bCz -bmQ -aaB +aOP +abL afz afD bxp bxm boA -aaB +abL afX agR bpi agR bil -laZ +abL mIj xAD laZ @@ -80744,37 +79523,37 @@ aaa aaa aaa aaa -abY -abY -aaU -aaU +aaa +aaa +aaa +aaa aaU -abY -abY -abY -abY -abY -abY aaa aaa -bHp +aaa +aaU +aaU +aaU +aZa +alC +bvI jCX qzT -fuW -uhJ -eqv -aUF -aUF -aUF -aUF +afw +pHV +pHV +pHV +ahi aUF -aaK -ahj -ahr +bCu +aVy +aoT +aVy +aRL baX -ahm +aaK bvq -aTX +amM amW bHz bHA @@ -80788,7 +79567,7 @@ ahC bvU ajY sCC -ahc +afV bcT ahf bwl @@ -80804,13 +79583,13 @@ boU bxq bxo boB -aaB +abL boQ agS bpj agS bpM -laZ +abL isj dDu laZ @@ -81005,8 +79784,7 @@ aaa aaa aaa aaa -aaa -aaa +aaU aaa aaa aaa @@ -81017,23 +79795,24 @@ bsW bsW bsW bsW +ace die -ebT -eqv -aUF -aUF -aUF -aUF -aUF -aaK -ahV +pHV +pHV +pHV +ahi +biH +bCu +aVy +aVy +aVy aRL aUn -ahm +aaK bvr -aTX -aTX -bbq +amM +amM +bvu bhi ahc bbg @@ -81045,7 +79824,7 @@ aja aAc ajY ajY -ahc +afV afV aBL bdh @@ -81055,19 +79834,19 @@ afV bge bDp bmQ -aaB +abL afB afC bjV afP afQ -aaB +abL agx bju bpk bpB bpN -laZ +abL sxM kqi laZ @@ -81262,47 +80041,47 @@ afa afa afa aal -xuS +alu xuS dNn dNn dNn xuS -xuS bsW bsX bBE bCf bsW +bjk fuW -mOc -eqv -aUF -aUF -aUF -aUF -aUF -aaK +pHV +pHV +pHV +ahi +aUK +bcb +bJU +bvB bfx aUc aUl -ahm +aaK ala aUu -aTX +amM bio baW -ahm +ahc bbx aPs -aUe +ajY ahE ajD akJ alm ajY alv -ahc +afV alL ahf ahf @@ -81312,19 +80091,19 @@ ssH acx bDp bmS -laZ -laZ -laZ -laZ -laZ -laZ -laZ -laZ -laZ +abL +abL +abL +abL +abL +abL +abL +abL +abL bpl -laZ -laZ -laZ +abL +abL +abL mIj lgg laZ @@ -81522,36 +80301,36 @@ adF xuS ddW ddW -ddW dlA +ddW hYm -xuS bsW bBm bCf bCf bLH -pJP -uqe -eqv -aUF -aUF -aUF -aUF -aUF +bjk +ueI +pHV +pHV +pHV +ahi +ahi +ahi +ahi +ahi +ahi +ahi +ahi aaK -ahr -aUg -ahr -ahj eWa -aiT -alb +amM +amM aUa bfy -ahm +ahc bbH -aUe +ajY ahk ajY aUj @@ -81566,8 +80345,8 @@ ame bwo bvl aKh -bwq -bEa +acx +bDp xMG laZ nWr @@ -81778,44 +80557,44 @@ aal aal xuS pcI -jHw -uBx -qIN -iLE -giV +xuS +ddW +ddW +iSP bsW bsW bLG ced bLH -fuW -jzy +bjk +afw +die +afw +afw +aae eqv -aUF -aUF -aUF -aUF -aUF -amM +eqv +aoq +aae alb aUm aUp -ahj +aaK aUr -alb -scS +amM +amM bvu bvZ -ahm +ahc bBj alq -aUe +ajY bhT -ahm +ahc amg -aUe -aUe -aUe +ajY +ajY +ajY afV bvk ame @@ -82035,40 +80814,40 @@ aAs aYR xuS xuS -eHi -ddW +xuS +bjX ryW nwR vlk ceq ceq vXM -rEt +aae bsV brm -xab +aUp +akb +aZg +aae eqv -aUF -aUF -aUF -aUF -aUF -aaK -aUo +eqv +eqv +bfA +akb aUo aUG -ahj +aaK aUq -alb +amM aoO bvV bGy -ahm +ahc bbW -aUe +ajY bHC -aUe -ahm +ajY +ahc bgG azf baT @@ -82292,44 +81071,44 @@ aAu aYS xuS gzY -oPR +ddW wWN pcG iSP -gOn +uoW ahD ahD dFO -keI -bsV +aae +aae aAt -bne -eqv -eqv -eqv +akb +akb +alb +aae eqv eqv eqv -bne -bne -bne -bne +aae +akb +akb +akb bne bne aQG bne bne bne -bne -aad -aad -aad +ahc +ahc +ahc +ahc bvM -aae -aae -aae -aae -aae +ahc +ahc +ahc +ahc +ahc afV afV afV @@ -82549,7 +81328,7 @@ aux aYX xuS uoW -jcy +uoW uoW uoW kcr @@ -82561,31 +81340,31 @@ xAS anu aqU akb -sYJ -bsy -bsy -tSY +akb +akb +aae +aae jxT -bsy -bsy -bsy -bsy +aae +aae +afE sRd -jxT -bsy +sRd +gBG +asv +psx bsy bsy -aZj bqY baV -bcb +bsy bay bcV asv rGm bbo asv -beN +asv qcn jrr asv @@ -82815,27 +81594,27 @@ cet bBa twB gGP -bsV +aae rbR -asK +aZZ mTV -krf +aZZ mTV mTV fJZ -cer +aZZ mTM -svh -bVl -bVl +aZZ +aZZ +aZZ bVl -mTV +ajv +alE cer -bCs cer lmR akD -bjt +cer baG bcX abt @@ -83095,15 +81874,15 @@ bBu aad bbr aad -aad -aad -aad -aad +aaB +aaB +aaB +aaB lJZ -aad -aad -aad -aad +aaB +aaB +aaB +aaB snt aad wYv @@ -83352,7 +82131,7 @@ bBu bft bbF bKR -aad +aaB abj acK aPa @@ -83360,7 +82139,7 @@ aSM bbu biU blS -aad +aaB bzH aad aad @@ -83607,18 +82386,18 @@ bBZ bKG bBu biO -bbF -bKR +pxF +bJP aaf -abk +afn acL -aPf +bvA aSN aPf -adG -abk -aad -bLU +cAn +jzy +aaB +bKR bGT bKP bKX @@ -83865,8 +82644,8 @@ pwJ bBu alI bbF -bLK -aad +bKR +aaB abn ada aSx @@ -83874,7 +82653,7 @@ aSO bfi biW blT -abq +aaB bBP bGU bKP @@ -84123,14 +82902,14 @@ bBu cfq bbF bKR -aaf -abk -adG -aSA +aaB +bGL +aho +bfQ aSP bfQ biX -blZ +asK bve bBQ bHl @@ -84380,13 +83159,13 @@ bKI aTO ajW bwh -aad +aaB abp -adQ +agE aSB aSQ -abk -abk +awv +aeQ bsR bvf bBR @@ -84637,15 +83416,15 @@ bKJ oJa bca kYm -aad -abq -abq -abq -abq -abq -abq -abq -aad +aaB +aaB +aaB +aaB +aaB +aaB +aaB +aaB +aaB abq bHt abq @@ -84897,7 +83676,7 @@ kYm aaj abs adW -aSC +bBW aSS biq biY @@ -85152,13 +83931,13 @@ jRa bcf bir biw -biH +bir bmi bno bwB bxu byK -bmW +bCj bxt bkv bLI @@ -85413,7 +84192,7 @@ abG abG abG abG -bxG +acf caa bBI abG @@ -91036,8 +89815,8 @@ xSZ rdp keO xSZ -cOK -aKC +bvD +alJ acg vwu acg @@ -91294,7 +90073,7 @@ uln uln uln qMf -aak +aou aak aaT aak @@ -91552,7 +90331,7 @@ cOK cOK cOK aay -acn +amy wfy acn acn @@ -102093,7 +100872,7 @@ aaN aMC aQO uTq -aQV +dXJ amC ajJ biS From 1c3f4897d02b8bd8decbff2e92c4f13f09a7cae9 Mon Sep 17 00:00:00 2001 From: SerynEngi Date: Fri, 13 Dec 2024 13:41:01 -0800 Subject: [PATCH 03/26] Areas.dm and .dmi Stolen from Gungnir Yay for conflict minimization --- icons/turf/areas.dmi | Bin 46539 -> 46687 bytes nsv13/code/game/area/areas.dm | 24 ++++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/icons/turf/areas.dmi b/icons/turf/areas.dmi index 7de9e2be8b38cfadf726a43ba704c9f0c283f0c2..70c10928284ff1f06cbb8a8917a628d7e8765f85 100644 GIT binary patch delta 14449 zcmZ{K2UHVLw=P9MMMVV#K|nf46A_TEfFdA8K#{I=gn;y(0hQhjOAC=WN z?&x?0KJ%=UT>U(NF!2~zn-vi32#2xvXx~K5?=N&NkgJbg8ppj<3o%W3p4-8{YUd-_ zUW_jH(m`}!)4&LgPWJ-J0XP+)RUCE54Z1n4g@IvBWi9Ryuf>v0nC@6eRslg)3lGZN zLut%6l?6H(0Y_uankZxC`hSI^v67v9-QVh2-yZq@p>a1l0$ILPn54tCaWq$M(O05d z!qD&BmRi#&#WhN?IShT5Qj9Qvf#i3cxca`)yjAPTkKbRr9LEw~;dF-LC8r%Mf-J3mz|nE-(B1 zRv|jS6vjUu!p%u>GUvNblS{5hD{cxK_`i^}&izj)6a{wc(A?CqEIfgATX zHE9z1MMnlwuF4Unc(oC~5g2-?(a@jR=*Hn!C3E-8?X*A4IX zyH9X6FYV0Em{S!bRV=TmDR@XtEhp<09Od7{xuu-W_9yN-GJdY^crl|`rIbup21MD8 zCD9AmMO!|3Z@;%AwAfGLVXW1HzR<+lGP+$_gL33f8u%S?fN2cdFIQgDP=Na%=zbLO zs@$K#*u_?@dP#kWp$$h)WW2gx-Zccsx(NTs40&pq&sXne`Rc&p;&p|p5{6+&MZG7{ zwrb1t@bShe0;cDYBK`hDOA8X_J)IeTtXl{tXmY1M*7n@ovQzfgl-?wafJ34W;jO@yL zjhI(#-#5Sem+g-VUH2N)e|QyAxoc*td7x!@??v}7O9tA#ob+ZDO&W!nL$sox3GcLRl+${Ku z)@2El#Dlv?wU5?roagz%dRg+`yL45r+Szxd*n}m=U}Ju2^(e%>f0yy*)pnP-UxPm9 z(v_xa>@yltL686Tjf(>XcdP(C;2zS5J#>{+`ZMriF7PcVHF+S(2K}=oAyfb{4~}e~ z#cIk<8(2Frb)B7m*q`b}+Sq58y(hQ~2-B_kAMx2&YH~8tx5hs^f~s|oiF~%NylocM zxkB3$^>9t~PxT}n+6b=2IYX6QVxqE&Z|m4PXXwVeRw`6rYKk{0hs8G`X+ar-Ee=Fm^{vO@&@p{n6IE6;eARn4exoi^+uH2ZB7 zqr&QH@jCqnV|6m`Utag3D4;!cbwxxvFk9@wRFgSvdh5Q`&cf1-)A4(Mga_HaJb9ee z^GuNk(^cb;B)XLHC`fZ`AzRvI5&`vc2p7oka_I5-cj}>>K*n}0u2j}8V(E_onqGI$ z^Bw*nyl+v7+2?L6gxg(-jlOyF(!-lvlnte?a@#g%jczhd6psD9}(LEXIG z3ch&9+Ny}Y0Qy@vDgV2Ak6{*FF8>QDe)~JW-xtip0(b0}LQp>^&(6!4PG60~^1YYe zz2NVTUFLpi7x3tLgi`Hnk!q!srKhrx3DCG0`MH=%w8O%X`&jpuI`LNDV8M-(8=GvQ z-N{Ko7bvho2)Kf)18(nbK0Jah$MN`9ym~5CV)5 z&TpDm!g)4#nX`EP%JfYX9tG?;T^qWcGLR)4{6a%vph5y}RGHYE#q8OA1oOQEv=NS) znEpc*h)gy!@y-)<+E6O0J5*X4kB$AacRPYAf=zuETl7@xVCNg$fyBo0)*YhKxzCK3 z>B9c%hzf_z-MpZG9Xw;4ug`EHF9q>7QsG`n!oi&xlNW#4oFuOZbK;Ke-gu1d-03>F z%RBw;=xsx|l81o^>q)Zl#qfnBgDw^I{73oSo)Fn=d|wCJE;nG~v;lABg7JdmrF%JD zsMURE~zH2;1`ANF&mwo zUalg}-sq^)SICZv;sS5HR3H@n+Fo|FDlUe1J`;V#rAxS?k_|iDn)L4GD!3tF&uc-Qa&Ya{kPW~SJ_u9};#L?jBj_-ZGrlmHt`xil8UaL&*S*{6qpTVO` zHqHc4Y}nLB>~@u?pft+e@=}Sc^>d&o12l5PjSG*byf>hbeY4}>u6W?;%huyVd7i+7 z?a0Z!)r6A1rjBQ^3;wC2gqp(bQ~`}dcMcY)_1TUExeRYL&e&jjosUJ=nS-yVlqK^l zShu-#gW-Fjjz+!LrXI4z%dvCZw<7MzF#i18Zb!$}r#r55&o(mBku|Rnqvc|5iLZT0 zhljcO4hw)oLTM?!JNoy}ujYR&+ULRR@63Rq2bAlMHnCRn(*({wu5eBzVLNdyFgI|i z7wmAiur|UhX+?ULQPXYwgv2W=9W>7$(+;f2{Uv;|lCcf2lV)j9lARN;0=P0COvH$QkahaszlA z*27F$W^yvf>1aoQSSztOdVE5rBAkf|@SL2>nT9`kYpIRGU(o)p`jhdYJ%{_jw+LJ$ zX+j*d7^`pKOuS~*FVdGd$$ZNb%v{t?LXdW27Nm5dD?^+jWY37|hi5K9(NU-CK6qsf z4ibrnGC$?@w;)VPy8qP`!<$2ZvQFn2 zqK@brFiZ$gR%`d&Z`tI6;Dasc2vPQ%aENKh1E6ZlGWc}4etDm}Kv&i83K4nBaV#yaB@eoFXxvzeu#1#YeE5oB$r2e0J*Iz%ctUhm8;Rt3oCh$jRg`W=f;f5G3a!W&!= zfWlDFUQ6V3r6sBgwXsCBXqPzm%DN@+k@w%zL-9#OJE6H0|Q`=P(JNjnb zf1#;=+uXH19l06sQX3`7`LS$v#V7r>8=!z~|3n;?%1C`C!scZ~{@AuLXsx(<>2x6? zXnQJgLEroA3$1D?_z?WB#(5H+GnvR}d3qLGPiQVAsCnT%G?|7ScdP>sxAT11>c!ui zSSqT%9}13fdfh(wnelbj(q-k&i%-4(ww9~jun3NrQkN>Iy=(YpFfg@c#J4pXKujwhjo2-wh9P6vo^i-B73!{?oSHjW$9K3s zq@SE|2Kl~=K>Pju=~iH*8mJlqY&oW1zcwyJek&J(A4(tFV}%wLB1q^*1PFr2a_xn6 zFnhjM{USlD-a1c0WyL9`t0`QZ0NRZ7H_;;NJ*at!n(-U)e;D6iAMnU1)?kG8E}^{I z7lSn8oyvxzb?@}>SGAq)Tt|0Zx>hFpz=Lh2Ca!CkRa8w~Dc3WYvzY-f>h(ctV=TV! z^<2-r(^FiA()P*CoINnqK<+diu&Z+!Y>T@-WSoC$k}y8%aYWdS@o6Ph*9+1c*6|Qp zmUNd7hV42zGBKdB_Q15^{jfl0cYf{d7pdqpoRaC@yH~-(fw~n!j`&#k_(Y+8b#5I# z_3?q$gY>*9RRHF`FA7K+a%#JVxokT5nD4%Wto?oO88;Jm@UAxjkyMj)oln*hwF4tv zE%KYJpWWGbouCz_Rt-JscyFaPfpzjGD|;|ZsC@qACa4iCiY<8I(BuU# ztr|r|oGM2@y}toT-e9$I42|sVmlgXNQACl$hj~e{8ntD{v!`Q^($w`k0 zN%EOic|$O%Bu_3%_x%UaxK(zpo=U1VXTX}4t$2Bn*r}6xcidI82M3l&xuEl$p1qbD z8s1|i(0rheWGjgYJ~id#E%)=<7nQ^jaIn9;9T+*X?;Q@(9ClQu6F|Nv3s_@IcS|?jGn-a)$0o2^ja9+Zi))u4?H9CS+b#v%{)~HAJaIuQdsr&T=mA-$ ze@4dZAiz>f^+x!9=w%ZTL^s+qhv)qP3vZ>(1~z-K;ew*b+3*R{qFt8*zL9v5Hi-*( zzL=HvZK27JQ~xmS2|0cX)3#0M^pnN}?av<~JAv3Mgyp7j*sS_ib;ENPEM zVe8P#`9xG_8=BjhtoLy54m$f9YVZ5y*sp}+;s{|+fS0@2IC2_H((Unn`uPal%oU#k zNzxQp7u5LFo6W5gbv|C+dX?c~2nqNe$l87rKD)LG*(vA=>VsSouZ#sIQ4y;*k0+h0YxZN;auZr4PTk{de@fUO2OcLCl4Q8`#F zX{ombTDEAR)yDK%t*RqH^gMBhPj1qdi3mCW$xHb37yc+=M%}yHS!lu|QoJO3-Ma9X z-tDtrr^q@*XJ3Ni>43H(6zmHr{G>vSfUJCyyc>eOpzvX%b~zD6x{^6Bp^0IIl1USO z+Y~u9g~sy6rao;JDlX(Pg8xDk!yj@j25o2QUy2LZJK4X?&)(DPnfre3vG-I>>5ENP zcQ#0JxG-I;ocDqt1Qz}n5Ki4*j+2w5g)gN{1L zPI7l?>;hRo=RLVp8)@xi+%lIx}`MVw&| z6N#icdosy_6kh-(`@s%>f8KB&G9lG}B~JXHy+|RqR8+Mz0QLXm{{I=zH`{deQEpGo zjc$Rc{|&3Z=>KSQYZM$X`{>thdioLIZ;2c7awP_H4T}2yr-vEcxv$~T(!N(xHZo$h zt)Rre_Z?OL4W-JUrFlTZci++n<U=)QT(E5D0PTOeKl47hK6X0$2>Y4T4jHw&A?e&~{ zAF&e*yH=~O;kAN|){!g}lIW;dbl5S=+O6WV(y7KDVubdaH(K+3XB$^D(Wf9Y5yD7~ z`kJ?lV(o~%5rC}yZCVy0)cQB*sU3Om02Tp@e6pJbw(v#s7 zsh!P2)_1^K8vo?JXgtgP%$cd1iWOF6a)Lenx#+v&|05=lYTv>`*7EfD*Qivjb$R6Q zIGN#Ts>b924`bDq@ zWXU(CZe%po1x~4Y@~H?32|0UueqNKR!h(&auU1)Z+w<|3BjWLNPGp4R_s{mbFStc=Gle}z_ z7we1{e@)?Rds^BPCG=ZfB|eFHzDIl>y|M0^A#v?;02|0kL;e*SKU_*u9y?c}qx5bQ zwNV#6E=>JSqo{n3-I~=pt!1P5(ukVe%G7YaeM4jgJXMDK!?l39awnzeh@@5>;Rs&3 zVh14^ieOIYb>)dqA^QgsV}CpX!tDb3`?`Ec_7(%s zO88R66gQGX*GaKd8w6{9Mp8wCi(SwF+u?2en>UyLp-88;u>>Q`??f(`fYPcP>%km(10k>{Hd4Hk>%UWox}d(H?sPVNbK2Y% zk%DD0b3{!UBh&Mg<4Xf>RW-R=*7dO07N!Ur4|HC%zE!5JiE>1bwJGe^+0|_>EfdSY z(Y4?!B`HuOP8{0`gV5TtpOOf!W^ngof_pfiSEfS#u}|$NOvrJ1h%*8le%94CRp_Y64{b+%-z-P)=&OfZ2n^?$$z8aO{}vn(HyS08Vjv{x#fcH}UU!9koP zVu?TTM|x=oP_wcl1knEh`p;NKfCC0+ekDx|n|N?)JUC+*O@C=Fhnrv>`VypEle_tC z1xtWhx32z(^@WNlXSDC_OzyOQ*S@JVz9idT#UG>Z;M_*^Ad}KzWF^A9$#ofMHhzsFKl&?)6+Jn%%<=2>0&aEx(h!Wt^~FlKD+ddWju_x-iK-L`-yO|Lj9f< zTkt}PVC|y)ZmA1w3O#UZ)$}EQNzwL9$BR12TTT1GHUWyhrjviH;rQf**%`j$KrbTD zRNdB~A&EvENHg(xrE3wR`|ultt}1@hCrfDRPTdBGYwSgEQimkRf*e;I#qqperu?V{ z!B@AW-Ydy(BR!CHQ?wY9NWga<64Ph*c~*^9nA3Z06||4G8|akAEjv&i+lfbWCEWuU%pss}(!mZLVGNdNc3=9>K@BkVLTT|32_RNSiF- zpGyZ=(|ncpLFm7IrHt8%0(dDhj+Z!;$&LLmW@03M^RB0{TdG9rFn<=w-ue_^*tGn-qA2J^>OWzeU>EJ63Ydq`NzQG_^##=!i3NL%lAJ@6Z8L$H})o@CVTc*|PRoCn~BxJ1; za-G|UTvNHn6gSimJ<)Untj zXSDN0x4y#w@l~Ev)T-ypB^R5nEKOPxhtkR7N*0Yoxnp5~TVSSd&XE6E;7jAV8P8 zL*M0Uus&ruXqD~#y`QOAVqGaPy&!zmb3`PG>yb6^vW9{1vEN!Yzq5PzwUvHNZVIq# zv)hk$4YY(2W)4HryxJ;-8bEr(czs2nbNk2%XE+~gKoBA8#tj|0_y&{dgVF4C1PS;z zS$DA-{Nor+30cr8=)>=))}gNs*xqr;FCJ&K*rFMA-)n1I*6AC_h#$WJ5@xJr<(2MK z21>M+J$Zygr=^>yvw9-is@GJt>O$ypr89%RSS`{m6y*YrNjNDAraqRj9rY0y#a9({O zKfN@lAqG-CVvlgGqO5cI>9?I52xZ5TQ5w~$*(?>tIUk}fKje5XjChI-CQ1IsVUl>5 zphsZ&<3@BZtU}RONZ! zBsHVt4pp;ep1Ye4V%N_kio{jYt0WM6uVdrG_RD-L%PZ~1+hBN@&!sc?^inMI#70?n zFwVuEaQVy-v~;TZ8@vD~+h?+$I{$>(FFe`_A+rZwRI?`>b&_rUh{#Uvk=*YO`r4K6 z%F3+c7kdEo1DV6gPa#9?pBH#ELHATOewpqgJ)WnvXD?nQ-U$>(nW6R)=D`v<;i`K$ z`I;{awN^q{^ST}cFS<6x1u>fVWavZFZ(Z}d!#8yXU+d3AhRj3~WoMXbgy>A4@MPPBX*;;_p!J=y;E7=%%h^Oqd?8x^)8IkCl>YHce`v3Ja4@-br%r{!-cf z1vbYJ#=47#bl7yZ(UPFWrJ;9K*F}+;CLU>{Ke_z~HP0TW8Rq?Nc1n3#YM6gfg>+>=AVFx=Dy#2gamy+f!O+XK#<#W~&Z zry!BVz75xq*x>~3$<2129y7I0Mo<828_za=F_{k910JeEuL~6Zw>(CPWIaRVpCuw34fKutk>4t6;$Vlb=2bta|g+fl#`5=rL*D2|O^tJ`L zzsCP6k*&^!fY*_vW?4I4XGpW6VY9uW?22fdaA9-2Lj0(=Ef6OIRl@6QOXdqh4wA%y zJ9Iax^2R~$D@7>M8^nrVvqkWmKauYxp0e`)38kUppXV4o6})!sVB&V$PTE0@4Lz<8 zrNU-6^m}NNWQ?6S`_p>M`c1sZteQqWDNXrbB0jZ}>%$&}`w|&%o;RR+bQPiMxf{AQ zwnMpAG;rhIavMipc+Sh)>P*N2yeDyT3_G5~YHx|+l=y>a`WVJU;sv_)Tw&MGvql;! z_RWYonEai4^{p;S6ooq_gx{3~J!2AP3;AICXz>_t^0Dc~71HuAj@Xmvnk*YmifOo3 zm%t)rU2Q#0O3FB2CMTly1`yjVom2VF%<)=@{zc%!7Q8g=lPYMCinI~1NytDGHuxMk zP02($BI{sO9tQw!T=ZRq!*PIJM}pI5-(pUbLcPy#ONJ)+fU`BSdfpGDtQ&IWfh5?? z96wD&gI*Jh3pFmN_rFx~CCj}*htTdCC5}8(Y1?i7i^u%8KgBgKnet;O z-xznnvhSv|(WnT>rFhqIlj%F(3~eCgO($dk>2b;EuhyBi3kd#TJ(Pkg`rRO`-lcBw zFeJB5sHWS(o>6KLH{C_F8Ws8TH^8vDw_PK*GnPB@s>mqEkjhI{%eM@%pn8tJ=p zs+jeqt*pqfwBV)xE~n1lJ}=#AwSQ@8_+ zzVQ=5Z8+8Edqt_#_%F=N^ztCR`%f4e_BW6dUifASrnpzP57q##@NkW=9RP?Fh6g{; zGs3d^_nJl!c|DP`4Nr4Dav8H6$15V!J%f!*4<_80y=21=#QrL%y8Waz^W!vAbzGa+ zQfo{P;iC9UvbrsF;uvH%Pmv!ENX0k9Kmt8SItN?KGO&uR5(ET&O;trvz7plLZ{(Oo zuu(KZ;z4yTHd8nFko>o7fqMjO+cW1jgG(D@>=tX+BP8_SL-Nm8VsJ@bguBLN8dq7_DSmg7ydsXMV zE2=(SGdzfoqHx?v$*17V6%;ikZjGs1WGb>bu`KN5rN{U*=Ob%%?c>GfU4FHT@a zt5~0PUK7Q}Bh>W!EpA9Ufoc3I5o{lR-Iw43$^GE<;`>}4Xr?KGxNX;Pfl$%24tF!dxpnUzRUa1!|#5YfaZj#cx z3+c?OxnP;%TJE%ig+d_#`I7X?i4N|{RglX3r>yh!PV@7`rvbz0+=J9krXUAsiE^Dj z9>Q24O|w-1c~tO_F-CG?_xt8}_YLdYkdFm-`Kxx3)_-kPdS$H=;_b&<+ng6USugz# zP^^lKtDdf4B(_kHR?dwbQeT*G zH&_7F8od5!Uf|xzF^g-nEjn~*?!BfL5EbY?r;+oqitB1zyW6QEgS9fmwdfWD65%}F zP=$xY6(vz_#91uJuUIe1h7Z{t3-hEjOu`a5kyS$nCDzmH{#HWl3DlO-9zCpej>YuU zv~U0nd0(>P|!MhxC@JQY%8}zozLnZwBjFZ~J*T)+`dnkOeqSyBad6Ep*t1 zTn*IrIyuz*mzw;NdPx6QQB!XkCiZRM_GC%ly*U@Ow3Rr16ir2S*&4F_^)AP;_X~n_ zqUFuZ?+s7fJX|hl7IcU(Io&4+0XT?6SsTEVZq@w|d$tO3PpJn6$|eOyCSkM*V($Q# z&6ENh8Ouk0F-6L06V$)!3}8z@`YH8fxLkX2QGh{4(=O6-%l@ZVMc~@XE#3l6ZXzcy zuL5>>vDo7q`PaPUC76!qaPx92Y7k7?41RC@Vdx?~P5r&Ac~|oU!l=TjI31C9fJfY| zWIBpd3$~(5i2;(1sZDn_&!(g_G>j)mN8BB*yL3+DaA3T$fQH5N4+Xg&QFDbH`Z+Cf zbm}p593_KMkKH+MLkdWRLX`#F58K;`9*%SSs^^5MsIHDLe2Lbr1s$yIMs!FsXWi5v zb-QQ#JnMEJ!4g|+s?7E>&M^jb@Uo7 zgAb0{VSl}#Z9GLIa<9@nFO4q|5qmjewuFEj6mU4cm@f@K$-^%coue#f#;kW|E~3d_o~9n~-`N+Zq0< zI3Yl7Od+zq^mM&_L2{SsoqYmwr+ZPi1O@fgFVc$$*Go0lN^4vcjJva@ zHa=YvtqrPxNBEK(2)9xD9E)j$#e|nsRAyZc$WtCG_5%@ASb~22>1!qVwlK0&h!ply zwmVX-cSsh&_I)1ky=|juZhOA5r6Rc9?^n|6HBjxEt=h)*neInb2tvJ%(;p9NTW|*g zO;m7~UMa07HdbR+Vypb3`;7Yu+@7lI{t^o7n}USPpl0&bJgQJ9n{eSzqSevZf1iBk zBK}2>>qi%Fg&gbJ05;ogZw2U*)w4Q`ITD=p`lJOu54=%Ii70temaX4LuEATN-fen0 zag8<30j^!NRP;+WQVxt(2{Jx=%ABQ`vyuVv35yToH#Wb;d*zS(UTer~QJa3Q@ymR( zePn%PYLxMZAiZ5&u}d7&YRIm)0#l}}$t5QV0w|i=hv$j&BzAxxx$k@D6 zYD}To3GnV}+HRSd(kOM6+bnL2aTpLGxk{yU(ZobNN&i0bBuW{TVQ_HErcmmAP(c$RR{(qg_Nha{?9Wa`+`a`^cMh>a_Z4o5Xhxzo(w`Y5`T_mnpB=W z-^xhB$`>ApQ&HLRJY^ZIF|4=JD_1ESaRgi><5>dRQ#|4;{hy-RrO;8)`1+iE7o8_Y zE7GZ3`m#;W4K5a?uwi>bH)c$V?>te(U7O#?B|8o<~eX;TGQvnx|bd<%D|ch z_ICfAnDxQN53ffd&0N3uQEE19@x<^?f`%bK8xA+!3nzJa3lM?I3Kf(2i01Q{qf=r? z^KnXu#9CHTYY3ym4Tq;D1Fw|s1O<>uQWDo>eQ^zPJe-|28xB^BN5^X~6J!u-LCh0; zu?e@UfoWJeWEQdTss6h%_IlfV{X-l#mSoU7Pf~j7tu2+w$fr=uHWGd<$1rZ=XOy1EQ?Iug zr7VRYLF3@w;ebutmqGL5bP4Efk^J@R5mJf#?|3g!t>sV2diQ%h5}<53f~%B%i@N>t zK#K)Tw&jYv@%QADE1?RoX!$E`_Pli4D`zt&m4 z|6SoX!x;0WTmwYS$w7R4c#xW9-$tLD?9IIkKAc(Hi!;FMW}zt`S8%Yc?ec&3;=J+y z#&IYv26r?=o^EsQuP>jIHbXb6;mb4==bvI-^(5{$Z2GWUtfGX~)b~0u7$ez4$Ec?I z4mfqHR6I}r9cpv){_IsZAoq2R|5?nJtbmHI6@Ax5Z*rS@uZ<|ZGUlDOjlL0!Qt*~e zypekJ+NQ@QG8guxFJ>@Mtj5M;Ta$!!fQVHq0I8aiN%&t>i}owuo|hnNMGOE? zh=kNP<%sCmqUwtGEi_(AO3?VXiX{?>zc9$jreNNbujQkXo720f9shI8Y}Z_))fyv* zu#F{%pG}kM=Y+aN*kl@2!Bm`wukdW*li9Hb>ppSNv5kL$At;e0J78mff`WDx)=US+ zy>7)r2OyS0fqhl+2|`i!3R5NmSc}(sJyD#*NXEMZtH&wf!>2JdpYhV+Gk7YP4;gZoPNsR-b}Pu@hI@Tg7OeHTpN^Q`(le)Ev(1ND8Ah5#O>j~Ug#&@ zHV`pyW`Hp2Mwi2%&Xhm2gtykmyDKF3&G^l_A>HOr?q*A_$_C8)?!H^a@TeL0g8sH* zW`6gg)IWWN2-fldRz8Z0xOby7ns;AP^IjM8&W!4^TNv}Z7EamK)e{0E#AI!Wd6)MV)@e~1>=2yJaogn4-yAy&&qO#TK_sOzUvU8l4J zI?J!eT>O%#b;82IFnpW`C!eIWtN}|8fnk`jt2ta_ci{jv=(B=U9%$}qm39unS~EB; z@DS47c@g{kc~-`X>7viQmGPsqk-OLd5HZ7N@SvT`bG`<5J?U<=mWtbej6^umz)(oa zInnAfQDiqFP`cc$6RQCD3Q2nTKkB=I-SZWB$|J$br6To)Vpp>N`on?^II6<@y4uPJ zXJcd7a$t^ZRfTuP8aaDRB@p(pp;sKk`|QIa1s8?|NX;7)yDzty%+rajprb(C=lq`7 z=^nem$S56gtNJT7Rohc5PtZ2^*VVZ?iYQG_m{S}3B%BWlbYHA1|Dg&crX+NUfjUQ~ zj_M<_t=CDY+9lf!ry(L!H1&u;E;3DEq45YXF4^`Q=({*jvLGNCUKFqu9CaS_6ZV)H z3d5DSnp}g3EDA79B`T~NmNc3?q4fAY+LcNVTOW&UTvw}(b#nc!7@e+>H{pi_;6kiL^wa1B4HXAHPV6V zDUD+NsOjSENMzpvxx^|QnZ{;t-r(N-XZj8z2hN3is6@5uXnlYAtVl-1^sDt39%a2b z7ix4UpA?S4ZidP}HllffO=(5C+MfpnUvZMS^Qi0DgtvtwXJ*2|)IGJy4a}#jmapG? zm#)1DIs*yNG?D$(>%>=*4%?|#-|sxTH`i*Qcw3Ls4< zr(I5AY-7ZJ$Kc+;2Mr9pZ5!^ilm%=h(WLCbK#c&;I?V!H>5U8LgD2Z; z!xK1pv$N7yl!#V;Tn&wsV4*WkiOu|OUH&Dd1XNE{;iAc zIhd~VFU}hpgipYi#X!K^txW2|c$}8SYR9ppd-s>#1>QSqPPrLUTNs3 zhcDt9Uh;wG*83;${tzH2$!B(9_bLQ(hJ)ZCa)Y0U5^`a9)x^A8zFr%0a^~E*=IsE9 z>`?A%?FpO6=ujPfx#Dg9jjsEy+?;#+tFtAwch5Fnu)dw*^bGj|YWU7b{EKJ9W8|)x zMx_%89GH~>wxdf>{NpCTTjP*{V@&u(!5vrr$C5Yy_DE6LrvmJoO+EBD3;RpK(F2b@ zZyctqSy*=ofFY2TwBA}>y&$?!nU9}Dp)H6upzX{9RbI+g{((?)H&ZG2X;<&IRei&XxYzc}{?lu=?*IficP*X*eG{vbG*#A7trkq{tqZHb@aKUNw z!qqF^uNdB)KO40D%R1UTix5Z)dRlxPICZ*34rV4-4-&d%QL3_|AdRx*JH{)o!gm`Y zO0|}dw*X<>y0S_>`|2G+RRX!DGZw}3tC z@5*m~Pu5m9P-ya+{q2qNS+Ons%b%l((hx&0+&!vI<(VC3x$`FY+fRS1Kt4L7vuoY? zybL-$*IPa=_03Njwx^ObSnRTPA`5BxMjf}>yx{`l6}c| z!vawT?`5&>M%q5ONpq#XNV3x2Br*d4O+5>jAtp4dYdbGASFAMMxZ`7`&-g{i%w?U> zZ8ciE898tS3C&r#>$G&yaw|?Zl%Wd!Rm$V|hE8d6;7U7H#Dnd-M`?}zHj#0`+S;YS zUPw-(e=b;9D^}}oY+UfPurZ1EZ^zrqmX2I(4~<%_zAr*H-=Ze_(0*I~;0wjs+GBAcTuRiR?rLzIZe<|0GiijNOYgTHKYix%n@04x^~1OCt+xy^ zxqp@tTuk|d!0+A|Sp&L-W3-2Dr8ihL)Nx;Um>~N-Pn(}1m`=Y~eh<>KJBTe|KG>v> z1N6BUZft9B_5JRh`$Hue-uq313Q$v~R3_$+AobECBtNk5SV*+*ypU(;x$^q{eR<0_ z?(oX{uZPX|jSxA8cQ(@V-rg3poUQLlS^~Au+*!wMQZ_nyJ$Ws54cE5(UhpJalc=KA1pm4N23yxnjG2?}vQ}Q6-7Usis z)335}WRzYhLDam`cs z#pUq^nR@Y5D}H}WFgQ)9zU43b1KT4i&D3$g>*Hr z7Mbi`QP4iZ9dW|+Hbn$^I*5>Qx6%6p7+>kx-`4K4NLFB>_qmn2tr`_uV0@?FLcZ=A z&`I-=$*TugdQ(C-Rgw!<_(}Ot9}?2F>mNKy`+Z)s$Iwu-WF?9IcVFiV;3C`mr?D2Q z+~1CAet|W!j3KO|HrDR8wbo{D3Eeid!gPEx1J4T&=^G^vo%=Zi$LKyrC#Rg6O$Z{QxfpDDi%(U2*|0Y-rP0e7@%j^1ioKxUE>h$O1}0I=#)0Pxafaw zR19Yte~Q0nwc*!V(^`DO1O$q7cN#k$J~VSK^=!B#?u%%fX!|X4`0dTo^K{7v@e#7| zsebBnk#>W(O@9f$$0g;r$vaIILsXFiS9I?q2R@?y{lrTm2j)t9-px|9PrVY4BwtKG ztX&J*CushG^2pOZ^tsZ@$-*oq%Jx?D{_(-v_XX~sminYj1tRps8B^{I-U9%*P^GI;E$Dwom%hek^NNv!1E-{USo6N=}$OYASfyklIV{ zW|;RDH~y;r=s5`gLLX>f`xLOSYhDX7s3N<=7zK1GO@f-ftL$Yzh$cuSebN#+5E+uB zh~wwQUq5#%I4mdH$w_`@*lSz$FS`c%Rb_(hlR-6!2&LPqQVvh4@10(irfQndq$1JW zn<%HQc&66*LQqy~$0)DLC;VVyl<%|rU9jBqNv)yOwOt6n%RCV+~9d3C8ZTOuwNC_cM3 zSHwbhs9#qfIM4a-Egyc;&MoA}U8{T*C>?r&k{D@Ht%l8?S4h_q0KhlR;%Ti9eqd+I z^s}C5fpTqdw9cZTCP~FxbU4G#49K{xt{tUt#=Xy;%;pyM4iQ+kv3LN9Cws1glV7p4 zS7rE{G=SNgs1cR`R+@=vf9$jemlCEDeZlscF5J_c{=2NT9$+b%IU9zuy5VuMY_#K0Ah-`VtbnLGJMU zo&vg9kwQS=`h%26aHLhT$xZQHdk z^Q$P{k~4Bzef*%ibt0+0+0V+sE4ZTuTU>&tm%++<14_zmLIxEqj~614D;TJV$v7dq zWb6EHx}6cqn+}z*<6Osi=>cm~*a?zcE5vPMU7&$=Tp}s-j9&tj7aMISx{mYxSC5~F z8OlRv1qSwFIuGMlq1LKQO!@|A2A-oUyW`JwS;w(H54md7H%}HOBqS6_ZwX3+aYM!c z!uyJt;`%j(ou8eW*oebwki>`~40$66O)hc9dufl)j>E?3_C7#8=)T5l8zV0m;oOk@ z`!W}u2S_dhSigg0_sY|5_imu#<9>JgYEa(k_XZ#@d3?JpGj~y=+*D#K!}r9aYxqnIjfJFtSY!5i zt;!nZD-1#i-K{5ImRL#$wRVWu3Cz>v=lU}!7aht9Jd_VgmLggwgTcFkrgTIMQ0hX65+HH@*H`k7~vP)tJ zq4QlzE~pax2&g>c6?GB2n@By@!SY+J>&+vmN73R`xOO0GpjPgDKqe9?87Eq3rD9cry`$+)%?C0;!b_-q8y5;N`Y zi=-Oe-)JS%_ziygC-h+?1Ae58rzLswSc)dhfHV{OU&;9pnW~EWYfoUT(<3w*-MIW4P6{t)`m?jG3uy`BhZ1*2hk`>lJQ(9lPa~F%x8jF|OMN zI*tmE1bG$so-5nx;k)7+-!+L^#pNEiJUcc&yjp!mU%Ic-SK|tk?NXNmhnik;6|uby zno&xSO+}(SGec!?HOp*zb|v+*W$aamUTjO;e?kGvdDc3bnt9}yg+mg=O0UH_;B%4{ z5kiGAv>=`v>d<|c4}zm%yF#O3@0*WfzX@MLut3obIXo+t0wl%J4ik_aLS}VYns0oA zQeRA6hOrb4`7>AV<`(zNTLmKb{sy>pXS-atf<{X7``k#!o7nCLm!zyKE;H;0^zHjD zaRYkn(=H!0o$VGKafk__D(1u6YZLXv(g(2mNX`}90=mq8-s zNv2cd(W3JnJ-%!f_(xM_#Bhvt+m0cC;DiyJGVo#OQjJa6X^$=8cXV)Utn)A!Iodv} z;XK-bcR`?eeR|mauQQE4$_`5cxJk)vb=Wee*w~82!8Qrl$S$0CKzBHWAhf)9KlUC{ z?mi{E{3T`h)Fa=!7CmzDpL?y9tug)e4jmae)OciJ3T%rW2P?Em4D+y@oaO=K!0E=S zfgna<2JGT9q?6YGb@wX}jddaqii3<&C9gMWuGcI9IM^9n%^D|q3}kwu8%SW{5ZG+z zbwui+>wzpH;6!x9Z3kupIFP+`m0Bzvo7~KHTL%@b0v^HStv~lg7#;}T5!-pN=JjN5 zHC;#Oj@N^3HG|Pp30}MDflj2a0O`ezb}CtmA`50nzi;%fPUG0dkD0^XVbg->?|V{6 zH}8E}kW#klJ$khu;C`s*>mNag#ZaZuY!;GSVFRX^hfLP5+YR*}Ek7f3DWJO-b%>6P z1%Fw93_sOCZZQH8yOlpaT(B-7Q3M3-TvAwWjI8i}?B3EKD_Xd-n!!=nLy8MYH{yCt zJdwLO&i-_YxEv&HWT4LdDLwld6Nh)0C@-J%Mo41A4Zfk7GnmzOO9fOSiReKb1+pOxHDoN_=IIFD6DEQr*h9|`Rr}A zY#l+wiXsgW`kI;zB+OMpo~f#usdX@;@7dd1Vxe}!zrHXhDfS3IIDrythe@}$73S2@ ztLY)tWi~)vO739FzRmJ8xvE+ZlU6Zu?e+;s{bqjE7XuJ6CnK#`^E>7}ww-2TdN5pq zJ#wq&ma*p_gPxmdawyAh!&F#`*OS+!yfVb=r!9=H)FJI&beBo}f8|EcTY~96c;7wwi^nI;X!vxv z2#tBgh!w}JBl7Z2HH!>W6B@}MnfQR@SF|d@0tB#1)I;v+;C*;9V?rRViHH6UM`zc& z+_&?Od?u<(o+C4=c);mVcd2!!{TJ_ne@8t6N>pY<2%POe;Bj2qMtto72sm;Rz~HSc zacyZhImq$k@TWQe5odU_?JQ4zxqUdj4z^NvQ(%x4iE3!IIK<{X+%8SqaKVo|!(%~;-tgSKY)IYooOyQUwmxeybaxdoN%!JU)k#AWXf}tY&O@< zD$ED+g&#jJtX%;%KIsom2BSZM^arVHM%Q57_s$k|;6i+bawcamaCvU(jX6E zTyA^Y!4curY5jT?F;!8t7nk#-DJf<54HHpV)jtjyY{S3NE}d!j9EoKsvPkA5^arT5 z;1_G0Y&zN+&|CkXd+Cts%GlrOxH@_5=XyYwZ3psjaGV4^M*}q5uVJEtUSL}m`vP4} zpYD&fTS+&a!15bkR2CtVCn5ayd9fQE$khxBon-5GF0jFgdf8cP?bgpWyIXL>MX#fJ z4NMKFdvY2FuQS4B+r{*3x%$~>_ZQbWl-C*&4Sd$|2|eV6)lh~|#`qbzycS#&(6n7c z-*l!})eikQgHZ__dU?1eZ+dh~&(f{d(uukm(d@XRUr_ABB?9`Eh8k7g!kH;-;by}k zD?R4y%edS^u?}bLuWFYN!6(<7@t>6s7yC0_!2>KmL*>;+TVuo-zl(yr8__SzVm{At z-V+KDUf`*8lDJIH`zLfA;Uh3fN{hX8F87Vn8r76B?pR9k0044;+%JNmCicT`9#Je- zuedj_RmXg_vxk{5W|k!4Jl?4#Z8&ZeR%#zLktWI#@5#E^x9b=NyQbsRxM-w zk2Osow{~k2$`1SW0}Lm^tlN@~ML>w#)J3?a9_T&JfaM)<$#9rNCQqc&2B~#;$}`L; z&OGma8NW(M#HbwP#&cd|2OrF-tUaa-)BVvqkjFCjT_wOBebiJ^u;C+2U@FHFQfF

p7jGB!9@J&eit^|v%hc$1Wi-nZ zaZ|a-f6!<;8gQL~*Ei!Cz19_-K?7G4(9XzIf6#YYW0l8Ah#)fvLJ%dXcP`n$0R7;= zz#-hx(Gj?$S&H_&vZ~KNClS#&lIj~6az3dhxDLyM8I8n%+vP@cD%vf(r;XdnQ?E!P zZB*-rv%5u;j0%2dP}Q#rHFQNwM2E>>U4aUNORE$wo01wTctHm*Cr#tC>=Z+FNGJKu^e# zLOOI;J^sYq=);s&ke1zY?mf6kh3>@UzE9KuMiEvuvW(zw3I%Pe42R_GzHuRH{*}xH z3XnZto^caKI-LG4OXffRT8#VX3P=6Zw@?X}PK-a_SX);6K2*%BQq0ivTDta8{x1yJ^f(LxM~Owy;TQY1W+^^ZK*wpg$P~(9Ty~pQ8)> zm}usLeP{6j$_{^0J~O}qJ0W37FM*b>NS7t<5d{Ie+vN3j=DZqmapMxH4J=dbqLkmd zMvBhNWcTFUbTVi(gd?`zB|Ci@`?c*lKm2jrWahKUy-PA~^n25ufwP1Yxm3-y{ty3r z0=asYPtM9PtfIcxu2LLs&$+o%0+YWl>(6q!INp%G3#5u3*G^TXVg&4f5%2lP_cBTZ zn&DH9=S`x=iw=kbjHl3``q`psdv2fK2nRF-V@QL3`@D>6T1*UeuNZbUg<)pJQOTiXIkAclaA;@Id~cgyZ#ai#muSETN=v~>j)0;2?5F9*x`&dNwZ zl|Yvy%Of@x0CaK{tMNVfj-~IGJQyqg#VE`b-Y|e77+g(o*(C1Px+uezcVRcl@TSA3)T5$h zv|pt-l3ojLkg@;ubsk7>a>lT*Nfbx7h)^`^0$huxtoiA}w(Ar~os%55IDoA@@7t}zyoABoR5I0(VFJ1cLr zwu|B^lFRSqwq20EC^j2QH~MAfd6NTIq?`G?(Bniv%*EV19^|$N^|P*-pkPYY(TPLt z>+njJ8fnse9GOyXY}ojgzCF?${AMrEIIAZtqdKqZ#0Vnfl;HF-^-Ef@9scoPyZwCo zS3+m%-k(|{`_KMB zQ1SA;<7LjQ{~9rdh^Z!%SFsWvs;pX7wW)W$Q~#RiU{|Ce(=7EzWPsW${0E7&|ADe3 zweTI9!fXHXx2eo(mMAGGE}rM_gHJQ=fUka`Rrbj}rs$R9eJ^R-E#Uvz>d&j%pcBsw z%U^B|gX0BJm}KG+?8OW@^Yk@0&Yu}7^Y=wON7;Ds~-z94Q_ zZH6Oh;Fx$;q=Ofj-c`+chXDRIS^%>MnD7}_V>{kAY`CK^L?vez)+n5DvdF6qy5HSJ zH7CG#4vqf7BeRw6VvjlCSn}M{42M)@FMNX58)d^Cv#ss!Xt*t-Mz$GdUQ8Fvj&4)p zr(KXM@e+c3e8zot#tldP*uj~TW>3pi4;U<|q1{d~lZVepch)oM)BaI=3>L<@ewsx( zFAoO8^kQ}*L0q4GC)+*bfpk(3z5p1uQ}J#xxza?V9X*={6uF6oR47&LXBnG2z5bJ=%R0x7i`xDdrDqLnAx z(C-Jl48cEYkr3Wn0Gfu18;@7ww}upVIj_C&Uknsl2t?+%!d#@jcolyjy=})Pt{>)j zitbLINU)9%5n<=_Hcy#g07?c<}W*ATKNJ7XutUKl8 zVYb{gOQ_3E_idDgW|p6PE}fB8gXA@;AA#2`*`9Zx=GaVOZaZJXnm)e@{-)L=Q=%3` z5lVX5$&F^@17<&vuS?klDt87Mk*njY`60Diz9&0&<9M?nOmpr8R9+IHiUCfGr@zhW z`bwx{N>1e@#it>&`=ncYm2NlCElTBct<@ciG{W3XGj)j#v?jMgDPMQml?JYbtlDiP zRZ2+z78dp$RCzR6w-iZ|w*_X`_QD&to6xSLEdQ!>k|5@D4QL~YD-Y#8LS`!=t2Coa z4#T2nGDuArxj<4imawA%eA@N$AZBq@S|JfZ=+He{15oRRfbXcGdYXCDb$&lv=m@Af zjo16QtC>)Q5mb&kP;tf!Y$(8^XAPin_u3b}ss|*tgeJ{TQNPJuNXLssIn6%q@oj9i zkwmQl^T#JDL`l)LU95UL^jcPHm`VoA+;z9|p<@eNy<`=3Z5QBWCtN4)X2xstb2_w% z&xPa&si^(KEjiSTL~8VIqrIBu`m0D0=IT1qgd1B;+xc2YzKS7bS!2IuD$t!ibMhpJ zzMVdjOVwLxp~0bsu_rL;f8i0;F+~N8@wGV;Nr(f28a^YQ35;ed(uM7ZnBAodb0z9Z zFnt=15CXD@Hfx5@E-6TyuuZo{jF}y;dLTy5+-;@W9E686uq`RjV~h4?ixxXE*-Pyu zb4^vvXSlIz%6$R~{4o^Jhn6wgaypz2wMv+HIFE%9?8RT-Y- zwkdr16K491oV;-4b`~Zb3?1Xd;!0;G(h&eF02!SaF=WPxVReFHIO~6(USn`-bL*Bg zJ9rnSaTvK-@9qX_QS>7=`LK{1;m8ihp#Gqo0nb4e>-dU(qbf^9RTeS2MH4wt*?n_S zVLRnFJh<}&~$407KTYwveBU#PbVOzpKHVAujPov!bGEIvY!$#BMR{rE0{cqH*; ziISS)N%M5x5$NBsqP*Xv*s5J8JvzA|^nTCh^3TJhvW=pXWnZcGUmV6YQL)aX!Qg+1 zkl5;xghbI{2&|&l@+rb^R|Ox>P>vQ%LV}N9xv8T6s+3-3{-UYrvx<`gHoGvM^b_k} zqW%!F&(9o8MGN3nuL`FeXdg#Loq(t*q=$~2LW9+8oPDPQW@17|IO$%x&!uobyHB{- z9o|mfgDHbEhPIh zfWGkX?Ymv4OCPON@ga`Izz|+?8b7E#pio05(h(%mnI6fVuDHW6(biuvXFWk&qjxYm zicnu?)Q^^{9(myL_PRGMyK_NV1WsqG)A{C|&VsAseyC>FKww z4$BLzj(&{p_Q>mNRGWz*J&CsEs<+!Z0avHg*pptKHFkB`I6eaAT3t^l%QRi~+4Q93 z5Uv@xz}ai&btj>IvtH}F@c)ghY^m{|dv0%ccIM_Jv9aQ>#&c6Tv%^C?ueE>D9G-Jp zRDR}HXnp-TOuD-j^7QyC)OTiTGCkB~+7Y%zyp0^&z%L{VHu^5a`)pyfk8~NV0Ucr) z`dtXN1ZWM*BV9sYjh(u;C|)@ zZCS9_`4)QYT$Uf7Yx105g=FCr8qqCNpq8sofeB#NBKKGNG5SgMU}P)b4eLpr3UWj%ErqxinpUc2}??2C3H!c+IB&42^Iy z>CJ8=_FnSrQxS?J6%e@zP3EoniP0aN3&+<(_0}`>Huvdq7lm-AS5qV}dG}yTxmuJ` z0sTOG8A;*YM`ayCd2AD{rSek+fqEcR0)h38mci9gX4~$7Q}yl=D54INhLcyR{xnV{ zjIjb04nU11Eoy7KQQhQ$w| z)1m7}3c1?9e}($bJ0VE1WKMOZEXfrBBFyL$ruoA{{N7nKpcYGpWbvJT#dW)I$LWqzk;ipUA9MjWIHZ5- zm|p?gK!HqSj{v=8?vkJelLZ{Zi!@n?M&=sBp|Jj1j@3Yn1%9uZXHrjwUTxP#_f$AyW=x|io)+A?pXcuOhsw20BCe_y8mdxE zOB}1h%v5uikTe+K^@%UNIh53tq`7~-V0kcl%F@b$>eH(7b4N8)E{_<3tH0j55IR&l z^fij|0vTTWGS`h#WN88U$x8ES5Ra945Utk9&b|YN2WN<6tp|QJ3w@lE7`)e9TuQ=* z;UK19R2~oG$!sCciM!3GB2Odu067F^&wn63;7~q|vYeD9QiShQ{fqWqvF$*>luzhM z$BKq`y!A8}n_Z-kee!jy1|{D7;J|!M>ech=0q~#vYFeu=?&Z$g@z!6#Aq5hb)R>zo%XNsj{uP`Ue`V2r_zd4_19D$R+r<_0N zc9Gy6)jA0_eCX-O`*-IRqwUE&bCCZ1V(Y2(04pJmBuYyuuak^g*P=_5R1#rcVDI8J z%24pD63+{yV{mVYDy1rzw)C@pD^W?;dduI-sTx7tn=8a|*;k)gwuBGZp8W)Bx||)W z|7X_xQ##52Z{8+t>c@6%haJu&{C4KuP*PUxDTh}nDCmd4=+b+)PTijqrIM{UvMTGf zJiOd!wF}$M7tjNu5U>N5ENcOh)2%ulV(0C^kc>KDzij+G%->FxBIx5O5l&`N}es+1ps~BLoaQK^;dmgP{ z7g@Z`SBOdGN+}{&<;h3K#_G($cI+~e+9<>V&l;2oQH2+7nC+eKHq|J(1K0dr5GdFq znzobWF!&=+ZccC^8OLloYJOG16PRbm6B#M5P*7;r`8(Qz-OZKcTi)yrbQE`jYi|v( zjSF_~hfRmLm@q!R39M$W90s)wXPv7qw!dbmd#_p6L@~qpOxFD=@$Bt1c8Zt=2C-WD za6urar$`8+3pVjn5vPW9z*&8;Q2$Jr6%xmD&dpYMWcyN^obY=JYKm90dgiJj?3Dzc zE#I{WIs<*RzG}@#bugWtetPp;S`+;}*FQ5*Za9Z!Asm?8U|xp$Awm(7P_+dM07j)7N9<}?CpXyLqzE_pnF$U1lJPjC&o6(Kxl)D2aL8jx^|keY5-&0v znzCOrC<8opYv78R8J%K_0Evs_p)FPKumom{o_tAZx+p6-f;v(`UFQg~`1J*`c@zZu z4No{02EoMKTQ&<(7AulB56Cg|hVr@b1}9CuVH&q~R4?A8xSjQi_sa4W_mz-;L*D!+ z^o1mRi6h4VnE~SNdZmyvRMN;g=1%+!MF^UN0c7m-Eykh(m*@A8<2wLac^W!*!g(IM z5X1AB?@@$PHoi)jjmWUm&j~i{c2R`6yo;C4u<_|^a$U7>_Ld2(bgW8|VIJL^lK1ou zl&Z&G_!&pZZnwp;`Zs__F=vRXc1M8@9;Cc@Xe@$n>Ul~u&m&Vkmwmmya-xNtLyEY zt%4=;k}dqw6S1UerTm2txZ(?42`!-%AMGv{-uO7j(lUj-V7~uNxAZO6F`Fjep{d3F zsb@vy5Hf5$yLWf?M`JzryQ;ve_8y-h0d`CB`6?F4Z_+@#k_la8b#>-4m1W>H0V|Oh z!aVl%c>8E0Skb$?eJo)ed4LUE5c|_L)Q%JUzG^x!-+^l3&Tbv6-gxcosU8$Cno5Nm zp2HhGAkJl{oMXLTwyD=#E@TUq*5sX?G(ONdoCoMlAR(Rp(On_$21pX5dqZy+OPNf>8%y~(ZrGoG z!N)w;TMbd+U!r( zp3sVA+)oI+^PKq&#cjqS=p&6>s(WR8J|Q^yms)G39}Nrlh&`rxJkv}NinT%?dYe*`AWwe>27W(TG;Q(u z?2zvCaq-lGG*F~^mPT*gw7(+rbRgt>dwT)@p*d+V+0$Kgo_SkAR<*sl`mJFpYUcE~ ztLu+)L6seL_0}!A|80aWy)Q5SR7y%pT1sl%Gy6Qyf9>mBfVnCK=+6=7Q2GZY8tItO ztE?%H?`JuAze_DshKw(9ARaSuygLJV=G6o$X&AN^VM4E#Cb-bQ557Ej^4h%T>#7Hk z`>HzN^kZgrKt*Xq_jM5#9xI$RnQh7|kC{+5gf~^^+eB1JwG7CJz-62_s-H} zPLs#DsXr(Q)qk>42chl#iVLlKl&liYthw2WSvG(PITk{o!L`uRB^p8OZHjofW;VlB|L^bM15 za737N^MCmjYomLkM%f~_L8gtRJ%^j`A+N#j(rQvQ)n>k2OSg08hQ)__5WCZKS;m;| za00qyX+R1{t|HD9k%D4N9{7n^CV75iJ9kF9s{nJFgvk8o@62iXJ2m{&B`$RJZ~*UQ_kpfJ#|mp&udNZZdGwL+p{@+a>V%r zGnw&q1{p4!7;?49kS!~W+#|p(BzF(_lPiW#t12WiRUWFWqN8YCYrIZ&+YL+33ZKJr zj{G$BYR>g_xrOlIORnCnS*TlR#=d-L4KA+{1GxD#9p(ig@FYu6YumP8J7)50b@GcJ z7c}p@+LUIB>}@UB6}*BCFaAi$P}JA5)YPbp8BAB7ZV=3FnDh@j|3i=R(o1JM`px^i zjISDUz}d~*hM@K|B-OKP{7NA8S|8C(^-lclz*%twKFKL8>1y@x`!!mjgEll4l$XV` z3mk@<1YUIpPsBZPUzH7dxjlcTuu>}~nNNQC#mRQANCP$Jk>k!(yj6mM#rQn#61l@OhX&Kk(vsuLG9R?)O@-7oZw4b?AUk$BAt7UntF6!=$_Ra&R) z_cWdr^zq*Adm0LKi4VP_3lUUYRU)%?dJm8IOwA*uZN39Mp?4PFpMZ)2`_Rgg2l_Bw z6_Y2jN8*9PcLp_(8k)|`IEJj_!+JS~mXBZbPQ(LKE@9gCUT1Fz=(ov^h|*!?^CfYC z^rZ=Tde1#qaiIgGhCrqA*pbn5Czr3)qxpSo_v3J!eh3s}RzUauT6M|!ce=6~qZ?j> zi8I5a-~VIky6`p2KY$VQCl%h;8O1!VJi+Iuk2hV;F@1EPrnMEBXiOrs>SAGks zEU&wBi=!>nM+7NA5lj>YTSztNx_rL=NV?jDQc;zxIlKDSFzn8?e49Hi3RSgN^}7RH z*$P~+e(JH}qK%DWZ7eBCW0GHrFeUkkaI`GT3MrZL!i@w@5O6(DGjjMuPe5Jf%`9%( zPyB^Zu(Zr*FFb@~Q>RA18MY>+VyB!nN408+ZFrxC=aD>rg=8k?U}3+^CHr`7CN1S1 z<*pO=&-$xb=VteOtU1NV#^uDt0DJf)Pw=L6-4;0`pR1gLzuSyx)jW2(R?};zqJJr* z?BU3ZVLUxRy*Pxk`Ed85aH;wh^6lsI!=nT&DTd}o0zK#;C|ZR^T3|1r_-}wbsHjpO zH%p+rJ;y_Je2zSsM#Cg+p$^7Vf%MM8#MPlj1aSEo#l1f~4?MR8rl}~{loyYrx(_>V wkA8K!=hXI{G~@qULQ`k)Y)mr$jOSB^3$?m)Y!(IGIlg_WWuRH5ZWHl;06WLH{r~^~ diff --git a/nsv13/code/game/area/areas.dm b/nsv13/code/game/area/areas.dm index 2c4366e42d2..29811460311 100644 --- a/nsv13/code/game/area/areas.dm +++ b/nsv13/code/game/area/areas.dm @@ -758,3 +758,27 @@ icon_state = "bunker" ambientsounds = list('nsv13/sound/ambience/leit_motif.ogg','nsv13/sound/ambience/wind.ogg','nsv13/sound/ambience/ship_damage/creak1.ogg','nsv13/sound/ambience/ship_damage/creak2.ogg','nsv13/sound/ambience/ship_damage/creak3.ogg','nsv13/sound/ambience/ship_damage/creak4.ogg','nsv13/sound/ambience/ship_damage/creak5.ogg','nsv13/sound/ambience/ship_damage/creak6.ogg','nsv13/sound/ambience/ship_damage/creak7.ogg') light_color = "#e69602" + +/area/nsv/weapons/munitions_lounge + name = "Munitions Lounge" + icon_state = "hallF" + +/area/nsv/weapons/weapons_secure_storage + name = "Munitions Secure Storage" + icon_state = "hallF" + +/area/nsv/weapons/equipment_room + name = "Munitions Equipment Room" + icon_state = "hallF" + +/area/nsv/weapons/observation_deck + name = "Munitions Observation Deck" + icon_state = "hallF" + +/area/nsv/weapons/main_passageway + name = "Munitions Access Corridor" + icon_state = "hallF" + +/area/nsv/engine/dcc + name = "Damage Control Central" + icon_state = "dc_central" From 1b06fa4c07b1882579ab1a5d021d630153b45ab5 Mon Sep 17 00:00:00 2001 From: SerynEngi Date: Fri, 13 Dec 2024 14:55:49 -0800 Subject: [PATCH 04/26] Tycoon Med Completed Recompleted --- _maps/map_files/Tycoon/Tycoon2.dmm | 1736 +++++++++++++++++++++------- 1 file changed, 1343 insertions(+), 393 deletions(-) diff --git a/_maps/map_files/Tycoon/Tycoon2.dmm b/_maps/map_files/Tycoon/Tycoon2.dmm index 0365b138d60..937b7c6a90c 100644 --- a/_maps/map_files/Tycoon/Tycoon2.dmm +++ b/_maps/map_files/Tycoon/Tycoon2.dmm @@ -171,9 +171,6 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, /turf/closed/wall/ship, /area/hallway/nsv/deck2/frame1/central) "aaz" = ( @@ -619,6 +616,15 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/monotile/steel, /area/medical/break_room) "abR" = ( @@ -919,7 +925,6 @@ /obj/machinery/firealarm{ pixel_y = 24 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/effect/turf_decal/tile/blue{ dir = 8 }, @@ -1826,6 +1831,9 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/monotile/light, /area/medical/medbay/central) "aeS" = ( @@ -2145,11 +2153,13 @@ /turf/open/floor/plasteel/grid/steel, /area/hallway/nsv/deck2/frame1/port) "afE" = ( -/obj/machinery/light{ - dir = 1 +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/open/floor/plating, -/area/maintenance/central) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/monotile/steel, +/area/medical/medbay/central) "afF" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -2728,11 +2738,8 @@ /turf/closed/wall/ship, /area/medical/storage) "ahk" = ( -/obj/machinery/requests_console{ - department = "Genetics"; - name = "Genetics Requests Console"; - payment_department = "MED"; - pixel_y = -30 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 }, /turf/open/floor/monotile/light, /area/medical/genetics) @@ -2894,6 +2901,11 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/monotile/light, /area/medical/genetics) "ahF" = ( @@ -2941,6 +2953,15 @@ dir = 4; sortType = 23 }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/monotile/steel, /area/medical) "ahL" = ( @@ -2975,6 +2996,18 @@ /obj/structure/disposalpipe/junction/flip{ dir = 1 }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, /turf/open/floor/monotile/dark, /area/medical) "ahS" = ( @@ -2996,7 +3029,7 @@ pixel_x = 3; pixel_y = -2 }, -/turf/open/floor/monotile/light, +/turf/open/floor/engine, /area/medical/medbay/central) "ahU" = ( /obj/machinery/computer/ship/viewscreen, @@ -3354,6 +3387,14 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /turf/open/floor/monotile/light, /area/medical/medbay/central) "ajf" = ( @@ -3446,6 +3487,9 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance/three, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/plating, /area/maintenance/central) "ajw" = ( @@ -3494,12 +3538,20 @@ dir = 1 }, /obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/monotile/light, /area/medical/genetics) "ajE" = ( /obj/machinery/atmospherics/pipe/manifold/general/hidden{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/monotile/light, /area/medical/medbay/central) "ajF" = ( @@ -3660,6 +3712,8 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/machinery/power/apc/auto_name/south, +/obj/structure/cable, /turf/open/floor/monotile/steel, /area/medical/medbay/central) "akh" = ( @@ -3676,9 +3730,13 @@ /area/crew_quarters/heads/cmo) "aki" = ( /obj/machinery/holopad, +/obj/structure/cable{ + icon_state = "2-4" + }, /turf/open/floor/monotile/dark, /area/medical/medbay/central) "akj" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/monotile/light, /area/crew_quarters/heads/cmo) "akk" = ( @@ -3854,6 +3912,15 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/monotile/light, /area/medical/medbay/central) "akG" = ( @@ -3875,10 +3942,20 @@ /area/medical/genetics) "akI" = ( /obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/medical/medbay/central) "akJ" = ( /obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/monotile/light, /area/medical/genetics) "akL" = ( @@ -3895,6 +3972,11 @@ dir = 1 }, /obj/effect/turf_decal/tile/blue, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/monotile/light, /area/medical/medbay/central) "akO" = ( @@ -3984,7 +4066,10 @@ /area/maintenance/central) "ald" = ( /obj/machinery/atmospherics/pipe/simple/general/hidden, -/turf/open/floor/monotile/light, +/obj/effect/turf_decal/stripes/white/line{ + dir = 5 + }, +/turf/open/floor/engine, /area/medical/medbay/central) "ale" = ( /obj/effect/landmark/start/paramedic, @@ -4041,6 +4126,11 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/monotile/light, /area/medical/genetics) "aln" = ( @@ -4054,6 +4144,9 @@ /obj/machinery/atmospherics/pipe/simple/general/hidden{ dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/monotile/light, /area/medical/medbay/central) "alp" = ( @@ -4064,6 +4157,15 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/monotile/light, /area/medical/storage) "alq" = ( @@ -4080,6 +4182,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/cmo) "alt" = ( @@ -4091,11 +4194,14 @@ /turf/closed/wall/r_wall/ship, /area/maintenance/nsv/weapons) "alv" = ( -/obj/machinery/defibrillator_mount{ - pixel_y = 28 +/obj/effect/turf_decal/tile/blue{ + dir = 1 }, -/turf/open/floor/monotile/light, -/area/medical/genetics) +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/monotile/steel, +/area/medical/surgery) "alw" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -4132,7 +4238,7 @@ }, /obj/effect/spawner/lootdrop/maintenance/two, /obj/item/reagent_containers/food/drinks/coffee{ - list_reagents = list(/datum/reagent/consumable/coffee = 10,/datum/reagent/toxin/mutagen = 30,/datum/reagent/toxin/mindbreaker = 10); + list_reagents = list(/datum/reagent/consumable/coffee=10,/datum/reagent/toxin/mutagen=30,/datum/reagent/toxin/mindbreaker=10); name = "Cursed Pumpkin Spice Latte"; desc = "This drink gives you an uneasy feeling." }, @@ -4168,9 +4274,9 @@ /area/crew_quarters/heads/cmo) "alH" = ( /obj/structure/table/glass, -/obj/item/statuebust/hippocratic{ - pixel_y = 16 - }, +/obj/item/scalpel/advanced, +/obj/item/retractor/advanced, +/obj/item/surgicaldrill/advanced, /turf/open/floor/carpet/ship, /area/crew_quarters/heads/cmo) "alI" = ( @@ -4241,6 +4347,12 @@ /area/crew_quarters/heads/cmo) "alR" = ( /obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/monotile/dark, /area/medical/surgery) "alS" = ( @@ -4263,6 +4375,10 @@ /obj/machinery/camera/autoname{ dir = 5 }, +/obj/machinery/airalarm/directional/west, +/obj/structure/cable{ + icon_state = "1-4" + }, /turf/open/floor/monotile/steel, /area/medical/break_room) "alU" = ( @@ -4296,12 +4412,23 @@ /turf/open/floor/monotile/dark, /area/science/nanite) "ama" = ( -/obj/machinery/computer/ship/viewscreen, -/obj/effect/turf_decal/loading_area{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/general/hidden{ + dir = 4 }, -/turf/open/floor/monotile/dark, -/area/medical/morgue) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/turf/open/floor/monotile/light, +/area/medical/medbay/central) "amc" = ( /obj/machinery/stasis, /turf/open/floor/monotile/light, @@ -4408,6 +4535,15 @@ }, /turf/open/floor/durasteel/lino, /area/engine/engineering/reactor_control) +"amw" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/turf/open/floor/monotile/steel, +/area/medical/storage) "amx" = ( /turf/closed/wall/r_wall/ship, /area/engine/gravity_generator) @@ -4524,6 +4660,12 @@ /obj/effect/turf_decal/loading_area{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/monotile/steel, /area/medical/surgery) "amX" = ( @@ -4954,6 +5096,15 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/monotile/steel, /area/medical/break_room) "aoA" = ( @@ -4985,8 +5136,24 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/template_noop, /area/maintenance/department/medical) +"aoE" = ( +/obj/structure/sign/ship/pods/east{ + pixel_y = -2; + pixel_x = 31 + }, +/turf/open/floor/monotile/steel, +/area/medical) "aoJ" = ( /obj/structure/table/wood, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, /turf/open/floor/monotile/dark, /area/medical/break_room) "aoL" = ( @@ -7445,6 +7612,10 @@ "axY" = ( /turf/open/floor/monotile/steel, /area/engine/atmos) +"aym" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/monotile/dark, +/area/medical/morgue) "ayp" = ( /obj/structure/rack, /obj/item/airlock_painter, @@ -8019,6 +8190,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/monotile/light, /area/medical/genetics) "aAd" = ( @@ -8220,9 +8392,6 @@ /turf/open/floor/circuit/telecomms/mainframe, /area/tcommsat/server) "aAH" = ( -/obj/structure/disposalpipe/junction/flip{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, @@ -8232,6 +8401,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/monotile/dark, /area/hallway/nsv/deck2/frame1/port) "aAI" = ( @@ -8740,12 +8912,18 @@ /area/hallway/nsv/deck2/frame2/port) "aBK" = ( /obj/machinery/atmospherics/components/unary/cryo_cell, -/turf/open/floor/monotile/light, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/turf/open/floor/engine, /area/medical/medbay/central) "aBL" = ( /obj/structure/table/reinforced, /obj/item/paper_bin, /obj/item/pen, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/monotile/light, /area/medical/medbay/lobby) "aBM" = ( @@ -11295,12 +11473,12 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, /turf/open/floor/monotile/light, /area/crew_quarters/heads/cmo) "aHS" = ( @@ -15084,8 +15262,14 @@ /obj/machinery/door/airlock/ship/maintenance/defaultaccess{ req_one_access_txt = "12;5" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/plating, -/area/maintenance/port) +/area/medical/surgery) "aQH" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -16375,13 +16559,6 @@ /turf/open/floor/monotile/dark, /area/medical/medbay/central) "aTZ" = ( -/obj/structure/table/glass, -/obj/machinery/power/apc/auto_name/north{ - pixel_y = 24 - }, -/obj/structure/cable{ - icon_state = "0-4" - }, /obj/item/reagent_containers/glass/beaker{ pixel_x = 8; pixel_y = 2 @@ -16390,6 +16567,7 @@ /obj/item/radio/intercom{ pixel_x = -26 }, +/obj/structure/table/glass, /turf/open/floor/monotile/light, /area/medical/genetics) "aUa" = ( @@ -16411,24 +16589,8 @@ /turf/open/floor/plasteel/ridged/steel, /area/engine/engineering/reactor_core) "aUc" = ( -/obj/structure/table/glass, -/obj/item/storage/firstaid/o2{ - pixel_x = -3; - pixel_y = -3 - }, -/obj/item/storage/firstaid/o2, -/obj/item/storage/firstaid/o2{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/machinery/door/window/northleft{ - dir = 8; - name = "Medical Supplies"; - red_alert_access = 1; - req_access_txt = "5" +/obj/machinery/door/airlock/ship{ + name = "Escape Pod" }, /turf/open/floor/monotile/light, /area/medical/storage) @@ -16507,9 +16669,15 @@ /turf/open/floor/monotile/dark, /area/medical/medbay/central) "aUu" = ( -/obj/effect/landmark/nuclear_waste_spawner, -/turf/open/floor/monotile/steel, -/area/medical/surgery) +/obj/structure/table/wood, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/monotile/dark, +/area/medical/break_room) "aUw" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -16531,6 +16699,11 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/monotile/light, /area/medical/medbay/central) "aUz" = ( @@ -16550,20 +16723,30 @@ /turf/open/floor/plating, /area/medical/break_room) "aUF" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8; - layer = 2.9 - }, /obj/structure/table/glass, -/obj/item/storage/firstaid/advanced, +/obj/machinery/door/window/southleft{ + base_state = "right"; + icon_state = "right"; + name = "Medical Supplies"; + req_one_access_txt = "5" + }, +/obj/item/storage/firstaid/brute, +/obj/item/storage/firstaid/brute{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/firstaid/brute{ + pixel_x = 6; + pixel_y = 6 + }, /turf/open/floor/monotile/light, /area/medical/storage) "aUG" = ( -/obj/structure/grille/broken, -/obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/plating, -/area/maintenance/central) +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/monotile/light, +/area/medical/genetics) "aUI" = ( /obj/structure/chair{ dir = 4 @@ -16574,14 +16757,17 @@ /turf/open/floor/monotile/dark, /area/medical/surgery) "aUK" = ( -/obj/structure/window/reinforced, /obj/structure/table/glass, -/obj/item/storage/firstaid/fire{ +/obj/structure/window/reinforced{ + dir = 8; + layer = 2.9 + }, +/obj/item/storage/firstaid/toxin{ pixel_x = -3; pixel_y = -3 }, -/obj/item/storage/firstaid/fire, -/obj/item/storage/firstaid/fire{ +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/toxin{ pixel_x = 3; pixel_y = 3 }, @@ -17950,6 +18136,9 @@ /area/security/brig) "aXN" = ( /obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-8" + }, /turf/open/floor/monotile/dark, /area/medical/morgue) "aXO" = ( @@ -19198,7 +19387,6 @@ /turf/open/floor/monotile/dark, /area/medical/medbay/central) "baT" = ( -/obj/machinery/airalarm/directional/east, /obj/machinery/computer/cloning{ dir = 8 }, @@ -19291,9 +19479,6 @@ /area/nsv/weapons/fore) "bbg" = ( /obj/machinery/dna_scannernew, -/obj/structure/cable{ - icon_state = "4-8" - }, /turf/open/floor/monotile/light, /area/medical/genetics) "bbi" = ( @@ -19396,9 +19581,6 @@ /area/maintenance/department/cargo) "bbx" = ( /obj/machinery/computer/scan_consolenew, -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/machinery/light{ dir = 1 }, @@ -19709,9 +19891,21 @@ /turf/open/floor/monotile/dark, /area/hallway/nsv/deck2/frame1/central) "bcb" = ( -/obj/structure/bed/roller, -/obj/effect/turf_decal/tile/blue{ - dir = 8 +/obj/structure/table/glass, +/obj/machinery/door/window/northleft{ + dir = 8; + name = "Medical Supplies"; + red_alert_access = 1; + req_access_txt = "5" + }, +/obj/item/storage/firstaid/o2{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/storage/firstaid/o2, +/obj/item/storage/firstaid/o2{ + pixel_x = 3; + pixel_y = 3 }, /turf/open/floor/monotile/light, /area/medical/storage) @@ -20140,6 +20334,13 @@ /area/medical/medbay/lobby) "bcU" = ( /obj/effect/turf_decal/tile/blue, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/monotile/light, /area/medical/medbay/central) "bcV" = ( @@ -20517,6 +20718,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/carpet/ship, /area/medical/medbay/central) "bdC" = ( @@ -21049,6 +21253,11 @@ /turf/open/floor/carpet/ship, /area/security/detectives_office) "beA" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/monotile/dark, /area/medical) "beB" = ( @@ -21475,6 +21684,9 @@ /obj/machinery/atmospherics/pipe/simple/general/hidden{ dir = 9 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, /turf/open/floor/monotile/light, /area/medical/medbay/central) "bfv" = ( @@ -21494,31 +21706,21 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/monotile/dark, /area/medical/surgery) "bfx" = ( -/obj/structure/window/reinforced{ - dir = 8; - layer = 2.9 - }, -/obj/structure/table/glass, -/obj/item/storage/firstaid/toxin{ - pixel_x = -3; - pixel_y = -3 - }, -/obj/item/storage/firstaid/toxin, -/obj/item/storage/firstaid/toxin{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 +/obj/structure/sign/ship/pods/north{ + pixel_y = 1; + pixel_x = 32 }, -/turf/open/floor/monotile/light, -/area/medical/storage) +/turf/open/floor/monotile/steel, +/area/medical) "bfy" = ( /obj/item/storage/backpack/duffelbag/med/surgery, /obj/structure/table/glass, @@ -21541,13 +21743,18 @@ /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) "bfA" = ( -/obj/machinery/door/firedoor/border_only{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 8 }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/airlock/ship/maintenance/defaultaccess, -/turf/open/floor/plating, -/area/maintenance/central) +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/monotile/steel, +/area/medical) "bfB" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -22139,6 +22346,15 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, /turf/open/floor/monotile/light, /area/medical/medbay/central) "bgP" = ( @@ -22240,6 +22456,11 @@ /obj/machinery/light{ dir = 1 }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/monotile/light, /area/medical/medbay/lobby) "bhd" = ( @@ -22250,7 +22471,7 @@ }, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/glass/beaker/cryoxadone, -/turf/open/floor/monotile/light, +/turf/open/floor/engine, /area/medical/medbay/central) "bhe" = ( /obj/effect/turf_decal/tile/red{ @@ -22554,9 +22775,9 @@ /turf/open/floor/monotile/steel, /area/security/brig) "bhT" = ( -/obj/machinery/airalarm{ - dir = 1; - pixel_y = -22 +/obj/machinery/power/apc/auto_name/south, +/obj/structure/cable{ + icon_state = "0-8" }, /turf/open/floor/monotile/light, /area/medical/genetics) @@ -22565,6 +22786,15 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/monotile/light, /area/medical/medbay/central) "bhW" = ( @@ -22737,6 +22967,9 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, +/obj/structure/cable{ + icon_state = "2-4" + }, /turf/open/floor/monotile/dark, /area/medical/morgue) "bin" = ( @@ -22908,21 +23141,16 @@ /area/nsv/weapons/fore) "biH" = ( /obj/structure/table/glass, -/obj/item/storage/firstaid/brute, -/obj/item/storage/firstaid/brute{ +/obj/structure/window/reinforced, +/obj/item/storage/firstaid/fire{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/fire{ pixel_x = 3; pixel_y = 3 }, -/obj/item/storage/firstaid/brute{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/machinery/door/window/southleft{ - base_state = "right"; - icon_state = "right"; - name = "Medical Supplies"; - req_one_access_txt = "5" - }, /turf/open/floor/monotile/light, /area/medical/storage) "biI" = ( @@ -23794,6 +24022,9 @@ /obj/structure/table/optable{ name = "autopsy table" }, +/obj/item/radio/intercom{ + pixel_y = -30 + }, /turf/open/floor/monotile/dark, /area/medical/morgue) "bkE" = ( @@ -24050,6 +24281,15 @@ name = "Surgery"; req_one_access_txt = "5" }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/monotile/dark, /area/medical/surgery) "blc" = ( @@ -24993,8 +25233,13 @@ /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) "bne" = ( -/turf/closed/wall/ship, -/area/maintenance/port) +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/monotile/light, +/area/medical/medbay/lobby) "bnf" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -29178,9 +29423,9 @@ /turf/open/floor/monotile/dark, /area/hallway/nsv/deck2/frame1/central) "bvk" = ( -/obj/structure/sign/departments/medbay/alt{ - name = "\improper INTENSIVE CARE UNIT"; - pixel_y = 26 +/obj/machinery/power/apc/auto_name/north, +/obj/structure/cable{ + icon_state = "0-8" }, /turf/open/floor/monotile/light, /area/medical/medbay/lobby) @@ -29234,15 +29479,8 @@ /turf/open/floor/monotile/dark, /area/janitor) "bvB" = ( -/obj/structure/window/reinforced, /obj/structure/bed/roller, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/monotile/light, +/turf/open/floor/monotile/steel, /area/medical/storage) "bvC" = ( /turf/closed/wall/ship, @@ -29283,6 +29521,15 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/monotile/dark, /area/medical/surgery) "bvP" = ( @@ -29322,6 +29569,15 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/monotile/steel, /area/medical) "bvU" = ( @@ -29374,9 +29630,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /turf/open/floor/monotile/light, /area/crew_quarters/heads/cmo) "bwf" = ( @@ -29457,16 +29711,15 @@ name = "Reception"; req_one_access_txt = "5" }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plating, /area/medical/medbay/lobby) "bws" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/monotile/steel, -/area/hallway/nsv/deck2/frame1/port) +/area/medical) "bwt" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -30747,6 +31000,7 @@ dir = 1 }, /obj/effect/landmark/start/chief_medical_officer, +/obj/machinery/holopad, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/cmo) "byZ" = ( @@ -31123,6 +31377,7 @@ /obj/machinery/computer/crew{ dir = 4 }, +/obj/machinery/power/apc/auto_name/south, /turf/open/floor/monotile/light, /area/medical/medbay/lobby) "bzN" = ( @@ -32296,6 +32551,7 @@ /area/hallway/nsv/deck2/frame1/central) "bCl" = ( /obj/effect/turf_decal/tile/blue, +/obj/machinery/airalarm/directional/west, /turf/open/floor/monotile/light, /area/medical/storage) "bCn" = ( @@ -32303,10 +32559,27 @@ dir = 1; sortType = 9 }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/monotile/dark, /area/medical) "bCo" = ( /obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/monotile/dark, /area/medical) "bCq" = ( @@ -32319,32 +32592,14 @@ /turf/open/floor/carpet/blue, /area/crew_quarters/heads/cmo) "bCr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 4 - }, -/obj/machinery/door/airlock/ship/public/glass{ - name = "Cloning Lab"; - req_access_txt = "5; 68" - }, /obj/machinery/atmospherics/pipe/simple/general/hidden{ dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/plasteel/white, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, /area/medical/genetics) "bCt" = ( /obj/structure/lattice, @@ -32404,13 +32659,12 @@ /turf/open/floor/monotile/dark, /area/hallway/nsv/deck2/frame1/port) "bCy" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/effect/turf_decal/tile/blue{ - dir = 8 +/obj/structure/sign/ship/pods/north{ + pixel_y = 1; + pixel_x = -32 }, -/obj/effect/turf_decal/tile/blue, /turf/open/floor/monotile/steel, -/area/hallway/nsv/deck2/frame1/port) +/area/medical) "bCz" = ( /obj/structure/cable{ icon_state = "4-8" @@ -32867,20 +33121,11 @@ /turf/open/floor/plasteel/grid/steel, /area/quartermaster/storage) "bDn" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 }, -/turf/open/floor/monotile/dark, -/area/hallway/nsv/deck2/frame1/port) +/turf/open/floor/monotile/light, +/area/medical/genetics) "bDo" = ( /obj/effect/turf_decal/tile/brown{ dir = 8 @@ -34308,6 +34553,11 @@ next_id = "tycoon_munitions" }, /obj/effect/turf_decal/tile/ship/full/blue, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/monotile/steel, /area/medical/medbay/lobby) "bGl" = ( @@ -35098,11 +35348,12 @@ /turf/open/floor/carpet/green, /area/chapel/main) "bIc" = ( -/obj/item/radio/intercom{ - pixel_y = 26 +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /turf/open/floor/monotile/dark, -/area/medical/morgue) +/area/medical/surgery) "bId" = ( /obj/structure/table/glass, /obj/item/storage/box/beakers{ @@ -35800,15 +36051,12 @@ /turf/open/space, /area/engine/atmos) "bJU" = ( -/obj/structure/bed/roller, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 +/obj/machinery/power/apc/auto_name/west, +/obj/structure/cable{ + icon_state = "0-4" }, -/turf/open/floor/monotile/light, -/area/medical/storage) +/turf/open/floor/monotile/dark, +/area/medical/morgue) "bJW" = ( /obj/structure/cable{ icon_state = "2-4" @@ -36519,15 +36767,16 @@ name = "CIC" }) "bLK" = ( -/obj/structure/fans/tiny/invisible, -/obj/docking_port/stationary{ - dwidth = 1; - height = 4; - roundstart_template = /datum/map_template/shuttle/escape_pod/default; - width = 3 +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/open/floor/plating, -/area/maintenance/department/medical) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/monotile/dark, +/area/medical) "bLL" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/effect/turf_decal/tile/orange{ @@ -36818,11 +37067,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/obj/structure/grille, /obj/effect/spawner/lootdrop/maintenance/three, +/obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/central) "bVw" = ( @@ -36918,11 +37164,17 @@ /turf/open/floor/monotile/steel, /area/engine/engineering/hangar) "bYc" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/effect/turf_decal/tile/blue{ + dir = 8 }, -/turf/open/floor/plating, -/area/maintenance/department/medical) +/obj/effect/turf_decal/tile/blue, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/monotile/steel, +/area/hallway/nsv/deck2/frame1/port) "bYd" = ( /turf/open/floor/plating{ icon_state = "platingdmg3" @@ -37161,6 +37413,15 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/monotile/light, /area/medical/medbay/central) "bZm" = ( @@ -37879,6 +38140,13 @@ initial_gas_mix = "TEMP=2.7" }, /area/engine/atmos) +"cph" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/turf/open/floor/monotile/steel, +/area/medical/surgery) "cpp" = ( /obj/machinery/atmospherics/pipe/manifold/orange/visible/layer2{ dir = 8 @@ -38123,6 +38391,10 @@ /obj/item/storage/fancy/donut_box, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"cIH" = ( +/obj/machinery/airalarm/directional/east, +/turf/open/floor/monotile/dark, +/area/medical/morgue) "cJz" = ( /obj/structure/shuttle/engine/heater{ dir = 8 @@ -38199,6 +38471,12 @@ "cOK" = ( /turf/closed/wall/ship, /area/maintenance/nsv/hangar) +"cOX" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/turf/open/floor/monotile/light, +/area/medical/genetics) "cPU" = ( /obj/item/radio/intercom{ pixel_y = -26 @@ -38248,6 +38526,12 @@ }, /turf/open/floor/monotile/steel, /area/crew_quarters/fitness/recreation) +"cTx" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/turf/open/floor/monotile/steel, +/area/medical/break_room) "cUs" = ( /obj/structure/cable{ icon_state = "1-8" @@ -38432,6 +38716,12 @@ }, /turf/open/floor/plasteel/ridged/steel, /area/engine/engineering/reactor_core) +"dhv" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/monotile/steel, +/area/medical/medbay/lobby) "dhL" = ( /obj/structure/table/reinforced, /obj/item/paper_bin, @@ -38527,6 +38817,18 @@ /obj/effect/spawner/lootdrop/maintenance/four, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"dre" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/monotile/light, +/area/medical/genetics) "drl" = ( /obj/machinery/meter, /obj/structure/grille, @@ -38587,6 +38889,16 @@ }, /turf/open/floor/wood, /area/library) +"dzN" = ( +/obj/structure/table/wood, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/turf/open/floor/monotile/dark, +/area/medical/break_room) "dzX" = ( /obj/machinery/atmospherics/pipe/multiz/layer2{ dir = 1 @@ -38704,6 +39016,15 @@ }, /turf/open/floor/plasteel/grid/steel, /area/hallway/secondary/exit) +"dJb" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/turf/open/floor/monotile/light, +/area/medical/genetics) "dJP" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 27 @@ -38764,6 +39085,15 @@ /obj/effect/spawner/lootdrop/maintenance/three, /turf/open/floor/plating, /area/maintenance/department/medical) +"dLZ" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/plating, +/area/medical/medbay/lobby) "dNn" = ( /obj/effect/spawner/structure/window/reinforced/ship, /turf/open/floor/plating, @@ -38774,6 +39104,12 @@ }, /turf/closed/wall/r_wall/ship, /area/engine/engine_room) +"dPn" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/turf/open/floor/monotile/light, +/area/medical/medbay/central) "dQA" = ( /obj/effect/turf_decal/bot, /obj/machinery/navbeacon{ @@ -38820,6 +39156,10 @@ }, /turf/open/floor/plating, /area/security/execution/transfer) +"dTj" = ( +/obj/machinery/power/apc/auto_name/west, +/turf/open/floor/monotile/steel, +/area/medical) "dTk" = ( /obj/machinery/door/airlock/ship/public/glass{ name = "Crew Lounge" @@ -39014,6 +39354,18 @@ /area/nsv/hanger/storage{ name = "Munitions Control Room" }) +"ehw" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/monotile/dark, +/area/hallway/nsv/deck2/frame1/port) "eiQ" = ( /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -39167,9 +39519,6 @@ /turf/open/floor/plating, /area/crew_quarters/dorms) "eoI" = ( -/obj/machinery/door/airlock/ship/public/glass{ - name = "Morgue" - }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -39179,7 +39528,19 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/space/basic, +/obj/machinery/door/airlock/ship/public/glass{ + name = "Morgue" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/monotile/steel, /area/medical/morgue) "eoU" = ( /obj/structure/cable{ @@ -39191,6 +39552,21 @@ }, /turf/open/floor/plating, /area/maintenance/central) +"epi" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/turf/open/floor/monotile/dark, +/area/medical/morgue) "epE" = ( /obj/machinery/atmospherics/components/binary/dp_vent_pump{ dir = 4 @@ -39547,6 +39923,16 @@ /obj/effect/decal/remains/human, /turf/open/floor/engine, /area/engine/engine_room) +"eOz" = ( +/obj/structure/window/reinforced{ + dir = 8; + layer = 2.9 + }, +/obj/structure/window/reinforced, +/obj/structure/table/glass, +/obj/item/storage/firstaid/advanced, +/turf/open/floor/monotile/light, +/area/medical/storage) "ePH" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 @@ -39768,6 +40154,13 @@ }, /turf/open/floor/monotile/steel, /area/nsv/hanger/deck2) +"fjp" = ( +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/power/apc/auto_name/east, +/turf/open/floor/monotile/steel, +/area/medical/storage) "fjB" = ( /obj/machinery/door/airlock/ship{ name = "Exothermic Chamber"; @@ -39921,6 +40314,15 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/monotile/dark, /area/crew_quarters/dorms) +"fuz" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/monotile/light, +/area/medical/medbay/central) "fuW" = ( /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -40093,6 +40495,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/central) +"fKK" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/turf/open/floor/monotile/dark, +/area/medical/morgue) "fLt" = ( /obj/structure/table, /turf/open/floor/plating, @@ -40168,6 +40576,16 @@ /area/bridge{ name = "CIC" }) +"fQU" = ( +/obj/effect/landmark/nuclear_waste_spawner, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/monotile/steel, +/area/medical/surgery) "fSF" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 @@ -40283,6 +40701,19 @@ /obj/item/clothing/ears/earmuffs, /turf/open/floor/carpet/ship, /area/quartermaster/storage) +"gbq" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/turf/open/floor/monotile/light, +/area/medical/genetics) "gbA" = ( /obj/machinery/door/airlock/ship/maintenance/defaultaccess, /obj/machinery/door/firedoor/border_only{ @@ -40759,6 +41190,9 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/monotile/steel, /area/medical/medbay/central) "gJU" = ( @@ -40779,6 +41213,10 @@ /obj/effect/landmark/zebra_interlock_point, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"gLs" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/monotile/steel, +/area/medical/storage) "gMB" = ( /obj/machinery/photocopier{ pixel_y = 3 @@ -41349,8 +41787,29 @@ /turf/open/floor/monotile/steel, /area/nsv/weapons/fore) "hzd" = ( -/obj/machinery/status_display/evac, -/turf/closed/wall/ship, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/airlock/ship/public/glass{ + name = "Cloning Lab"; + req_access_txt = "5; 68" + }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/plasteel/white, /area/medical/genetics) "hzH" = ( /obj/effect/spawner/room/threexthree, @@ -41427,6 +41886,10 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"hDV" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/monotile/dark, +/area/medical/surgery) "hER" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -41592,6 +42055,15 @@ /obj/effect/spawner/lootdrop/minor/pirate_or_bandana, /turf/open/floor/plating, /area/maintenance/department/cargo) +"hQu" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/monotile/steel, +/area/medical/surgery) "hQx" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 @@ -41715,6 +42187,15 @@ }, /turf/open/floor/monotile/dark, /area/tcommsat/computer) +"hZL" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/monotile/steel, +/area/medical/storage) "icy" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -42048,6 +42529,10 @@ pixel_x = 32 }, /obj/structure/closet/firecloset, +/obj/structure/sign/departments/medbay/alt{ + name = "\improper INTENSIVE CARE UNIT"; + pixel_y = 26 + }, /turf/open/floor/monotile/light, /area/medical/medbay/lobby) "iDR" = ( @@ -42332,6 +42817,12 @@ }, /turf/open/floor/plating, /area/maintenance/nsv/weapons) +"iUg" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/template_noop, +/area/maintenance/central) "iUA" = ( /obj/structure/table/reinforced, /obj/item/storage/box/matches{ @@ -42377,6 +42868,16 @@ initial_gas_mix = "TEMP=2.7" }, /area/engine/atmos) +"iWK" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/monotile/steel, +/area/medical/medbay/lobby) "iXF" = ( /obj/effect/turf_decal/delivery, /obj/machinery/power/terminal, @@ -42392,6 +42893,19 @@ }, /turf/open/floor/carpet/ship, /area/quartermaster/storage) +"iZY" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/machinery/power/apc/auto_name/west, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/monotile/steel, +/area/medical/break_room) "jaI" = ( /obj/machinery/light/small/broken{ dir = 4 @@ -42440,6 +42954,14 @@ }, /turf/open/floor/plating, /area/maintenance/department/engine) +"jca" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/monotile/light, +/area/medical/medbay/central) "jcy" = ( /obj/machinery/door/airlock/ship/public/glass{ name = "Medical Equipment"; @@ -42465,6 +42987,10 @@ }, /turf/open/space/basic, /area/space/nearstation) +"jhM" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/monotile/steel, +/area/medical/break_room) "jiL" = ( /obj/structure/grille, /obj/structure/window/reinforced{ @@ -42600,7 +43126,7 @@ /area/nsv/hanger/deck2) "jqT" = ( /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating, +/turf/closed/wall/r_wall/ship, /area/maintenance/department/medical) "jrd" = ( /obj/machinery/atmospherics/pipe/manifold/brown/hidden{ @@ -42683,10 +43209,15 @@ /turf/open/floor/durasteel/techfloor, /area/nsv/weapons/fore) "jxT" = ( -/obj/machinery/light{ +/obj/machinery/door/airlock/ship/maintenance/defaultaccess, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ dir = 8 }, -/turf/closed/wall/ship, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/space/basic, /area/maintenance/central) "jyj" = ( /obj/structure/cable{ @@ -42877,6 +43408,17 @@ "jSc" = ( /turf/open/floor/carpet/green, /area/engine/engineering/reactor_control) +"jSr" = ( +/obj/structure/closet/secure_closet/medical3, +/obj/machinery/requests_console{ + department = "Medbay Clinic"; + departmentType = 1; + name = "Medbay RC"; + payment_department = "MED"; + pixel_y = 28 + }, +/turf/open/floor/monotile/light, +/area/medical/storage) "jSw" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 @@ -43009,6 +43551,19 @@ /obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship, /area/crew_quarters/dorms) +"kaF" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/monotile/light, +/area/medical/medbay/central) "kbg" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -43452,6 +44007,12 @@ }, /turf/open/floor/plasteel/techmaint, /area/maintenance/starboard) +"kwD" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/turf/open/floor/monotile/steel, +/area/medical/medbay/lobby) "kwI" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -43482,6 +44043,14 @@ }, /turf/open/floor/monotile/steel, /area/engine/engineering/reactor_core) +"kyP" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/monotile/steel, +/area/hallway/nsv/deck2/frame1/port) "kze" = ( /obj/structure/cable{ icon_state = "2-8" @@ -43826,6 +44395,15 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/monotile/steel, /area/medical) "lcf" = ( @@ -44362,6 +44940,15 @@ }, /turf/open/space/basic, /area/engine/atmos) +"lNf" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/turf/open/floor/monotile/steel, +/area/medical/surgery) "lNT" = ( /obj/structure/lattice/catwalk/over/ship, /obj/machinery/light{ @@ -44488,6 +45075,15 @@ }, /turf/open/floor/monotile/steel, /area/engine/engineering/reactor_core) +"lWo" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/turf/open/floor/monotile/dark, +/area/medical/surgery) "lZz" = ( /obj/effect/turf_decal/pool{ dir = 4 @@ -44621,6 +45217,26 @@ }, /turf/open/floor/plating, /area/medical/medbay/lobby) +"mjX" = ( +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/airlock/ship/public/glass{ + name = "Cryogenics"; + req_one_access_txt = "5" + }, +/obj/effect/landmark/zebra_interlock_point, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/monotile/light, +/area/medical/medbay/lobby) "mlC" = ( /obj/machinery/atmospherics/pipe/simple/dark/visible{ dir = 10 @@ -44647,9 +45263,14 @@ /turf/open/space, /area/engine/atmos) "mmh" = ( -/obj/structure/fans/tiny/invisible, -/turf/open/floor/plating, -/area/maintenance/department/medical) +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/monotile/light, +/area/medical/genetics) "mmu" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 6 @@ -44659,6 +45280,12 @@ }, /turf/open/floor/monotile/steel, /area/engine/engineering/reactor_core) +"mmF" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/turf/open/floor/monotile/steel, +/area/medical) "mnn" = ( /obj/structure/chair, /turf/open/floor/plating{ @@ -45126,6 +45753,12 @@ /obj/structure/cable/yellow, /turf/open/floor/monotile/steel, /area/engine/engineering/hangar) +"mQK" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/monotile/light, +/area/medical/medbay/lobby) "mRi" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -45290,6 +45923,15 @@ }, /turf/open/floor/plating, /area/engine/storage) +"nch" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/monotile/steel, +/area/medical/surgery) "ncj" = ( /obj/machinery/holopad, /turf/open/floor/monotile/dark, @@ -45315,6 +45957,22 @@ /obj/machinery/advanced_airlock_controller/directional/north, /turf/open/floor/plating, /area/maintenance/department/cargo) +"neh" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/monotile/light, +/area/medical/medbay/central) +"nes" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/turf/open/floor/monotile/light, +/area/medical/genetics) "neD" = ( /obj/machinery/door/airlock/ship/maintenance/defaultaccess, /obj/machinery/door/firedoor/border_only{ @@ -45355,6 +46013,18 @@ /obj/structure/curtain/obscuring/grey, /turf/open/floor/plating, /area/maintenance/department/engine) +"njf" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/turf/open/floor/monotile/steel, +/area/hallway/nsv/deck2/frame1/port) "nkx" = ( /obj/machinery/light/small, /turf/open/floor/engine/o2, @@ -45568,6 +46238,10 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/security/checkpoint/engineering) +"nBI" = ( +/obj/machinery/airalarm/directional/north, +/turf/open/floor/monotile/light, +/area/medical/medbay/central) "nBM" = ( /obj/structure/rack, /obj/item/clothing/mask/surgical, @@ -45770,6 +46444,15 @@ initial_gas_mix = "TEMP=2.7" }, /area/engine/atmos) +"nOn" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/turf/open/floor/monotile/steel, +/area/medical/surgery) "nOu" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -46182,6 +46865,17 @@ }, /turf/open/floor/plasteel/ridged/steel, /area/engine/engineering/reactor_control) +"oAd" = ( +/obj/structure/table/reinforced, +/obj/machinery/requests_console{ + department = "Medbay Clinic"; + departmentType = 1; + name = "Medbay RC"; + payment_department = "MED"; + pixel_x = -32 + }, +/turf/open/floor/monotile/light, +/area/medical/medbay/central) "oAv" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, /turf/open/floor/monotile/steel, @@ -46450,6 +47144,33 @@ }, /turf/open/floor/monotile/steel, /area/crew_quarters/fitness/recreation) +"pbp" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/turf/open/floor/monotile/steel, +/area/medical/storage) +"pbM" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/monotile/dark, +/area/medical/morgue) "pcG" = ( /obj/machinery/light/small{ dir = 4 @@ -46472,6 +47193,21 @@ /obj/structure/table/reinforced, /turf/open/floor/monotile/light, /area/medical/medbay/central) +"peg" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/monotile/light, +/area/medical/medbay/central) "per" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -46507,6 +47243,21 @@ /obj/machinery/atmospherics/pipe/simple/brown/hidden, /turf/open/floor/plating, /area/engine/engineering/hangar) +"pgp" = ( +/obj/machinery/atmospherics/pipe/simple/general/hidden{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/turf/open/floor/monotile/light, +/area/medical/medbay/central) "pgF" = ( /obj/structure/table/wood, /obj/machinery/computer/libraryconsole, @@ -46519,6 +47270,10 @@ }, /turf/open/floor/carpet/ship, /area/quartermaster/qm) +"pip" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/monotile/light, +/area/medical/medbay/central) "pjr" = ( /obj/structure/chair, /obj/machinery/computer/ship/viewscreen, @@ -46861,6 +47616,10 @@ /area/nsv/hanger/storage{ name = "Munitions Control Room" }) +"pHx" = ( +/obj/effect/turf_decal/stripes/white/line, +/turf/open/floor/engine, +/area/medical/medbay/central) "pHV" = ( /turf/template_noop, /area/maintenance/department/medical) @@ -46939,6 +47698,10 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"pLy" = ( +/obj/machinery/airalarm/directional/west, +/turf/open/floor/monotile/steel, +/area/medical) "pNz" = ( /obj/machinery/atmospherics/pipe/manifold/yellow/visible{ dir = 1 @@ -47155,6 +47918,16 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"qjH" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/monotile/steel, +/area/medical/medbay/lobby) "qlR" = ( /obj/structure/closet/crate{ opened = 1 @@ -47188,6 +47961,17 @@ /obj/structure/disposalpipe/junction/yjunction{ dir = 1 }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, /turf/open/floor/monotile/dark, /area/medical) "qqk" = ( @@ -47260,6 +48044,10 @@ /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, /area/maintenance/starboard) +"qxi" = ( +/obj/effect/spawner/structure/window/reinforced/ship, +/turf/open/floor/plating, +/area/maintenance/department/medical) "qxl" = ( /obj/effect/turf_decal/stripes/white/corner{ dir = 1 @@ -47404,6 +48192,12 @@ /obj/effect/turf_decal/bot_white, /turf/open/floor/monotile/steel, /area/gateway) +"qGw" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/monotile/steel, +/area/medical/medbay/lobby) "qHc" = ( /obj/machinery/status_display/ai, /turf/closed/wall/ship, @@ -47470,6 +48264,16 @@ /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, /area/maintenance/department/engine) +"qLy" = ( +/obj/docking_port/stationary{ + dwidth = 1; + height = 4; + roundstart_template = /datum/map_template/shuttle/escape_pod/default; + width = 3; + dir = 4 + }, +/turf/open/floor/plating, +/area/medical/storage) "qLS" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 @@ -47492,6 +48296,18 @@ }, /turf/open/floor/plating, /area/maintenance/nsv/hangar) +"qMY" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/monotile/dark, +/area/hallway/nsv/deck2/frame1/port) "qNS" = ( /obj/effect/turf_decal/tile/red{ dir = 4 @@ -47645,6 +48461,9 @@ }, /turf/open/floor/plasteel/tech/grid, /area/nsv/weapons/fore) +"ram" = ( +/turf/open/floor/plating, +/area/medical/storage) "raq" = ( /obj/structure/sign/ship/radiation{ dir = 8 @@ -48260,6 +49079,12 @@ }, /turf/open/floor/plasteel/grid/steel, /area/engine/engineering/reactor_core) +"rJV" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/monotile/light, +/area/medical/medbay/lobby) "rKx" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /obj/machinery/atmospherics/pipe/simple/green/visible{ @@ -48756,6 +49581,18 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/starboard) +"swq" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/monotile/light, +/area/medical/medbay/central) "swR" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxins_mixing_input{ dir = 4 @@ -48921,7 +49758,7 @@ }) "sRd" = ( /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating, +/turf/closed/wall/ship, /area/maintenance/central) "sRj" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ @@ -48951,6 +49788,10 @@ }, /turf/open/floor/monotile/steel, /area/engine/engineering/reactor_core) +"sTU" = ( +/obj/machinery/atmospherics/components/unary/cryo_cell, +/turf/open/floor/engine, +/area/medical/medbay/central) "sYQ" = ( /obj/structure/chair/office/light{ dir = 1 @@ -49032,6 +49873,10 @@ /obj/structure/cable, /turf/open/floor/wood, /area/library) +"tfk" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/monotile/steel, +/area/medical/surgery) "tfx" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -49097,6 +49942,9 @@ /obj/item/storage/backpack/duffelbag/med/surgery, /obj/item/storage/box/bodybags, /obj/machinery/light, +/obj/machinery/computer/ship/viewscreen{ + pixel_y = -30 + }, /turf/open/floor/monotile/dark, /area/medical/morgue) "tjC" = ( @@ -49303,10 +50151,12 @@ /turf/open/floor/monotile/dark, /area/hallway/nsv/deck2/frame1/central) "txH" = ( -/obj/machinery/holopad, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/cmo) "tyr" = ( @@ -49439,14 +50289,17 @@ /turf/open/floor/monotile/dark, /area/engine/engineering) "tDB" = ( -/obj/machinery/airalarm{ - pixel_y = 26 +/obj/effect/turf_decal/tile/blue{ + dir = 1 }, -/obj/effect/turf_decal/loading_area{ +/obj/effect/turf_decal/tile/blue{ dir = 4 }, -/turf/open/floor/monotile/dark, -/area/medical/morgue) +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/turf/open/floor/monotile/light, +/area/medical/storage) "tDG" = ( /obj/machinery/conveyor/slow{ id = "torp" @@ -49633,6 +50486,15 @@ name = "Medical Equipment"; req_one_access_txt = "5" }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/monotile/steel, /area/medical/storage) "tTM" = ( @@ -49875,6 +50737,17 @@ initial_gas_mix = "TEMP=2.7" }, /area/engine/atmos) +"ukF" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/turf/open/floor/monotile/dark, +/area/hallway/nsv/deck2/frame1/port) "uln" = ( /obj/structure/cable{ icon_state = "1-2" @@ -49888,6 +50761,14 @@ /obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/space/basic, /area/space/nearstation) +"unA" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/monotile/light, +/area/medical/storage) "uoi" = ( /obj/effect/turf_decal/delivery/red, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -49953,6 +50834,22 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /turf/open/floor/monotile/steel, /area/engine/engineering) +"uwQ" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/monotile/light, +/area/medical/genetics) +"uxq" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/monotile/light, +/area/medical/medbay/central) "uyI" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -49981,6 +50878,13 @@ }, /turf/open/floor/monotile/dark, /area/shuttle/turbolift/shaft) +"uBy" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/monotile/dark, +/area/medical) "uEb" = ( /turf/open/floor/plating{ icon_state = "panelscorched" @@ -50807,6 +51711,12 @@ /area/maintenance/starboard/secondary{ name = "Munitions Projects" }) +"vYr" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/turf/open/floor/monotile/dark, +/area/medical/surgery) "vYs" = ( /obj/machinery/camera/autoname, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, @@ -50943,6 +51853,10 @@ /area/bridge{ name = "CIC" }) +"wjj" = ( +/obj/machinery/airalarm/directional/east, +/turf/open/floor/monotile/light, +/area/medical/genetics) "wjv" = ( /obj/effect/decal/cleanable/blood/footprints{ dir = 4 @@ -50990,6 +51904,13 @@ }, /turf/open/floor/durasteel/padded, /area/maintenance/department/medical) +"wnI" = ( +/obj/structure/sign/ship/pods/west{ + pixel_y = -2; + pixel_x = -31 + }, +/turf/open/floor/durasteel, +/area/medical) "woq" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -51045,6 +51966,10 @@ }, /turf/open/floor/engine/vacuum, /area/engine/atmospherics_engine) +"wrG" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/monotile/dark, +/area/medical/morgue) "wss" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -51074,6 +51999,12 @@ /obj/machinery/door/airlock/ship/maintenance/defaultaccess, /turf/open/floor/plating, /area/maintenance/department/cargo) +"wto" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/monotile/steel, +/area/medical/medbay/lobby) "wvu" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, @@ -51168,6 +52099,14 @@ /area/bridge{ name = "CIC" }) +"wyL" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/monotile/light, +/area/medical/medbay/central) "wyO" = ( /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 @@ -51214,6 +52153,11 @@ /obj/effect/landmark/nuclear_waste_spawner, /turf/open/floor/plating, /area/maintenance/starboard) +"wDF" = ( +/obj/machinery/atmospherics/pipe/simple/general/hidden, +/obj/effect/turf_decal/stripes/white/line, +/turf/open/floor/engine, +/area/medical/medbay/central) "wEq" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 @@ -51900,6 +52844,12 @@ /obj/machinery/door/airlock/ship/maintenance/defaultaccess, /turf/open/floor/plating, /area/maintenance/nsv/hangar) +"xLJ" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/monotile/light, +/area/medical/genetics) "xMG" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -74139,8 +75089,8 @@ bKQ bEa aaU aaU -bKQ -bKQ +aZa +aZa aZa aZa rUJ @@ -74396,10 +75346,10 @@ bKQ abY aaJ aaJ -aaJ -aaJ -agX -mmh +qxi +pHV +pHV +ahS jqT agX ueI @@ -74653,11 +75603,11 @@ oUI mLQ aaJ aaJ -aaJ -aaJ -agX -bLK -bYc +qxi +pHV +pHV +pHV +fuW agX fuW pHV @@ -74910,11 +75860,11 @@ jLQ aaJ aaJ aaJ -aaJ -aaJ -bYd -mmh -agX +qxi +pHV +pHV +pHV +aZa agX afw pHV @@ -75167,11 +76117,11 @@ jLQ jLQ aaU aaU -bKQ -bKQ aZa -agX -agX +aZa +aZa +aZa +aZa agX afw afw @@ -75946,7 +76896,7 @@ agX agU aow aoo -bLU +iZY alT bLU ahr @@ -75957,7 +76907,7 @@ ahP ahP aGL ahP -aic +bJU ajf ahm aZb @@ -76204,11 +77154,11 @@ mut aow krf aUT -aoJ -aUT +dzN +cTx bwq ahO -ama +ahQ ahQ ahQ ahQ @@ -76233,9 +77183,9 @@ alH acF xyX afw -bws -bCz -aOP +acx +ehw +njf aed aeh afu @@ -76461,17 +77411,17 @@ loC aow rEt aUT -aoJ +aUu aUT ajX ahO -bIc -aic -aic -aic -aic -ajf aic +aym +wrG +wrG +wrG +epi +fKK tiu ahm akx @@ -76491,7 +77441,7 @@ acF acF acF acH -bCR +bCS aOP aee eTv @@ -76717,17 +77667,17 @@ agX alB aow aoB -aUT +jhM aoJ aUT bbb ahO -tDB aky aky aky aky -ajf +aky +pbM aic bkD ahm @@ -76984,14 +77934,14 @@ aUz aUz aUz aUz -ajf -aic +pbM +cIH aZM ahm -aUe -aUe +nBI +neh bvX -pdT +oAd pdT amc aok @@ -77246,13 +78196,13 @@ ahO ahO ahm aUe +fuz aUe aUe aUe aUe -aUe -aok -aUe +pgp +wyL akG bvP blc @@ -77484,32 +78434,32 @@ oWy aZa alz aYU -baz +wnI eLS aZX -aZX -aZX -lca -aZX -aZX -aZX +bCy +bws +bfA aZX aZX aZX aZX +dTj +pLy +bCy aZX ahK baY baY bCh bbp -bbp +uxq bbp bhf beH bfn bgO -aUe +dPn bwb aiR bld @@ -77745,7 +78695,7 @@ aov eCP aAI aAI -bCo +uBy ahR bCo bCo @@ -77753,17 +78703,17 @@ bCn bCo bCo bCo -bCo +bLK bCo qoc beA beA akI -aUe -aUe +jca +kaF bcU aUy -aTX +afE akM ajd aUe @@ -78007,14 +78957,14 @@ aZX aZX aZX bvT +aoE aZX aZX -aZX -aZX +mmF aZX lca aZX -aZX +bfx aiY aUe aUe @@ -78286,7 +79236,7 @@ bwf ahf ame ame -ame +qGw ahf aKh acx @@ -78531,7 +79481,7 @@ aLf ahM ahm ahT -aUe +pHx ajE akB bvS @@ -78543,7 +79493,7 @@ aKh ahf ame mib -ame +dhv ahf tsM acx @@ -78774,37 +79724,37 @@ agX acb ahi bvE -bCu -aVy -aVy -aVy +unA +gLs +gLs +pbp aRL bvw aaK alU -bvZ -bvZ -bvZ +hDV +bIc +vYr bbm ahm -aBK -ald +sTU +wDF bfu aUe aUe -aUe -alh -aUe -aUe -bwf +pip +ama +peg +jca +mjX bhb -ame +qjH bGk -ame -ahf -aKh -acx -bCS +iWK +bne +dLZ +bYc +ukF bmP bnd bnl @@ -79030,11 +79980,11 @@ afw afw afw ahi -bvE +jSr bCu -aVy +bvB amX -aVy +hZL aRL aoU aaK @@ -79045,24 +79995,24 @@ bco bco ahm bhd -aUe +pHx aUe ajT aTP ajT alh -aUe +swq aTP bJd ahf -ame +wto mib ame ahf tsM -bCy -bCR -aOP +acx +bCS +alv abL afy afD @@ -79287,11 +80237,11 @@ pHV pHV aaS ahi -bvw +eOz bCu -aVy +bvB bzX -aVy +hZL aRL bId aaK @@ -79312,13 +80262,13 @@ hzd ahc afV ble -ame +wto amd ame akE aKh -bws -bCz +acx +qMY aOP abL afz @@ -79546,10 +80496,10 @@ pHV ahi aUF bCu -aVy +bvB aoT -aVy -aRL +amw +tDB baX aaK bvq @@ -79565,17 +80515,17 @@ aVM ahc ahC bvU -ajY +dre sCC afV bcT -ahf +rJV bwl ahf ajh afV acx -bDn +bCH bmR boz boK @@ -79805,24 +80755,24 @@ biH bCu aVy aVy -aVy +fjp aRL aUn aaK bvr -amM -amM +tfk +cph bvu bhi ahc bbg ajY -ajY +xLJ akH aUj aja aAc -ajY +nes ajY afV afV @@ -79832,7 +80782,7 @@ aTM afV afV bge -bDp +bCS bmQ abL afB @@ -80060,36 +81010,36 @@ pHV ahi aUK bcb -bJU -bvB -bfx -aUc aUl +ahi +ahi +aUc +ahi aaK ala -aUu amM +fQU bio baW ahc bbx aPs -ajY +dJb ahE ajD akJ alm +gbq ajY -alv afV alL -ahf +rJV ahf bzM afV ssH acx -bDp +bCS bmS abL abL @@ -80319,34 +81269,34 @@ ahi ahi ahi ahi -ahi -ahi -ahi +ram +qLy +ram aaK eWa amM -amM +hQu aUa bfy ahc bbH ajY ahk -ajY +aUG aUj ajY ale -ajY -ajY +mmh +uwQ bwr -ahf -ame +mQK +kwD ame bwo bvl aKh -acx -bDp +kyP +bCR xMG laZ nWr @@ -80573,27 +81523,27 @@ afw afw aae eqv -eqv +iUg aoq aae -alb -aUm -aUp +akb +akb +akb aaK aUr -amM -amM -bvu +nOn +lNf +lWo bvZ ahc bBj alq -ajY +cOX bhT ahc amg ajY -ajY +bDn ajY afV bvk @@ -80826,25 +81776,25 @@ aae bsV brm aUp -akb +alb aZg aae eqv eqv eqv -bfA +aae akb aUo -aUG +akb aaK aUq -amM +nch aoO bvV bGy ahc bbW -ajY +wjj bHC ajY ahc @@ -81093,12 +82043,12 @@ aae akb akb akb -bne -bne +aaK +aaK aQG -bne -bne -bne +aaK +aaK +aaK ahc ahc ahc @@ -81341,17 +82291,17 @@ anu aqU akb akb -akb +aUm aae aae jxT aae aae -afE +aae sRd sRd +aae gBG -asv psx bsy bsy From 58698329a1d302e01a22ea1effd9f56ab1b0654a Mon Sep 17 00:00:00 2001 From: SerynEngi Date: Fri, 13 Dec 2024 16:24:04 -0800 Subject: [PATCH 05/26] Tycoon DCC Complete Damage Control Central- your one stop shop for knowing how soon you are about to die! --- _maps/map_files/Tycoon/Tycoon1.dmm | 1 - _maps/map_files/Tycoon/Tycoon2.dmm | 4272 +++++++++++++++------------- 2 files changed, 2315 insertions(+), 1958 deletions(-) diff --git a/_maps/map_files/Tycoon/Tycoon1.dmm b/_maps/map_files/Tycoon/Tycoon1.dmm index 1a589feec83..0054a5e64c7 100644 --- a/_maps/map_files/Tycoon/Tycoon1.dmm +++ b/_maps/map_files/Tycoon/Tycoon1.dmm @@ -5573,7 +5573,6 @@ /turf/open/floor/plating, /area/nsv/briefingroom) "na" = ( -/obj/structure/ladder, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 }, diff --git a/_maps/map_files/Tycoon/Tycoon2.dmm b/_maps/map_files/Tycoon/Tycoon2.dmm index 937b7c6a90c..c2a305025c5 100644 --- a/_maps/map_files/Tycoon/Tycoon2.dmm +++ b/_maps/map_files/Tycoon/Tycoon2.dmm @@ -554,21 +554,21 @@ }) "abH" = ( /obj/structure/sign/ship/securearea, -/turf/closed/wall/ship, +/turf/closed/wall/r_wall/ship, /area/bridge{ name = "CIC" }) "abI" = ( /obj/structure/sign/ship/deck/two, -/turf/closed/wall/ship, +/turf/closed/wall/r_wall/ship, /area/bridge{ name = "CIC" }) "abJ" = ( -/obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, -/obj/item/stack/rods/fifty, -/turf/open/floor/plating, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) "abL" = ( /turf/closed/wall/ship, @@ -768,13 +768,29 @@ /turf/open/floor/plasteel/grid/steel, /area/quartermaster/storage) "acl" = ( -/turf/open/floor/plating, +/obj/structure/table/reinforced, +/obj/item/storage/toolbox/mechanical{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/storage/toolbox/mechanical{ + pixel_y = 3; + pixel_x = 3 + }, +/obj/item/storage/toolbox/mechanical, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/turf/open/floor/monotile/dark, /area/hallway/nsv/deck2/frame1/central) "acm" = ( -/obj/structure/chair/fancy{ +/obj/effect/turf_decal/stripes{ dir = 1 }, -/turf/open/floor/plating, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) "acn" = ( /obj/effect/turf_decal/tile/neutral{ @@ -822,9 +838,13 @@ /turf/open/floor/monotile/steel, /area/hydroponics) "acq" = ( -/obj/effect/landmark/nuclear_waste_spawner, -/turf/open/floor/monotile/steel, -/area/engine/engineering/hangar) +/obj/effect/spawner/structure/window/plasma/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + name = "DC Central Shutters"; + id = "dcc" + }, +/turf/open/space/basic, +/area/nsv/engine/dcc) "acr" = ( /turf/closed/wall/ship, /area/science/nanite) @@ -932,8 +952,10 @@ /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) "acI" = ( -/obj/structure/closet/toolcloset, -/turf/open/floor/plating, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) "acK" = ( /obj/machinery/status_display/evac{ @@ -2119,13 +2141,29 @@ /turf/open/floor/wood, /area/library) "afy" = ( -/obj/machinery/camera/autoname, +/obj/structure/closet/emcloset/anchored, +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 + }, +/obj/machinery/camera{ + network = list("eng"); + name = "Forward DC Locker"; + dir = 5 + }, /turf/open/floor/monotile/steel, -/area/hallway/nsv/deck2/frame1/port) +/area/hallway/nsv/deck2/frame1/central) "afz" = ( -/obj/machinery/computer/ship/viewscreen, -/turf/open/floor/monotile/steel, -/area/hallway/nsv/deck2/frame1/port) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/camera/autoname{ + dir = 8 + }, +/turf/open/floor/plasteel/ridged/steel, +/area/engine/engineering) "afA" = ( /obj/machinery/door/airlock/ship/maintenance/defaultaccess, /obj/machinery/door/firedoor/border_only{ @@ -2135,31 +2173,46 @@ /turf/open/floor/plating, /area/hallway/nsv/deck2/frame1/port) "afB" = ( -/obj/machinery/portable_atmospherics/canister/water_vapor, -/obj/item/radio/intercom{ - pixel_x = 26 +/obj/effect/turf_decal/stripes/corner{ + dir = 1 }, +/obj/machinery/vending/tool, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) "afC" = ( -/obj/effect/turf_decal/box, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 +/obj/effect/turf_decal/tile/blue{ + dir = 8 }, +/obj/effect/turf_decal/tile/blue, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) "afD" = ( -/turf/open/floor/plasteel/grid/steel, +/obj/structure/rack, +/obj/item/rcd_ammo/large{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/rcd_ammo/large, +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 + }, +/turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) "afE" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/monotile/steel, -/area/medical/medbay/central) +/area/medical/surgery) "afF" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -2238,17 +2291,33 @@ /turf/open/floor/plasteel/dark, /area/chapel/main) "afP" = ( -/obj/vehicle/ridden/janicart, -/obj/item/key/janitor, -/obj/effect/turf_decal/box, +/obj/structure/closet/firecloset, +/obj/item/clothing/suit/fire/firefighter, +/obj/item/clothing/suit/fire/firefighter, +/obj/item/clothing/suit/fire/firefighter, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/obj/item/clothing/head/hardhat/red, +/obj/item/clothing/head/hardhat/red, +/obj/item/clothing/head/hardhat/red, +/obj/item/extinguisher, +/obj/item/extinguisher, +/obj/item/extinguisher, +/obj/structure/window/reinforced{ + dir = 1 + }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) "afQ" = ( -/obj/structure/janitorialcart{ +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/turf/open/floor/monotile/steel, -/area/hallway/nsv/deck2/frame1/port) +/turf/open/floor/monotile/light, +/area/medical/genetics) "afR" = ( /obj/item/grown/bananapeel, /turf/open/floor/plating, @@ -2271,34 +2340,31 @@ /turf/open/floor/carpet/ship, /area/crew_quarters/dorms) "afU" = ( -/obj/structure/chair/fancy/sofa/old/left{ +/obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/machinery/power/apc/auto_name/north{ - pixel_y = 24 - }, -/obj/structure/cable{ - icon_state = "0-2" - }, +/obj/machinery/portable_atmospherics/scrubber, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) "afV" = ( /turf/closed/wall/ship, /area/medical/medbay/lobby) "afW" = ( -/obj/machinery/computer/ship/viewscreen, -/turf/open/floor/plasteel/grid/steel, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/scrubber, +/turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) "afX" = ( -/obj/structure/closet/emcloset, -/obj/structure/sign/poster/contraband/rebels_unite{ - pixel_y = 26 - }, -/obj/effect/turf_decal/stripes/white/line{ - dir = 8 +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/dark/hidden{ + dir = 4 }, -/turf/open/floor/plasteel/techmaint, -/area/hallway/nsv/deck2/frame1/port) +/turf/open/floor/monotile/steel, +/area/engine/engineering/hangar) "afY" = ( /turf/open/floor/plasteel/chapel{ dir = 8 @@ -2469,12 +2535,17 @@ /turf/open/space/basic, /area/engine/engine_room) "agx" = ( -/obj/machinery/space_heater, -/obj/machinery/firealarm{ - pixel_y = 24 +/obj/effect/turf_decal/tile/neutral{ + dir = 4 }, -/turf/open/floor/plasteel/techmaint, -/area/hallway/nsv/deck2/frame1/port) +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/door/airlock/ship/public/glass{ + name = "Aft Primary Hallway" + }, +/turf/open/floor/monotile/steel, +/area/hallway/nsv/deck2/frame1/central) "agy" = ( /turf/open/floor/monotile/dark, /area/nsv/weapons/fore) @@ -2606,30 +2677,61 @@ /turf/open/floor/monotile/steel, /area/medical/medbay/central) "agQ" = ( -/obj/machinery/light{ - dir = 8 +/obj/item/clothing/suit/space/eva, +/obj/item/clothing/suit/space/eva, +/obj/item/clothing/suit/space/eva, +/obj/item/clothing/suit/space/eva, +/obj/item/clothing/suit/space/eva, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/clothing/head/helmet/space/eva, +/obj/item/clothing/head/helmet/space/eva, +/obj/item/clothing/head/helmet/space/eva, +/obj/item/clothing/head/helmet/space/eva, +/obj/item/clothing/head/helmet/space/eva, +/obj/structure/closet{ + name = "Space Suit Locker" + }, +/obj/structure/window/reinforced{ + dir = 1 }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) "agR" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/dark/hidden{ + dir = 5 }, -/turf/open/floor/plasteel/techmaint, -/area/hallway/nsv/deck2/frame1/port) +/turf/open/floor/monotile/steel, +/area/engine/engineering/hangar) "agS" = ( -/turf/open/floor/plasteel/techmaint, -/area/hallway/nsv/deck2/frame1/port) +/obj/structure/closet/secure_closet/medical3, +/obj/machinery/requests_console{ + department = "Medbay Clinic"; + departmentType = 1; + name = "Medbay RC"; + payment_department = "MED"; + pixel_y = 28 + }, +/turf/open/floor/monotile/light, +/area/medical/storage) "agT" = ( -/obj/structure/chair/fancy/sofa/old/right{ - dir = 4 +/obj/structure/rack, +/obj/item/rcd_ammo/large{ + pixel_x = 3; + pixel_y = 3 }, -/obj/structure/cable{ - icon_state = "1-4" +/obj/item/rcd_ammo/large, +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 }, -/obj/machinery/airalarm{ - dir = 4; - pixel_x = -22 +/obj/machinery/camera{ + network = list("eng"); + name = "Aft Adv. DC Locker"; + dir = 5 }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) @@ -2719,6 +2821,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/brown/hidden{ + dir = 4 + }, /turf/open/floor/plating, /area/engine/engineering/hangar) "ahe" = ( @@ -3179,6 +3284,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/brown/hidden{ + dir = 4 + }, /turf/open/floor/plating, /area/engine/engineering/hangar) "aiq" = ( @@ -3329,6 +3437,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/brown/hidden{ + dir = 4 + }, /turf/open/floor/plating, /area/engine/engineering/hangar) "aiU" = ( @@ -3452,6 +3563,9 @@ icon_state = "4-8" }, /obj/machinery/advanced_airlock_controller/directional/north, +/obj/machinery/atmospherics/pipe/simple/brown/hidden{ + dir = 4 + }, /turf/open/floor/plating, /area/engine/engineering/hangar) "ajo" = ( @@ -4194,14 +4308,11 @@ /turf/closed/wall/r_wall/ship, /area/maintenance/nsv/weapons) "alv" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/open/floor/monotile/steel, -/area/medical/surgery) +/turf/open/floor/monotile/light, +/area/medical/genetics) "alw" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -4412,23 +4523,9 @@ /turf/open/floor/monotile/dark, /area/science/nanite) "ama" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, +/obj/machinery/airalarm/directional/east, /turf/open/floor/monotile/light, -/area/medical/medbay/central) +/area/medical/genetics) "amc" = ( /obj/machinery/stasis, /turf/open/floor/monotile/light, @@ -4535,15 +4632,6 @@ }, /turf/open/floor/durasteel/lino, /area/engine/engineering/reactor_control) -"amw" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/turf/open/floor/monotile/steel, -/area/medical/storage) "amx" = ( /turf/closed/wall/r_wall/ship, /area/engine/gravity_generator) @@ -4739,18 +4827,15 @@ /turf/open/floor/monotile/steel, /area/engine/engineering/hangar) "ann" = ( -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/machinery/power/apc/auto_name/north{ - pixel_y = 24 +/obj/machinery/computer/monitor{ + name = "Reactor Power Grid monitoring console" }, -/obj/machinery/light_switch{ - pixel_x = 13; - pixel_y = 26 +/obj/structure/cable/yellow{ + icon_state = "0-2" }, -/turf/open/floor/monotile/dark, -/area/security/checkpoint/engineering) +/obj/machinery/camera/autoname, +/turf/open/floor/monotile/steel, +/area/nsv/engine/dcc) "anp" = ( /turf/closed/wall/r_wall/ship, /area/crew_quarters/heads/chief) @@ -4883,6 +4968,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/brown/hidden{ + dir = 4 + }, /turf/open/floor/monotile/steel, /area/engine/engineering/hangar) "anJ" = ( @@ -4901,11 +4989,11 @@ /turf/open/floor/plasteel/ridged/steel, /area/engine/engineering) "anM" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 6 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 }, /turf/open/floor/monotile/dark, -/area/engine/engineering/hangar) +/area/medical/morgue) "anN" = ( /turf/closed/wall/ship, /area/crew_quarters/fitness/recreation) @@ -5136,13 +5224,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/template_noop, /area/maintenance/department/medical) -"aoE" = ( -/obj/structure/sign/ship/pods/east{ - pixel_y = -2; - pixel_x = 31 - }, -/turf/open/floor/monotile/steel, -/area/medical) "aoJ" = ( /obj/structure/table/wood, /obj/structure/cable{ @@ -5151,17 +5232,13 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, /turf/open/floor/monotile/dark, /area/medical/break_room) "aoL" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 1 - }, -/turf/open/floor/monotile/dark, -/area/engine/engineering/hangar) +/turf/closed/wall/r_wall/ship, +/area/bridge{ + name = "CIC" + }) "aoM" = ( /obj/structure/cable{ icon_state = "4-8" @@ -5234,10 +5311,10 @@ /turf/closed/wall/r_wall/ship, /area/engine/storage) "aoX" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 10 +/obj/machinery/camera/autoname{ + dir = 5 }, -/turf/open/floor/monotile/dark, +/turf/open/floor/monotile/steel, /area/engine/engineering/hangar) "aoZ" = ( /turf/open/floor/plating, @@ -5510,11 +5587,23 @@ /turf/closed/wall/r_wall/ship, /area/engine/atmospherics_engine) "apX" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/general/hidden{ + dir = 4 }, -/turf/open/floor/monotile/dark, -/area/engine/engineering/hangar) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/turf/open/floor/monotile/light, +/area/medical/medbay/central) "apZ" = ( /obj/machinery/hydroponics/constructable, /turf/open/floor/monotile/dark, @@ -7612,10 +7701,6 @@ "axY" = ( /turf/open/floor/monotile/steel, /area/engine/atmos) -"aym" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/monotile/dark, -/area/medical/morgue) "ayp" = ( /obj/structure/rack, /obj/item/airlock_painter, @@ -7636,12 +7721,14 @@ /turf/open/floor/plating, /area/engine/storage) "ayE" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/structure/cable{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/structure/cable/yellow{ icon_state = "1-2" }, /turf/open/floor/monotile/dark, -/area/security/checkpoint/engineering) +/area/nsv/engine/dcc) "ayF" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -7894,10 +7981,7 @@ /area/medical/genetics) "azg" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/monotile/steel, +/turf/open/floor/monotile/dark, /area/engine/engineering/hangar) "azi" = ( /obj/structure/closet/secure_closet/detective, @@ -7955,6 +8039,17 @@ }, /turf/open/floor/monotile/dark, /area/engine/atmos) +"azw" = ( +/obj/machinery/atmospherics/components/binary/valve/layer4{ + dir = 4; + name = "Scrubbers Emergency Dump"; + req_one_access_txt = "10" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/plating, +/area/nsv/engine/dcc) "azx" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/plasteel/ridged/steel, @@ -7992,14 +8087,8 @@ /turf/open/floor/plating, /area/engine/atmospherics_engine) "azD" = ( -/obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, -/obj/item/stack/sheet/glass/fifty, -/obj/item/stack/sheet/iron/fifty{ - pixel_x = 3; - pixel_y = 3 - }, -/turf/open/floor/plating, +/obj/structure/tank_dispenser, +/turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) "azE" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -8257,16 +8346,8 @@ /turf/open/floor/monotile/dark, /area/engine/break_room) "aAk" = ( -/obj/machinery/button/door{ - id = "maintshop"; - name = "shutters"; - pixel_x = 32 - }, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/structure/closet/toolcloset, -/turf/open/floor/plating, +/obj/machinery/vending/tool, +/turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) "aAl" = ( /obj/item/kirbyplants/random, @@ -8544,6 +8625,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/monotile/steel, /area/engine/engineering) "aAX" = ( @@ -8671,16 +8755,8 @@ /turf/open/floor/monotile/dark, /area/engine/atmospherics_engine) "aBj" = ( -/obj/machinery/holopad, -/obj/effect/landmark/blobstart, -/obj/machinery/power/apc/auto_name/north{ - pixel_y = 24 - }, -/obj/structure/cable{ - icon_state = "0-2" - }, /turf/open/floor/monotile/steel, -/area/engine/engineering/hangar) +/area/nsv/engine/dcc) "aBk" = ( /turf/open/floor/plating/airless, /area/space/nearstation) @@ -8912,9 +8988,6 @@ /area/hallway/nsv/deck2/frame2/port) "aBK" = ( /obj/machinery/atmospherics/components/unary/cryo_cell, -/obj/effect/turf_decal/stripes/white/line{ - dir = 8 - }, /turf/open/floor/engine, /area/medical/medbay/central) "aBL" = ( @@ -12105,16 +12178,10 @@ /turf/open/floor/mineral/plastitanium/airless, /area/science/test_area) "aJH" = ( -/obj/structure/table, -/obj/machinery/recharger{ - pixel_y = 4 - }, -/obj/structure/reagent_dispensers/peppertank{ - pixel_y = 30 - }, -/obj/machinery/airalarm/directional/west, -/turf/open/floor/monotile/dark, -/area/security/checkpoint/engineering) +/obj/structure/table/reinforced, +/obj/machinery/coffeemaker, +/turf/open/floor/monotile/steel, +/area/nsv/engine/dcc) "aJI" = ( /obj/structure/closet/cardboard, /turf/open/floor/mineral/plastitanium/airless, @@ -12828,13 +12895,11 @@ /turf/open/floor/monotile/dark, /area/nsv/weapons/fore) "aLk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-2" }, /turf/open/floor/monotile/steel, -/area/engine/engineering/hangar) +/area/nsv/engine/dcc) "aLl" = ( /obj/effect/turf_decal/tile/purple{ dir = 4 @@ -14527,10 +14592,11 @@ /turf/open/floor/plasteel/techmaint, /area/medical/chemistry) "aOT" = ( -/obj/structure/table, -/obj/item/reagent_containers/food/drinks/beer/light, -/obj/machinery/camera/autoname{ - dir = 4 +/obj/structure/rack, +/obj/item/watertank/atmos, +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) @@ -15046,27 +15112,22 @@ /turf/closed/wall/r_wall/ship, /area/engine/storage) "aQl" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 4 +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/open/floor/monotile/dark, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/monotile/steel, /area/engine/engineering/hangar) "aQm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/airlock/ship/security{ - name = "Engineering Security Post"; - req_access_txt = "2" - }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-2" }, /turf/open/floor/monotile/dark, -/area/security/checkpoint/engineering) +/area/nsv/engine/dcc) "aQn" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ @@ -15084,27 +15145,37 @@ /turf/open/floor/plating, /area/engine/engineering/hangar) "aQq" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 5 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/turf/open/floor/monotile/dark, +/turf/open/floor/monotile/steel, /area/engine/engineering/hangar) "aQr" = ( -/obj/effect/turf_decal/stripes/white/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/overmap/small_craft/transport/sabre{ - req_one_access = null; - req_one_access_txt = "10;24" +/obj/structure/cable/yellow{ + icon_state = "1-8" }, /turf/open/floor/monotile/dark, /area/engine/engineering/hangar) "aQs" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 9 +/obj/structure/cable{ + icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/monotile/dark, /area/engine/engineering/hangar) +"aQt" = ( +/obj/effect/turf_decal/tile/orange{ + dir = 4 + }, +/obj/effect/turf_decal/tile/orange{ + dir = 1 + }, +/obj/effect/turf_decal/stripes, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/monotile/steel, +/area/hallway/nsv/deck2/frame1/central) "aQu" = ( /obj/machinery/door/airlock/ship/engineering/glass{ name = "Reactor control Room"; @@ -15197,6 +15268,11 @@ /obj/structure/table, /obj/item/paper_bin, /obj/item/pen, +/obj/machinery/camera{ + network = list("eng"); + name = "Ships SMES"; + dir = 1 + }, /turf/open/floor/monotile/dark, /area/engine/engine_smes) "aQB" = ( @@ -15250,6 +15326,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/monotile/steel, /area/engine/engineering) "aQG" = ( @@ -15477,6 +15556,11 @@ /area/tcommsat/computer) "aRf" = ( /obj/machinery/telecomms/broadcaster/preset_right, +/obj/machinery/camera{ + network = list("eng"); + name = "Telecomms"; + dir = 1 + }, /turf/open/floor/circuit/telecomms/server, /area/tcommsat/server) "aRg" = ( @@ -16128,18 +16212,41 @@ /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) "aSH" = ( -/obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/light/small{ - dir = 8 +/obj/item/clothing/suit/space/eva, +/obj/item/clothing/suit/space/eva, +/obj/item/clothing/suit/space/eva, +/obj/item/clothing/suit/space/eva, +/obj/item/clothing/suit/space/eva, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/clothing/head/helmet/space/eva, +/obj/item/clothing/head/helmet/space/eva, +/obj/item/clothing/head/helmet/space/eva, +/obj/item/clothing/head/helmet/space/eva, +/obj/item/clothing/head/helmet/space/eva, +/obj/structure/closet{ + name = "Space Suit Locker" }, -/obj/item/electronics/apc, -/obj/item/electronics/airlock, -/turf/open/floor/plating, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) "aSI" = ( -/obj/structure/reagent_dispensers/watertank, -/turf/open/floor/plating, +/obj/structure/closet/radiation, +/obj/item/clothing/suit/radiation, +/obj/item/clothing/suit/radiation, +/obj/item/clothing/head/radiation, +/obj/item/clothing/head/radiation, +/obj/item/shovel, +/obj/item/shovel, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) "aSJ" = ( /obj/effect/turf_decal/stripes/line{ @@ -16494,6 +16601,7 @@ /obj/structure/table/reinforced, /obj/item/storage/firstaid/fire, /obj/machinery/light, +/obj/item/radio/intercom/directional/south, /turf/open/floor/monotile/light, /area/medical/medbay/central) "aTK" = ( @@ -16506,6 +16614,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/item/radio/intercom/directional/west, /turf/open/floor/monotile/steel, /area/medical/medbay/central) "aTM" = ( @@ -16586,6 +16695,10 @@ /obj/machinery/computer/turbine_computer{ id = "reactor2" }, +/obj/machinery/camera{ + network = list("eng"); + name = "Reactor Core #1" + }, /turf/open/floor/plasteel/ridged/steel, /area/engine/engineering/reactor_core) "aUc" = ( @@ -16669,15 +16782,15 @@ /turf/open/floor/monotile/dark, /area/medical/medbay/central) "aUu" = ( -/obj/structure/table/wood, -/obj/structure/cable{ - icon_state = "4-8" - }, +/obj/effect/landmark/nuclear_waste_spawner, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/turf/open/floor/monotile/dark, -/area/medical/break_room) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/monotile/steel, +/area/medical/surgery) "aUw" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -16742,11 +16855,11 @@ /turf/open/floor/monotile/light, /area/medical/storage) "aUG" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/dark/hidden{ + dir = 10 }, -/turf/open/floor/monotile/light, -/area/medical/genetics) +/turf/open/floor/monotile/steel, +/area/engine/engineering/hangar) "aUI" = ( /obj/structure/chair{ dir = 4 @@ -17315,40 +17428,32 @@ /turf/open/space/basic, /area/engine/atmospherics_engine) "aWc" = ( -/obj/structure/closet/crate{ - opened = 1 - }, -/obj/item/storage/box/mousetraps{ - pixel_x = -3; - pixel_y = 8 - }, -/obj/item/storage/box/lights/mixed{ - pixel_x = 6; - pixel_y = 8 +/obj/structure/rack, +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 }, -/obj/item/storage/box/lights/mixed{ - pixel_x = 6; - pixel_y = 8 +/obj/item/clothing/shoes/magboots{ + pixel_y = -3; + pixel_x = -3 }, +/obj/item/clothing/shoes/magboots, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) "aWd" = ( -/obj/item/stack/sheet/mineral/copper, -/obj/item/stack/sheet/mineral/copper, -/obj/structure/closet/crate/trashcart, +/obj/item/radio/intercom/directional/south, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) "aWe" = ( -/obj/structure/chair/fancy/sofa/old{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "1-2" +/obj/structure/rack, +/obj/item/clothing/gloves/color/yellow{ + pixel_y = 3 }, -/obj/machinery/light{ - dir = 8 +/obj/item/clothing/gloves/color/yellow, +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 }, -/mob/living/simple_animal/kalo, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) "aWf" = ( @@ -18655,11 +18760,31 @@ /turf/open/floor/monotile/dark, /area/nsv/weapons/fore) "aZl" = ( -/obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, -/obj/item/storage/toolbox/emergency, -/obj/item/clothing/gloves/color/fyellow, -/turf/open/floor/plating, +/obj/item/clothing/suit/space/eva, +/obj/item/clothing/suit/space/eva, +/obj/item/clothing/suit/space/eva, +/obj/item/clothing/suit/space/eva, +/obj/item/clothing/suit/space/eva, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/clothing/head/helmet/space/eva, +/obj/item/clothing/head/helmet/space/eva, +/obj/item/clothing/head/helmet/space/eva, +/obj/item/clothing/head/helmet/space/eva, +/obj/item/clothing/head/helmet/space/eva, +/obj/structure/closet{ + name = "Space Suit Locker" + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) "aZm" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -18729,16 +18854,20 @@ /turf/open/floor/monotile/steel, /area/crew_quarters/dorms) "aZq" = ( -/obj/machinery/button/door{ - id = "commissarydoor"; - name = "Commissary Door Lock"; - normaldoorcontrol = 1; - pixel_x = 6; - pixel_y = -26; - specialfunctions = 4 +/obj/machinery/door/firedoor/border_only{ + dir = 1 }, -/turf/open/floor/plating, -/area/hallway/nsv/deck2/frame1/central) +/obj/machinery/door/firedoor/border_only, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/door/poddoor/shutters/ship{ + id = "dc1"; + name = "Damage Control Supplies" + }, +/turf/open/floor/monotile/steel, +/area/hallway/nsv/deck2/frame1/port) "aZr" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -19552,8 +19681,20 @@ /turf/open/floor/plating, /area/hallway/nsv/deck2/frame1/central) "bbt" = ( -/obj/machinery/vending/assist, -/turf/open/floor/plating, +/obj/structure/closet/radiation, +/obj/item/clothing/suit/radiation, +/obj/item/clothing/suit/radiation, +/obj/item/clothing/head/radiation, +/obj/item/clothing/head/radiation, +/obj/item/shovel, +/obj/item/shovel, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) "bbu" = ( /obj/machinery/camera/autoname{ @@ -21715,12 +21856,16 @@ /turf/open/floor/monotile/dark, /area/medical/surgery) "bfx" = ( -/obj/structure/sign/ship/pods/north{ - pixel_y = 1; - pixel_x = 32 +/obj/effect/spawner/structure/window/plasma/reinforced, +/obj/machinery/atmospherics/pipe/layer_manifold{ + dir = 4 }, -/turf/open/floor/monotile/steel, -/area/medical) +/obj/machinery/door/poddoor/shutters/preopen{ + name = "DC Central Shutters"; + id = "dcc" + }, +/turf/open/space/basic, +/area/nsv/engine/dcc) "bfy" = ( /obj/item/storage/backpack/duffelbag/med/surgery, /obj/structure/table/glass, @@ -21743,18 +21888,19 @@ /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) "bfA" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/structure/table/reinforced, +/obj/item/storage/toolbox/emergency{ + pixel_x = 6; + pixel_y = 6 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/item/storage/toolbox/emergency{ + pixel_y = 3; + pixel_x = 3 }, -/turf/open/floor/monotile/steel, -/area/medical) +/obj/item/storage/toolbox/emergency, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/monotile/dark, +/area/hallway/nsv/deck2/frame1/central) "bfB" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -21875,12 +22021,12 @@ /area/hallway/secondary/exit) "bfM" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/airalarm{ - pixel_y = 23 - }, /obj/structure/cable/yellow{ icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/brown/hidden{ + dir = 4 + }, /turf/open/floor/monotile/steel, /area/engine/engineering/hangar) "bfN" = ( @@ -22540,21 +22686,37 @@ /turf/open/floor/engine, /area/engine/engineering) "bhr" = ( -/obj/structure/closet/secure_closet/security/engine, -/obj/machinery/requests_console{ - department = "Security"; - departmentType = 5; - pixel_x = 30 +/obj/structure/cable{ + icon_state = "2-4" }, -/obj/machinery/camera/autoname, -/turf/open/floor/monotile/dark, -/area/security/checkpoint/engineering) +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/power/apc/auto_name/north{ + pixel_y = 24 + }, +/obj/structure/table/reinforced, +/obj/item/radio/intercom{ + freerange = 1; + name = "Common Channel"; + pixel_y = 5 + }, +/obj/item/radio/intercom{ + freerange = 1; + name = "Engineering Channel"; + pixel_y = -6; + frequency = 1357 + }, +/turf/open/floor/monotile/steel, +/area/nsv/engine/dcc) "bhs" = ( /obj/effect/turf_decal/delivery, /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/brown/hidden, +/obj/machinery/atmospherics/pipe/simple/brown/hidden{ + dir = 6 + }, /turf/open/floor/monotile/steel, /area/engine/engineering/hangar) "bht" = ( @@ -22950,15 +23112,7 @@ /turf/open/floor/monotile/dark, /area/science/nanite) "bil" = ( -/obj/structure/closet/crate{ - opened = 1 - }, -/obj/item/storage/box/donkpockets, -/obj/effect/turf_decal/stripes/white/line{ - dir = 8 - }, -/obj/machinery/light, -/turf/open/floor/plasteel/techmaint, +/turf/closed/wall/r_wall/ship, /area/hallway/nsv/deck2/frame1/port) "bim" = ( /obj/effect/turf_decal/loading_area{ @@ -23097,15 +23251,17 @@ /turf/open/floor/monotile/dark, /area/hallway/nsv/deck2/frame1/central) "biB" = ( -/obj/machinery/door/airlock/ship/maintenance{ - id_tag = "commissarydoor"; - name = "Abandoned Requisitions Post" +/obj/structure/table/reinforced, +/obj/item/storage/firstaid{ + pixel_x = 6; + pixel_y = 6 }, -/obj/effect/landmark/nuclear_waste_spawner, -/obj/machinery/door/firedoor/border_only{ - dir = 1 +/obj/item/storage/firstaid{ + pixel_x = 3; + pixel_y = 3 }, -/obj/machinery/door/firedoor/border_only, +/obj/item/storage/firstaid, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/monotile/dark, /area/hallway/nsv/deck2/frame1/central) "biD" = ( @@ -23524,11 +23680,13 @@ /turf/open/floor/plasteel/techmaint, /area/medical/chemistry) "bju" = ( -/obj/machinery/light{ - dir = 4 +/obj/effect/turf_decal/delivery, +/obj/structure/overmap/small_craft/transport/sabre{ + req_one_access = null; + req_one_access_txt = "10;24" }, -/turf/open/floor/plasteel/techmaint, -/area/hallway/nsv/deck2/frame1/port) +/turf/open/floor/plating, +/area/engine/engineering/hangar) "bjx" = ( /obj/item/radio/intercom{ pixel_x = 26 @@ -23764,8 +23922,15 @@ /turf/open/floor/carpet/ship, /area/crew_quarters/heads/hor) "bjV" = ( -/obj/machinery/light{ - dir = 4 +/obj/structure/closet/radiation, +/obj/item/clothing/suit/radiation, +/obj/item/clothing/suit/radiation, +/obj/item/clothing/head/radiation, +/obj/item/clothing/head/radiation, +/obj/item/shovel, +/obj/item/shovel, +/obj/structure/window/reinforced{ + dir = 1 }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) @@ -24010,6 +24175,15 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/plating, /area/maintenance/department/medical) +"bkB" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/turf/open/floor/monotile/steel, +/area/medical/storage) "bkC" = ( /obj/structure/window/reinforced{ dir = 4; @@ -24028,20 +24202,13 @@ /turf/open/floor/monotile/dark, /area/medical/morgue) "bkE" = ( -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 1 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/structure/extinguisher_cabinet{ - pixel_y = 26 +/obj/effect/turf_decal/stripes/corner, +/obj/structure/reagent_dispensers/fueltank, +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 }, -/obj/structure/ladder, -/turf/open/floor/monotile/dark, +/turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) "bkF" = ( /obj/effect/turf_decal/stripes/white/line{ @@ -24205,25 +24372,31 @@ /turf/open/floor/plating, /area/maintenance/department/medical) "bkU" = ( -/obj/effect/turf_decal/tile/brown{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 +/turf/open/floor/monotile/light, +/area/medical/medbay/central) +"bkV" = ( +/obj/structure/closet/crate{ + opened = 1 }, -/obj/machinery/computer/ship/viewscreen, -/obj/effect/landmark/patrol_node{ - id = "tycoon_deck2_ladder"; - next_id = "tycoon_deck1_ladder" +/obj/item/stack/rods/fifty, +/obj/item/stack/rods/fifty, +/obj/item/stack/rods/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/tile/plasteel{ + amount = 50 }, -/turf/open/floor/monotile/dark, -/area/hallway/nsv/deck2/frame1/central) -"bkV" = ( -/obj/effect/turf_decal/tile/brown{ - dir = 1 +/obj/item/stack/tile/plasteel{ + amount = 50 }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 }, /turf/open/floor/monotile/dark, /area/hallway/nsv/deck2/frame1/central) @@ -24320,48 +24493,27 @@ /turf/open/floor/monotile/light, /area/medical/medbay/lobby) "blf" = ( -/obj/effect/turf_decal/tile/brown{ - dir = 1 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/monotile/dark, -/area/hallway/nsv/deck2/frame1/central) +/area/medical/morgue) "blg" = ( -/obj/effect/turf_decal/tile/brown{ - dir = 1 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/brown, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/machinery/disposal/deliveryChute{ - dir = 8; - name = "Crate Disposal Chute"; - pixel_x = 5; - pixel_y = 2 - }, -/obj/machinery/door/window/westleft{ - base_state = "right"; - icon_state = "right"; - name = "Crate Disposal Chute" - }, -/obj/structure/window/reinforced, +/obj/structure/closet/firecloset, +/obj/item/clothing/suit/fire/firefighter, +/obj/item/clothing/suit/fire/firefighter, +/obj/item/clothing/suit/fire/firefighter, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/obj/item/clothing/head/hardhat/red, +/obj/item/clothing/head/hardhat/red, +/obj/item/clothing/head/hardhat/red, +/obj/item/extinguisher, +/obj/item/extinguisher, +/obj/item/extinguisher, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, -/turf/open/floor/monotile/dark, +/turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) "blh" = ( /obj/structure/disposalpipe/segment, @@ -24889,7 +25041,7 @@ dir = 8 }, /obj/machinery/camera/autoname, -/obj/structure/disposalpipe/junction/flip{ +/obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/monotile/steel, @@ -24992,11 +25144,8 @@ dir = 1 }, /obj/effect/turf_decal/tile/neutral, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 1; - sortType = 22 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/disposalpipe/segment, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) "bmI" = ( @@ -25087,23 +25236,25 @@ /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) "bmQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue{ dir = 1 }, /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/machinery/button/door{ + name = "Damage Control Supply Access"; + pixel_y = -30; + id = "dc1"; + req_one_access_txt = "11" + }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) "bmR" = ( /obj/effect/turf_decal/stripes/line, -/obj/structure/disposalpipe/segment, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue{ @@ -25115,18 +25266,9 @@ /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) "bmS" = ( -/obj/machinery/light, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, +/obj/machinery/power/apc/auto_name/west, /turf/open/floor/monotile/steel, -/area/hallway/nsv/deck2/frame1/port) +/area/medical) "bmT" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -25220,26 +25362,27 @@ /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) "bnd" = ( -/obj/machinery/door/airlock/ship/public{ - name = "Custodial Closet"; - req_one_access_txt = "26" - }, -/obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, -/obj/effect/landmark/zebra_interlock_point, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/door/poddoor/shutters/ship{ + id = "dc1"; + name = "Damage Control Supplies" + }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) "bne" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/machinery/computer/station_alert{ + dir = 8; + name = "ship alert console" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/monotile/light, -/area/medical/medbay/lobby) +/turf/open/floor/monotile/steel, +/area/nsv/engine/dcc) "bnf" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -25277,12 +25420,16 @@ /turf/open/floor/monotile/dark, /area/science) "bnl" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, /obj/structure/disposalpipe/segment, -/turf/open/floor/monotile/steel, -/area/hallway/nsv/deck2/frame1/port) +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/monotile/dark, +/area/medical) "bno" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable{ @@ -25423,9 +25570,10 @@ /turf/open/floor/monotile/dark, /area/medical/chemistry) "bnF" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel/grid/steel, -/area/hallway/nsv/deck2/frame1/port) +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/components/unary/outlet_injector/on, +/turf/open/space/basic, +/area/space/nearstation) "bnG" = ( /obj/structure/table, /obj/item/stack/wrapping_paper, @@ -25823,35 +25971,51 @@ /turf/open/floor/monotile/dark, /area/medical/chemistry) "boz" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/airlock/ship/public{ - name = "Custodial Closet"; - req_one_access_txt = "26" - }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, -/obj/effect/landmark/zebra_interlock_point, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/door/poddoor/shutters/ship{ + id = "dc1"; + name = "Damage Control Supplies" + }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) "boA" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/machinery/button/door{ + name = "Advanced Damage Control Supplies"; + pixel_y = -31; + id = "dc2"; + req_one_access_txt = "20, 56, 57" }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) "boB" = ( -/obj/structure/disposalpipe/segment{ - dir = 9 +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +/obj/effect/turf_decal/stripes, +/obj/effect/turf_decal/stripes{ dir = 1 }, +/obj/machinery/door/poddoor/shutters/ship{ + id = "dc1"; + name = "Damage Control Supplies" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/monotile/steel, -/area/hallway/nsv/deck2/frame1/port) +/area/hallway/nsv/deck2/frame1/central) "boC" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -25930,9 +26094,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) "boL" = ( @@ -25973,14 +26136,13 @@ /turf/open/floor/monotile/steel, /area/medical/chemistry) "boQ" = ( -/obj/structure/rack, -/obj/structure/sign/poster/contraband/have_a_puff{ - pixel_y = 26 +/obj/structure/sign/directions/evac, +/obj/structure/sign/directions/security{ + dir = 8; + pixel_y = -9 }, -/obj/item/storage/box/lights/mixed, -/obj/item/clothing/suit/hazardvest, -/turf/open/floor/plasteel/techmaint, -/area/hallway/nsv/deck2/frame1/port) +/turf/closed/wall/r_wall/ship, +/area/hallway/nsv/deck2/frame1/central) "boR" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -26006,10 +26168,9 @@ /turf/open/floor/monotile/steel, /area/medical/chemistry) "boU" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel/grid/steel, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/monotile/dark, /area/hallway/nsv/deck2/frame1/port) "boV" = ( /obj/effect/turf_decal/stripes/line{ @@ -26137,84 +26298,66 @@ /turf/open/floor/monotile/steel, /area/medical/chemistry) "bpg" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/simple/brown/hidden, +/obj/machinery/holopad, /turf/open/floor/monotile/steel, -/area/hallway/nsv/deck2/frame1/port) +/area/engine/engineering/hangar) "bph" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/structure/rack, +/obj/item/pipe_dispenser, +/obj/item/pipe_dispenser{ + pixel_y = 3; + pixel_x = 3 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 }, -/turf/open/floor/plasteel/grid/steel, +/turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) "bpi" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 8 - }, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/turf/open/floor/plasteel/techmaint, -/area/hallway/nsv/deck2/frame1/port) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/monotile/steel, +/area/medical/medbay/lobby) "bpj" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plasteel/techmaint, -/area/hallway/nsv/deck2/frame1/port) +/turf/template_noop, +/area/maintenance/starboard) "bpk" = ( -/obj/effect/turf_decal/stripes/line{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/turf/open/floor/plasteel/techmaint, -/area/hallway/nsv/deck2/frame1/port) +/turf/open/floor/monotile/steel, +/area/medical/medbay/lobby) "bpl" = ( -/obj/machinery/door/airlock/ship/public{ - name = "Janitorial Storage"; - req_one_access_txt = "26" +/obj/structure/disposalpipe/segment{ + dir = 4 }, /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 }, -/turf/open/floor/plating, -/area/hallway/nsv/deck2/frame1/port) +/turf/open/floor/monotile/dark, +/area/medical/morgue) "bpm" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plating, -/area/maintenance/starboard) +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/monotile/light, +/area/medical/medbay/central) "bpn" = ( /obj/effect/turf_decal/tile/red{ dir = 8 @@ -26361,12 +26504,9 @@ /turf/open/floor/plasteel/techmaint, /area/medical/chemistry) "bpB" = ( -/obj/structure/disposalpipe/segment, -/obj/item/radio/intercom{ - pixel_x = 26 - }, -/turf/open/floor/plasteel/techmaint, -/area/hallway/nsv/deck2/frame1/port) +/obj/structure/bed/roller, +/turf/open/floor/monotile/steel, +/area/medical/storage) "bpC" = ( /obj/machinery/door/airlock/ship{ name = "Experimental munitions"; @@ -26486,24 +26626,33 @@ /turf/open/floor/monotile/dark, /area/science) "bpL" = ( -/obj/structure/janitorialcart{ - dir = 4 +/obj/structure/rack, +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 }, -/obj/item/mop, -/obj/item/reagent_containers/glass/bucket, -/turf/open/floor/plasteel/grid/steel, +/obj/item/storage/box/smart_metal_foam, +/turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) "bpM" = ( -/obj/structure/reagent_dispensers/watertank, -/turf/open/floor/plasteel/techmaint, -/area/hallway/nsv/deck2/frame1/port) +/obj/effect/spawner/room/threexfive, +/turf/template_noop, +/area/maintenance/starboard) "bpN" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ dir = 1 }, -/turf/open/floor/plasteel/techmaint, -/area/hallway/nsv/deck2/frame1/port) +/obj/effect/turf_decal/stripes, +/obj/effect/turf_decal/stripes{ + dir = 1 + }, +/obj/machinery/door/poddoor/shutters/ship{ + id = "dc1"; + name = "Damage Control Supplies" + }, +/turf/open/floor/monotile/steel, +/area/hallway/nsv/deck2/frame1/central) "bpO" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -28012,10 +28161,10 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/structure/cable{ - icon_state = "2-8" - }, /obj/structure/disposalpipe/segment, +/obj/machinery/light{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/starboard) "bsK" = ( @@ -28274,9 +28423,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/cable{ - icon_state = "1-4" - }, /obj/machinery/atmospherics/pipe/simple/brown/hidden{ dir = 4 }, @@ -28437,12 +28583,6 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/machinery/door/airlock/ship/public/glass{ - name = "Aft Primary Hallway" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, @@ -28450,6 +28590,9 @@ dir = 4 }, /obj/effect/landmark/zebra_interlock_point, +/obj/machinery/door/airlock/ship/public/glass{ + name = "Aft Primary Hallway" + }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) "btD" = ( @@ -29305,18 +29448,34 @@ /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) "buY" = ( -/obj/effect/turf_decal/tile/brown{ - dir = 8 +/obj/structure/closet/crate{ + opened = 1 }, -/obj/effect/turf_decal/tile/brown{ - dir = 1 +/obj/item/stack/rods/fifty, +/obj/item/stack/rods/fifty, +/obj/item/stack/rods/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/tile/plasteel{ + amount = 50 }, -/obj/machinery/vending/tool, -/turf/open/floor/monotile/dark, +/obj/item/stack/tile/plasteel{ + amount = 50 + }, +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 + }, +/turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) "bva" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/monotile/dark, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/machinery/camera{ + network = list("eng"); + name = "Forward Adv. DC Locker" + }, +/turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) "bvb" = ( /obj/structure/disposalpipe/segment{ @@ -29345,14 +29504,18 @@ name = "CIC" }) "bvd" = ( -/obj/effect/turf_decal/tile/brown{ - dir = 4 +/obj/structure/table/reinforced, +/obj/item/storage/toolbox/electrical{ + pixel_y = 6; + pixel_x = 6 }, -/obj/effect/turf_decal/tile/brown, -/obj/item/radio/intercom{ - pixel_x = 26 +/obj/item/storage/toolbox/electrical{ + pixel_y = 3; + pixel_x = 3 }, -/obj/machinery/vending/assist, +/obj/item/storage/toolbox/electrical, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/monotile/dark, /area/hallway/nsv/deck2/frame1/central) "bve" = ( @@ -29406,21 +29569,25 @@ /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) "bvi" = ( -/obj/item/storage/toolbox/mechanical, -/obj/structure/table, -/obj/item/storage/belt/utility, -/obj/effect/turf_decal/tile/brown{ +/obj/machinery/light{ dir = 8 }, -/obj/effect/turf_decal/tile/brown{ +/turf/template_noop, +/area/maintenance/central) +"bvj" = ( +/obj/machinery/door/poddoor/ship{ + id = "dc2"; + name = "Restricted Damage Control Supplies" + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ dir = 1 }, -/obj/item/storage/belt/utility, -/turf/open/floor/monotile/dark, -/area/hallway/nsv/deck2/frame1/central) -"bvj" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/turf/open/floor/monotile/dark, +/obj/effect/turf_decal/stripes, +/obj/effect/turf_decal/stripes{ + dir = 1 + }, +/turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) "bvk" = ( /obj/machinery/power/apc/auto_name/north, @@ -29479,8 +29646,16 @@ /turf/open/floor/monotile/dark, /area/janitor) "bvB" = ( -/obj/structure/bed/roller, -/turf/open/floor/monotile/steel, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/turf/open/floor/monotile/light, /area/medical/storage) "bvC" = ( /turf/closed/wall/ship, @@ -29612,6 +29787,7 @@ /turf/open/floor/monotile/light, /area/medical/medbay/central) "bvZ" = ( +/obj/item/radio/intercom/directional/south, /turf/open/floor/monotile/dark, /area/medical/surgery) "bwb" = ( @@ -29700,6 +29876,7 @@ /obj/structure/chair/fancy/sofa/old/left{ dir = 1 }, +/obj/item/radio/intercom/directional/south, /turf/open/floor/monotile/steel, /area/medical/break_room) "bwr" = ( @@ -29717,9 +29894,17 @@ /turf/open/floor/plating, /area/medical/medbay/lobby) "bws" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, /turf/open/floor/monotile/steel, -/area/medical) +/area/medical/storage) "bwt" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -30172,17 +30357,30 @@ /turf/open/floor/monotile/dark, /area/science) "bxl" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 }, -/turf/open/floor/plasteel/grid/steel, +/turf/open/floor/monotile/dark, /area/hallway/nsv/deck2/frame1/port) "bxm" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/structure/closet/crate{ + opened = 1 }, -/turf/open/floor/plasteel/grid/steel, +/obj/item/stack/rods/fifty, +/obj/item/stack/rods/fifty, +/obj/item/stack/rods/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/tile/plasteel{ + amount = 50 + }, +/obj/item/stack/tile/plasteel{ + amount = 50 + }, +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 + }, +/turf/open/floor/monotile/dark, /area/hallway/nsv/deck2/frame1/port) "bxn" = ( /obj/machinery/light/small{ @@ -30191,47 +30389,35 @@ /turf/open/floor/engine, /area/science/xenobiology) "bxo" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/turf/open/floor/plasteel/grid/steel, -/area/hallway/nsv/deck2/frame1/port) +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/monotile/light, +/area/medical/medbay/central) "bxp" = ( +/obj/structure/reagent_dispensers/watertank, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 + dir = 8 }, -/turf/open/floor/plasteel/grid/steel, +/turf/open/floor/monotile/dark, /area/hallway/nsv/deck2/frame1/port) "bxq" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 }, -/turf/open/floor/plasteel/grid/steel, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/turf/open/floor/monotile/dark, /area/hallway/nsv/deck2/frame1/port) "bxr" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel/grid/steel, +/turf/open/floor/monotile/dark, /area/hallway/nsv/deck2/frame1/port) "bxs" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/open/floor/monotile/steel, -/area/hallway/nsv/deck2/frame1/port) +/turf/open/floor/monotile/dark, +/area/medical) "bxt" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -30751,13 +30937,7 @@ name = "CIC" }) "byA" = ( -/obj/structure/table, -/obj/item/storage/firstaid/ancient, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/brown, -/turf/open/floor/monotile/dark, +/turf/closed/wall/r_wall/ship, /area/hallway/nsv/deck2/frame1/central) "byB" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -32032,9 +32212,6 @@ /obj/machinery/light{ dir = 4 }, -/obj/item/radio/intercom{ - pixel_x = 26 - }, /obj/structure/table/reinforced, /obj/item/reagent_containers/food/drinks/solgovcup, /turf/open/floor/monotile/steel, @@ -32406,17 +32583,12 @@ /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) "bBS" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/power/apc/auto_name/west, +/obj/structure/cable{ + icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/monotile/steel, -/area/hallway/nsv/deck2/frame1/central) +/turf/open/floor/monotile/dark, +/area/medical/morgue) "bBT" = ( /obj/structure/cable{ icon_state = "4-8" @@ -32659,12 +32831,17 @@ /turf/open/floor/monotile/dark, /area/hallway/nsv/deck2/frame1/port) "bCy" = ( -/obj/structure/sign/ship/pods/north{ - pixel_y = 1; - pixel_x = -32 +/obj/structure/cable{ + icon_state = "4-8" }, -/turf/open/floor/monotile/steel, -/area/medical) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/monotile/dark, +/area/hallway/nsv/deck2/frame1/port) "bCz" = ( /obj/structure/cable{ icon_state = "4-8" @@ -32677,29 +32854,16 @@ /area/hallway/nsv/deck2/frame1/port) "bCA" = ( /obj/effect/turf_decal/stripes/line, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) "bCB" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/airlock/ship/public{ - name = "Custodial Closet"; - req_one_access_txt = "26" - }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 +/obj/machinery/door/poddoor/ship{ + id = "dc2"; + name = "Restricted Damage Control Supplies" }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) @@ -32707,11 +32871,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) "bCD" = ( @@ -33121,11 +33280,18 @@ /turf/open/floor/plasteel/grid/steel, /area/quartermaster/storage) "bDn" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 +/obj/structure/table/wood, +/obj/structure/cable{ + icon_state = "4-8" }, -/turf/open/floor/monotile/light, -/area/medical/genetics) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/turf/open/floor/monotile/dark, +/area/medical/break_room) "bDo" = ( /obj/effect/turf_decal/tile/brown{ dir = 8 @@ -33294,9 +33460,6 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -34447,20 +34610,17 @@ /turf/open/floor/plating, /area/maintenance/department/science) "bFX" = ( -/obj/item/storage/toolbox/mechanical, -/obj/structure/table, -/obj/effect/turf_decal/tile/brown{ - dir = 8 +/obj/structure/sign/ship/pods/north{ + pixel_y = 1; + pixel_x = -32 }, -/obj/effect/turf_decal/tile/brown{ +/turf/open/floor/monotile/steel, +/area/medical) +"bFY" = ( +/obj/effect/turf_decal/stripes{ dir = 1 }, -/obj/item/stack/cable_coil/red, -/turf/open/floor/monotile/dark, -/area/hallway/nsv/deck2/frame1/central) -"bFY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/monotile/dark, +/turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) "bFZ" = ( /obj/structure/cable{ @@ -34694,11 +34854,20 @@ /turf/open/floor/monotile/dark, /area/medical/surgery) "bGz" = ( +/obj/structure/table/reinforced, +/obj/item/storage/toolbox/emergency{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/storage/toolbox/emergency{ + pixel_y = 3; + pixel_x = 3 + }, +/obj/item/storage/toolbox/emergency, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 + dir = 8 }, -/obj/machinery/holopad, -/turf/open/floor/plasteel/grid/steel, +/turf/open/floor/monotile/dark, /area/hallway/nsv/deck2/frame1/port) "bGA" = ( /obj/effect/turf_decal/stripes/line, @@ -34762,19 +34931,8 @@ /turf/open/floor/monotile/steel, /area/hallway/secondary/exit) "bGH" = ( -/obj/structure/table, -/obj/item/stock_parts/cell/high, -/obj/item/clothing/gloves/color/yellow, -/obj/item/storage/toolbox/electrical, -/obj/item/multitool, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/brown, -/obj/machinery/light{ - dir = 4 - }, -/turf/open/floor/monotile/dark, +/obj/machinery/portable_atmospherics/scrubber, +/turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) "bGI" = ( /obj/structure/cable{ @@ -35348,12 +35506,15 @@ /turf/open/floor/carpet/green, /area/chapel/main) "bIc" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/turf/open/floor/monotile/dark, -/area/medical/surgery) +/obj/machinery/light, +/turf/open/floor/monotile/steel, +/area/hallway/nsv/deck2/frame1/central) "bId" = ( /obj/structure/table/glass, /obj/item/storage/box/beakers{ @@ -36051,12 +36212,17 @@ /turf/open/space, /area/engine/atmos) "bJU" = ( -/obj/machinery/power/apc/auto_name/west, +/obj/machinery/computer/monitor{ + name = "Ships Power Grid monitoring console" + }, /obj/structure/cable{ - icon_state = "0-4" + icon_state = "0-8" }, -/turf/open/floor/monotile/dark, -/area/medical/morgue) +/obj/machinery/airalarm{ + pixel_y = 26 + }, +/turf/open/floor/monotile/steel, +/area/nsv/engine/dcc) "bJW" = ( /obj/structure/cable{ icon_state = "2-4" @@ -36225,16 +36391,16 @@ name = "Munitions Projects" }) "bKx" = ( -/obj/structure/table, -/obj/item/clothing/gloves/color/yellow, -/obj/item/storage/box/lights/mixed, -/obj/effect/turf_decal/tile/brown{ - dir = 8 +/obj/structure/rack, +/obj/item/clothing/gloves/color/yellow{ + pixel_y = 3 }, -/obj/effect/turf_decal/tile/brown{ - dir = 1 +/obj/item/clothing/gloves/color/yellow, +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 }, -/turf/open/floor/monotile/dark, +/turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) "bKF" = ( /obj/structure/cable{ @@ -36318,19 +36484,26 @@ /turf/open/floor/monotile/dark, /area/security/brig) "bKM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/monotile/dark, -/area/hallway/nsv/deck2/frame1/central) +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/power/apc/auto_name/north{ + pixel_y = 24 + }, +/turf/open/floor/plating, +/area/maintenance/starboard) "bKN" = ( -/obj/structure/table, -/obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high, -/obj/effect/turf_decal/tile/brown{ - dir = 4 +/obj/structure/rack, +/obj/item/pipe_dispenser, +/obj/item/pipe_dispenser{ + pixel_y = 3; + pixel_x = 3 }, -/obj/effect/turf_decal/tile/brown, -/turf/open/floor/monotile/dark, +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 + }, +/turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) "bKP" = ( /obj/structure/stairs{ @@ -36345,53 +36518,45 @@ /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) "bKS" = ( -/obj/structure/reagent_dispensers/fueltank, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 1 +/obj/structure/rack, +/obj/item/rcd_ammo/large{ + pixel_x = 3; + pixel_y = 3 }, -/obj/effect/turf_decal/tile/brown, -/turf/open/floor/monotile/dark, +/obj/item/rcd_ammo/large, +/turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) "bKT" = ( -/obj/effect/turf_decal/tile/brown, -/obj/effect/turf_decal/tile/brown{ - dir = 8 +/obj/structure/rack, +/obj/item/clothing/shoes/magboots{ + pixel_y = -3; + pixel_x = -3 }, -/turf/open/floor/monotile/dark, +/obj/item/clothing/shoes/magboots, +/turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) "bKU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/brown, -/obj/effect/turf_decal/tile/brown{ - dir = 8 +/obj/structure/rack, +/obj/item/rcd_ammo/large{ + pixel_x = 3; + pixel_y = 3 }, -/turf/open/floor/monotile/dark, +/obj/item/rcd_ammo/large, +/obj/machinery/light, +/turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) "bKV" = ( -/obj/effect/turf_decal/tile/brown, -/obj/effect/turf_decal/tile/brown{ - dir = 8 +/obj/structure/rack, +/obj/item/watertank/atmos, +/obj/machinery/light{ + dir = 4 }, -/obj/structure/disposalpipe/junction/flip, -/turf/open/floor/monotile/dark, +/turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) "bKW" = ( -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/brown, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/turf/open/floor/monotile/dark, +/obj/structure/rack, +/obj/item/storage/box/smart_metal_foam, +/turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) "bKX" = ( /obj/structure/sign/directions/medical{ @@ -36440,7 +36605,7 @@ /obj/structure/sign/directions/supply{ pixel_y = -9 }, -/turf/closed/wall/ship, +/turf/closed/wall/r_wall/ship, /area/hallway/nsv/deck2/frame1/central) "bLd" = ( /obj/machinery/door/airlock/ship/public/glass{ @@ -36767,16 +36932,12 @@ name = "CIC" }) "bLK" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/components/unary/cryo_cell, +/obj/effect/turf_decal/stripes/white/line{ dir = 8 }, -/turf/open/floor/monotile/dark, -/area/medical) +/turf/open/floor/engine, +/area/medical/medbay/central) "bLL" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/effect/turf_decal/tile/orange{ @@ -36822,11 +36983,9 @@ /turf/open/floor/monotile/dark, /area/engine/engineering/hangar) "bLQ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/monotile/steel, -/area/engine/engineering/hangar) +/area/medical/surgery) "bLR" = ( /obj/docking_port/stationary{ dir = 2; @@ -37013,6 +37172,13 @@ }, /turf/open/floor/durasteel/techfloor, /area/nsv/weapons/fore) +"bPQ" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/simple/dark/hidden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/engine/engineering/hangar) "bRy" = ( /obj/item/beacon, /turf/open/floor/engine, @@ -37161,20 +37327,15 @@ /area/hallway/nsv/deck2/frame1/central) "bYb" = ( /obj/machinery/camera/autoname, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /turf/open/floor/monotile/steel, /area/engine/engineering/hangar) "bYc" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/airalarm/directional/west, /turf/open/floor/monotile/steel, -/area/hallway/nsv/deck2/frame1/port) +/area/medical) "bYd" = ( /turf/open/floor/plating{ icon_state = "platingdmg3" @@ -37515,7 +37676,7 @@ /obj/structure/sign/ship/securearea/alt{ dir = 8 }, -/turf/closed/wall/ship, +/turf/closed/wall/r_wall/ship, /area/bridge{ name = "CIC" }) @@ -37549,7 +37710,7 @@ /obj/structure/sign/ship/securearea/alt{ dir = 4 }, -/turf/closed/wall/ship, +/turf/closed/wall/r_wall/ship, /area/bridge{ name = "CIC" }) @@ -37825,7 +37986,7 @@ /obj/structure/sign/ship/securearea{ dir = 1 }, -/turf/closed/wall/ship, +/turf/closed/wall/r_wall/ship, /area/bridge{ name = "CIC" }) @@ -38078,6 +38239,17 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"cmf" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/camera{ + network = list("eng"); + name = "Reactor Core #2"; + dir = 1 + }, +/turf/open/floor/plasteel/ridged/steel, +/area/engine/engineering/reactor_core) "cmj" = ( /obj/machinery/atmospherics/pipe/simple/yellow/visible, /obj/machinery/atmospherics/pipe/simple/orange/visible/layer2{ @@ -38098,9 +38270,6 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/newscaster{ pixel_y = -32 }, @@ -38140,13 +38309,6 @@ initial_gas_mix = "TEMP=2.7" }, /area/engine/atmos) -"cph" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/turf/open/floor/monotile/steel, -/area/medical/surgery) "cpp" = ( /obj/machinery/atmospherics/pipe/manifold/orange/visible/layer2{ dir = 8 @@ -38156,13 +38318,10 @@ }, /area/engine/atmos) "cpz" = ( +/obj/machinery/atmospherics/pipe/simple/general/hidden, /obj/effect/turf_decal/stripes/white/line, -/obj/structure/overmap/small_craft/transport/sabre{ - req_one_access = null; - req_one_access_txt = "10;24" - }, -/turf/open/floor/monotile/dark, -/area/engine/engineering/hangar) +/turf/open/floor/engine, +/area/medical/medbay/central) "cpD" = ( /obj/structure/table, /obj/item/reagent_containers/food/condiment/saltshaker{ @@ -38391,10 +38550,19 @@ /obj/item/storage/fancy/donut_box, /turf/open/floor/plating, /area/maintenance/starboard/fore) -"cIH" = ( -/obj/machinery/airalarm/directional/east, +"cIR" = ( +/obj/structure/table/reinforced, +/obj/item/storage/toolbox/electrical{ + pixel_y = 6; + pixel_x = 6 + }, +/obj/item/storage/toolbox/electrical{ + pixel_y = 3; + pixel_x = 3 + }, +/obj/item/storage/toolbox/electrical, /turf/open/floor/monotile/dark, -/area/medical/morgue) +/area/hallway/nsv/deck2/frame1/port) "cJz" = ( /obj/structure/shuttle/engine/heater{ dir = 8 @@ -38471,12 +38639,6 @@ "cOK" = ( /turf/closed/wall/ship, /area/maintenance/nsv/hangar) -"cOX" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/turf/open/floor/monotile/light, -/area/medical/genetics) "cPU" = ( /obj/item/radio/intercom{ pixel_y = -26 @@ -38526,12 +38688,6 @@ }, /turf/open/floor/monotile/steel, /area/crew_quarters/fitness/recreation) -"cTx" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/turf/open/floor/monotile/steel, -/area/medical/break_room) "cUs" = ( /obj/structure/cable{ icon_state = "1-8" @@ -38705,6 +38861,12 @@ "ddW" = ( /turf/open/floor/plating, /area/maintenance/nsv/weapons) +"dfh" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/monotile/steel, +/area/medical/medbay/lobby) "dgt" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -38716,12 +38878,6 @@ }, /turf/open/floor/plasteel/ridged/steel, /area/engine/engineering/reactor_core) -"dhv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/monotile/steel, -/area/medical/medbay/lobby) "dhL" = ( /obj/structure/table/reinforced, /obj/item/paper_bin, @@ -38817,18 +38973,6 @@ /obj/effect/spawner/lootdrop/maintenance/four, /turf/open/floor/plating, /area/maintenance/starboard/fore) -"dre" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/monotile/light, -/area/medical/genetics) "drl" = ( /obj/machinery/meter, /obj/structure/grille, @@ -38889,16 +39033,6 @@ }, /turf/open/floor/wood, /area/library) -"dzN" = ( -/obj/structure/table/wood, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/turf/open/floor/monotile/dark, -/area/medical/break_room) "dzX" = ( /obj/machinery/atmospherics/pipe/multiz/layer2{ dir = 1 @@ -38994,11 +39128,8 @@ /turf/open/floor/plasteel/grid/steel, /area/engine/engineering/reactor_core) "dIj" = ( -/obj/item/trash/can, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating{ - icon_state = "platingdmg1" - }, +/turf/closed/wall/ship, /area/maintenance/starboard) "dIo" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -39016,15 +39147,6 @@ }, /turf/open/floor/plasteel/grid/steel, /area/hallway/secondary/exit) -"dJb" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/turf/open/floor/monotile/light, -/area/medical/genetics) "dJP" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 27 @@ -39085,15 +39207,6 @@ /obj/effect/spawner/lootdrop/maintenance/three, /turf/open/floor/plating, /area/maintenance/department/medical) -"dLZ" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plating, -/area/medical/medbay/lobby) "dNn" = ( /obj/effect/spawner/structure/window/reinforced/ship, /turf/open/floor/plating, @@ -39104,12 +39217,6 @@ }, /turf/closed/wall/r_wall/ship, /area/engine/engine_room) -"dPn" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/turf/open/floor/monotile/light, -/area/medical/medbay/central) "dQA" = ( /obj/effect/turf_decal/bot, /obj/machinery/navbeacon{ @@ -39156,10 +39263,6 @@ }, /turf/open/floor/plating, /area/security/execution/transfer) -"dTj" = ( -/obj/machinery/power/apc/auto_name/west, -/turf/open/floor/monotile/steel, -/area/medical) "dTk" = ( /obj/machinery/door/airlock/ship/public/glass{ name = "Crew Lounge" @@ -39224,6 +39327,10 @@ }, /turf/open/floor/monotile/dark, /area/engine/engineering) +"dXF" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/monotile/steel, +/area/medical/storage) "dXJ" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -39354,18 +39461,6 @@ /area/nsv/hanger/storage{ name = "Munitions Control Room" }) -"ehw" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/turf/open/floor/monotile/dark, -/area/hallway/nsv/deck2/frame1/port) "eiQ" = ( /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -39474,6 +39569,16 @@ /obj/machinery/light, /turf/open/floor/plasteel/grid/steel, /area/engine/engineering/reactor_control) +"enm" = ( +/obj/effect/turf_decal/tile/orange{ + dir = 4 + }, +/obj/effect/turf_decal/tile/orange{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/monotile/steel, +/area/hallway/nsv/deck2/frame1/central) "eno" = ( /obj/machinery/lazylift/master, /turf/open/floor/monotile/dark, @@ -39512,6 +39617,15 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/engine/storage) +"eoh" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/monotile/steel, +/area/medical/storage) "eot" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/disposalpipe/segment, @@ -39552,21 +39666,6 @@ }, /turf/open/floor/plating, /area/maintenance/central) -"epi" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/turf/open/floor/monotile/dark, -/area/medical/morgue) "epE" = ( /obj/machinery/atmospherics/components/binary/dp_vent_pump{ dir = 4 @@ -39640,6 +39739,16 @@ }, /turf/closed/wall/ship, /area/nsv/weapons/fore) +"euM" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/monotile/light, +/area/medical/medbay/central) "evj" = ( /obj/machinery/light{ dir = 1 @@ -39900,18 +40009,20 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "eNN" = ( -/obj/machinery/door/airlock/ship/public/glass{ - name = "Primary Tool Storage" +/obj/machinery/atmospherics/pipe/simple/general/hidden{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 }, -/obj/effect/landmark/zebra_interlock_point, -/turf/open/floor/monotile/dark, -/area/hallway/nsv/deck2/frame1/central) +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/turf/open/floor/monotile/light, +/area/medical/medbay/central) "eOh" = ( /obj/effect/turf_decal/stripes/red/line, /obj/effect/turf_decal/stripes/red/line{ @@ -39923,16 +40034,6 @@ /obj/effect/decal/remains/human, /turf/open/floor/engine, /area/engine/engine_room) -"eOz" = ( -/obj/structure/window/reinforced{ - dir = 8; - layer = 2.9 - }, -/obj/structure/window/reinforced, -/obj/structure/table/glass, -/obj/item/storage/firstaid/advanced, -/turf/open/floor/monotile/light, -/area/medical/storage) "ePH" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 @@ -40032,15 +40133,18 @@ /turf/open/floor/durasteel, /area/security/prison) "eZb" = ( -/obj/structure/lattice/catwalk, /obj/structure/cable{ - icon_state = "2-4" + icon_state = "1-2" }, /obj/structure/cable{ - icon_state = "4-10" + icon_state = "2-8" }, -/turf/open/space/basic, -/area/space/nearstation) +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/monotile/light, +/area/medical/medbay/central) "eZC" = ( /obj/structure/cable{ icon_state = "1-2" @@ -40079,12 +40183,14 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "faG" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light{ - dir = 8 +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating, -/area/maintenance/starboard) +/area/medical/medbay/lobby) "fbx" = ( /turf/closed/wall/r_wall/ship, /area/shuttle/turbolift/shaft) @@ -40126,13 +40232,29 @@ /turf/open/floor/monotile/steel, /area/crew_quarters/fitness/recreation) "feG" = ( -/obj/machinery/light{ - dir = 8 +/obj/structure/table/reinforced, +/obj/machinery/button/door{ + name = "Damage Control Supply Access"; + pixel_x = -6; + pixel_y = 8; + id = "dc1"; + req_one_access_txt = "11" }, -/obj/item/radio/intercom/directional/west, -/obj/structure/table, -/turf/open/floor/monotile/dark, -/area/security/checkpoint/engineering) +/obj/machinery/button/door{ + name = "Advanced Damage Control Supplies"; + pixel_x = 4; + pixel_y = 8; + id = "dc2"; + req_one_access_txt = "20, 56, 57" + }, +/obj/machinery/button/door{ + name = "Damage Control Central Window Shutters"; + pixel_x = -1; + id = "dcc"; + req_one_access_txt = "11" + }, +/turf/open/floor/monotile/steel, +/area/nsv/engine/dcc) "ffp" = ( /obj/structure/ladder, /turf/open/floor/plating, @@ -40154,13 +40276,6 @@ }, /turf/open/floor/monotile/steel, /area/nsv/hanger/deck2) -"fjp" = ( -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/power/apc/auto_name/east, -/turf/open/floor/monotile/steel, -/area/medical/storage) "fjB" = ( /obj/machinery/door/airlock/ship{ name = "Exothermic Chamber"; @@ -40314,15 +40429,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/monotile/dark, /area/crew_quarters/dorms) -"fuz" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, -/turf/open/floor/monotile/light, -/area/medical/medbay/central) "fuW" = ( /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -40377,6 +40483,12 @@ /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/engine/atmos) +"fBA" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/monotile/light, +/area/medical/genetics) "fBC" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -40397,11 +40509,14 @@ /turf/open/floor/monotile/dark, /area/engine/storage_shared) "fBS" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 }, /turf/open/floor/monotile/steel, -/area/engine/engineering/hangar) +/area/medical/surgery) "fBV" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -40447,18 +40562,9 @@ /turf/open/floor/monotile/steel, /area/security/brig) "fHb" = ( -/obj/machinery/paystand, -/obj/machinery/door/poddoor/ship{ - id = "maintshop"; - layer = 3.1 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/obj/effect/landmark/zebra_interlock_point, -/turf/open/floor/plating, -/area/hallway/nsv/deck2/frame1/central) +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/monotile/dark, +/area/medical/surgery) "fHB" = ( /obj/structure/lattice/catwalk/over/ship, /obj/machinery/computer/ship/viewscreen, @@ -40495,12 +40601,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/central) -"fKK" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/turf/open/floor/monotile/dark, -/area/medical/morgue) "fLt" = ( /obj/structure/table, /turf/open/floor/plating, @@ -40543,21 +40643,20 @@ /turf/open/space/basic, /area/space/nearstation) "fPZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/item/radio/intercom{ pixel_y = -26 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/structure/cable{ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/brown/hidden{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/structure/cable{ + icon_state = "1-8" + }, /turf/open/floor/monotile/steel, /area/engine/engineering/hangar) "fQD" = ( @@ -40576,16 +40675,6 @@ /area/bridge{ name = "CIC" }) -"fQU" = ( -/obj/effect/landmark/nuclear_waste_spawner, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/monotile/steel, -/area/medical/surgery) "fSF" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 @@ -40701,19 +40790,6 @@ /obj/item/clothing/ears/earmuffs, /turf/open/floor/carpet/ship, /area/quartermaster/storage) -"gbq" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/turf/open/floor/monotile/light, -/area/medical/genetics) "gbA" = ( /obj/machinery/door/airlock/ship/maintenance/defaultaccess, /obj/machinery/door/firedoor/border_only{ @@ -40837,6 +40913,14 @@ }, /turf/open/floor/monotile/dark, /area/tcommsat/computer) +"gks" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/monotile/light, +/area/medical/medbay/lobby) "gkP" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -40887,6 +40971,18 @@ initial_gas_mix = "TEMP=2.7" }, /area/engine/atmos) +"gox" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/turf/open/floor/monotile/steel, +/area/hallway/nsv/deck2/frame1/port) "gpN" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible/layer2, /obj/machinery/atmospherics/pipe/manifold/yellow/visible{ @@ -40918,7 +41014,7 @@ /area/maintenance/department/science) "gqR" = ( /turf/closed/wall/r_wall/ship, -/area/security/checkpoint/engineering) +/area/nsv/engine/dcc) "grp" = ( /obj/structure/cable{ icon_state = "1-2" @@ -41019,6 +41115,17 @@ }, /turf/open/floor/engine, /area/engine/engine_room) +"gBn" = ( +/obj/structure/lattice/catwalk/over/ship, +/obj/machinery/camera{ + network = list("eng"); + name = "CIC"; + dir = 1 + }, +/turf/open/floor/monotile/dark, +/area/bridge{ + name = "CIC" + }) "gBp" = ( /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -41213,10 +41320,6 @@ /obj/effect/landmark/zebra_interlock_point, /turf/open/floor/plating, /area/maintenance/starboard/fore) -"gLs" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/monotile/steel, -/area/medical/storage) "gMB" = ( /obj/machinery/photocopier{ pixel_y = 3 @@ -41247,6 +41350,15 @@ /obj/machinery/status_display/evac, /turf/closed/wall/ship, /area/security/brig) +"gPT" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/computer/atmos_alert{ + dir = 8 + }, +/turf/open/floor/monotile/steel, +/area/nsv/engine/dcc) "gRe" = ( /obj/structure/cable{ icon_state = "1-2" @@ -41254,6 +41366,12 @@ /obj/effect/decal/cleanable/oil/streak, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"gRE" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/turf/open/floor/monotile/light, +/area/medical/genetics) "gSo" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -41312,9 +41430,6 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/extinguisher_cabinet{ pixel_y = -27 }, @@ -41479,6 +41594,9 @@ }, /turf/open/floor/monotile/steel, /area/nsv/weapons/gauss) +"hgf" = ( +/turf/open/floor/plating, +/area/medical/storage) "hhh" = ( /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating, @@ -41511,9 +41629,11 @@ /turf/open/floor/monotile/steel, /area/crew_quarters/heads/chief) "hiP" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 4 +/obj/effect/turf_decal/stripes/corner, +/obj/structure/reagent_dispensers/fueltank, +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) @@ -41529,6 +41649,12 @@ }, /turf/open/floor/plating, /area/medical/chemistry) +"hkw" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/turf/open/floor/monotile/dark, +/area/nsv/engine/dcc) "hkB" = ( /obj/structure/table, /obj/item/reagent_containers/glass/bucket, @@ -41615,6 +41741,21 @@ }, /turf/open/space/basic, /area/engine/atmos) +"hqQ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/monotile/dark, +/area/medical/morgue) "hrv" = ( /obj/machinery/newscaster/security_unit, /turf/closed/wall/ship, @@ -41886,10 +42027,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/fore) -"hDV" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/turf/open/floor/monotile/dark, -/area/medical/surgery) "hER" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -41959,6 +42096,12 @@ initial_gas_mix = "TEMP=2.7" }, /area/engine/atmos) +"hIK" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/turf/open/floor/monotile/steel, +/area/medical/break_room) "hIX" = ( /obj/structure/closet/emcloset, /turf/open/floor/plating, @@ -42055,15 +42198,13 @@ /obj/effect/spawner/lootdrop/minor/pirate_or_bandana, /turf/open/floor/plating, /area/maintenance/department/cargo) -"hQu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 +"hQw" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable{ + icon_state = "2-4" }, -/turf/open/floor/monotile/steel, -/area/medical/surgery) +/turf/open/space/basic, +/area/engine/engineering/hangar) "hQx" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 @@ -42187,15 +42328,10 @@ }, /turf/open/floor/monotile/dark, /area/tcommsat/computer) -"hZL" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, +"hZW" = ( +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/monotile/steel, -/area/medical/storage) +/area/hallway/nsv/deck2/frame1/central) "icy" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -42355,6 +42491,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/brown/hidden{ + dir = 4 + }, /turf/open/floor/plating, /area/engine/engineering/hangar) "isj" = ( @@ -42409,14 +42548,18 @@ /turf/open/floor/plasteel/ridged/steel, /area/engine/engineering/reactor_core) "ixc" = ( -/obj/machinery/firealarm{ +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/computer/camera_advanced{ + desc = "Used to access the various cameras on the Ship."; + em_block = d; dir = 4; - pixel_x = -26 + network = list("eng"); + name = "Critical Engineering Monitoring Console" }, -/obj/structure/table, -/obj/effect/turf_decal/stripes/corner, -/turf/open/floor/monotile/dark, -/area/security/checkpoint/engineering) +/turf/open/floor/monotile/steel, +/area/nsv/engine/dcc) "ixq" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -42431,6 +42574,14 @@ }, /turf/open/floor/monotile/dark, /area/engine/engine_room) +"iye" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/monotile/steel, +/area/medical/medbay/central) "iyx" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer, /obj/machinery/camera/autoname, @@ -42731,6 +42882,10 @@ }, /turf/open/floor/monotile/dark, /area/ai_monitored/security/armory) +"iOq" = ( +/obj/effect/turf_decal/stripes/white/line, +/turf/open/floor/engine, +/area/medical/medbay/central) "iOz" = ( /obj/machinery/atmospherics/components/binary/drive_pylon, /obj/structure/cable/yellow{ @@ -42739,6 +42894,11 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/monotile/dark, /area/engine/engineering) +"iOS" = ( +/obj/structure/table/glass, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/monotile/light, +/area/medical/medbay/central) "iPA" = ( /obj/structure/cable{ icon_state = "4-8" @@ -42817,12 +42977,6 @@ }, /turf/open/floor/plating, /area/maintenance/nsv/weapons) -"iUg" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/template_noop, -/area/maintenance/central) "iUA" = ( /obj/structure/table/reinforced, /obj/item/storage/box/matches{ @@ -42868,16 +43022,6 @@ initial_gas_mix = "TEMP=2.7" }, /area/engine/atmos) -"iWK" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/monotile/steel, -/area/medical/medbay/lobby) "iXF" = ( /obj/effect/turf_decal/delivery, /obj/machinery/power/terminal, @@ -42893,19 +43037,21 @@ }, /turf/open/floor/carpet/ship, /area/quartermaster/storage) -"iZY" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 +"jau" = ( +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/machinery/power/apc/auto_name/west, /obj/structure/cable{ - icon_state = "0-2" + icon_state = "2-4" }, -/turf/open/floor/monotile/steel, -/area/medical/break_room) +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/monotile/light, +/area/medical/medbay/central) "jaI" = ( /obj/machinery/light/small/broken{ dir = 4 @@ -42954,14 +43100,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/engine) -"jca" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/monotile/light, -/area/medical/medbay/central) "jcy" = ( /obj/machinery/door/airlock/ship/public/glass{ name = "Medical Equipment"; @@ -42969,6 +43107,26 @@ }, /turf/open/floor/monotile/steel, /area/medical/storage) +"jdn" = ( +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/airlock/ship/public/glass{ + name = "Cryogenics"; + req_one_access_txt = "5" + }, +/obj/effect/landmark/zebra_interlock_point, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/monotile/light, +/area/medical/medbay/lobby) "jeX" = ( /obj/structure/cable, /obj/structure/cable{ @@ -42987,10 +43145,6 @@ }, /turf/open/space/basic, /area/space/nearstation) -"jhM" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/turf/open/floor/monotile/steel, -/area/medical/break_room) "jiL" = ( /obj/structure/grille, /obj/structure/window/reinforced{ @@ -43124,6 +43278,13 @@ /obj/item/ship_weapon/ammunition/missile, /turf/open/floor/durasteel/techfloor, /area/nsv/hanger/deck2) +"jqA" = ( +/obj/structure/sign/ship/pods/west{ + pixel_y = -2; + pixel_x = -31 + }, +/turf/open/floor/durasteel, +/area/medical) "jqT" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/closed/wall/r_wall/ship, @@ -43408,23 +43569,21 @@ "jSc" = ( /turf/open/floor/carpet/green, /area/engine/engineering/reactor_control) -"jSr" = ( -/obj/structure/closet/secure_closet/medical3, -/obj/machinery/requests_console{ - department = "Medbay Clinic"; - departmentType = 1; - name = "Medbay RC"; - payment_department = "MED"; - pixel_y = 28 - }, -/turf/open/floor/monotile/light, -/area/medical/storage) "jSw" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, /turf/open/floor/monotile/steel, /area/engine/gravity_generator) +"jSG" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/turf/open/floor/monotile/steel, +/area/medical/surgery) "jTD" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/heat_exchanging/simple, @@ -43465,19 +43624,9 @@ /turf/open/floor/plating, /area/maintenance/starboard) "jYf" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/requests_console{ - department = "Engineering"; - departmentType = 3; - name = "Engineering RC"; - pixel_x = 32 - }, -/turf/open/floor/plasteel/ridged/steel, -/area/engine/engineering) +/obj/effect/spawner/structure/window/reinforced/ship, +/turf/open/floor/plating, +/area/maintenance/department/medical) "jYn" = ( /obj/machinery/atmospherics/pipe/simple/green/visible, /obj/machinery/atmospherics/pipe/simple/green/visible{ @@ -43551,19 +43700,6 @@ /obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship, /area/crew_quarters/dorms) -"kaF" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/monotile/light, -/area/medical/medbay/central) "kbg" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -43585,6 +43721,13 @@ initial_gas_mix = "TEMP=2.7" }, /area/engine/atmos) +"kcf" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/structure/tank_dispenser, +/turf/open/floor/monotile/steel, +/area/hallway/nsv/deck2/frame1/port) "kcn" = ( /obj/item/circuitboard/computer/stormdrive_reactor_control, /obj/structure/frame/computer, @@ -43763,6 +43906,19 @@ initial_gas_mix = "TEMP=2.7" }, /area/engine/atmos) +"kkk" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/machinery/power/apc/auto_name/west, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/monotile/steel, +/area/medical/break_room) "kkz" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 4 @@ -43892,13 +44048,11 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/cable{ - icon_state = "1-4" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, +/obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, /area/maintenance/starboard) "kqI" = ( @@ -43971,6 +44125,10 @@ }, /turf/open/floor/engine/nucleium, /area/engine/engineering/reactor_core) +"ktI" = ( +/obj/item/radio/intercom/directional/south, +/turf/open/floor/monotile/light, +/area/medical/genetics) "kuw" = ( /obj/machinery/light{ dir = 1 @@ -44007,12 +44165,6 @@ }, /turf/open/floor/plasteel/techmaint, /area/maintenance/starboard) -"kwD" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/turf/open/floor/monotile/steel, -/area/medical/medbay/lobby) "kwI" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -44043,14 +44195,6 @@ }, /turf/open/floor/monotile/steel, /area/engine/engineering/reactor_core) -"kyP" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/monotile/steel, -/area/hallway/nsv/deck2/frame1/port) "kze" = ( /obj/structure/cable{ icon_state = "2-8" @@ -44226,6 +44370,17 @@ }, /turf/open/floor/engine/airless, /area/space/nearstation) +"kKB" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/turf/open/floor/monotile/dark, +/area/hallway/nsv/deck2/frame1/port) "kLw" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -44269,6 +44424,11 @@ /area/nsv/hanger/storage{ name = "Munitions Control Room" }) +"kOo" = ( +/obj/machinery/suit_storage_unit/radsuit, +/obj/item/tank/internals/oxygen, +/turf/open/floor/monotile/steel, +/area/nsv/engine/dcc) "kOJ" = ( /obj/effect/turf_decal/stripes/red/line, /obj/effect/turf_decal/stripes/red/line{ @@ -44313,6 +44473,21 @@ }, /turf/open/space/basic, /area/space/nearstation) +"kSo" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/monotile/steel, +/area/medical) "kSO" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/ship/external/glass{ @@ -44354,6 +44529,12 @@ initial_gas_mix = "TEMP=2.7" }, /area/engine/atmos) +"kYa" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/turf/open/floor/monotile/steel, +/area/medical/medbay/lobby) "kYm" = ( /obj/effect/turf_decal/tile/orange{ dir = 4 @@ -44363,6 +44544,12 @@ }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) +"kYP" = ( +/obj/structure/lattice/catwalk, +/obj/structure/ladder, +/obj/machinery/atmospherics/pipe/simple/brown/hidden, +/turf/open/space/basic, +/area/space/nearstation) "kZu" = ( /obj/machinery/portable_atmospherics/scrubber/huge, /obj/machinery/light{ @@ -44398,9 +44585,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, @@ -44607,15 +44792,24 @@ /turf/open/floor/engine/airless, /area/space/nearstation) "lod" = ( -/obj/structure/filingcabinet, -/obj/machinery/newscaster{ - pixel_x = 30 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 +/obj/machinery/meter{ + target_layer = 4; + name = "Scrubber Line Status"; + pixel_x = 5; + pixel_y = 6 }, -/turf/open/floor/monotile/dark, -/area/security/checkpoint/engineering) +/obj/machinery/meter{ + name = "Supply Line Status"; + pixel_y = -6; + pixel_x = -7 + }, +/turf/open/floor/plating, +/area/nsv/engine/dcc) "loC" = ( /obj/machinery/space_heater, /obj/item/storage/box/lights/mixed, @@ -44674,6 +44868,18 @@ }, /turf/open/floor/plating, /area/maintenance/department/engine) +"lqZ" = ( +/obj/machinery/door/airlock/ship/external/glass{ + req_one_access_txt = "10" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/dark/hidden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/engine/engineering/hangar) "lrx" = ( /obj/machinery/power/solar{ id = "portsolar"; @@ -44839,18 +45045,31 @@ /turf/open/floor/plating, /area/maintenance/department/cargo) "lFb" = ( -/obj/machinery/computer/secure_data{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 }, -/obj/machinery/computer/security/telescreen{ - desc = "Used for monitoring the engine."; - dir = 8; - name = "Engine Monitor"; - network = list("engine"); - pixel_x = 32 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/chair/office{ + dir = 1; + name = "Damage Control Coordinator's Chair" + }, +/turf/open/floor/monotile/dark, +/area/nsv/engine/dcc) +"lFu" = ( +/obj/structure/table/wood, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 }, /turf/open/floor/monotile/dark, -/area/security/checkpoint/engineering) +/area/medical/break_room) "lGr" = ( /obj/structure/cable{ icon_state = "1-2" @@ -44940,15 +45159,6 @@ }, /turf/open/space/basic, /area/engine/atmos) -"lNf" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/turf/open/floor/monotile/steel, -/area/medical/surgery) "lNT" = ( /obj/structure/lattice/catwalk/over/ship, /obj/machinery/light{ @@ -45075,15 +45285,6 @@ }, /turf/open/floor/monotile/steel, /area/engine/engineering/reactor_core) -"lWo" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/turf/open/floor/monotile/dark, -/area/medical/surgery) "lZz" = ( /obj/effect/turf_decal/pool{ dir = 4 @@ -45100,11 +45301,15 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/brown/hidden{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/monotile/steel, /area/engine/engineering/hangar) "mbD" = ( @@ -45132,6 +45337,19 @@ /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/space/nearstation) +"mck" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/turf/open/floor/monotile/light, +/area/medical/genetics) "mcA" = ( /obj/machinery/airalarm{ dir = 8; @@ -45217,26 +45435,6 @@ }, /turf/open/floor/plating, /area/medical/medbay/lobby) -"mjX" = ( -/obj/effect/mapping_helpers/airlock/unres{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/airlock/ship/public/glass{ - name = "Cryogenics"; - req_one_access_txt = "5" - }, -/obj/effect/landmark/zebra_interlock_point, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/monotile/light, -/area/medical/medbay/lobby) "mlC" = ( /obj/machinery/atmospherics/pipe/simple/dark/visible{ dir = 10 @@ -45264,13 +45462,14 @@ /area/engine/atmos) "mmh" = ( /obj/structure/cable{ - icon_state = "2-8" + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 }, -/turf/open/floor/monotile/light, -/area/medical/genetics) +/turf/open/floor/monotile/steel, +/area/medical/medbay/lobby) "mmu" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 6 @@ -45280,12 +45479,18 @@ }, /turf/open/floor/monotile/steel, /area/engine/engineering/reactor_core) -"mmF" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 +"mng" = ( +/obj/structure/cable{ + icon_state = "4-8" }, -/turf/open/floor/monotile/steel, -/area/medical) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/monotile/light, +/area/medical/genetics) "mnn" = ( /obj/structure/chair, /turf/open/floor/plating{ @@ -45321,6 +45526,14 @@ /obj/effect/landmark/zebra_interlock_point, /turf/open/floor/plating, /area/crew_quarters/fitness/recreation) +"mpJ" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/monotile/light, +/area/medical/medbay/central) "mpS" = ( /obj/effect/turf_decal/pool/corner, /obj/effect/turf_decal/stripes/line{ @@ -45422,11 +45635,21 @@ /obj/effect/landmark/zebra_interlock_point, /turf/open/floor/monotile/steel, /area/science/research) +"mvE" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/monotile/steel, +/area/hallway/nsv/deck2/frame1/port) "mxN" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/components/unary/outlet_injector/on, -/turf/open/space/basic, -/area/engine/engineering/hangar) +/obj/structure/table/reinforced, +/obj/item/toy/plush/lizardplushie, +/turf/open/floor/monotile/steel, +/area/nsv/engine/dcc) "myk" = ( /obj/machinery/atmospherics/components/unary/thermomachine/heater, /turf/open/floor/durasteel/techfloor{ @@ -45476,6 +45699,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/brown/hidden{ + dir = 4 + }, /turf/open/floor/plating, /area/engine/engineering/hangar) "mCu" = ( @@ -45602,6 +45828,12 @@ }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) +"mIN" = ( +/obj/machinery/atmospherics/pipe/simple/dark/hidden{ + dir = 4 + }, +/turf/open/floor/monotile/steel, +/area/engine/engineering/hangar) "mJg" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -45686,6 +45918,9 @@ /obj/machinery/atmospherics/components/binary/dp_vent_pump{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/dark/hidden{ + dir = 4 + }, /turf/open/floor/plating, /area/engine/engineering/hangar) "mOC" = ( @@ -45753,12 +45988,6 @@ /obj/structure/cable/yellow, /turf/open/floor/monotile/steel, /area/engine/engineering/hangar) -"mQK" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/open/floor/monotile/light, -/area/medical/medbay/lobby) "mRi" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -45837,6 +46066,15 @@ /obj/effect/decal/cleanable/cobweb, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"mUL" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/turf/open/floor/monotile/light, +/area/medical/genetics) "mVt" = ( /obj/machinery/space_heater, /turf/open/floor/plating, @@ -45881,20 +46119,26 @@ /turf/open/floor/carpet/ship, /area/crew_quarters/dorms) "mXz" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "2-8" +/obj/effect/spawner/structure/window/plasma/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + name = "DC Central Shutters"; + id = "dcc" }, /turf/open/floor/monotile/steel, -/area/engine/engineering/hangar) +/area/nsv/engine/dcc) "mYZ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 5 }, /turf/open/floor/monotile/steel, /area/engine/engineering/reactor_core) +"naa" = ( +/obj/structure/sign/ship/pods/north{ + pixel_y = 1; + pixel_x = 32 + }, +/turf/open/floor/monotile/steel, +/area/medical) "naO" = ( /obj/machinery/camera/autoname, /obj/item/ship_weapon/ammunition/naval_artillery, @@ -45923,15 +46167,6 @@ }, /turf/open/floor/plating, /area/engine/storage) -"nch" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/monotile/steel, -/area/medical/surgery) "ncj" = ( /obj/machinery/holopad, /turf/open/floor/monotile/dark, @@ -45957,22 +46192,6 @@ /obj/machinery/advanced_airlock_controller/directional/north, /turf/open/floor/plating, /area/maintenance/department/cargo) -"neh" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/monotile/light, -/area/medical/medbay/central) -"nes" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/turf/open/floor/monotile/light, -/area/medical/genetics) "neD" = ( /obj/machinery/door/airlock/ship/maintenance/defaultaccess, /obj/machinery/door/firedoor/border_only{ @@ -46002,6 +46221,12 @@ }, /turf/open/floor/engine, /area/engine/atmospherics_engine) +"ngo" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/monotile/light, +/area/medical/genetics) "nil" = ( /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 8 @@ -46013,31 +46238,17 @@ /obj/structure/curtain/obscuring/grey, /turf/open/floor/plating, /area/maintenance/department/engine) -"njf" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/turf/open/floor/monotile/steel, -/area/hallway/nsv/deck2/frame1/port) "nkx" = ( /obj/machinery/light/small, /turf/open/floor/engine/o2, /area/engine/atmos) "nkM" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable/yellow{ icon_state = "1-2" }, /turf/open/floor/monotile/dark, -/area/security/checkpoint/engineering) +/area/nsv/engine/dcc) "nkN" = ( /obj/machinery/atmospherics/components/unary/portables_connector{ dir = 1 @@ -46081,6 +46292,10 @@ }, /turf/open/floor/monotile/dark, /area/hallway/secondary/exit) +"nnZ" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/monotile/dark, +/area/medical/morgue) "noR" = ( /obj/machinery/firealarm/directional/west, /obj/machinery/computer/ship/munitions_computer/west, @@ -46210,15 +46425,17 @@ /turf/open/floor/monotile/steel, /area/nsv/hanger/deck2) "nxI" = ( -/obj/machinery/door/firedoor/border_only{ - dir = 1 +/obj/machinery/button/door{ + name = "Advanced Damage Control Supplies"; + pixel_y = -31; + id = "dc2"; + req_one_access_txt = "20, 56, 57" }, -/obj/machinery/door/firedoor/border_only, -/obj/effect/landmark/zebra_interlock_point, -/turf/open/floor/plating{ - icon_state = "platingdmg3" +/obj/effect/turf_decal/stripes/corner{ + dir = 8 }, -/area/maintenance/starboard) +/turf/open/floor/monotile/steel, +/area/hallway/nsv/deck2/frame1/central) "nxK" = ( /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -46235,13 +46452,20 @@ /turf/open/space/basic, /area/engine/atmos) "nAH" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/security/checkpoint/engineering) -"nBI" = ( -/obj/machinery/airalarm/directional/north, -/turf/open/floor/monotile/light, -/area/medical/medbay/central) +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/table/reinforced, +/obj/item/storage/box/coffeepack, +/obj/item/geiger_counter, +/turf/open/floor/monotile/dark, +/area/nsv/engine/dcc) "nBM" = ( /obj/structure/rack, /obj/item/clothing/mask/surgical, @@ -46262,12 +46486,10 @@ /turf/open/space/basic, /area/engine/atmos) "nBU" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/reagent_dispensers/watertank, +/obj/machinery/suit_storage_unit/engine, +/obj/item/tank/internals/oxygen, /turf/open/floor/monotile/steel, -/area/engine/engineering/hangar) +/area/nsv/engine/dcc) "nCw" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 4 @@ -46372,6 +46594,14 @@ /obj/structure/girder, /turf/open/floor/plating, /area/maintenance/department/medical) +"nKJ" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/monotile/light, +/area/medical/medbay/central) "nKT" = ( /obj/machinery/door/airlock/ship/external/glass{ req_one_access_txt = "13" @@ -46444,15 +46674,6 @@ initial_gas_mix = "TEMP=2.7" }, /area/engine/atmos) -"nOn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/turf/open/floor/monotile/steel, -/area/medical/surgery) "nOu" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -46462,6 +46683,12 @@ }, /turf/open/floor/durasteel/lino, /area/engine/engineering/reactor_control) +"nOy" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/turf/open/floor/monotile/dark, +/area/medical/surgery) "nOz" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 @@ -46544,6 +46771,15 @@ }, /turf/open/floor/monotile/steel, /area/crew_quarters/fitness/recreation) +"nRh" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/turf/open/floor/monotile/dark, +/area/medical/surgery) "nRp" = ( /turf/closed/wall/r_wall, /area/space/nearstation) @@ -46598,6 +46834,14 @@ }, /turf/open/floor/wood, /area/library) +"oao" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/monotile/steel, +/area/hallway/nsv/deck2/frame1/port) "obp" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 @@ -46644,6 +46888,18 @@ }, /turf/open/floor/monotile/dark, /area/engine/engineering) +"ogX" = ( +/obj/structure/rack, +/obj/item/watertank/atmos, +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 + }, +/turf/open/floor/monotile/steel, +/area/hallway/nsv/deck2/frame1/port) "ohf" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -46726,6 +46982,12 @@ }, /turf/open/floor/monotile/steel, /area/engine/engineering/hangar) +"olI" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/monotile/light, +/area/medical/medbay/lobby) "olN" = ( /obj/structure/chair/office{ dir = 8 @@ -46737,6 +46999,13 @@ /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"ope" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/engine/engineering/hangar) "opF" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -46837,6 +47106,10 @@ }, /turf/open/floor/plasteel/airless/solarpanel, /area/space/nearstation) +"oxY" = ( +/obj/machinery/airalarm/directional/east, +/turf/open/floor/monotile/dark, +/area/medical/morgue) "oyi" = ( /turf/closed/wall/r_wall/ship, /area/maintenance/starboard/fore) @@ -46865,17 +47138,6 @@ }, /turf/open/floor/plasteel/ridged/steel, /area/engine/engineering/reactor_control) -"oAd" = ( -/obj/structure/table/reinforced, -/obj/machinery/requests_console{ - department = "Medbay Clinic"; - departmentType = 1; - name = "Medbay RC"; - payment_department = "MED"; - pixel_x = -32 - }, -/turf/open/floor/monotile/light, -/area/medical/medbay/central) "oAv" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, /turf/open/floor/monotile/steel, @@ -47094,6 +47356,7 @@ /obj/machinery/atmospherics/pipe/simple/brown/hidden{ dir = 4 }, +/obj/structure/reagent_dispensers/watertank, /turf/open/floor/monotile/steel, /area/engine/engineering/hangar) "oWy" = ( @@ -47144,33 +47407,6 @@ }, /turf/open/floor/monotile/steel, /area/crew_quarters/fitness/recreation) -"pbp" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/turf/open/floor/monotile/steel, -/area/medical/storage) -"pbM" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/monotile/dark, -/area/medical/morgue) "pcG" = ( /obj/machinery/light/small{ dir = 4 @@ -47191,21 +47427,7 @@ /area/maintenance/department/engine) "pdT" = ( /obj/structure/table/reinforced, -/turf/open/floor/monotile/light, -/area/medical/medbay/central) -"peg" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, +/obj/item/radio/intercom/directional/west, /turf/open/floor/monotile/light, /area/medical/medbay/central) "per" = ( @@ -47239,25 +47461,13 @@ /turf/open/floor/monotile/steel, /area/engine/engineering/reactor_core) "pgd" = ( -/obj/effect/spawner/structure/window/reinforced/ship, -/obj/machinery/atmospherics/pipe/simple/brown/hidden, -/turf/open/floor/plating, -/area/engine/engineering/hangar) -"pgp" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 +/obj/machinery/door/firedoor/border_only{ + dir = 1 }, -/turf/open/floor/monotile/light, -/area/medical/medbay/central) +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/ship/maintenance/defaultaccess, +/turf/open/floor/plating, +/area/maintenance/starboard) "pgF" = ( /obj/structure/table/wood, /obj/machinery/computer/libraryconsole, @@ -47270,10 +47480,6 @@ }, /turf/open/floor/carpet/ship, /area/quartermaster/qm) -"pip" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/monotile/light, -/area/medical/medbay/central) "pjr" = ( /obj/structure/chair, /obj/machinery/computer/ship/viewscreen, @@ -47286,6 +47492,11 @@ /area/security/execution/transfer) "pjU" = ( /obj/machinery/light_switch/south, +/obj/machinery/camera{ + network = list("eng"); + name = "Reactor Control"; + dir = 1 + }, /turf/open/floor/durasteel/lino, /area/engine/engineering/reactor_control) "pkh" = ( @@ -47338,6 +47549,16 @@ }, /turf/open/floor/plasteel/ridged/steel, /area/engine/engineering/reactor_core) +"pnv" = ( +/obj/docking_port/stationary{ + dwidth = 1; + height = 4; + roundstart_template = /datum/map_template/shuttle/escape_pod/default; + width = 3; + dir = 4 + }, +/turf/open/floor/plating, +/area/medical/storage) "poc" = ( /obj/structure/cable/yellow, /obj/machinery/computer/monitor{ @@ -47418,6 +47639,18 @@ /obj/machinery/portable_atmospherics/canister/oxygen, /turf/open/floor/monotile/steel, /area/engine/engineering/reactor_core) +"psX" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/monotile/light, +/area/medical/medbay/central) "pvj" = ( /obj/machinery/door/airlock/ship/public/glass/turbolift{ dir = 4 @@ -47503,6 +47736,13 @@ }, /turf/open/floor/durasteel/lino, /area/engine/engineering/reactor_control) +"pzC" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/simple/dark/hidden{ + dir = 4 + }, +/turf/open/space/basic, +/area/space/nearstation) "pzR" = ( /obj/structure/cable{ icon_state = "2-4" @@ -47549,6 +47789,12 @@ }, /turf/open/floor/engine, /area/engine/engine_room) +"pCw" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/monotile/light, +/area/medical/medbay/central) "pCV" = ( /obj/item/radio/intercom{ dir = 4; @@ -47616,10 +47862,6 @@ /area/nsv/hanger/storage{ name = "Munitions Control Room" }) -"pHx" = ( -/obj/effect/turf_decal/stripes/white/line, -/turf/open/floor/engine, -/area/medical/medbay/central) "pHV" = ( /turf/template_noop, /area/maintenance/department/medical) @@ -47698,10 +47940,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/fore) -"pLy" = ( -/obj/machinery/airalarm/directional/west, -/turf/open/floor/monotile/steel, -/area/medical) "pNz" = ( /obj/machinery/atmospherics/pipe/manifold/yellow/visible{ dir = 1 @@ -47799,17 +48037,19 @@ /turf/open/floor/engine/airless, /area/space/nearstation) "pZe" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/poddoor/ship{ - id = "maintshop"; - layer = 3.1 +/obj/machinery/door/poddoor/shutters/ship{ + id = "dc1"; + name = "Damage Control Supplies" }, +/obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, -/obj/machinery/door/firedoor/border_only, -/obj/effect/landmark/zebra_interlock_point, -/turf/open/floor/plating, +/obj/effect/turf_decal/stripes, +/obj/effect/turf_decal/stripes{ + dir = 1 + }, +/turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) "pZr" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ @@ -47824,6 +48064,12 @@ /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/space/nearstation) +"qaY" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/monotile/light, +/area/medical/medbay/lobby) "qbI" = ( /obj/structure/closet, /obj/effect/decal/cleanable/dirt/dust, @@ -47882,13 +48128,28 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plasteel/ridged/steel, +/turf/open/space/basic, /area/engine/engineering) +"qhy" = ( +/obj/structure/closet/emcloset/anchored, +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 + }, +/turf/open/floor/monotile/steel, +/area/hallway/nsv/deck2/frame1/port) "qio" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/monotile/dark, -/area/engine/engineering/hangar) +/area/hallway/nsv/deck2/frame1/port) "qir" = ( /obj/machinery/conveyor_switch/oneway{ dir = 8; @@ -47918,16 +48179,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/starboard/fore) -"qjH" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/monotile/steel, -/area/medical/medbay/lobby) "qlR" = ( /obj/structure/closet/crate{ opened = 1 @@ -48023,6 +48274,16 @@ }, /turf/open/floor/durasteel, /area/security/prison) +"qsx" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/turf/open/floor/monotile/light, +/area/medical/genetics) "qvd" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 @@ -48041,13 +48302,9 @@ /turf/closed/wall/r_wall/ship, /area/engine/storage) "qxg" = ( -/obj/structure/reagent_dispensers/fueltank, -/turf/open/floor/plating, -/area/maintenance/starboard) -"qxi" = ( -/obj/effect/spawner/structure/window/reinforced/ship, -/turf/open/floor/plating, -/area/maintenance/department/medical) +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/monotile/steel, +/area/medical) "qxl" = ( /obj/effect/turf_decal/stripes/white/corner{ dir = 1 @@ -48076,6 +48333,12 @@ }, /turf/open/floor/durasteel/techfloor, /area/nsv/weapons/fore) +"qzs" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/monotile/dark, +/area/hallway/nsv/deck2/frame1/central) "qzT" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -48103,7 +48366,7 @@ /area/nsv/weapons/fore) "qBl" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, +/turf/closed/wall/ship, /area/maintenance/starboard) "qBr" = ( /obj/structure/reagent_dispensers/fueltank/cryogenic_fuel, @@ -48192,12 +48455,6 @@ /obj/effect/turf_decal/bot_white, /turf/open/floor/monotile/steel, /area/gateway) -"qGw" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, -/turf/open/floor/monotile/steel, -/area/medical/medbay/lobby) "qHc" = ( /obj/machinery/status_display/ai, /turf/closed/wall/ship, @@ -48264,16 +48521,16 @@ /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, /area/maintenance/department/engine) -"qLy" = ( -/obj/docking_port/stationary{ - dwidth = 1; - height = 4; - roundstart_template = /datum/map_template/shuttle/escape_pod/default; - width = 3; +"qLv" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ dir = 4 }, -/turf/open/floor/plating, -/area/medical/storage) +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/monotile/steel, +/area/hallway/nsv/deck2/frame1/port) "qLS" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 @@ -48296,18 +48553,6 @@ }, /turf/open/floor/plating, /area/maintenance/nsv/hangar) -"qMY" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/monotile/dark, -/area/hallway/nsv/deck2/frame1/port) "qNS" = ( /obj/effect/turf_decal/tile/red{ dir = 4 @@ -48336,12 +48581,31 @@ /turf/open/floor/plating, /area/maintenance/department/cargo) "qOb" = ( -/obj/effect/turf_decal/box, -/obj/machinery/requests_console{ - department = "Custodial Closet"; - departmentType = 3; - payment_department = "CIV"; - pixel_x = -28 +/obj/item/clothing/suit/space/eva, +/obj/item/clothing/suit/space/eva, +/obj/item/clothing/suit/space/eva, +/obj/item/clothing/suit/space/eva, +/obj/item/clothing/suit/space/eva, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/clothing/head/helmet/space/eva, +/obj/item/clothing/head/helmet/space/eva, +/obj/item/clothing/head/helmet/space/eva, +/obj/item/clothing/head/helmet/space/eva, +/obj/item/clothing/head/helmet/space/eva, +/obj/structure/closet{ + name = "Space Suit Locker" + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/camera{ + network = list("eng"); + name = "Aft DC Locker"; + dir = 5 }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) @@ -48387,6 +48651,9 @@ /obj/machinery/atmospherics/components/binary/dp_vent_pump{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/dark/hidden{ + dir = 4 + }, /turf/open/floor/plating, /area/engine/engineering/hangar) "qQR" = ( @@ -48417,14 +48684,21 @@ /turf/open/floor/plating, /area/engine/storage) "qUD" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 10 - }, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "1-2" }, -/turf/open/floor/monotile/dark, -/area/engine/engineering/hangar) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/door/airlock/highsecurity/ship{ + name = "Damage Control Central"; + req_one_access_txt = "11" + }, +/turf/open/floor/monotile/steel, +/area/nsv/engine/dcc) +"qUV" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/monotile/steel, +/area/medical/break_room) "qVj" = ( /obj/effect/turf_decal/tile/orange, /obj/effect/turf_decal/stripes/line{ @@ -48461,9 +48735,6 @@ }, /turf/open/floor/plasteel/tech/grid, /area/nsv/weapons/fore) -"ram" = ( -/turf/open/floor/plating, -/area/medical/storage) "raq" = ( /obj/structure/sign/ship/radiation{ dir = 8 @@ -48586,6 +48857,9 @@ initial_gas_mix = "TEMP=2.7" }, /area/engine/atmos) +"rii" = ( +/turf/open/floor/monotile/dark, +/area/nsv/engine/dcc) "riu" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -48747,6 +49021,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"rsC" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/turf/open/floor/monotile/steel, +/area/medical) "rsK" = ( /obj/effect/turf_decal/stripes/red/line, /obj/effect/turf_decal/stripes/red/line{ @@ -48787,22 +49067,30 @@ }, /area/engine/atmos) "rtU" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 1 +/obj/effect/spawner/structure/window/plasma/reinforced, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable{ - icon_state = "1-4" +/obj/machinery/door/poddoor/shutters/preopen{ + name = "DC Central Shutters"; + id = "dcc" }, -/turf/open/floor/monotile/dark, -/area/engine/engineering/hangar) +/turf/open/floor/monotile/steel, +/area/nsv/engine/dcc) "ruX" = ( /obj/structure/cable{ icon_state = "2-8" }, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"rvU" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/monotile/light, +/area/medical/storage) "rwm" = ( /obj/effect/turf_decal/stripes/red/line, /obj/effect/turf_decal/stripes/red/line{ @@ -48855,6 +49143,13 @@ }, /turf/open/floor/monotile/steel, /area/engine/engineering/reactor_core) +"rxR" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/turf/open/floor/monotile/dark, +/area/medical/surgery) "ryh" = ( /obj/structure/cable{ icon_state = "4-8" @@ -48949,6 +49244,9 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, +/obj/machinery/atmospherics/pipe/simple/brown/hidden{ + dir = 9 + }, /turf/open/space/basic, /area/space/nearstation) "rEe" = ( @@ -48996,7 +49294,7 @@ /area/crew_quarters/bar) "rFk" = ( /obj/item/storage/secure/safe/caps_spare, -/turf/closed/wall/ship, +/turf/closed/wall/r_wall/ship, /area/bridge{ name = "CIC" }) @@ -49079,12 +49377,6 @@ }, /turf/open/floor/plasteel/grid/steel, /area/engine/engineering/reactor_core) -"rJV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/monotile/light, -/area/medical/medbay/lobby) "rKx" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /obj/machinery/atmospherics/pipe/simple/green/visible{ @@ -49145,6 +49437,16 @@ }, /turf/open/floor/engine, /area/engine/engine_room) +"rON" = ( +/obj/structure/window/reinforced{ + dir = 8; + layer = 2.9 + }, +/obj/structure/window/reinforced, +/obj/structure/table/glass, +/obj/item/storage/firstaid/advanced, +/turf/open/floor/monotile/light, +/area/medical/storage) "rSa" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -49345,16 +49647,9 @@ /turf/open/space/basic, /area/engine/atmos) "skf" = ( -/obj/machinery/power/solar{ - id = "portsolar"; - name = "Port Solar Array" - }, -/obj/machinery/atmospherics/pipe/simple/brown/hidden, -/obj/structure/cable{ - icon_state = "0-5" - }, -/turf/open/floor/plasteel/airless/solarpanel, -/area/engine/engineering/hangar) +/obj/machinery/airalarm/directional/north, +/turf/open/floor/monotile/light, +/area/medical/medbay/central) "slq" = ( /obj/structure/munitions_trolley, /obj/effect/turf_decal/ship/delivery/yellow, @@ -49581,33 +49876,33 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/starboard) -"swq" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/monotile/light, -/area/medical/medbay/central) "swR" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxins_mixing_input{ dir = 4 }, /turf/open/floor/engine/vacuum, /area/science/mixing/chamber) +"sxm" = ( +/obj/structure/table/reinforced, +/obj/machinery/requests_console{ + department = "Medbay Clinic"; + departmentType = 1; + name = "Medbay RC"; + payment_department = "MED"; + pixel_x = -32 + }, +/turf/open/floor/monotile/light, +/area/medical/medbay/central) "sxM" = ( -/obj/machinery/power/apc/auto_name/north{ - pixel_y = 24 +/obj/effect/turf_decal/tile/orange{ + dir = 4 }, -/obj/structure/cable{ - icon_state = "0-2" +/obj/effect/turf_decal/tile/orange{ + dir = 1 }, -/turf/open/floor/plating, -/area/maintenance/starboard) +/obj/effect/turf_decal/stripes, +/turf/open/floor/monotile/steel, +/area/hallway/nsv/deck2/frame1/central) "sxT" = ( /obj/machinery/light/small{ dir = 4 @@ -49688,6 +49983,18 @@ }, /turf/open/floor/monotile/light, /area/medical/medbay/lobby) +"sHy" = ( +/obj/machinery/door/airlock/ship/external/glass{ + req_one_access_txt = "10" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/dark/hidden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/engine/engineering/hangar) "sIU" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2, @@ -49788,10 +50095,6 @@ }, /turf/open/floor/monotile/steel, /area/engine/engineering/reactor_core) -"sTU" = ( -/obj/machinery/atmospherics/components/unary/cryo_cell, -/turf/open/floor/engine, -/area/medical/medbay/central) "sYQ" = ( /obj/structure/chair/office/light{ dir = 1 @@ -49873,10 +50176,6 @@ /obj/structure/cable, /turf/open/floor/wood, /area/library) -"tfk" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/turf/open/floor/monotile/steel, -/area/medical/surgery) "tfx" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -50199,6 +50498,13 @@ }, /turf/open/space/basic, /area/space/nearstation) +"tzQ" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/components/unary/passive_vent{ + dir = 8 + }, +/turf/open/space/basic, +/area/space/nearstation) "tBp" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 8; @@ -50289,17 +50595,9 @@ /turf/open/floor/monotile/dark, /area/engine/engineering) "tDB" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/turf/open/floor/monotile/light, -/area/medical/storage) +/obj/effect/turf_decal/stripes, +/turf/open/floor/monotile/steel, +/area/hallway/nsv/deck2/frame1/central) "tDG" = ( /obj/machinery/conveyor/slow{ id = "torp" @@ -50327,6 +50625,21 @@ }, /turf/open/floor/monotile/steel, /area/crew_quarters/fitness/recreation) +"tGE" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/turf/open/floor/monotile/steel, +/area/medical/surgery) +"tHS" = ( +/obj/machinery/airalarm{ + pixel_y = 23 + }, +/turf/open/space/basic, +/area/space) "tIg" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/wood, @@ -50539,6 +50852,9 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/monotile/steel, /area/engine/engineering) "tXO" = ( @@ -50567,6 +50883,13 @@ initial_gas_mix = "TEMP=2.7" }, /area/engine/atmos) +"uav" = ( +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/power/apc/auto_name/east, +/turf/open/floor/monotile/steel, +/area/medical/storage) "uaW" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /obj/structure/lattice/catwalk, @@ -50670,6 +50993,14 @@ "ufF" = ( /turf/closed/wall/r_wall/ship, /area/science/mixing/chamber) +"ufH" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/monotile/steel, +/area/nsv/engine/dcc) "ufS" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible/layer4, /turf/open/floor/durasteel/techfloor{ @@ -50737,17 +51068,6 @@ initial_gas_mix = "TEMP=2.7" }, /area/engine/atmos) -"ukF" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/turf/open/floor/monotile/dark, -/area/hallway/nsv/deck2/frame1/port) "uln" = ( /obj/structure/cable{ icon_state = "1-2" @@ -50761,14 +51081,6 @@ /obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/space/basic, /area/space/nearstation) -"unA" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/turf/open/floor/monotile/light, -/area/medical/storage) "uoi" = ( /obj/effect/turf_decal/delivery/red, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -50834,22 +51146,6 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /turf/open/floor/monotile/steel, /area/engine/engineering) -"uwQ" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/monotile/light, -/area/medical/genetics) -"uxq" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/monotile/light, -/area/medical/medbay/central) "uyI" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -50878,13 +51174,6 @@ }, /turf/open/floor/monotile/dark, /area/shuttle/turbolift/shaft) -"uBy" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/monotile/dark, -/area/medical) "uEb" = ( /turf/open/floor/plating{ icon_state = "panelscorched" @@ -51035,6 +51324,9 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/layer_manifold, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, /turf/open/floor/monotile/steel, /area/engine/engineering) "uRG" = ( @@ -51374,6 +51666,10 @@ }, /turf/open/floor/wood, /area/library) +"vur" = ( +/obj/item/radio/intercom/directional/west, +/turf/open/floor/monotile/light, +/area/medical/medbay/lobby) "vvn" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -51430,6 +51726,19 @@ }, /turf/open/space/basic, /area/space/nearstation) +"vzQ" = ( +/obj/structure/table/reinforced, +/obj/item/storage/toolbox/mechanical{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/storage/toolbox/mechanical{ + pixel_y = 3; + pixel_x = 3 + }, +/obj/item/storage/toolbox/mechanical, +/turf/open/floor/monotile/dark, +/area/hallway/nsv/deck2/frame1/port) "vBM" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -51711,12 +52020,6 @@ /area/maintenance/starboard/secondary{ name = "Munitions Projects" }) -"vYr" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/turf/open/floor/monotile/dark, -/area/medical/surgery) "vYs" = ( /obj/machinery/camera/autoname, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, @@ -51819,6 +52122,12 @@ /area/science/mixing{ name = "Prototype munitions bay" }) +"whb" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/monotile/light, +/area/medical/genetics) "whd" = ( /obj/structure/cable{ icon_state = "4-8" @@ -51853,10 +52162,24 @@ /area/bridge{ name = "CIC" }) -"wjj" = ( -/obj/machinery/airalarm/directional/east, -/turf/open/floor/monotile/light, -/area/medical/genetics) +"wjq" = ( +/obj/effect/turf_decal/tile/orange{ + dir = 4 + }, +/obj/effect/turf_decal/tile/orange{ + dir = 1 + }, +/obj/machinery/button/door{ + name = "Damage Control Supply Access"; + pixel_y = -30; + id = "dc1"; + req_one_access_txt = "11" + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/monotile/steel, +/area/hallway/nsv/deck2/frame1/central) "wjv" = ( /obj/effect/decal/cleanable/blood/footprints{ dir = 4 @@ -51904,13 +52227,6 @@ }, /turf/open/floor/durasteel/padded, /area/maintenance/department/medical) -"wnI" = ( -/obj/structure/sign/ship/pods/west{ - pixel_y = -2; - pixel_x = -31 - }, -/turf/open/floor/durasteel, -/area/medical) "woq" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -51966,10 +52282,6 @@ }, /turf/open/floor/engine/vacuum, /area/engine/atmospherics_engine) -"wrG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/monotile/dark, -/area/medical/morgue) "wss" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -51999,12 +52311,6 @@ /obj/machinery/door/airlock/ship/maintenance/defaultaccess, /turf/open/floor/plating, /area/maintenance/department/cargo) -"wto" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/monotile/steel, -/area/medical/medbay/lobby) "wvu" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, @@ -52099,14 +52405,6 @@ /area/bridge{ name = "CIC" }) -"wyL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/monotile/light, -/area/medical/medbay/central) "wyO" = ( /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 @@ -52153,11 +52451,6 @@ /obj/effect/landmark/nuclear_waste_spawner, /turf/open/floor/plating, /area/maintenance/starboard) -"wDF" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden, -/obj/effect/turf_decal/stripes/white/line, -/turf/open/floor/engine, -/area/medical/medbay/central) "wEq" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 @@ -52174,6 +52467,15 @@ }, /turf/open/floor/monotile/steel, /area/engine/engineering/hangar) +"wGk" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/simple/brown/hidden, +/obj/effect/landmark/blobstart, +/obj/machinery/atmospherics/pipe/simple/dark/hidden{ + dir = 4 + }, +/turf/open/floor/monotile/steel, +/area/engine/engineering/hangar) "wGp" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -52259,6 +52561,18 @@ /area/bridge{ name = "CIC" }) +"wOL" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/monotile/dark, +/area/hallway/nsv/deck2/frame1/central) "wPl" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -52433,6 +52747,17 @@ }, /turf/open/floor/plating, /area/maintenance/nsv/hangar) +"xbr" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/landmark/nuclear_waste_spawner, +/obj/machinery/atmospherics/pipe/simple/dark/hidden{ + dir = 4 + }, +/turf/open/floor/monotile/steel, +/area/engine/engineering/hangar) "xbZ" = ( /obj/machinery/meter/atmos/distro_loop, /obj/machinery/atmospherics/pipe/simple/supply/visible{ @@ -52602,6 +52927,17 @@ }, /turf/open/floor/monotile/steel, /area/engine/engineering/reactor_core) +"xqt" = ( +/obj/machinery/atmospherics/components/binary/valve/layer2{ + dir = 8; + name = "Supply Emergency Dump"; + req_one_access_txt = "10" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/plating, +/area/nsv/engine/dcc) "xqR" = ( /obj/structure/cable{ icon_state = "1-4" @@ -52739,6 +53075,9 @@ dir = 4 }, /obj/effect/spawner/lootdrop/grille_or_trash, +/obj/structure/cable{ + icon_state = "1-4" + }, /turf/open/floor/plating, /area/maintenance/starboard) "xAS" = ( @@ -52755,6 +53094,21 @@ /area/maintenance/starboard/secondary{ name = "Munitions Projects" }) +"xCD" = ( +/obj/structure/sign/ship/pods/east{ + pixel_y = -2; + pixel_x = 31 + }, +/turf/open/floor/monotile/steel, +/area/medical) +"xCH" = ( +/obj/structure/cable, +/obj/machinery/power/solar{ + id = "portsolar"; + name = "Port Solar Array" + }, +/turf/open/floor/plasteel/airless/solarpanel, +/area/engine/engineering/hangar) "xDn" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 4 @@ -52781,6 +53135,13 @@ /obj/machinery/holopad, /turf/open/floor/carpet/ship, /area/crew_quarters/dorms) +"xFb" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/turf/open/floor/monotile/steel, +/area/medical/surgery) "xGc" = ( /obj/effect/turf_decal/tile/brown{ dir = 4 @@ -52844,16 +53205,7 @@ /obj/machinery/door/airlock/ship/maintenance/defaultaccess, /turf/open/floor/plating, /area/maintenance/nsv/hangar) -"xLJ" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, -/turf/open/floor/monotile/light, -/area/medical/genetics) "xMG" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/extinguisher_cabinet{ pixel_y = -27 }, @@ -53140,6 +53492,12 @@ }, /turf/open/floor/engine, /area/engine/engine_room) +"ylS" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/monotile/steel, +/area/medical/medbay/lobby) (1,1,1) = {" aaa @@ -75346,7 +75704,7 @@ bKQ abY aaJ aaJ -qxi +jYf pHV pHV ahS @@ -75603,7 +75961,7 @@ oUI mLQ aaJ aaJ -qxi +jYf pHV pHV pHV @@ -75860,7 +76218,7 @@ jLQ aaJ aaJ aaJ -qxi +jYf pHV pHV pHV @@ -76896,7 +77254,7 @@ agX agU aow aoo -iZY +kkk alT bLU ahr @@ -76907,7 +77265,7 @@ ahP ahP aGL ahP -bJU +bBS ajf ahm aZb @@ -77154,8 +77512,8 @@ mut aow krf aUT -dzN -cTx +lFu +hIK bwq ahO ahQ @@ -77184,8 +77542,8 @@ acF xyX afw acx -ehw -njf +bCy +gox aed aeh afu @@ -77411,17 +77769,17 @@ loC aow rEt aUT -aUu +aoJ aUT ajX ahO aic -aym -wrG -wrG -wrG -epi -fKK +nnZ +blf +blf +blf +bpl +anM tiu ahm akx @@ -77667,8 +78025,8 @@ agX alB aow aoB -jhM -aoJ +qUV +bDn aUT bbb ahO @@ -77677,7 +78035,7 @@ aky aky aky aky -pbM +hqQ aic bkD ahm @@ -77934,14 +78292,14 @@ aUz aUz aUz aUz -pbM -cIH +hqQ +oxY aZM ahm -nBI -neh +skf +pCw bvX -oAd +sxm pdT amc aok @@ -78196,13 +78554,13 @@ ahO ahO ahm aUe -fuz +bpm aUe aUe aUe aUe -pgp -wyL +eNN +mpJ akG bvP blc @@ -78434,32 +78792,32 @@ oWy aZa alz aYU -wnI +jqA eLS aZX -bCy -bws -bfA +bFX +qxg +lca aZX aZX aZX aZX -dTj -pLy -bCy +bmS +bYc +bFX aZX ahK baY baY bCh bbp -uxq +euM bbp bhf beH bfn bgO -dPn +bkU bwb aiR bld @@ -78695,7 +79053,7 @@ aov eCP aAI aAI -uBy +bxs ahR bCo bCo @@ -78703,17 +79061,17 @@ bCn bCo bCo bCo -bLK +bnl bCo qoc beA beA akI -jca -kaF +nKJ +eZb bcU aUy -afE +iye akM ajd aUe @@ -78957,14 +79315,14 @@ aZX aZX aZX bvT -aoE +xCD aZX aZX -mmF +rsC aZX -lca +kSo aZX -bfx +naa aiY aUe aUe @@ -79223,7 +79581,7 @@ blb gOn aaK ahm -aBK +bLK ald alo apT @@ -79236,7 +79594,7 @@ bwf ahf ame ame -qGw +ylS ahf aKh acx @@ -79248,13 +79606,13 @@ abL abL abL abL -abL -abL -abL -abL -abL -abL -abL +bil +bil +bil +bil +bil +bil +bil laZ laZ laZ @@ -79481,7 +79839,7 @@ aLf ahM ahm ahT -pHx +iOq ajE akB bvS @@ -79493,25 +79851,25 @@ aKh ahf ame mib -dhv +dfh ahf tsM acx bCS -aOP +mvE abL -aOH +kcf qOb agQ -afP +qhy hiP -abL +bil afU aWe agT aOT aWc -abL +bil bqx xdT ssf @@ -79724,51 +80082,51 @@ agX acb ahi bvE -unA -gLs -gLs -pbp +rvU +dXF +dXF +bws aRL bvw aaK alU -hDV -bIc -vYr +fHb +rxR +nOy bbm ahm -sTU -wDF +aBK +cpz bfu aUe aUe -pip -ama -peg -jca -mjX +bxo +apX +jau +nKJ +jdn bhb -qjH +mmh bGk -iWK -bne -dLZ -bYc -ukF +bpi +gks +faG +afC +kKB bmP bnd -bnl -bnF +bCC +bxr bxl bxr bCA bCB bCC -bxs -bpg -aOH +bxr +bxr +bxr aWd -abL +bil gWm aZh oES @@ -79980,11 +80338,11 @@ afw afw afw ahi -jSr +agS bCu -bvB +bpB amX -hZL +eoh aRL aoU aaK @@ -79995,37 +80353,37 @@ bco bco ahm bhd -pHx +iOq aUe ajT -aTP +iOS ajT alh -swq +psX aTP bJd ahf -wto +bpk mib ame ahf tsM acx bCS -alv -abL -afy -afD +qLv +aZq +bCC +cIR bGz bxm boA -abL +bil afW -afD +ogX bph afD bpL -abL +bil wCS mMv riN @@ -80237,11 +80595,11 @@ pHV pHV aaS ahi -eOz +rON bCu -bvB +bpB bzX -hZL +eoh aRL bId aaK @@ -80262,28 +80620,28 @@ hzd ahc afV ble -wto +bpk amd ame akE aKh acx -qMY -aOP -abL -afz -afD +qio +qLv +aZq +bCC +vzQ bxp bxm -boA -abL -afX -agR -bpi -agR +aOH bil -abL -mIj +bil +bil +bil +bil +bil +bil +bKM xAD laZ laZ @@ -80496,10 +80854,10 @@ pHV ahi aUF bCu -bvB +bpB aoT -amw -tDB +bkB +bvB baX aaK bvq @@ -80515,11 +80873,11 @@ aVM ahc ahC bvU -dre +mng sCC afV bcT -rJV +qaY bwl ahf ajh @@ -80531,15 +80889,15 @@ boz boK boU bxq -bxo -boB +bxr +aWd abL -boQ -agS bpj -agS +bpj +bpj +bpj bpM -abL +laZ isj dDu laZ @@ -80755,24 +81113,24 @@ biH bCu aVy aVy -fjp +uav aRL aUn aaK bvr -tfk -cph +bLQ +xFb bvu bhi ahc bbg ajY -xLJ +fBA akH aUj aja aAc -nes +qsx ajY afV afV @@ -80786,18 +81144,18 @@ bCS bmQ abL afB -afC +bjV bjV afP -afQ -abL -agx -bju -bpk -bpB -bpN +afP abL -sxM +bpj +bpj +bpj +bpj +bpj +pgd +mIj kqi laZ acu @@ -81018,42 +81376,42 @@ ahi aaK ala amM -fQU +aUu bio baW ahc bbx aPs -dJb +mUL ahE ajD akJ alm -gbq +mck ajY afV alL -rJV -ahf +qaY +vur bzM afV ssH acx bCS -bmS -abL -abL -abL -abL -abL +afK abL abL abL abL -bpl abL abL abL +bpj +bpj +bpj +bpj +bpj +laZ mIj lgg laZ @@ -81269,33 +81627,33 @@ ahi ahi ahi ahi -ram -qLy -ram +hgf +pnv +hgf aaK eWa amM -hQu +afE aUa bfy ahc bbH ajY ahk -aUG +whb aUj ajY ale -mmh -uwQ +afQ +alv bwr -mQK -kwD +olI +kYa ame bwo bvl aKh -kyP +oao bCR xMG laZ @@ -81304,13 +81662,13 @@ sgN krH laZ iNZ -qxg +laZ dIj -faG -bpm -mIj +dIj +laZ +laZ qBl -nxI +laZ mIj whd laZ @@ -81523,7 +81881,7 @@ afw afw aae eqv -iUg +bvi aoq aae akb @@ -81531,19 +81889,19 @@ akb akb aaK aUr -nOn -lNf -lWo +tGE +jSG +nRh bvZ ahc bBj alq -cOX +gRE bhT ahc amg ajY -bDn +ngo ajY afV bvk @@ -81554,7 +81912,7 @@ aQR aKh baF aAH -bmQ +aOP laZ pzR lKg @@ -81788,15 +82146,15 @@ aUo akb aaK aUq -nch +fBS aoO bvV bGy ahc bbW -wjj +ama bHC -ajY +ktI ahc bgG azf @@ -81811,7 +82169,7 @@ afV afV afS bDp -bmQ +aOP laZ qbU thO @@ -82325,7 +82683,7 @@ bFE bHB bwi aRD -bmU +aPk laZ asF kdN @@ -82582,7 +82940,7 @@ bFF aae aeT bEe -bmU +agx laZ asF kvZ @@ -82839,7 +83197,7 @@ wYv aad bIw bEe -bmU +aPk laZ iPA laZ @@ -83096,7 +83454,7 @@ aad aad bHY bEh -bmV +bIc aad bLk abT @@ -83353,7 +83711,7 @@ bKP bKX bwt bEi -bmU +aPk aad bLk abT @@ -83610,7 +83968,7 @@ bKP aad ahz bEe -bmU +aPk aSh bLl ohf @@ -83867,7 +84225,7 @@ adG bKY bgf bEe -bmU +aPk aad bLm bjA @@ -84124,7 +84482,7 @@ bKR aad aPx bEz -bmU +aPk aad bLn xDX @@ -84381,7 +84739,7 @@ abq aad buR bEe -bmU +aPk aad bLo abT @@ -84895,7 +85253,7 @@ bkv bBK blZ bEA -bmU +aPk aad bLq kit @@ -85137,19 +85495,19 @@ bXF bXG bcq kYm -abG -abG -abG -abG -abG +aoL +aoL +aoL +aoL +aoL acf caa bBI -abG -abG -abG -abG -abG +aoL +aoL +aoL +aoL +aoL bms bEh cmZ @@ -85394,22 +85752,22 @@ bXH bLM bct kYm -abG -abG +aoL +aoL bfZ bYf -abG +aoL buW cak bzO -abG +aoL iVx caG -abG -abG +aoL +aoL bwt bEi -bmU +aPk aad ecX ohf @@ -85651,7 +86009,7 @@ bpR jRa bcq kYm -abG +aoL kCd jYY dhL @@ -85663,7 +86021,7 @@ abG wZk ilH jnA -abG +aoL bnZ bDE bDG @@ -85908,7 +86266,7 @@ bpR jRa bcq kYm -abG +aoL biN bmC bmC @@ -85920,10 +86278,10 @@ bmE bmE bmE cQQ -abG +aoL aeT bEe -bmU +aPk aad bLr bnI @@ -86165,7 +86523,7 @@ cbg aec aHk bgR -abG +aoL biP byz bYh @@ -86180,7 +86538,7 @@ bmE cee bgf bEe -bmU +aPk aad cjB bnJ @@ -86422,7 +86780,7 @@ bXF biK bcw kYm -abG +aoL biQ bzN wyB @@ -86434,7 +86792,7 @@ tbX itk caR bmE -abG +aoL bmq bEB bmG @@ -86679,7 +87037,7 @@ cbh bcd bcx kYm -abG +aoL biT bBU cNT @@ -86691,7 +87049,7 @@ rCv bTi caT gHw -abG +aoL fnN bFh bLa @@ -87193,7 +87551,7 @@ cbh eba bcD kYm -abG +aoL bji bBU wMJ @@ -87204,8 +87562,8 @@ bmE xvg bTi caT -bmE -abG +gBn +aoL bmr bFI bmU @@ -87450,7 +87808,7 @@ cbj vyU bcq kYm -abG +aoL bjQ bTR lyW @@ -87462,7 +87820,7 @@ gDl vLt caV bmE -abG +aoL bmr bFI bmU @@ -87964,7 +88322,7 @@ bLT tgV bcM kYm -abG +aoL bkq bmE bmE @@ -87976,7 +88334,7 @@ bmE bmE bmE cQQ -abG +aoL bwu bGI bmU @@ -88221,19 +88579,19 @@ agm kEU bcq kYm -abG -abG -abG -abG -abG +aoL +aoL +aoL +aoL +aoL bvc cap bzP -abG -abG -abG -abG -abG +aoL +aoL +aoL +aoL +aoL bXZ bFI bmU @@ -89000,11 +89358,11 @@ aad aad aad aad -aad -aad -aad -aad -aad +byA +byA +byA +byA +byA bmt bFI bmU @@ -89248,20 +89606,20 @@ slq agm qRr bcq -kYm +enm aad abJ azD aSH aZl -aad +afy bkE buY -bvi -bFX +byA +bGH bKx bKS -bKY +boQ bmr bFI bmU @@ -89505,20 +89863,20 @@ abV bHr vyU bcq -kYm -aad -acl -acl -acl -acl -aad -bkU +sxM +bpN +bFY +abk abk abk abk abk +hZW +byA +abJ +abk bKT -abq +byA bmr bFI bmU @@ -89761,23 +90119,23 @@ eCK rfC hxW vyU -bcq -kYm -pZe +wOL +aQt +boB acm +bvd acl -acl -acl +bfA biB bkV -abk +tDB bvj bFY -bKM +abk bKU -eNN -bBS -bHd +byA +bmr +qzs bmU aci bnt @@ -90019,20 +90377,20 @@ rdR prp vyU bcq -kYm +sxM pZe -acl -acl -acl -aZq -aad -blf -bva -bva -bva +bFY +abk +abk +abk +abk +abk +nxI +byA bva +abk bKV -bnq +byA bmu bFI bmU @@ -90276,20 +90634,20 @@ qzh agm mzE bcq -kYm -fHb +wjq +aad acI aAk aSI bbt -aad blg -bvd +blg +buY byA bGH bKN bKW -aad +byA bmv bHI bmY @@ -90542,10 +90900,10 @@ aad aad aad aad -aad -aad -aad -aad +byA +byA +byA +byA bLc aRQ bEj @@ -102324,9 +102682,9 @@ ctp ixq ixq ixq -jYf -qhr ixq +qhr +afz ixq tXv bAs @@ -102577,15 +102935,15 @@ vIX anJ hJc tRF +anJ gqR gqR gqR +acq +acq gqR -gqR -anj -avP -avP avP +ope bAt ayJ aiz @@ -102834,14 +103192,14 @@ vbV chg cae ohH -gqR +anJ aJH feG ixc -nAH +aBj nBU -anM -apX +gqR +anm aQq btn ayJ @@ -103091,14 +103449,14 @@ sDP rEm pkk qLS -gqR +anJ ann ayE nkM aQm aLk rtU -qio +otW aQr lZG ayJ @@ -103348,12 +103706,12 @@ ixD chg jaI jbD -gqR +anJ bhr lFb lod nAH -anm +ufH qUD aQl aQs @@ -103605,14 +103963,14 @@ anJ anJ anJ anJ -gqR -gqR -gqR -gqR -gqR +anJ +bJU +hkw +rii +azw aBj mXz -fBS +anm azg bto ayJ @@ -103859,18 +104217,18 @@ aaa aaa aaa aaa -aaJ -aaJ -aaJ -anb -bLP -hJH -eSk -anm +anJ +anJ +anJ +anJ +mxN +bne +gPT +xqt +kOo +gqR anm -anM -apX -aQq +mKt mPU azk aMu @@ -104116,18 +104474,18 @@ aaa aaa aaa aaa -aaJ -aaJ -aaJ -aoV -bLQ -tWl -liD -anm +anJ +anJ +anJ +anJ +gqR +gqR +gqR +bfx acq -aoL +gqR +anm mKt -cpz vtl azk aQS @@ -104377,14 +104735,14 @@ aaJ aaJ aaJ anb -liD -anm -anm -anm -anm +bLP +hJH +eSk +aUG +agR aoX -aQl -aQs +anm +mKt oUM agG aQT @@ -104630,15 +104988,15 @@ aaa aaa aaa aaa -anj -anj -anj -anj +aaJ +aaJ +aaJ +aoV bYb +tWl +liD anm -anm -anm -anm +mIN anm anm anm @@ -104887,17 +105245,17 @@ aaa aaa aaa aaa -aaa -mxN -skf -pgd +aaJ +aaJ +aaJ +anb bhs anx eKw anx +wGk anx -anx -eKw +bpg anx vWj azk @@ -105144,15 +105502,15 @@ aaa aaa aaa aaa -aaa -eZb -vRI +anj +anj +anj anj bfM wFS otW wFS -wFS +xbr wFS snV iXF @@ -105166,7 +105524,7 @@ fBV ilc xpP xDn -vgZ +cmf azk lgi azk @@ -105402,14 +105760,14 @@ aaa aaa aaa aaa -vvn -vRI +hQw +xCH anj anI bkn aQn lfX -lfX +afX ydG qFC okI @@ -105666,7 +106024,7 @@ ahd anj tDf aQo -aQo +lqZ aQo tDf anj @@ -106180,8 +106538,8 @@ aip aaZ hUb smz -smz -smz +bPQ +bju vBM aaZ ebV @@ -106694,7 +107052,7 @@ iry anj hUb smz -smz +bPQ smz epE anj @@ -107208,7 +107566,7 @@ mBj anj ugG ugG -ugG +sHy ugG ugG anj @@ -107459,13 +107817,13 @@ aaa aaa aaa arT -arT -bMp +bnF +kYP rCH arT arT arT -arT +pzC arT jha icy @@ -107722,7 +108080,7 @@ aaa arT avw jLQ -arT +pzC jLQ avw ugK @@ -107974,12 +108332,12 @@ aaa aaa aaa aaa -aaa +tHS aaa aaa avI jLQ -arT +tzQ jLQ avI oMJ From 6bb9b54cb73769ce8f0da27a82690fd61a4cf2c9 Mon Sep 17 00:00:00 2001 From: SerynEngi Date: Fri, 13 Dec 2024 16:28:22 -0800 Subject: [PATCH 06/26] Delete Virologist job from Tycoon We may have accidentally blown it off the side of the ship. Our bad. Anyway. --- _maps/map_files/Tycoon/job_changes.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/_maps/map_files/Tycoon/job_changes.dm b/_maps/map_files/Tycoon/job_changes.dm index 60f0805b296..9c1b70e8259 100644 --- a/_maps/map_files/Tycoon/job_changes.dm +++ b/_maps/map_files/Tycoon/job_changes.dm @@ -1,3 +1,5 @@ +MAP_REMOVE_JOB(virologist) //This job is being phased out of NSV + /datum/job/pilot/New() ..() MAP_JOB_CHECK From fea648dd1add09bf980a21865d7155eadf916e26 Mon Sep 17 00:00:00 2001 From: SerynEngi Date: Fri, 13 Dec 2024 16:55:29 -0800 Subject: [PATCH 07/26] Atlas Damage Control Central --- _maps/map_files/Atlas/atlas.dmm | 1143 ++++++++++++++++---------- _maps/map_files/Atlas/atlas2.dmm | 405 +++++---- _maps/map_files/Atlas/job_changes.dm | 2 +- 3 files changed, 926 insertions(+), 624 deletions(-) diff --git a/_maps/map_files/Atlas/atlas.dmm b/_maps/map_files/Atlas/atlas.dmm index b8b859628ae..ed1ef8f8af2 100644 --- a/_maps/map_files/Atlas/atlas.dmm +++ b/_maps/map_files/Atlas/atlas.dmm @@ -129,14 +129,21 @@ /turf/open/floor/wood, /area/chapel/main) "aq" = ( -/obj/machinery/door/airlock/ship/maintenance, -/obj/machinery/door/firedoor/border_only{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, -/obj/machinery/door/firedoor/border_only, -/obj/effect/landmark/zebra_interlock_point, -/turf/open/floor/plating, -/area/maintenance/nsv/deck2/port) +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/effect/turf_decal/ship/techfloor{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/durasteel/lino, +/area/hallway/nsv/deck2/primary) "ar" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -185,14 +192,11 @@ /turf/open/floor/monotile/steel, /area/science) "ay" = ( -/obj/effect/turf_decal/tile/ship/half/green{ - dir = 8 - }, /obj/effect/turf_decal/ship/techfloor{ - dir = 4 + dir = 5 }, -/obj/machinery/suit_storage_unit/standard_unit, -/turf/open/floor/monotile/dark, +/obj/effect/decal/cleanable/glitter/white, +/turf/open/floor/carpet/ship, /area/hallway/nsv/deck2/primary) "az" = ( /obj/structure/table, @@ -248,6 +252,22 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/maintenance/nsv/deck2/port) +"aJ" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "2-8"; + tag = "" + }, +/turf/open/floor/monotile/steel, +/area/hallway/nsv/deck2/primary) "aL" = ( /obj/machinery/conveyor/slow{ dir = 1; @@ -270,15 +290,14 @@ /turf/open/floor/durasteel/alt, /area/hallway/nsv/deck2/primary) "aP" = ( +/obj/machinery/airalarm/directional/west, +/obj/structure/table/reinforced, +/obj/item/lighter, +/obj/effect/decal/cleanable/glitter/white, /obj/effect/turf_decal/ship/techfloor{ - dir = 8 - }, -/obj/effect/turf_decal/tile/ship/half/green{ - dir = 4 + dir = 10 }, -/obj/machinery/suit_storage_unit/standard_unit, -/obj/machinery/airalarm/directional/west, -/turf/open/floor/monotile/dark, +/turf/open/floor/carpet/ship, /area/hallway/nsv/deck2/primary) "aT" = ( /obj/machinery/atmospherics/components/trinary/mixer/flipped/layer4{ @@ -306,14 +325,15 @@ /turf/open/floor/plasteel/techmaint, /area/security/main) "aY" = ( -/obj/effect/turf_decal/tile/ship/half/green{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 }, -/obj/structure/tank_dispenser/oxygen, /obj/effect/turf_decal/ship/techfloor{ - dir = 4 + dir = 6 }, -/turf/open/floor/monotile/dark, +/obj/effect/decal/cleanable/glitter/white, +/turf/open/floor/carpet/ship, /area/hallway/nsv/deck2/primary) "ba" = ( /obj/effect/decal/cleanable/blood/tracks{ @@ -613,6 +633,19 @@ /obj/structure/grille/wall, /turf/open/space/basic, /area/space/nearstation) +"ce" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/monotile/steel, +/area/hallway/nsv/deck2/primary) "cf" = ( /obj/machinery/air_sensor/atmos{ id_tag = "sdmix_sensor"; @@ -628,25 +661,25 @@ /turf/open/floor/monotile/steel, /area/nsv/weapons) "cj" = ( -/obj/machinery/airalarm/directional/north, -/obj/effect/turf_decal/ship/techfloor{ - dir = 9 +/obj/structure/closet/crate{ + opened = 1 }, -/obj/structure/chair/stool, -/obj/effect/decal/cleanable/cobweb, -/obj/effect/landmark/start/janitor, -/obj/structure/chair/noose, -/obj/effect/decal/remains/human{ - name = "Joe Czanek" +/obj/item/stack/rods/fifty, +/obj/item/stack/rods/fifty, +/obj/item/stack/rods/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/tile/plasteel{ + amount = 50 }, -/obj/machinery/requests_console{ - department = "Custodial Closet"; - departmentType = 2; - name = "Custodial RC"; - pixel_x = -32 +/obj/item/stack/tile/plasteel{ + amount = 50 }, -/turf/open/floor/durasteel/lino, -/area/janitor) +/obj/machinery/camera{ + network = list("ss13,eng"); + name = "Deck 2 DC" + }, +/turf/open/floor/monotile/steel, +/area/hallway/nsv/deck2/primary) "cl" = ( /obj/effect/landmark/xeno_spawn, /turf/template_noop, @@ -829,6 +862,17 @@ }, /turf/open/floor/plating/airless, /area/space/nearstation) +"cR" = ( +/obj/effect/turf_decal/tile/ship/green{ + dir = 4 + }, +/obj/effect/turf_decal/tile/ship/green{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/durasteel/alt, +/area/hallway/nsv/deck2/primary) "cS" = ( /obj/structure/cable{ icon_state = "1-2" @@ -949,24 +993,11 @@ /turf/open/floor/monotile/dark, /area/security/main) "dp" = ( -/obj/structure/rack, -/obj/effect/turf_decal/tile/ship/half/blue{ - dir = 8 - }, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/shoes/magboots, -/obj/item/tank/jetpack/oxygen, -/obj/item/tank/jetpack/oxygen, -/obj/item/tank/jetpack/oxygen, -/obj/item/tank/jetpack/oxygen, +/obj/machinery/vending/wardrobe/jani_wardrobe, /obj/effect/turf_decal/ship/techfloor{ - dir = 4 + dir = 6 }, -/obj/machinery/firealarm/directional/east, -/turf/open/floor/monotile/dark, +/turf/open/floor/durasteel/lino, /area/hallway/nsv/deck2/primary) "dq" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -1008,6 +1039,23 @@ /obj/structure/lattice/catwalk/over/ship, /turf/open/floor/monotile/dark, /area/nsv/weapons) +"dw" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/ship/green{ + dir = 8 + }, +/obj/effect/turf_decal/tile/ship/green{ + dir = 1 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = -26 + }, +/turf/open/floor/durasteel/alt, +/area/hallway/nsv/deck2/primary) "dx" = ( /obj/effect/spawner/lootdrop/maintenance/three, /obj/structure/rack, @@ -1642,16 +1690,8 @@ /turf/open/floor/plating, /area/maintenance/nsv/deck2/port/fore) "ft" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/ship/green{ - dir = 8 - }, -/obj/effect/turf_decal/tile/ship/green{ - dir = 1 - }, -/obj/structure/extinguisher_cabinet/west, -/turf/open/floor/durasteel/alt, -/area/hallway/nsv/deck2/primary) +/turf/closed/wall/r_wall, +/area/nsv/engine/dcc) "fu" = ( /obj/machinery/atmospherics/pipe/simple/general/hidden{ dir = 6 @@ -1805,6 +1845,13 @@ /obj/machinery/status_display/evac/east, /turf/open/floor/monotile/dark, /area/engine/engine_room) +"fQ" = ( +/obj/structure/cable{ + icon_state = "2-8"; + tag = "" + }, +/turf/open/floor/plasteel/ridged/steel, +/area/nsv/engine/dcc) "fS" = ( /obj/structure/sign/directions/supply{ pixel_y = -6 @@ -2167,8 +2214,14 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, /turf/open/floor/plasteel/ridged/steel, -/area/hallway/nsv/deck2/primary) +/area/nsv/engine/dcc) "gS" = ( /turf/open/floor/engine/airless, /area/space/nearstation) @@ -2320,16 +2373,9 @@ /turf/open/floor/plating, /area/maintenance/nsv/deck2/starboard) "hp" = ( -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/airlock/ship/command/glass{ - name = "Public EVA" - }, -/obj/effect/landmark/zebra_interlock_point, +/obj/structure/chair, /turf/open/floor/monotile/steel, -/area/hallway/nsv/deck2/primary) +/area/hallway/secondary/exit/departure_lounge) "hq" = ( /obj/machinery/door/airlock/ship/security/glass{ name = "Security Equipment"; @@ -2438,7 +2484,7 @@ dir = 1 }, /turf/open/floor/durasteel/alt, -/area/janitor) +/area/hallway/nsv/deck2/primary) "hE" = ( /obj/structure/cable{ icon_state = "1-8" @@ -2510,15 +2556,18 @@ /turf/closed/wall/steel, /area/nsv/weapons/gauss/battery/deck2/port) "hM" = ( -/obj/effect/turf_decal/tile/ship/half/green{ - dir = 8 +/obj/machinery/firealarm/directional/east, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 }, /obj/effect/turf_decal/ship/techfloor{ dir = 4 }, -/obj/machinery/firealarm/directional/east, -/obj/machinery/suit_storage_unit/standard_unit, -/turf/open/floor/monotile/dark, +/obj/effect/decal/cleanable/glitter/white, +/turf/open/floor/carpet/ship, /area/hallway/nsv/deck2/primary) "hO" = ( /obj/structure/closet/secure_closet/personal/cabinet, @@ -3302,8 +3351,12 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/machinery/door/poddoor/shutters/preopen{ + name = "DC Central Shutters"; + id = "dcc" + }, /turf/open/floor/monotile/steel, -/area/maintenance/nsv/deck2/starboard) +/area/nsv/engine/dcc) "kt" = ( /obj/structure/cable{ icon_state = "4-8" @@ -3517,12 +3570,14 @@ /turf/open/floor/monotile/dark, /area/nsv/weapons) "kT" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 }, -/obj/effect/turf_decal/box, -/turf/open/floor/monotile/dark, -/area/janitor) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/turf/open/floor/monotile/steel, +/area/hallway/nsv/deck2/primary) "kU" = ( /obj/item/ship_weapon/ammunition/missile, /obj/item/ship_weapon/ammunition/missile{ @@ -3657,7 +3712,7 @@ }, /obj/effect/turf_decal/tile/yellow, /turf/open/floor/monotile/steel, -/area/hallway/nsv/deck2/primary) +/area/nsv/engine/dcc) "lj" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/monotile/dark, @@ -4562,6 +4617,11 @@ }, /obj/machinery/light_switch/east, /obj/effect/landmark/start/depsec/engineering, +/obj/machinery/camera{ + network = list("eng"); + name = "Reactor Control"; + dir = 8 + }, /turf/open/floor/monotile/steel, /area/engine/engine_room) "oi" = ( @@ -4684,20 +4744,24 @@ /turf/open/floor/monotile/steel, /area/engine/engine_room) "oB" = ( -/obj/structure/rack, -/obj/item/construction/rcd, -/obj/item/construction/rcd, -/obj/item/construction/rcd, -/obj/item/rcd_ammo/large, -/obj/item/rcd_ammo/large, -/obj/item/rcd_ammo/large, -/obj/effect/turf_decal/tile/ship/half/blue{ - dir = 8 - }, /obj/effect/turf_decal/ship/techfloor{ dir = 4 }, -/turf/open/floor/monotile/dark, +/obj/item/cigbutt, +/obj/item/cigbutt{ + pixel_x = 5; + pixel_y = -3 + }, +/obj/item/cigbutt{ + pixel_x = 12; + pixel_y = 6 + }, +/obj/item/storage/fancy/cigarettes{ + desc = "These taste terrible, but they'll help you manage a community."; + name = "\improper Community Manager's Cigarettes" + }, +/obj/machinery/light_switch/east, +/turf/open/floor/durasteel/lino, /area/hallway/nsv/deck2/primary) "oC" = ( /obj/machinery/light{ @@ -4801,8 +4865,12 @@ /turf/open/floor/durasteel/techfloor_grid, /area/security/prison) "oU" = ( -/turf/closed/wall/steel, -/area/hallway/secondary/exit/departure_lounge) +/obj/machinery/door/poddoor/ship{ + id = "dc2"; + name = "Restricted Damage Control Supplies" + }, +/turf/open/floor/monotile/steel, +/area/hallway/nsv/deck2/primary) "oV" = ( /obj/effect/turf_decal/tile/ship/green{ dir = 4 @@ -4941,9 +5009,12 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/structure/cable{ + icon_state = "1-2" }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/primary) @@ -5166,17 +5237,15 @@ /turf/open/floor/plating, /area/maintenance/nsv/deck2/port/fore) "pT" = ( -/obj/effect/turf_decal/tile/ship/half/green{ +/obj/machinery/camera/autoname{ dir = 4 }, +/obj/structure/table/reinforced, +/obj/effect/decal/cleanable/glitter/white, /obj/effect/turf_decal/ship/techfloor{ dir = 8 }, -/obj/machinery/suit_storage_unit/standard_unit, -/obj/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/monotile/dark, +/turf/open/floor/carpet/ship, /area/hallway/nsv/deck2/primary) "pU" = ( /obj/effect/turf_decal/stripes/line{ @@ -5230,18 +5299,14 @@ /turf/open/floor/plating/airless, /area/space/nearstation) "pZ" = ( -/obj/effect/turf_decal/tile/ship/half/green{ - dir = 4 +/obj/machinery/vending/cigarette{ + name = "Adama's Finest Cigars" }, +/obj/effect/decal/cleanable/glitter/white, /obj/effect/turf_decal/ship/techfloor{ - dir = 8 - }, -/obj/machinery/camera/autoname{ - dir = 4 + dir = 9 }, -/obj/machinery/suit_storage_unit/standard_unit, -/obj/item/radio/intercom/directional/north, -/turf/open/floor/monotile/dark, +/turf/open/floor/carpet/ship, /area/hallway/nsv/deck2/primary) "qa" = ( /obj/machinery/light/small{ @@ -5254,14 +5319,21 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/effect/turf_decal/ship/techfloor, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/monotile/steel, -/area/hallway/nsv/deck2/primary) +/obj/machinery/meter{ + target_layer = 4; + name = "Scrubber Line Status"; + pixel_x = 5; + pixel_y = 6 + }, +/obj/machinery/meter{ + name = "Supply Line Status"; + pixel_y = -6; + pixel_x = -7 + }, +/turf/open/floor/plating, +/area/nsv/engine/dcc) "qc" = ( /obj/machinery/conveyor/slow{ id = "atlas_torp" @@ -5442,13 +5514,18 @@ /turf/open/floor/plating, /area/maintenance/nsv/deck2/starboard) "qN" = ( +/obj/machinery/door/airlock/ship/public{ + name = "Custodial Garage"; + req_one_access_txt = "26" + }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, -/obj/machinery/door/airlock/ship/command/glass{ - name = "E.V.A. Storage"; - req_access_txt = "18" +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "1-2" }, /obj/effect/landmark/zebra_interlock_point, /turf/open/floor/monotile/steel, @@ -5468,17 +5545,12 @@ /turf/closed/wall/steel, /area/nsv/weapons/gauss/battery/deck2/starboard) "qU" = ( -/obj/effect/turf_decal/tile/ship/half/blue{ - dir = 4 - }, +/obj/structure/janitorialcart, +/obj/item/mop, /obj/effect/turf_decal/ship/techfloor{ - dir = 8 - }, -/obj/machinery/camera/autoname{ - dir = 4 + dir = 10 }, -/obj/machinery/suit_storage_unit/standard_unit, -/turf/open/floor/monotile/dark, +/turf/open/floor/durasteel/lino, /area/hallway/nsv/deck2/primary) "qY" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -5588,16 +5660,25 @@ /turf/open/floor/plating, /area/nsv/weapons) "rr" = ( -/obj/effect/turf_decal/tile/ship/half/blue{ - dir = 4 - }, +/obj/machinery/airalarm/directional/north, /obj/effect/turf_decal/ship/techfloor{ - dir = 8 + dir = 9 }, -/obj/machinery/airalarm/directional/west, -/obj/item/radio/intercom/directional/north, -/obj/machinery/suit_storage_unit/standard_unit, -/turf/open/floor/monotile/dark, +/obj/structure/chair/stool, +/obj/effect/decal/cleanable/cobweb, +/obj/effect/landmark/start/janitor, +/obj/structure/chair/noose, +/obj/effect/decal/remains/human{ + name = "Joe Czanek" + }, +/obj/machinery/requests_console{ + department = "Custodial Closet"; + departmentType = 2; + name = "Custodial RC"; + pixel_x = -32; + payment_department = "CIV" + }, +/turf/open/floor/durasteel/lino, /area/hallway/nsv/deck2/primary) "ru" = ( /obj/structure/grille/broken, @@ -5704,18 +5785,18 @@ /turf/open/floor/durasteel/alt, /area/hallway/nsv/deck2/primary) "rJ" = ( -/obj/effect/turf_decal/tile/ship/half/blue{ - dir = 4 - }, /obj/effect/turf_decal/ship/techfloor{ dir = 8 }, -/obj/machinery/light/small{ - brightness = 3; - dir = 8 +/obj/machinery/firealarm{ + dir = 4; + pixel_x = -26 }, -/obj/machinery/suit_storage_unit/standard_unit, -/turf/open/floor/monotile/dark, +/obj/item/cigbutt/roach, +/mob/living/simple_animal/kalo{ + name = "Comrade" + }, +/turf/open/floor/durasteel/lino, /area/hallway/nsv/deck2/primary) "rK" = ( /obj/machinery/door/firedoor/border_only{ @@ -5759,15 +5840,11 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/structure/disposalpipe/segment{ dir = 10 }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/primary) "rR" = ( @@ -5802,18 +5879,24 @@ }, /area/maintenance/nsv/deck2/starboard) "rU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/effect/turf_decal/ship/techfloor{ - dir = 1 - }, -/turf/open/floor/durasteel/lino, -/area/janitor) +/obj/machinery/camera/autoname, +/obj/structure/closet/firecloset, +/obj/item/clothing/suit/fire/firefighter, +/obj/item/clothing/suit/fire/firefighter, +/obj/item/clothing/suit/fire/firefighter, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/obj/item/clothing/head/hardhat/red, +/obj/item/clothing/head/hardhat/red, +/obj/item/clothing/head/hardhat/red, +/obj/item/extinguisher, +/obj/item/extinguisher, +/obj/item/extinguisher, +/obj/machinery/airalarm/directional/north, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/monotile/steel, +/area/hallway/nsv/deck2/primary) "rV" = ( /obj/effect/turf_decal/tile/ship/half/green, /obj/machinery/light{ @@ -5931,12 +6014,13 @@ dir = 1 }, /obj/effect/turf_decal/tile/yellow, -/obj/structure/rack, -/obj/item/stack/sheet/duranium/twenty, -/obj/item/stack/sheet/duranium/twenty, -/obj/item/stack/sheet/mineral/titanium/fifty, +/obj/machinery/computer/station_alert{ + dir = 1; + name = "ship alert console" + }, +/obj/machinery/airalarm/directional/south, /turf/open/floor/monotile/steel, -/area/hallway/nsv/deck2/primary) +/area/nsv/engine/dcc) "sq" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, @@ -5947,14 +6031,16 @@ /turf/open/floor/plating, /area/nsv/hanger/notkmcstupidhanger) "sy" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 +/obj/effect/spawner/structure/window/plasma/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + name = "DC Central Shutters"; + id = "dcc" }, -/turf/open/floor/plasteel/grid/steel, -/area/hallway/secondary/exit/departure_lounge) +/turf/open/floor/plating, +/area/nsv/engine/dcc) "sz" = ( /obj/machinery/shieldgen, /turf/open/floor/plating, @@ -5983,7 +6069,7 @@ }, /obj/effect/turf_decal/tile/yellow, /turf/open/floor/monotile/steel, -/area/hallway/nsv/deck2/primary) +/area/nsv/engine/dcc) "sF" = ( /obj/machinery/light/floor, /turf/open/floor/plasteel/techmaint{ @@ -6293,17 +6379,18 @@ /turf/open/floor/monotile/dark, /area/science) "ty" = ( -/obj/effect/turf_decal/tile/ship/red{ - dir = 8 - }, -/obj/effect/turf_decal/tile/ship/red{ +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 +/obj/machinery/door/airlock/ship/public/glass{ + name = "Smoking area" }, -/turf/open/floor/plasteel/grid/steel, -/area/hallway/secondary/exit/departure_lounge) +/obj/effect/landmark/zebra_interlock_point, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/monotile/steel, +/area/hallway/nsv/deck2/primary) "tz" = ( /obj/machinery/seed_extractor, /turf/open/floor/plasteel/techmaint, @@ -6369,7 +6456,9 @@ /turf/open/floor/monotile/steel, /area/nsv/weapons) "tJ" = ( -/obj/structure/chair, +/obj/structure/rack, +/obj/item/relic, +/obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating{ icon_state = "panelscorched" }, @@ -6396,7 +6485,7 @@ }, /obj/structure/ladder, /turf/open/floor/durasteel/alt, -/area/janitor) +/area/hallway/nsv/deck2/primary) "tP" = ( /turf/closed/wall/r_wall, /area/quartermaster/storage) @@ -6457,9 +6546,20 @@ dir = 8 }, /obj/effect/turf_decal/tile/yellow, -/obj/item/radio/intercom/directional/east, +/obj/item/radio/intercom{ + freerange = 1; + name = "Engineering Channel"; + pixel_y = -6; + frequency = 1357 + }, +/obj/item/radio/intercom{ + freerange = 1; + name = "Common Channel"; + pixel_y = 5 + }, +/obj/structure/table, /turf/open/floor/monotile/steel, -/area/hallway/nsv/deck2/primary) +/area/nsv/engine/dcc) "uc" = ( /obj/structure/closet/secure_closet/engineering_welding{ req_access = null; @@ -6528,6 +6628,15 @@ /obj/structure/chair/stool, /turf/open/floor/monotile/steel, /area/security/main) +"uj" = ( +/obj/structure/chair/stool, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/obj/effect/decal/cleanable/glitter/white, +/obj/effect/turf_decal/ship/techfloor, +/turf/open/floor/carpet/ship, +/area/hallway/nsv/deck2/primary) "uk" = ( /obj/effect/turf_decal/ship/delivery/yellow, /obj/machinery/door/firedoor/border_only, @@ -6656,8 +6765,15 @@ }, /obj/effect/turf_decal/tile/yellow, /obj/machinery/firealarm/directional/east, +/obj/machinery/computer/camera_advanced{ + desc = "Used to access the various cameras on the Ship."; + em_block = d; + dir = 8; + network = list("eng"); + name = "Critical Engineering Monitoring Console" + }, /turf/open/floor/monotile/steel, -/area/hallway/nsv/deck2/primary) +/area/nsv/engine/dcc) "ux" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -6820,13 +6936,15 @@ /turf/open/floor/monotile/steel, /area/nsv/weapons/gauss/battery/deck2/port) "uX" = ( -/obj/structure/janitorialcart, -/obj/item/mop, -/obj/effect/turf_decal/ship/techfloor{ - dir = 10 +/obj/structure/reagent_dispensers/watertank, +/obj/machinery/button/door{ + name = "Advanced Damage Control Supplies"; + pixel_y = -31; + id = "dc2"; + req_one_access_txt = "20, 56, 57" }, -/turf/open/floor/durasteel/lino, -/area/janitor) +/turf/open/floor/monotile/steel, +/area/hallway/nsv/deck2/primary) "uY" = ( /obj/machinery/deck_turret/autoelevator, /obj/effect/turf_decal/stripes/line, @@ -7032,6 +7150,19 @@ }, /turf/open/floor/plating, /area/engine/atmos) +"vI" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/ship/green{ + dir = 8 + }, +/obj/effect/turf_decal/tile/ship/green{ + dir = 1 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/durasteel/alt, +/area/hallway/nsv/deck2/primary) "vJ" = ( /obj/machinery/conveyor{ dir = 4; @@ -7076,17 +7207,10 @@ /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/primary) "vS" = ( -/obj/machinery/door/airlock/ship/security/glass{ - name = "Prisoner Transfer"; - req_one_access_txt = "2" - }, -/obj/effect/landmark/zebra_interlock_point, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 +/obj/item/kirbyplants{ + icon_state = "plant-32" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/computer/ship/viewscreen, /turf/open/floor/monotile/steel, /area/hallway/secondary/exit/departure_lounge) "vT" = ( @@ -7170,7 +7294,7 @@ dir = 8 }, /turf/open/floor/monotile/steel, -/area/hallway/nsv/deck2/primary) +/area/nsv/engine/dcc) "wd" = ( /turf/closed/wall/steel, /area/maintenance/nsv/deck2/port) @@ -7178,8 +7302,9 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, +/obj/machinery/airalarm/directional/west, /turf/open/floor/plasteel/ridged/steel, -/area/hallway/nsv/deck2/primary) +/area/nsv/engine/dcc) "wh" = ( /obj/machinery/light{ dir = 8 @@ -7211,19 +7336,11 @@ /turf/open/floor/monotile/steel, /area/quartermaster/miningoffice) "wq" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "2-4" +/obj/machinery/firealarm{ + dir = 4; + pixel_x = -26 }, -/turf/open/floor/monotile/steel, +/turf/closed/wall/r_wall, /area/hallway/nsv/deck2/primary) "wr" = ( /obj/item/radio/intercom/directional/east, @@ -7255,8 +7372,11 @@ /turf/open/floor/engine, /area/quartermaster/storage) "wx" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plasteel/ridged/steel, -/area/hallway/nsv/deck2/primary) +/area/nsv/engine/dcc) "wy" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/curtain/obscuring/grey, @@ -7336,22 +7456,24 @@ /turf/open/floor/carpet/orange, /area/engine/engine_room) "wN" = ( -/obj/structure/closet/l3closet/janitor, -/obj/machinery/camera/autoname, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/power/apc/auto_name/north, -/obj/effect/turf_decal/ship/techfloor{ - dir = 5 - }, -/obj/item/poster/random_contraband{ - desc = "No memes in general!"; - name = "discord moderation textbook" - }, -/obj/item/radio/intercom/directional/east, -/turf/open/floor/durasteel/lino, -/area/janitor) +/obj/item/clothing/suit/space/eva, +/obj/item/clothing/suit/space/eva, +/obj/item/clothing/suit/space/eva, +/obj/item/clothing/suit/space/eva, +/obj/item/clothing/suit/space/eva, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/clothing/head/helmet/space/eva, +/obj/item/clothing/head/helmet/space/eva, +/obj/item/clothing/head/helmet/space/eva, +/obj/item/clothing/head/helmet/space/eva, +/obj/item/clothing/head/helmet/space/eva, +/obj/structure/closet, +/turf/open/floor/monotile/steel, +/area/hallway/nsv/deck2/primary) "wO" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -7556,7 +7678,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/landmark/zebra_interlock_point, /turf/open/floor/monotile/steel, -/area/hallway/nsv/deck2/primary) +/area/nsv/engine/dcc) "xA" = ( /obj/structure/cable{ icon_state = "4-8" @@ -8035,7 +8157,7 @@ dir = 5 }, /turf/open/floor/plasteel/ridged/steel, -/area/hallway/nsv/deck2/primary) +/area/nsv/engine/dcc) "zc" = ( /obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ dir = 4 @@ -8605,8 +8727,15 @@ /obj/machinery/camera/autoname{ dir = 4 }, +/obj/structure/table, +/obj/machinery/button/door{ + name = "Damage Control Central Window Shutters"; + id = "dcc"; + req_one_access_txt = "11"; + pixel_y = 4 + }, /turf/open/floor/monotile/steel, -/area/hallway/nsv/deck2/primary) +/area/nsv/engine/dcc) "Bd" = ( /obj/structure/lattice/catwalk/over/ship, /obj/structure/extinguisher_cabinet/south, @@ -8629,18 +8758,33 @@ /obj/machinery/light{ dir = 4 }, +/obj/structure/table, +/obj/machinery/button/door{ + name = "Advanced Damage Control Supplies"; + pixel_x = 4; + pixel_y = 8; + id = "dc2"; + req_one_access_txt = "20, 56, 57" + }, +/obj/machinery/button/door{ + name = "Damage Control Supply Access"; + pixel_x = -6; + pixel_y = 8; + id = "dc1"; + req_one_access_txt = "11" + }, /turf/open/floor/monotile/steel, -/area/hallway/nsv/deck2/primary) +/area/nsv/engine/dcc) "Bi" = ( -/obj/effect/turf_decal/tile/ship/red, -/obj/effect/turf_decal/tile/ship/red{ +/obj/effect/turf_decal/ship/techfloor, +/obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/open/floor/plasteel/grid/steel, -/area/hallway/secondary/exit/departure_lounge) +/turf/open/floor/monotile/steel, +/area/nsv/engine/dcc) "Bj" = ( /turf/open/floor/monotile/dark, /area/science) @@ -8766,10 +8910,6 @@ /turf/open/floor/monotile/steel, /area/ai_monitored/security/armory) "BM" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -26 - }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/ship/green{ dir = 8 @@ -8780,6 +8920,13 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, +/obj/machinery/button/door{ + name = "Damage Control Supply Access"; + pixel_y = -1; + id = "dc1"; + req_one_access_txt = "11"; + pixel_x = -30 + }, /turf/open/floor/durasteel/alt, /area/hallway/nsv/deck2/primary) "BN" = ( @@ -9018,21 +9165,15 @@ /turf/open/floor/monotile/steel, /area/hallway/secondary/exit/departure_lounge) "CD" = ( -/obj/machinery/door/airlock/ship/public{ - name = "Custodial Garage"; - req_one_access_txt = "26" - }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/vehicle/ridden/janicart, +/obj/item/key/janitor, +/obj/effect/turf_decal/ship/techfloor, +/obj/machinery/light/small/broken, /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/monotile/steel, -/area/janitor) +/turf/open/floor/durasteel/lino, +/area/hallway/nsv/deck2/primary) "CE" = ( /turf/closed/wall/r_wall, /area/security/detectives_office) @@ -9046,8 +9187,11 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/ridged/steel, -/area/hallway/nsv/deck2/primary) +/area/nsv/engine/dcc) "CG" = ( /obj/machinery/deck_turret, /turf/open/floor/plating, @@ -9104,7 +9248,7 @@ }, /obj/effect/turf_decal/tile/yellow, /turf/open/floor/monotile/steel, -/area/hallway/nsv/deck2/primary) +/area/nsv/engine/dcc) "CY" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance/three, @@ -9396,19 +9540,10 @@ /turf/open/floor/plasteel/techmaint, /area/quartermaster/miningoffice) "Ec" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/ship/green{ - dir = 8 - }, -/obj/effect/turf_decal/tile/ship/green{ - dir = 1 - }, -/obj/machinery/status_display/evac/west, -/turf/open/floor/durasteel/alt, -/area/hallway/nsv/deck2/primary) +/obj/structure/chair, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/monotile/steel, +/area/hallway/secondary/exit/departure_lounge) "Ef" = ( /obj/effect/turf_decal/tile/ship/green, /obj/effect/turf_decal/tile/ship/green{ @@ -9423,8 +9558,8 @@ /obj/structure/sign/ship/deck/two{ dir = 8 }, -/turf/closed/wall/steel, -/area/hallway/nsv/deck2/primary) +/turf/closed/wall/r_wall, +/area/nsv/engine/dcc) "Eh" = ( /obj/effect/turf_decal/tile/ship/half/red{ dir = 8 @@ -9758,6 +9893,14 @@ /obj/machinery/portable_atmospherics/canister/toxins, /turf/open/floor/plating, /area/engine/atmos) +"FC" = ( +/obj/item/radio/intercom/directional/north, +/obj/effect/decal/cleanable/glitter/white, +/obj/effect/turf_decal/ship/techfloor{ + dir = 1 + }, +/turf/open/floor/carpet/ship, +/area/hallway/nsv/deck2/primary) "FE" = ( /obj/machinery/airalarm{ dir = 1; @@ -10091,6 +10234,16 @@ }, /turf/open/floor/monotile/dark, /area/security/brig) +"GD" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/box, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/monotile/dark, +/area/hallway/nsv/deck2/primary) "GF" = ( /obj/machinery/ammo_sorter{ dir = 8; @@ -10415,8 +10568,8 @@ /obj/structure/sign/ship/nosmoking{ dir = 1 }, -/turf/closed/wall/steel, -/area/hallway/nsv/deck2/primary) +/turf/closed/wall/r_wall, +/area/nsv/engine/dcc) "HJ" = ( /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -10593,8 +10746,15 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/machinery/computer/monitor{ + name = "Reactor Power Grid monitoring console"; + dir = 4 + }, /turf/open/floor/monotile/steel, -/area/hallway/nsv/deck2/primary) +/area/nsv/engine/dcc) "It" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -10693,8 +10853,24 @@ /turf/closed/wall/steel, /area/engine/engine_room) "IW" = ( -/turf/closed/wall/steel, -/area/janitor) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/poddoor/shutters/ship{ + id = "dc1"; + name = "Damage Control Supplies" + }, +/turf/open/floor/monotile/steel, +/area/hallway/nsv/deck2/primary) "IZ" = ( /obj/effect/turf_decal/ship/delivery/yellow, /obj/machinery/door/firedoor/border_only, @@ -10858,19 +11034,25 @@ /turf/open/floor/monotile/dark, /area/nsv/weapons) "Jt" = ( -/obj/effect/turf_decal/ship/techfloor{ +/obj/machinery/light{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -26 +/obj/structure/rack, +/obj/item/storage/toolbox/mechanical{ + pixel_y = 6; + pixel_x = 6 }, -/obj/item/cigbutt/roach, -/mob/living/simple_animal/kalo{ - name = "Comrade" +/obj/item/storage/toolbox/mechanical{ + pixel_y = 3; + pixel_x = 3 }, -/turf/open/floor/durasteel/lino, -/area/janitor) +/obj/item/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical{ + pixel_y = -3; + pixel_x = -3 + }, +/turf/open/floor/monotile/steel, +/area/hallway/nsv/deck2/primary) "Ju" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -11067,25 +11249,14 @@ /turf/open/floor/plating, /area/engine/atmos) "JW" = ( -/obj/effect/turf_decal/ship/techfloor{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/item/cigbutt, -/obj/item/cigbutt{ - pixel_x = 5; - pixel_y = -3 - }, -/obj/item/cigbutt{ - pixel_x = 12; - pixel_y = 6 - }, -/obj/item/storage/fancy/cigarettes{ - desc = "These taste terrible, but they'll help you manage a community."; - name = "\improper Community Manager's Cigarettes" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, -/obj/machinery/light_switch/east, -/turf/open/floor/durasteel/lino, -/area/janitor) +/turf/open/floor/monotile/steel, +/area/hallway/nsv/deck2/primary) "JX" = ( /obj/structure/cable{ icon_state = "1-2" @@ -11884,8 +12055,11 @@ apnw_id = "atlas_comedy" }, /obj/structure/cable/yellow, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, /turf/open/floor/plasteel/ridged/steel, -/area/hallway/nsv/deck2/primary) +/area/nsv/engine/dcc) "Ml" = ( /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance, @@ -12236,7 +12410,7 @@ dir = 4 }, /turf/open/floor/monotile/steel, -/area/hallway/nsv/deck2/primary) +/area/nsv/engine/dcc) "Nt" = ( /obj/structure/ladder, /turf/open/floor/durasteel/techfloor, @@ -12266,6 +12440,9 @@ dir = 8 }, /obj/effect/turf_decal/tile/yellow, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/durasteel/alt, /area/hallway/nsv/deck2/primary) "ND" = ( @@ -12347,6 +12524,10 @@ }, /turf/open/floor/plasteel/techmaint, /area/nsv/weapons) +"NS" = ( +/obj/effect/decal/cleanable/glitter/white, +/turf/closed/wall/steel, +/area/maintenance/nsv/deck2/port) "NT" = ( /obj/effect/turf_decal/pool{ dir = 4 @@ -12684,6 +12865,19 @@ /obj/item/radio/intercom/directional/north, /turf/open/floor/plating, /area/engine/atmos) +"OL" = ( +/obj/effect/turf_decal/ship/techfloor{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow, +/obj/structure/rack, +/obj/item/stack/sheet/mineral/titanium/fifty, +/obj/item/stack/sheet/duranium/twenty, +/obj/item/stack/sheet/duranium/twenty, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/south, +/turf/open/floor/monotile/steel, +/area/nsv/engine/dcc) "OO" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -12803,6 +12997,11 @@ dir = 4 }, /obj/effect/turf_decal/tile/ship/half/blue, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/primary) "Pk" = ( @@ -12907,7 +13106,7 @@ }, /obj/effect/turf_decal/tile/yellow, /turf/open/floor/monotile/steel, -/area/hallway/nsv/deck2/primary) +/area/nsv/engine/dcc) "PD" = ( /obj/machinery/power/smes/engineering, /obj/structure/cable{ @@ -12931,14 +13130,9 @@ /turf/open/floor/monotile/dark, /area/nsv/weapons) "PH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/effect/turf_decal/tile/ship/half/green, /turf/open/floor/monotile/steel, -/area/janitor) +/area/hallway/nsv/deck2/primary) "PJ" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -13054,8 +13248,15 @@ /obj/machinery/light{ dir = 8 }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/machinery/computer/monitor{ + name = "Ships Power Grid monitoring console"; + dir = 4 + }, /turf/open/floor/monotile/steel, -/area/hallway/nsv/deck2/primary) +/area/nsv/engine/dcc) "Qa" = ( /obj/structure/window/reinforced/spawner, /obj/machinery/computer/cargo/request{ @@ -13118,6 +13319,14 @@ }, /turf/open/floor/carpet/royalblack, /area/chapel/main) +"Qi" = ( +/obj/structure/chair/stool, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/obj/effect/decal/cleanable/glitter/white, +/turf/open/floor/carpet/ship, +/area/hallway/nsv/deck2/primary) "Qk" = ( /obj/effect/turf_decal/tile/ship/half/orange{ dir = 4 @@ -13237,6 +13446,11 @@ dir = 4; id = "sdmix_in" }, +/obj/machinery/camera{ + network = list("eng"); + name = "Stormdrive Fuel Tank"; + dir = 8 + }, /turf/open/floor/engine/vacuum, /area/engine/atmos) "QC" = ( @@ -13474,9 +13688,11 @@ /turf/open/floor/monotile/dark, /area/nsv/weapons) "Rm" = ( -/obj/structure/sign/departments/evac, +/obj/structure/sign/ship/deck/two{ + dir = 4 + }, /turf/closed/wall/r_wall, -/area/hallway/secondary/exit/departure_lounge) +/area/hallway/nsv/deck2/primary) "Rp" = ( /obj/effect/turf_decal/pool/corner{ dir = 1 @@ -13674,12 +13890,11 @@ /turf/open/floor/carpet/red, /area/nsv/weapons) "RR" = ( -/obj/vehicle/ridden/janicart, -/obj/item/key/janitor, -/obj/effect/turf_decal/ship/techfloor, -/obj/machinery/light/small/broken, -/turf/open/floor/durasteel/lino, -/area/janitor) +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/turf/open/floor/monotile/steel, +/area/hallway/nsv/deck2/primary) "RS" = ( /obj/machinery/camera/autoname{ dir = 1 @@ -13837,12 +14052,9 @@ /turf/open/floor/plasteel/airless/solarpanel, /area/space/nearstation) "Sn" = ( -/obj/machinery/vending/wardrobe/jani_wardrobe, -/obj/effect/turf_decal/ship/techfloor{ - dir = 6 - }, -/turf/open/floor/durasteel/lino, -/area/janitor) +/obj/structure/tank_dispenser/oxygen, +/turf/open/floor/monotile/steel, +/area/hallway/nsv/deck2/primary) "So" = ( /obj/structure/ladder, /obj/effect/turf_decal/tile/ship/half/green{ @@ -13915,11 +14127,6 @@ /turf/open/floor/monotile/steel, /area/science) "SJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -14137,15 +14344,15 @@ /turf/open/floor/carpet/red, /area/security/main) "Tt" = ( -/obj/machinery/door/airlock/ship/maintenance/defaultaccess{ - name = "EVA"; - req_one_access_txt = "18" - }, /obj/effect/landmark/zebra_interlock_point, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/ship/maintenance, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plating, /area/maintenance/nsv/deck2/starboard) "Tu" = ( @@ -14158,10 +14365,9 @@ /turf/open/floor/plasteel/techmaint, /area/security/prison) "Tv" = ( -/obj/structure/chair, -/obj/machinery/computer/ship/viewscreen, +/obj/machinery/light/small, /turf/open/floor/monotile/steel, -/area/hallway/secondary/exit/departure_lounge) +/area/hallway/nsv/deck2/primary) "Tw" = ( /obj/structure/cable{ icon_state = "1-2" @@ -14528,15 +14734,13 @@ /turf/open/floor/plating, /area/maintenance/nsv/deck2/starboard) "UA" = ( -/obj/machinery/firealarm/directional/west, -/obj/machinery/light{ - dir = 1 - }, -/obj/item/kirbyplants{ - icon_state = "plant-33" - }, +/obj/structure/rack, +/obj/item/watertank/atmos, +/obj/item/pipe_dispenser, +/obj/item/rcd_ammo/large, +/obj/item/rcd_ammo/large, /turf/open/floor/monotile/steel, -/area/hallway/secondary/exit/departure_lounge) +/area/hallway/nsv/deck2/primary) "UB" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/monotile/dark/airless, @@ -14861,10 +15065,16 @@ /turf/open/floor/plating, /area/maintenance/nsv/deck2/starboard) "VA" = ( -/obj/structure/chair, -/obj/machinery/camera/autoname, +/obj/structure/rack, +/obj/item/clothing/gloves/color/yellow, +/obj/item/holosign_creator/atmos, +/obj/machinery/camera{ + network = list("ss13,eng"); + name = "Deck 2 Adv. DC" + }, +/obj/item/clothing/shoes/magboots, /turf/open/floor/monotile/steel, -/area/hallway/secondary/exit/departure_lounge) +/area/hallway/nsv/deck2/primary) "VC" = ( /obj/effect/turf_decal/ship/delivery/yellow, /obj/machinery/door/firedoor/border_only, @@ -15068,6 +15278,10 @@ /area/nsv/weapons) "Wf" = ( /obj/machinery/atmospherics/pipe/layer_manifold, +/obj/machinery/camera{ + network = list("eng"); + name = "Stormdrive" + }, /turf/open/floor/engine, /area/engine/engine_room) "Wg" = ( @@ -15137,6 +15351,22 @@ /obj/machinery/airalarm/directional/south, /turf/open/floor/plating, /area/maintenance/department/engine/atmos) +"Wv" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/ship/green{ + dir = 8 + }, +/obj/effect/turf_decal/tile/ship/green{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/durasteel/alt, +/area/hallway/nsv/deck2/primary) "Ww" = ( /obj/machinery/button/door{ id = "muni_atlas"; @@ -15443,6 +15673,15 @@ }, /turf/open/space/basic, /area/space/nearstation) +"XH" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/effect/landmark/zebra_interlock_point, +/obj/machinery/door/airlock/ship/maintenance, +/turf/open/floor/monotile/steel, +/area/maintenance/nsv/deck2/port) "XI" = ( /obj/structure/particle_accelerator/particle_emitter/left{ dir = 8 @@ -15476,9 +15715,11 @@ /turf/open/floor/engine, /area/quartermaster/storage) "XL" = ( -/obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, -/obj/item/relic, +/obj/structure/cable{ + icon_state = "8-16" + }, +/obj/effect/turf_decal/ship/shutoff, +/obj/effect/turf_decal/box, /turf/open/floor/plating, /area/maintenance/nsv/deck2/starboard) "XP" = ( @@ -15664,11 +15905,11 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 }, /turf/open/floor/plasteel/grid/steel, /area/hallway/secondary/exit/departure_lounge) @@ -15726,8 +15967,11 @@ /area/nsv/weapons) "YL" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/ridged/steel, -/area/hallway/nsv/deck2/primary) +/area/nsv/engine/dcc) "YM" = ( /obj/effect/turf_decal/tile/ship/green{ dir = 4 @@ -15898,14 +16142,21 @@ /turf/open/floor/plasteel/grid/steel, /area/hallway/secondary/exit/departure_lounge) "Zm" = ( -/obj/structure/tank_dispenser/oxygen, -/obj/effect/turf_decal/tile/ship/half/blue{ - dir = 8 +/obj/structure/closet/l3closet/janitor, +/obj/machinery/camera/autoname, +/obj/structure/cable{ + icon_state = "0-8" }, +/obj/machinery/power/apc/auto_name/north, /obj/effect/turf_decal/ship/techfloor{ - dir = 4 + dir = 5 }, -/turf/open/floor/monotile/dark, +/obj/item/poster/random_contraband{ + desc = "No memes in general!"; + name = "discord moderation textbook" + }, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/durasteel/lino, /area/hallway/nsv/deck2/primary) "Zn" = ( /obj/structure/closet/crate{ @@ -15927,6 +16178,14 @@ /obj/machinery/power/apc/auto_name/north, /turf/open/floor/plating, /area/maintenance/nsv/deck2/port) +"Zq" = ( +/obj/effect/spawner/structure/window/plasma/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + name = "DC Central Shutters"; + id = "dcc" + }, +/turf/open/floor/plating, +/area/nsv/engine/dcc) "Zr" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -44525,11 +44784,11 @@ Tl Vr Mh NZ -YQ -YQ -YQ -YQ -YQ +qI +qI +qI +qI +qI kC ca vJ @@ -44786,7 +45045,7 @@ qI rr rJ qU -YQ +qI tJ sP zq @@ -45017,11 +45276,11 @@ Yr sl bh iC -aq -Jk -Jk -Jk -hp +wd +FC +Qi +uj +ew WH ko vd @@ -45040,11 +45299,11 @@ vd pl Pi qN -Jk -Jk -Jk +aq +GD +CD Tt -Ie +pg sP mL vw @@ -45274,12 +45533,12 @@ HG kH kH bt -WB +XH ay hM aY -ew -rf +ty +cR rQ nO Tg @@ -45300,7 +45559,7 @@ qI Zm oB dp -YQ +qI XL Ie LJ @@ -45531,7 +45790,7 @@ Kt kH DD iC -wd +NS wd qI qI @@ -45553,13 +45812,13 @@ zI Qv kq pc -qI -qI +ft +ft Eg -qI -YQ -YQ -YQ +ft +ft +ft +ft Ie Oc mL @@ -45810,13 +46069,13 @@ zI zf dE bB -qI +ft wb PZ Ir Bc CU -YQ +ft Ie nI mL @@ -46065,10 +46324,10 @@ eD dW zI oX -un +aJ NC -ew -Nr +sy +Bi gQ YL za @@ -46330,7 +46589,7 @@ CF Mj wf sp -YQ +ft Ie Uz mL @@ -46581,13 +46840,13 @@ yU WY lx Dv -ew +Zq Nr +fQ wx wx -wx -PA -YQ +OL +ft wR jf mL @@ -46844,7 +47103,7 @@ ub uw Bh sE -YQ +ft Ie zy yC @@ -47095,13 +47354,13 @@ zI Bw un ql -qI -qI -qI -YQ -YQ -YQ -YQ +ft +ft +ft +ft +ft +ft +ft cp vr mE @@ -49409,14 +49668,14 @@ Jz un bn hC -IW +YQ cj Jt uX -oU +YQ UA -ty -JT +YQ +hp uv oC AS @@ -49663,16 +49922,16 @@ pH KF RN HN -wq +un SJ PH -CD +YQ rU kT RR oU Tv -sy +YQ vS Yw aw @@ -49923,14 +50182,14 @@ sR Ae gv tN -IW +YQ wN JW Sn -oU +YQ VA -Bi -JT +YQ +Ec PM em ei @@ -50179,13 +50438,13 @@ RN LA un ny +qI +wq +YQ IW -IW -IW -IW -IW -oU -JT +YQ +YQ +YQ Rm Ni zA @@ -50437,11 +50696,11 @@ dS pw rZ rb -rH +dw BM -Ec -ft +Wv rH +vI sQ Zw JT @@ -50696,7 +50955,7 @@ BW Sh TK OV -TK +ce TK lN yL diff --git a/_maps/map_files/Atlas/atlas2.dmm b/_maps/map_files/Atlas/atlas2.dmm index 51bff34e99c..269954710bb 100644 --- a/_maps/map_files/Atlas/atlas2.dmm +++ b/_maps/map_files/Atlas/atlas2.dmm @@ -41,22 +41,6 @@ /obj/effect/turf_decal/tile/ship/green, /turf/open/floor/durasteel/alt, /area/hallway/nsv/deck1/hallway) -"af" = ( -/obj/machinery/door/airlock/ship/public/glass{ - name = "Smoking area" - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/landmark/zebra_interlock_point, -/turf/open/floor/monotile/steel, -/area/hallway/nsv/deck1/hallway) "ag" = ( /obj/structure/curtain, /obj/machinery/shower{ @@ -169,11 +153,20 @@ /turf/open/floor/plating, /area/maintenance/nsv/deck1/port) "aJ" = ( -/obj/effect/decal/cleanable/glitter/white{ - layer = 4.1; - name = "smoke" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/stripes, +/obj/effect/turf_decal/stripes{ + dir = 1 + }, +/obj/machinery/door/poddoor/shutters/ship{ + id = "dc1"; + name = "Damage Control Supplies" + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 }, -/obj/machinery/light/small, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck1/hallway) "aK" = ( @@ -598,12 +591,8 @@ /turf/open/floor/monotile/steel, /area/crew_quarters/heads/xo) "cV" = ( -/obj/effect/decal/cleanable/glitter/white{ - layer = 4.1; - name = "smoke" - }, -/obj/structure/table/reinforced, -/obj/machinery/camera/autoname{ +/obj/structure/tank_dispenser/oxygen, +/obj/effect/turf_decal/stripes/corner{ dir = 8 }, /turf/open/floor/monotile/steel, @@ -685,6 +674,16 @@ }, /turf/open/floor/monotile/steel, /area/crew_quarters/heads/xo) +"dm" = ( +/obj/effect/turf_decal/tile/ship/green, +/obj/effect/turf_decal/tile/ship/green{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/durasteel/alt, +/area/hallway/nsv/deck1/hallway) "dn" = ( /obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ dir = 8 @@ -922,6 +921,11 @@ /obj/structure/table/reinforced, /obj/structure/railing, /obj/item/radio/intercom, +/obj/machinery/camera{ + network = list("eng"); + name = "CIC"; + dir = 1 + }, /turf/open/floor/carpet/royalblack, /area/bridge/cic) "ej" = ( @@ -2074,16 +2078,6 @@ /obj/machinery/vending/snack/random, /turf/open/floor/durasteel/alt, /area/hallway/nsv/deck1/hallway) -"iX" = ( -/obj/effect/decal/cleanable/glitter/white{ - layer = 4.1; - name = "smoke" - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/monotile/steel, -/area/hallway/nsv/deck1/hallway) "ja" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/brigdoor/northleft{ @@ -2690,6 +2684,9 @@ /area/security/detectives_office) "lo" = ( /obj/structure/railing/corner, +/obj/structure/cable{ + icon_state = "2-4" + }, /turf/open/floor/plating, /area/maintenance/nsv/deck1/starboard) "lp" = ( @@ -2731,13 +2728,13 @@ /turf/closed/wall/r_wall, /area/space/nearstation) "lA" = ( -/obj/effect/decal/cleanable/glitter/white{ - layer = 4.1; - name = "smoke" +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 }, -/obj/structure/chair/stool, -/obj/effect/landmark/event_spawn, -/turf/open/floor/carpet/ship/beige_carpet, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/turf/open/floor/monotile/steel, /area/hallway/nsv/deck1/hallway) "lD" = ( /obj/effect/turf_decal/tile/neutral{ @@ -4189,11 +4186,16 @@ /obj/effect/turf_decal/tile/ship/green{ dir = 8 }, -/obj/structure/cable{ - icon_state = "1-2" +/obj/effect/turf_decal/stripes/corner, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/obj/machinery/button/door{ + name = "Damage Control Supply Access"; + pixel_y = -30; + id = "dc1"; + req_one_access_txt = "11" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/durasteel/alt, /area/hallway/nsv/deck1/hallway) "sx" = ( @@ -4508,19 +4510,24 @@ /turf/open/floor/monotile/steel, /area/maintenance/nsv/deck1/port) "tM" = ( -/obj/effect/decal/cleanable/glitter/white{ - layer = 4.1; - name = "smoke" +/obj/machinery/light{ + dir = 8 }, -/obj/structure/chair/stool, -/obj/structure/cable{ - icon_state = "1-2" +/obj/structure/rack, +/obj/item/storage/toolbox/mechanical{ + pixel_y = 6; + pixel_x = 6 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 +/obj/item/storage/toolbox/mechanical{ + pixel_y = 3; + pixel_x = 3 }, -/obj/machinery/light_switch/west, -/turf/open/floor/carpet/ship/beige_carpet, +/obj/item/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical{ + pixel_y = -3; + pixel_x = -3 + }, +/turf/open/floor/monotile/steel, /area/hallway/nsv/deck1/hallway) "tQ" = ( /obj/effect/turf_decal/tile/ship/green, @@ -4665,8 +4672,12 @@ /turf/open/floor/plating, /area/crew_quarters/heads/chief) "ux" = ( -/obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plating, /area/maintenance/nsv/deck1/starboard) "uz" = ( @@ -4744,10 +4755,10 @@ /turf/open/floor/plating, /area/maintenance/nsv/deck1/starboard) "uV" = ( -/obj/effect/turf_decal/tile/ship/half/green, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/stripes, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck1/hallway) "uX" = ( @@ -5073,6 +5084,9 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plating{ icon_state = "panelscorched" }, @@ -5522,12 +5536,9 @@ /turf/open/floor/monotile/steel, /area/bridge/cic) "yl" = ( -/obj/machinery/light/small{ - dir = 1 - }, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating, -/area/maintenance/nsv/deck1/starboard) +/turf/closed/wall/r_wall, +/area/hallway/nsv/deck1/hallway) "yo" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 @@ -6263,20 +6274,16 @@ /turf/open/floor/monotile/dark, /area/ai_monitored/nuke_storage) "BL" = ( -/obj/machinery/door/airlock/ship/maintenance/defaultaccess{ - name = "Smoking lounge access"; - req_one_access_txt = "12;25" - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/landmark/zebra_interlock_point, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 +/obj/structure/rack, +/obj/item/watertank/atmos, +/obj/item/pipe_dispenser, +/obj/item/rcd_ammo/large, +/obj/item/rcd_ammo/large, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 }, /turf/open/floor/monotile/steel, -/area/maintenance/nsv/deck1/starboard) +/area/hallway/nsv/deck1/hallway) "BN" = ( /obj/machinery/door/airlock/ship/hatch{ name = "Mission Critical Systems"; @@ -6762,33 +6769,34 @@ /turf/open/floor/carpet/royalblack, /area/bridge/cic) "DK" = ( -/obj/effect/decal/cleanable/glitter/white{ - layer = 4.1; - name = "smoke" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/stripes{ + dir = 1 }, -/turf/open/floor/carpet/ship/beige_carpet, +/turf/open/floor/monotile/steel, /area/hallway/nsv/deck1/hallway) "DL" = ( -/obj/effect/decal/cleanable/glitter/white{ - layer = 4.1; - name = "smoke" +/obj/structure/closet/crate{ + opened = 1 }, -/obj/structure/cable{ - icon_state = "1-2" +/obj/item/stack/rods/fifty, +/obj/item/stack/rods/fifty, +/obj/item/stack/rods/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/tile/plasteel{ + amount = 50 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 +/obj/item/stack/tile/plasteel{ + amount = 50 }, -/obj/item/radio/intercom/directional/west, -/turf/open/floor/carpet/ship/beige_carpet, -/area/hallway/nsv/deck1/hallway) -"DM" = ( -/obj/effect/decal/cleanable/glitter/white{ - layer = 4.1; - name = "smoke" +/obj/machinery/camera{ + network = list("ss13,eng"); + name = "Deck 1 DC" + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 }, -/obj/structure/table/reinforced, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck1/hallway) "DQ" = ( @@ -6881,12 +6889,24 @@ /turf/open/floor/monotile/steel, /area/hallway/nsv/deck1/hallway) "En" = ( -/obj/effect/decal/cleanable/glitter/white{ - layer = 4.1; - name = "smoke" +/obj/machinery/camera/autoname, +/obj/structure/closet/firecloset, +/obj/item/clothing/suit/fire/firefighter, +/obj/item/clothing/suit/fire/firefighter, +/obj/item/clothing/suit/fire/firefighter, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/obj/item/clothing/head/hardhat/red, +/obj/item/clothing/head/hardhat/red, +/obj/item/clothing/head/hardhat/red, +/obj/item/extinguisher, +/obj/item/extinguisher, +/obj/item/extinguisher, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 }, -/obj/structure/chair/stool, -/turf/open/floor/carpet/ship/beige_carpet, +/turf/open/floor/monotile/steel, /area/hallway/nsv/deck1/hallway) "Eo" = ( /turf/open/floor/monotile/steel, @@ -6976,6 +6996,10 @@ }, /turf/open/floor/engine/airless, /area/space/nearstation) +"EF" = ( +/obj/effect/turf_decal/stripes, +/turf/open/floor/monotile/steel, +/area/hallway/nsv/deck1/hallway) "EH" = ( /obj/structure/cable{ icon_state = "1-2" @@ -7181,11 +7205,13 @@ /turf/open/floor/monotile/steel, /area/hallway/nsv/deck1/hallway) "FA" = ( -/obj/effect/spawner/lootdrop/grille_or_trash, /obj/structure/railing/corner{ dir = 4; pixel_y = 1 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plating{ icon_state = "panelscorched" }, @@ -7419,6 +7445,9 @@ "GJ" = ( /obj/structure/railing, /obj/machinery/light_switch/north, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plating{ icon_state = "panelscorched" }, @@ -7747,12 +7776,6 @@ /obj/effect/landmark/start/research_director, /turf/open/floor/carpet/ship/beige_carpet, /area/crew_quarters/heads/hor) -"Ih" = ( -/obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance/three, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating, -/area/maintenance/nsv/deck1/starboard) "Ii" = ( /obj/machinery/door/poddoor/ship/preopen{ dir = 8; @@ -8142,15 +8165,15 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 1 }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck1/hallway) "JG" = ( @@ -8228,18 +8251,15 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/cable{ - icon_state = "2-8" +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck1/hallway) "JS" = ( @@ -8737,14 +8757,12 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, /obj/effect/turf_decal/ship/delivery/yellow, +/obj/effect/landmark/zebra_interlock_point, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "2-8"; + tag = "" }, -/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/monotile/steel, /area/maintenance/nsv/deck1/starboard) "LX" = ( @@ -9019,10 +9037,19 @@ /turf/open/floor/durasteel/lino, /area/ai_monitored/nuke_storage) "Ng" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/space_heater, -/turf/open/floor/plating, -/area/maintenance/nsv/deck1/starboard) +/obj/structure/rack, +/obj/item/clothing/gloves/color/yellow, +/obj/item/holosign_creator/atmos, +/obj/machinery/camera{ + network = list("ss13,eng"); + name = "Deck 1 Adv. DC" + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/item/clothing/shoes/magboots, +/turf/open/floor/monotile/steel, +/area/hallway/nsv/deck1/hallway) "Nh" = ( /obj/structure/table_frame/wood, /obj/item/toy/talking/AI, @@ -9067,6 +9094,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plating, /area/maintenance/nsv/deck1/starboard) "Np" = ( @@ -9251,10 +9281,11 @@ /turf/open/floor/monotile/steel, /area/hallway/nsv/deck1/hallway) "NN" = ( -/obj/structure/sign/ship/smoking{ - dir = 8 +/obj/machinery/light/small, +/obj/effect/turf_decal/stripes{ + dir = 1 }, -/turf/closed/wall/r_wall, +/turf/open/floor/monotile/steel, /area/hallway/nsv/deck1/hallway) "NP" = ( /obj/machinery/door/firedoor/border_only{ @@ -9832,15 +9863,27 @@ /turf/open/floor/durasteel/alt, /area/hallway/nsv/deck1/hallway) "Qw" = ( -/obj/effect/decal/cleanable/glitter/white{ - layer = 4.1; - name = "smoke" - }, -/obj/machinery/vending/cigarette{ - name = "Adama's Finest Cigars" +/obj/item/clothing/suit/space/eva, +/obj/item/clothing/suit/space/eva, +/obj/item/clothing/suit/space/eva, +/obj/item/clothing/suit/space/eva, +/obj/item/clothing/suit/space/eva, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/clothing/head/helmet/space/eva, +/obj/item/clothing/head/helmet/space/eva, +/obj/item/clothing/head/helmet/space/eva, +/obj/item/clothing/head/helmet/space/eva, +/obj/item/clothing/head/helmet/space/eva, +/obj/structure/closet, +/obj/machinery/airalarm/directional/north, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 }, -/obj/machinery/computer/ship/viewscreen, -/turf/open/floor/carpet/ship/beige_carpet, +/turf/open/floor/monotile/steel, /area/hallway/nsv/deck1/hallway) "Qy" = ( /obj/structure/safe, @@ -10057,6 +10100,9 @@ }, /obj/effect/turf_decal/ship/delivery/yellow, /obj/effect/landmark/zebra_interlock_point, +/obj/structure/cable{ + icon_state = "1-4" + }, /turf/open/floor/monotile/steel, /area/maintenance/nsv/deck1/starboard) "RI" = ( @@ -10638,14 +10684,6 @@ }, /turf/open/floor/plating, /area/maintenance/nsv/deck1/port) -"Up" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plating{ - icon_state = "platingdmg1" - }, -/area/maintenance/nsv/deck1/starboard) "Uq" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/ship/preopen{ @@ -11053,16 +11091,14 @@ /turf/closed/wall/steel, /area/hydroponics) "WC" = ( -/obj/effect/decal/cleanable/glitter/white{ - layer = 4.1; - name = "smoke" - }, -/obj/structure/table/reinforced, -/obj/structure/cable{ - icon_state = "1-2" +/obj/structure/reagent_dispensers/watertank, +/obj/effect/turf_decal/stripes/corner, +/obj/machinery/button/door{ + name = "Advanced Damage Control Supplies"; + pixel_y = -31; + id = "dc2"; + req_one_access_txt = "20, 56, 57" }, -/obj/item/lighter/greyscale, -/obj/machinery/newscaster/directional/west, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck1/hallway) "WD" = ( @@ -11073,9 +11109,13 @@ /turf/open/floor/monotile/steel, /area/crew_quarters/bar/mess_hall) "WE" = ( -/obj/effect/decal/cleanable/glitter/white{ - layer = 4.1; - name = "smoke" +/obj/effect/turf_decal/stripes, +/obj/effect/turf_decal/stripes{ + dir = 1 + }, +/obj/machinery/door/poddoor/ship{ + id = "dc2"; + name = "Restricted Damage Control Supplies" }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck1/hallway) @@ -11392,6 +11432,9 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, +/obj/structure/cable{ + icon_state = "1-8" + }, /turf/open/floor/plating, /area/maintenance/nsv/deck1/starboard) "Yc" = ( @@ -41480,8 +41523,8 @@ Am Am Am Am -Up -Ng +Am +GY MS lx Rg @@ -41731,14 +41774,14 @@ Pm MQ JR su -af +Am DL tM WC -iX +Am BL -VS -Ih +Am +GY MS lx Rg @@ -41988,14 +42031,14 @@ gq hA JE uV -TE +aJ DK lA -DM +EF WE +NN Am -rV -Od +GY MS lx Rg @@ -42244,13 +42287,13 @@ CI kk wg zL -Sc -Pk +dm +Am Qw En cV -aJ Am +Ng yl ux MS @@ -42504,12 +42547,12 @@ wu vs Am Am -NN Am Am Am -Ej -zS +Am +yl +GY MS lx Rg @@ -42763,10 +42806,10 @@ XZ lo wj FA -rV +dK Nn -rV -zS +dK +VS MS lx Rg diff --git a/_maps/map_files/Atlas/job_changes.dm b/_maps/map_files/Atlas/job_changes.dm index 8d8ff455326..8f16bccbfad 100644 --- a/_maps/map_files/Atlas/job_changes.dm +++ b/_maps/map_files/Atlas/job_changes.dm @@ -27,7 +27,7 @@ */ -//There's no viro on atlas :( +//There's no viro on atlas =D MAP_REMOVE_JOB(virologist) //Civilian guys without an office MAP_REMOVE_JOB(curator) From 6b509341f381b37efeede308f9fd5453ae40ed0a Mon Sep 17 00:00:00 2001 From: SerynEngi Date: Fri, 13 Dec 2024 17:54:50 -0800 Subject: [PATCH 08/26] Fix Lattice in Wall --- _maps/map_files/Tycoon/Tycoon2.dmm | 1 - 1 file changed, 1 deletion(-) diff --git a/_maps/map_files/Tycoon/Tycoon2.dmm b/_maps/map_files/Tycoon/Tycoon2.dmm index c2a305025c5..e2a0463b79c 100644 --- a/_maps/map_files/Tycoon/Tycoon2.dmm +++ b/_maps/map_files/Tycoon/Tycoon2.dmm @@ -4304,7 +4304,6 @@ /turf/open/floor/carpet/ship, /area/crew_quarters/heads/cmo) "alu" = ( -/obj/structure/lattice, /turf/closed/wall/r_wall/ship, /area/maintenance/nsv/weapons) "alv" = ( From 3eca413b4dfa548ef1e025c1dab4755faf20b8eb Mon Sep 17 00:00:00 2001 From: SerynEngi Date: Fri, 13 Dec 2024 18:09:26 -0800 Subject: [PATCH 09/26] Hopefully compile --- _maps/map_files/Atlas/atlas.dmm | 7 ++++--- _maps/map_files/Tycoon/Tycoon2.dmm | 5 +---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/_maps/map_files/Atlas/atlas.dmm b/_maps/map_files/Atlas/atlas.dmm index ed1ef8f8af2..5f4645ed647 100644 --- a/_maps/map_files/Atlas/atlas.dmm +++ b/_maps/map_files/Atlas/atlas.dmm @@ -6767,7 +6767,6 @@ /obj/machinery/firealarm/directional/east, /obj/machinery/computer/camera_advanced{ desc = "Used to access the various cameras on the Ship."; - em_block = d; dir = 8; network = list("eng"); name = "Critical Engineering Monitoring Console" @@ -7302,7 +7301,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, -/obj/machinery/airalarm/directional/west, /turf/open/floor/plasteel/ridged/steel, /area/nsv/engine/dcc) "wh" = ( @@ -14606,6 +14604,9 @@ }, /turf/open/floor/monotile/dark, /area/ai_monitored/security/armory) +"TZ" = ( +/turf/open/floor/plating, +/area/nsv/engine/dcc) "Ua" = ( /obj/machinery/telecomms/relay/preset/station, /obj/machinery/light/small{ @@ -47616,7 +47617,7 @@ cn hP sj Ie -Ie +TZ Rf xa dh diff --git a/_maps/map_files/Tycoon/Tycoon2.dmm b/_maps/map_files/Tycoon/Tycoon2.dmm index e2a0463b79c..b24ce1bb87d 100644 --- a/_maps/map_files/Tycoon/Tycoon2.dmm +++ b/_maps/map_files/Tycoon/Tycoon2.dmm @@ -4303,9 +4303,6 @@ /obj/machinery/suit_storage_unit/cmo, /turf/open/floor/carpet/ship, /area/crew_quarters/heads/cmo) -"alu" = ( -/turf/closed/wall/r_wall/ship, -/area/maintenance/nsv/weapons) "alv" = ( /obj/structure/cable{ icon_state = "1-2" @@ -81348,7 +81345,7 @@ afa afa afa aal -alu +xuS xuS dNn dNn From b78b2e82b6e47fa40e09587231646563b086b3a3 Mon Sep 17 00:00:00 2001 From: SerynEngi Date: Fri, 13 Dec 2024 18:23:38 -0800 Subject: [PATCH 10/26] attempt to get telescreens to not break --- _maps/map_files/Atlas/atlas.dmm | 11 ++++++----- _maps/map_files/Tycoon/Tycoon2.dmm | 12 ++++++------ 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/_maps/map_files/Atlas/atlas.dmm b/_maps/map_files/Atlas/atlas.dmm index 5f4645ed647..b70bdf1fb0c 100644 --- a/_maps/map_files/Atlas/atlas.dmm +++ b/_maps/map_files/Atlas/atlas.dmm @@ -6765,11 +6765,12 @@ }, /obj/effect/turf_decal/tile/yellow, /obj/machinery/firealarm/directional/east, -/obj/machinery/computer/camera_advanced{ - desc = "Used to access the various cameras on the Ship."; - dir = 8; - network = list("eng"); - name = "Critical Engineering Monitoring Console" +/obj/structure/table, +/obj/machinery/computer/security/telescreen{ + desc = "Used for watching Prison Wing holding areas."; + name = "Engineering Critical Monitoring"; + network = list("ss13","eng"); + pixel_y = 2 }, /turf/open/floor/monotile/steel, /area/nsv/engine/dcc) diff --git a/_maps/map_files/Tycoon/Tycoon2.dmm b/_maps/map_files/Tycoon/Tycoon2.dmm index b24ce1bb87d..efff7d7237b 100644 --- a/_maps/map_files/Tycoon/Tycoon2.dmm +++ b/_maps/map_files/Tycoon/Tycoon2.dmm @@ -42547,13 +42547,13 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/computer/camera_advanced{ - desc = "Used to access the various cameras on the Ship."; - em_block = d; - dir = 4; - network = list("eng"); - name = "Critical Engineering Monitoring Console" +/obj/machinery/computer/security/telescreen{ + desc = "Used for watching Prison Wing holding areas."; + name = "Engineering Critical Monitoring"; + network = list("ss13","eng"); + pixel_y = 2 }, +/obj/structure/table/reinforced, /turf/open/floor/monotile/steel, /area/nsv/engine/dcc) "ixq" = ( From 01130e1444e340b26cf8e8fb601083d4ce4eef15 Mon Sep 17 00:00:00 2001 From: SerynEngi Date: Fri, 13 Dec 2024 18:32:31 -0800 Subject: [PATCH 11/26] Take 2 for camera consoles --- _maps/map_files/Atlas/atlas.dmm | 15 ++++---------- _maps/map_files/Atlas/atlas2.dmm | 6 +++--- _maps/map_files/Tycoon/Tycoon2.dmm | 32 ++++++++++-------------------- 3 files changed, 17 insertions(+), 36 deletions(-) diff --git a/_maps/map_files/Atlas/atlas.dmm b/_maps/map_files/Atlas/atlas.dmm index b70bdf1fb0c..c83a2cbcb7b 100644 --- a/_maps/map_files/Atlas/atlas.dmm +++ b/_maps/map_files/Atlas/atlas.dmm @@ -675,7 +675,7 @@ amount = 50 }, /obj/machinery/camera{ - network = list("ss13,eng"); + network = list("ss13","eng"); name = "Deck 2 DC" }, /turf/open/floor/monotile/steel, @@ -6765,13 +6765,6 @@ }, /obj/effect/turf_decal/tile/yellow, /obj/machinery/firealarm/directional/east, -/obj/structure/table, -/obj/machinery/computer/security/telescreen{ - desc = "Used for watching Prison Wing holding areas."; - name = "Engineering Critical Monitoring"; - network = list("ss13","eng"); - pixel_y = 2 - }, /turf/open/floor/monotile/steel, /area/nsv/engine/dcc) "ux" = ( @@ -13446,7 +13439,7 @@ id = "sdmix_in" }, /obj/machinery/camera{ - network = list("eng"); + network = list("ss13","eng"); name = "Stormdrive Fuel Tank"; dir = 8 }, @@ -15071,7 +15064,7 @@ /obj/item/clothing/gloves/color/yellow, /obj/item/holosign_creator/atmos, /obj/machinery/camera{ - network = list("ss13,eng"); + network = list("ss13","eng"); name = "Deck 2 Adv. DC" }, /obj/item/clothing/shoes/magboots, @@ -15281,7 +15274,7 @@ "Wf" = ( /obj/machinery/atmospherics/pipe/layer_manifold, /obj/machinery/camera{ - network = list("eng"); + network = list("ss13","eng"); name = "Stormdrive" }, /turf/open/floor/engine, diff --git a/_maps/map_files/Atlas/atlas2.dmm b/_maps/map_files/Atlas/atlas2.dmm index 269954710bb..e4e8249257c 100644 --- a/_maps/map_files/Atlas/atlas2.dmm +++ b/_maps/map_files/Atlas/atlas2.dmm @@ -922,7 +922,7 @@ /obj/structure/railing, /obj/item/radio/intercom, /obj/machinery/camera{ - network = list("eng"); + network = list("ss13","eng"); name = "CIC"; dir = 1 }, @@ -6791,7 +6791,7 @@ amount = 50 }, /obj/machinery/camera{ - network = list("ss13,eng"); + network = list("ss13","eng"); name = "Deck 1 DC" }, /obj/effect/turf_decal/stripes/corner{ @@ -9041,7 +9041,7 @@ /obj/item/clothing/gloves/color/yellow, /obj/item/holosign_creator/atmos, /obj/machinery/camera{ - network = list("ss13,eng"); + network = list("ss13","eng"); name = "Deck 1 Adv. DC" }, /obj/effect/turf_decal/stripes/corner{ diff --git a/_maps/map_files/Tycoon/Tycoon2.dmm b/_maps/map_files/Tycoon/Tycoon2.dmm index efff7d7237b..cd9bf2e2023 100644 --- a/_maps/map_files/Tycoon/Tycoon2.dmm +++ b/_maps/map_files/Tycoon/Tycoon2.dmm @@ -2147,7 +2147,7 @@ layer = 2.9 }, /obj/machinery/camera{ - network = list("eng"); + network = list("ss13","eng"); name = "Forward DC Locker"; dir = 5 }, @@ -2534,18 +2534,6 @@ }, /turf/open/space/basic, /area/engine/engine_room) -"agx" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/machinery/door/airlock/ship/public/glass{ - name = "Aft Primary Hallway" - }, -/turf/open/floor/monotile/steel, -/area/hallway/nsv/deck2/frame1/central) "agy" = ( /turf/open/floor/monotile/dark, /area/nsv/weapons/fore) @@ -2729,7 +2717,7 @@ layer = 2.9 }, /obj/machinery/camera{ - network = list("eng"); + network = list("ss13","eng"); name = "Aft Adv. DC Locker"; dir = 5 }, @@ -16692,7 +16680,7 @@ id = "reactor2" }, /obj/machinery/camera{ - network = list("eng"); + network = list("ss13","eng"); name = "Reactor Core #1" }, /turf/open/floor/plasteel/ridged/steel, @@ -29468,7 +29456,7 @@ dir = 1 }, /obj/machinery/camera{ - network = list("eng"); + network = list("ss13","eng"); name = "Forward Adv. DC Locker" }, /turf/open/floor/monotile/steel, @@ -38240,7 +38228,7 @@ dir = 1 }, /obj/machinery/camera{ - network = list("eng"); + network = list("ss13","eng"); name = "Reactor Core #2"; dir = 1 }, @@ -41114,7 +41102,7 @@ "gBn" = ( /obj/structure/lattice/catwalk/over/ship, /obj/machinery/camera{ - network = list("eng"); + network = list("ss13","eng"); name = "CIC"; dir = 1 }, @@ -42550,7 +42538,7 @@ /obj/machinery/computer/security/telescreen{ desc = "Used for watching Prison Wing holding areas."; name = "Engineering Critical Monitoring"; - network = list("ss13","eng"); + network = list("eng"); pixel_y = 2 }, /obj/structure/table/reinforced, @@ -47489,7 +47477,7 @@ "pjU" = ( /obj/machinery/light_switch/south, /obj/machinery/camera{ - network = list("eng"); + network = list("ss13","eng"); name = "Reactor Control"; dir = 1 }, @@ -48599,7 +48587,7 @@ dir = 1 }, /obj/machinery/camera{ - network = list("eng"); + network = list("ss13","eng"); name = "Aft DC Locker"; dir = 5 }, @@ -82936,7 +82924,7 @@ bFF aae aeT bEe -agx +aPk laZ asF kvZ From 14ae7e6a036245e2cca6dfef6b9ea280246cab4d Mon Sep 17 00:00:00 2001 From: SerynEngi Date: Fri, 13 Dec 2024 18:37:30 -0800 Subject: [PATCH 12/26] This will probably work! Missing quotes in variables=bad --- _maps/map_files/Atlas/atlas.dmm | 5 +++++ _maps/map_files/Tycoon/Tycoon2.dmm | 8 +++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/_maps/map_files/Atlas/atlas.dmm b/_maps/map_files/Atlas/atlas.dmm index c83a2cbcb7b..0067bff29ea 100644 --- a/_maps/map_files/Atlas/atlas.dmm +++ b/_maps/map_files/Atlas/atlas.dmm @@ -6765,6 +6765,11 @@ }, /obj/effect/turf_decal/tile/yellow, /obj/machinery/firealarm/directional/east, +/obj/machinery/computer/camera_advanced{ + network = list("eng"); + name = "Engineering Critical Monitoring"; + dir = 8 + }, /turf/open/floor/monotile/steel, /area/nsv/engine/dcc) "ux" = ( diff --git a/_maps/map_files/Tycoon/Tycoon2.dmm b/_maps/map_files/Tycoon/Tycoon2.dmm index cd9bf2e2023..3868488dc6c 100644 --- a/_maps/map_files/Tycoon/Tycoon2.dmm +++ b/_maps/map_files/Tycoon/Tycoon2.dmm @@ -42535,13 +42535,11 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/computer/security/telescreen{ - desc = "Used for watching Prison Wing holding areas."; - name = "Engineering Critical Monitoring"; +/obj/machinery/computer/camera_advanced{ network = list("eng"); - pixel_y = 2 + name = "Engineering Critical Monitoring"; + dir = 4 }, -/obj/structure/table/reinforced, /turf/open/floor/monotile/steel, /area/nsv/engine/dcc) "ixq" = ( From 90ae271e640fbcbf79934c6d81d6eeab5dc7feb3 Mon Sep 17 00:00:00 2001 From: SerynEngi Date: Fri, 13 Dec 2024 18:50:26 -0800 Subject: [PATCH 13/26] Alright Telescreen variables theoretically fixed --- _maps/map_files/Atlas/atlas.dmm | 17 +++++++++-------- _maps/map_files/Tycoon/Tycoon2.dmm | 14 +++++++++++--- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/_maps/map_files/Atlas/atlas.dmm b/_maps/map_files/Atlas/atlas.dmm index 0067bff29ea..403be80c7ee 100644 --- a/_maps/map_files/Atlas/atlas.dmm +++ b/_maps/map_files/Atlas/atlas.dmm @@ -674,10 +674,6 @@ /obj/item/stack/tile/plasteel{ amount = 50 }, -/obj/machinery/camera{ - network = list("ss13","eng"); - name = "Deck 2 DC" - }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/primary) "cl" = ( @@ -5879,7 +5875,6 @@ }, /area/maintenance/nsv/deck2/starboard) "rU" = ( -/obj/machinery/camera/autoname, /obj/structure/closet/firecloset, /obj/item/clothing/suit/fire/firefighter, /obj/item/clothing/suit/fire/firefighter, @@ -5895,6 +5890,10 @@ /obj/item/extinguisher, /obj/machinery/airalarm/directional/north, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/machinery/camera{ + network = list("ss13","eng"); + name = "Deck 2 DC" + }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/primary) "rV" = ( @@ -6765,11 +6764,13 @@ }, /obj/effect/turf_decal/tile/yellow, /obj/machinery/firealarm/directional/east, -/obj/machinery/computer/camera_advanced{ - network = list("eng"); +/obj/machinery/computer/security/telescreen{ + desc = "Used for watching critical engineering areas"; name = "Engineering Critical Monitoring"; - dir = 8 + network = list("eng"); + pixel_y = 2 }, +/obj/structure/table, /turf/open/floor/monotile/steel, /area/nsv/engine/dcc) "ux" = ( diff --git a/_maps/map_files/Tycoon/Tycoon2.dmm b/_maps/map_files/Tycoon/Tycoon2.dmm index 3868488dc6c..fbc11be05f9 100644 --- a/_maps/map_files/Tycoon/Tycoon2.dmm +++ b/_maps/map_files/Tycoon/Tycoon2.dmm @@ -12882,6 +12882,12 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/computer/security/telescreen{ + desc = "Used for watching critical engineering areas"; + name = "Engineering Critical Monitoring"; + network = list("eng"); + pixel_y = 2 + }, /turf/open/floor/monotile/steel, /area/nsv/engine/dcc) "aLl" = ( @@ -42535,11 +42541,13 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/computer/camera_advanced{ - network = list("eng"); +/obj/machinery/computer/security/telescreen{ + desc = "Used for watching critical engineering areas"; name = "Engineering Critical Monitoring"; - dir = 4 + network = list("eng"); + pixel_y = 2 }, +/obj/structure/table/reinforced, /turf/open/floor/monotile/steel, /area/nsv/engine/dcc) "ixq" = ( From ab20e9e7b12d4fe8cd2f59f728d249b7d535b8ed Mon Sep 17 00:00:00 2001 From: SerynEngi Date: Sat, 14 Dec 2024 16:22:28 -0800 Subject: [PATCH 14/26] Fixed missing lighting and various other tweaks also added a bit more of what's left of virology to act as even more ablative shielding --- _maps/map_files/Tycoon/Tycoon2.dmm | 448 +++++++++++++++++++++-------- 1 file changed, 333 insertions(+), 115 deletions(-) diff --git a/_maps/map_files/Tycoon/Tycoon2.dmm b/_maps/map_files/Tycoon/Tycoon2.dmm index fbc11be05f9..aaed2f1530c 100644 --- a/_maps/map_files/Tycoon/Tycoon2.dmm +++ b/_maps/map_files/Tycoon/Tycoon2.dmm @@ -604,9 +604,6 @@ /turf/closed/wall/r_wall/ship, /area/maintenance/department/security) "abQ" = ( -/obj/machinery/door/airlock/ship/public/glass{ - name = "Medical Lounge" - }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -625,6 +622,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/machinery/door/airlock/ship/public/glass{ + name = "Medical Lounge" + }, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/monotile/steel, /area/medical/break_room) "abR" = ( @@ -711,6 +712,7 @@ "acb" = ( /obj/structure/closet/firecloset, /obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light/small, /turf/open/floor/durasteel/padded, /area/maintenance/department/medical) "acc" = ( @@ -2686,6 +2688,9 @@ /obj/structure/window/reinforced{ dir = 1 }, +/obj/machinery/light{ + dir = 8 + }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) "agR" = ( @@ -2910,7 +2915,7 @@ /obj/structure/cable{ icon_state = "2-8" }, -/turf/open/floor/monotile/dark, +/turf/open/floor/plating/airless, /area/space/nearstation) "ahw" = ( /obj/structure/closet/crate/coffin, @@ -3208,6 +3213,16 @@ }, /turf/open/floor/monotile/dark, /area/chapel/main) +"aig" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/monotile/light, +/area/medical/storage) "aih" = ( /turf/closed/wall/ship, /area/maintenance/department/cargo) @@ -3458,6 +3473,11 @@ name = "Cryogenics"; req_one_access_txt = "5" }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/monotile/light, /area/medical/medbay/central) "aiZ" = ( @@ -3587,8 +3607,6 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance/three, /obj/structure/disposalpipe/segment{ dir = 9 }, @@ -3633,7 +3651,7 @@ "ajD" = ( /obj/machinery/door/airlock/ship/public/glass{ name = "Genetics Lab"; - req_one_access_txt = "9" + req_one_access_txt = "5" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -4160,6 +4178,9 @@ /obj/item/radio/intercom{ pixel_y = 26 }, +/obj/machinery/light{ + dir = 1 + }, /turf/open/floor/monotile/steel, /area/medical/surgery) "alb" = ( @@ -4512,6 +4533,7 @@ /area/medical/genetics) "amc" = ( /obj/machinery/stasis, +/obj/machinery/firealarm/directional/west, /turf/open/floor/monotile/light, /area/medical/medbay/central) "amd" = ( @@ -5131,7 +5153,7 @@ icon_state = "0-4" }, /obj/structure/grille, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/space/nearstation) "aoq" = ( /obj/effect/spawner/room/threexthree, @@ -8981,6 +9003,15 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, /turf/open/floor/monotile/light, /area/medical/medbay/lobby) "aBM" = ( @@ -11840,7 +11871,7 @@ /area/hallway/nsv/deck2/frame1/port) "aIL" = ( /obj/structure/girder, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/space) "aIM" = ( /obj/effect/turf_decal/stripes/line{ @@ -12150,7 +12181,7 @@ /area/science/robotics) "aJF" = ( /obj/structure/girder/reinforced, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/space/nearstation) "aJG" = ( /obj/item/cardboard_cutout{ @@ -12882,12 +12913,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/computer/security/telescreen{ - desc = "Used for watching critical engineering areas"; - name = "Engineering Critical Monitoring"; - network = list("eng"); - pixel_y = 2 - }, /turf/open/floor/monotile/steel, /area/nsv/engine/dcc) "aLl" = ( @@ -14993,9 +15018,7 @@ icon_state = "2-8" }, /obj/item/shard, -/turf/open/floor/plating{ - icon_state = "panelscorched" - }, +/turf/open/floor/plating/airless, /area/space/nearstation) "aPF" = ( /obj/structure/cable{ @@ -16609,6 +16632,12 @@ /area/medical/medbay/central) "aTM" = ( /obj/structure/table/reinforced, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, /turf/open/floor/monotile/light, /area/medical/medbay/lobby) "aTN" = ( @@ -16905,7 +16934,7 @@ /obj/structure/cable{ icon_state = "2-8" }, -/turf/open/floor/monotile/dark, +/turf/open/floor/plating/airless, /area/space/nearstation) "aUQ" = ( /obj/effect/turf_decal/tile/yellow{ @@ -17270,9 +17299,7 @@ /area/maintenance/starboard/fore) "aVL" = ( /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating{ - icon_state = "panelscorched" - }, +/turf/open/floor/plating/airless, /area/space) "aVM" = ( /obj/machinery/disposal/bin, @@ -20457,10 +20484,8 @@ /turf/open/floor/plating, /area/medical/break_room) "bcT" = ( -/obj/machinery/light{ - dir = 1 - }, /obj/machinery/computer/ship/viewscreen, +/obj/item/kirbyplants/random, /turf/open/floor/monotile/light, /area/medical/medbay/lobby) "bcU" = ( @@ -20610,6 +20635,12 @@ "bdh" = ( /obj/machinery/holopad, /obj/structure/table/reinforced, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, /turf/open/floor/monotile/light, /area/medical/medbay/lobby) "bdi" = ( @@ -22589,16 +22620,14 @@ /turf/open/floor/plating, /area/maintenance/department/cargo) "bhb" = ( -/obj/machinery/light{ - dir = 1 - }, /obj/structure/cable{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/monotile/light, -/area/medical/medbay/lobby) +/obj/machinery/light, +/turf/open/floor/monotile/dark, +/area/medical) "bhd" = ( /obj/structure/table/glass, /obj/item/reagent_containers/glass/beaker/cryoxadone{ @@ -24356,9 +24385,6 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/structure/cable{ - icon_state = "2-4" - }, /turf/open/floor/plating, /area/maintenance/department/medical) "bkU" = ( @@ -24453,6 +24479,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/monotile/dark, /area/medical/surgery) "blc" = ( @@ -29648,8 +29675,8 @@ /turf/open/floor/monotile/light, /area/medical/storage) "bvC" = ( -/turf/closed/wall/ship, -/area/medical) +/turf/open/floor/plating/airless, +/area/space) "bvD" = ( /obj/machinery/atmospherics/pipe/multiz/layer4{ dir = 4 @@ -29850,7 +29877,7 @@ /area/medical/medbay/lobby) "bwm" = ( /obj/structure/girder/reinforced, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/space) "bwo" = ( /obj/structure/chair/office{ @@ -29881,6 +29908,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/plating, /area/medical/medbay/lobby) "bws" = ( @@ -32680,12 +32708,16 @@ /turf/open/floor/monotile/dark, /area/shuttle/turbolift/secondary) "bCh" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, /obj/machinery/door/airlock/ship/public/glass{ name = "Cryogenics"; req_one_access_txt = "5" }, -/obj/structure/disposalpipe/segment, -/obj/structure/disposalpipe/segment, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/monotile/light, /area/medical/medbay/central) "bCi" = ( @@ -36902,8 +36934,11 @@ /turf/open/floor/monotile/steel, /area/shuttle/turbolift/secondary) "bLH" = ( -/turf/closed/wall/ship, -/area/shuttle/turbolift/secondary) +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/monotile/light, +/area/medical/genetics) "bLI" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 @@ -37149,6 +37184,15 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/plating, /area/maintenance/nsv/hangar) +"bOz" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plating, +/area/medical/medbay/central) "bPF" = ( /obj/machinery/deck_turret/payload_gate, /obj/effect/turf_decal/loading_area{ @@ -37223,8 +37267,8 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance/three, -/obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/central) "bVw" = ( @@ -38477,7 +38521,7 @@ icon_state = "0-4" }, /obj/structure/grille/broken, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/space/nearstation) "cDF" = ( /turf/open/floor/plating, @@ -38642,6 +38686,10 @@ /area/bridge{ name = "CIC" }) +"cRk" = ( +/obj/item/shard, +/turf/open/floor/plating/airless, +/area/space) "cSU" = ( /obj/effect/turf_decal/stripes/red/line, /obj/effect/turf_decal/stripes/red/line{ @@ -38888,7 +38936,7 @@ /area/engine/engineering/reactor_core) "die" = ( /obj/effect/decal/cleanable/dirt, -/turf/closed/wall/ship, +/turf/closed/wall/r_wall/ship, /area/maintenance/department/medical) "diS" = ( /obj/structure/lattice/catwalk, @@ -39372,6 +39420,15 @@ }, /turf/open/floor/plating, /area/engine/engineering/hangar) +"ech" = ( +/obj/structure/bodycontainer/morgue{ + dir = 8 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/monotile/dark, +/area/medical/morgue) "ecp" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/monotile/dark, @@ -39644,6 +39701,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/monotile/steel, /area/medical/morgue) "eoU" = ( @@ -39988,6 +40046,11 @@ name = "Virology"; req_one_access_txt = "5" }, +/obj/effect/landmark/zebra_interlock_point, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, /turf/open/floor/monotile/steel, /area/medical) "eNG" = ( @@ -40498,6 +40561,15 @@ }, /turf/open/floor/monotile/dark, /area/engine/storage_shared) +"fBI" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plating, +/area/maintenance/department/medical) "fBS" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -40845,6 +40917,12 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/durasteel/techfloor, /area/engine/engineering/reactor_control) +"gfu" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/monotile/steel, +/area/medical/storage) "gfy" = ( /obj/structure/lattice/catwalk/over/ship, /obj/machinery/camera/autoname{ @@ -41038,6 +41116,10 @@ }, /turf/open/floor/plating, /area/maintenance/nsv/hangar) +"gub" = ( +/obj/machinery/light, +/turf/open/floor/monotile/light, +/area/medical/medbay/central) "guw" = ( /obj/machinery/door/airlock/ship/external/glass{ req_one_access_txt = "24" @@ -41086,6 +41168,10 @@ /obj/structure/closet/cardboard, /turf/open/floor/plating, /area/maintenance/nsv/weapons) +"gAd" = ( +/obj/machinery/light, +/turf/open/floor/monotile/light, +/area/medical/genetics) "gAp" = ( /obj/machinery/door/airlock/ship/maintenance/defaultaccess{ req_one_access_txt = "28;35;25;46;26" @@ -41317,6 +41403,12 @@ /obj/machinery/computer/ship/viewscreen, /turf/open/floor/wood, /area/library) +"gML" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plating, +/area/maintenance/department/security) "gNA" = ( /obj/machinery/status_display/evac{ pixel_y = 26 @@ -41863,6 +41955,17 @@ /obj/structure/plasticflaps/opaque, /turf/open/floor/plasteel/techmaint, /area/crew_quarters/kitchen/coldroom) +"hxi" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/monotile/light, +/area/medical/medbay/central) "hxF" = ( /obj/structure/cable{ icon_state = "1-2" @@ -42528,6 +42631,16 @@ "iuA" = ( /turf/closed/wall/ship, /area/maintenance/starboard/fore) +"iwo" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/central) "iwG" = ( /obj/effect/turf_decal/pool{ dir = 4 @@ -42602,6 +42715,13 @@ /obj/machinery/disposal/bin, /turf/open/floor/plasteel/grid/steel, /area/quartermaster/storage) +"iBy" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/spawner/lootdrop/maintenance/three, +/turf/open/floor/plating, +/area/maintenance/central) "iBz" = ( /obj/structure/table/glass, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -42887,6 +43007,9 @@ "iOS" = ( /obj/structure/table/glass, /obj/item/radio/intercom/directional/east, +/obj/machinery/light{ + dir = 4 + }, /turf/open/floor/monotile/light, /area/medical/medbay/central) "iPA" = ( @@ -43095,6 +43218,13 @@ name = "Medical Equipment"; req_one_access_txt = "5" }, +/obj/effect/landmark/zebra_interlock_point, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, /turf/open/floor/monotile/steel, /area/medical/storage) "jdn" = ( @@ -43590,6 +43720,15 @@ }, /turf/open/floor/monotile/steel, /area/security/prison) +"jTW" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/department/medical) "jUp" = ( /obj/structure/disposalpipe/segment, /obj/machinery/missile_builder/assembler, @@ -47418,6 +47557,9 @@ "pdT" = ( /obj/structure/table/reinforced, /obj/item/radio/intercom/directional/west, +/obj/machinery/light{ + dir = 8 + }, /turf/open/floor/monotile/light, /area/medical/medbay/central) "per" = ( @@ -47569,6 +47711,13 @@ /obj/effect/turf_decal/ship/delivery/yellow, /turf/open/floor/monotile/dark, /area/nsv/weapons/fore) +"ppL" = ( +/obj/structure/bodycontainer/morgue, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/monotile/dark, +/area/medical/morgue) "pqr" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -48041,6 +48190,10 @@ }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) +"pZf" = ( +/obj/machinery/light/small, +/turf/open/floor/plating, +/area/maintenance/department/security) "pZr" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 9 @@ -48339,6 +48492,7 @@ /obj/structure/cable{ icon_state = "1-4" }, +/obj/machinery/light/small, /turf/open/floor/durasteel, /area/maintenance/department/medical) "qAP" = ( @@ -49269,6 +49423,9 @@ dir = 1 }, /obj/machinery/coffeemaker, +/obj/machinery/light{ + dir = 1 + }, /turf/open/floor/monotile/steel, /area/medical/break_room) "rFe" = ( @@ -49394,6 +49551,9 @@ /area/nsv/hanger/storage{ name = "Munitions Control Room" }) +"rLy" = ( +/turf/closed/wall/r_wall/ship, +/area/maintenance/central) "rLI" = ( /obj/effect/spawner/lootdrop/two_percent_xeno_egg_spawner, /turf/open/floor/engine, @@ -49906,6 +50066,15 @@ }, /turf/open/floor/plating, /area/hallway/secondary/exit) +"syG" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/light, +/turf/open/floor/monotile/light, +/area/medical/medbay/lobby) "szH" = ( /obj/effect/spawner/structure/window/reinforced/ship, /obj/machinery/atmospherics/pipe/layer_manifold/visible{ @@ -49971,6 +50140,7 @@ payment_department = "MED"; pixel_x = -32 }, +/obj/item/kirbyplants/random, /turf/open/floor/monotile/light, /area/medical/medbay/lobby) "sHy" = ( @@ -50625,11 +50795,21 @@ /turf/open/floor/monotile/steel, /area/medical/surgery) "tHS" = ( -/obj/machinery/airalarm{ - pixel_y = 23 +/obj/structure/closet/radiation, +/obj/item/clothing/suit/radiation, +/obj/item/clothing/suit/radiation, +/obj/item/clothing/head/radiation, +/obj/item/clothing/head/radiation, +/obj/item/shovel, +/obj/item/shovel, +/obj/structure/window/reinforced{ + dir = 1 }, -/turf/open/space/basic, -/area/space) +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/monotile/steel, +/area/hallway/nsv/deck2/frame1/port) "tIg" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/wood, @@ -50798,6 +50978,13 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/landmark/zebra_interlock_point, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, /turf/open/floor/monotile/steel, /area/medical/storage) "tTM" = ( @@ -50823,6 +51010,12 @@ }, /turf/open/floor/monotile/steel, /area/medical/chemistry) +"tVW" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/monotile/steel, +/area/medical) "tWl" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -51079,8 +51272,9 @@ /turf/open/floor/engine, /area/engine/engine_room) "uoW" = ( -/turf/closed/wall/ship, -/area/maintenance/nsv/weapons) +/obj/item/kirbyplants/random, +/turf/open/floor/monotile/light, +/area/medical/medbay/lobby) "upe" = ( /obj/effect/landmark/start/munitions_tech, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -51859,6 +52053,12 @@ /area/bridge{ name = "CIC" }) +"vMi" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/monotile/light, +/area/medical/medbay/lobby) "vMN" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/simple/purple/visible, @@ -52068,6 +52268,16 @@ /obj/machinery/meter/atmos/atmos_waste_loop, /turf/open/space/basic, /area/engine/atmos) +"wcy" = ( +/obj/structure/sign/ship/pods/north{ + pixel_y = 1; + pixel_x = -32 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/monotile/steel, +/area/medical) "weE" = ( /obj/structure/closet/secure_closet/brig, /obj/machinery/firealarm{ @@ -52116,6 +52326,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/light, /turf/open/floor/monotile/light, /area/medical/genetics) "whd" = ( @@ -52551,6 +52762,9 @@ /area/bridge{ name = "CIC" }) +"wNv" = ( +/turf/closed/wall/r_wall/ship, +/area/medical/storage) "wOL" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -53396,6 +53610,10 @@ }, /turf/open/floor/plasteel/ridged/steel, /area/engine/engineering/reactor_core) +"ycN" = ( +/obj/machinery/firealarm/directional/west, +/turf/open/floor/monotile/steel, +/area/medical) "ydG" = ( /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -75197,7 +75415,7 @@ jLQ jLQ aaa abP -xue +gML akO eBC afR @@ -75457,7 +75675,7 @@ abP afR afR eBC -xue +pZf abP bJj bej @@ -76734,7 +76952,7 @@ baC baC baC baC -baC +jTW baC baC baC @@ -76986,9 +77204,9 @@ akL agX alD aow -alg -alg -alg +aow +aow +aow aUE alg ahO @@ -77239,7 +77457,7 @@ jLQ aaa jLQ aZa -akL +fBI agX agU aow @@ -77252,7 +77470,7 @@ ahO ahP ahP ahP -ahP +ppL aGL ahP bBS @@ -77523,7 +77741,7 @@ ajZ aTK aTV ahm -nNn +bOz acF alt alF @@ -78280,7 +78498,7 @@ ahO aUz aUz aUz -aUz +ech aUz hqQ oxY @@ -78516,8 +78734,8 @@ aaa aaa aaa aaa -aaa -aaa +bKQ +bwm bKQ aaa jLQ @@ -78772,9 +78990,9 @@ aaa aaa aaa aaa -agz -aaa -sdB +aIL +bvC +bvC sdB cCS aop @@ -78791,10 +79009,10 @@ lca aZX aZX aZX -aZX +ycN bmS bYc -bFX +wcy aZX ahK baY @@ -79029,9 +79247,9 @@ aaa agz aaa aaa -aaa -aaa -sdB +bwm +bvC +cRk aVL aPE ahv @@ -79055,9 +79273,9 @@ bnl bCo qoc beA -beA +bhb akI -nKJ +hxi eZb bcU aUy @@ -79300,7 +79518,7 @@ baz eLS aZX aZX -aZX +tVW aZX aZX aZX @@ -79328,9 +79546,9 @@ sHl bFU bvQ bin -ahf +uoW afV -bge +acx bCS aOP hjP @@ -79546,7 +79764,7 @@ aaa aaa aaa aaa -sdB +bvC jLQ aaJ aaJ @@ -79555,8 +79773,8 @@ aUU aoM uEb aUS -bvC -ahi +aUS +wNv ahi ahi jcy @@ -79812,12 +80030,12 @@ aZa apa aZa aZa -afw -ahi +aZa +wNv bvE bCl aMD -aMD +aig alp alw aAN @@ -79836,9 +80054,9 @@ bvS aUh bhU aUe -aUe +gub aKh -ahf +vMi ame mib dfh @@ -80070,7 +80288,7 @@ pJP lay agX acb -ahi +wNv bvE rvU dXF @@ -80095,11 +80313,11 @@ apX jau nKJ jdn -bhb +gks mmh bGk bpi -gks +syG faG afC kKB @@ -80323,11 +80541,11 @@ aaU aZa lrR vFo -afw -afw -afw -afw -ahi +aZa +aZa +aZa +aZa +wNv agS bCu bpB @@ -80580,7 +80798,7 @@ aZa aZa aZa vFo -ueI +jqT pHV pHV aaS @@ -80837,7 +81055,7 @@ alC bvI jCX qzT -afw +aZa pHV pHV pHV @@ -81102,7 +81320,7 @@ ahi biH bCu aVy -aVy +gfu uav aRL aUn @@ -81121,7 +81339,7 @@ aUj aja aAc qsx -ajY +gAd afV afV aBL @@ -81135,7 +81353,7 @@ bmQ abL afB bjV -bjV +tHS afP afP abL @@ -81606,9 +81824,9 @@ bsW bBm bCf bCf -bLH +bsW bjk -ueI +jqT pHV pHV pHV @@ -81632,7 +81850,7 @@ ajY ahk whb aUj -ajY +bLH ale afQ alv @@ -81863,12 +82081,12 @@ bsW bsW bLG ced -bLH +bsW bjk -afw +aZa die -afw -afw +aZa +aZa aae eqv bvi @@ -82120,7 +82338,7 @@ vlk ceq ceq vXM -aae +rLy bsV brm aUp @@ -82373,7 +82591,7 @@ ddW wWN pcG iSP -uoW +xuS ahD ahD dFO @@ -82625,12 +82843,12 @@ azE aux aYX xuS -uoW -uoW -uoW -uoW +xuS +xuS +xuS +xuS kcr -uoW +xuS ces cev cKq @@ -82896,7 +83114,7 @@ aae rbR aZZ mTV -aZZ +iwo mTV mTV fJZ @@ -82905,11 +83123,11 @@ mTM aZZ aZZ aZZ -bVl +aZZ ajv +iBy +bVl alE -cer -cer lmR akD cer @@ -108322,7 +108540,7 @@ aaa aaa aaa aaa -tHS +aaa aaa aaa avI From c1703288ac0dc7d66fbd8d3c187d042c570dad17 Mon Sep 17 00:00:00 2001 From: SerynEngi Date: Sat, 14 Dec 2024 17:02:30 -0800 Subject: [PATCH 15/26] Missed a pipe --- _maps/map_files/Tycoon/Tycoon2.dmm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/_maps/map_files/Tycoon/Tycoon2.dmm b/_maps/map_files/Tycoon/Tycoon2.dmm index aaed2f1530c..47a13f94382 100644 --- a/_maps/map_files/Tycoon/Tycoon2.dmm +++ b/_maps/map_files/Tycoon/Tycoon2.dmm @@ -48477,11 +48477,12 @@ /turf/open/floor/durasteel/techfloor, /area/nsv/weapons/fore) "qzs" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/conveyor{ + dir = 4; + id = "atlas_powder" }, /turf/open/floor/monotile/dark, -/area/hallway/nsv/deck2/frame1/central) +/area/nsv/weapons/fore) "qzT" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -90343,7 +90344,7 @@ abk bKU byA bmr -qzs +bFI bmU aci bnt @@ -90579,7 +90580,7 @@ mfa aTr cgs rdR -rdR +qzs rdR rdR prp From cfcd6ee7f3e26082046f3f5f5306a115a1068a43 Mon Sep 17 00:00:00 2001 From: SerynEngi Date: Sun, 15 Dec 2024 12:45:53 -0800 Subject: [PATCH 16/26] Coffee! and a slight tweaking of areas in the medical escape pod --- _maps/map_files/Tycoon/Tycoon2.dmm | 71 ++++++++++++++++-------------- 1 file changed, 39 insertions(+), 32 deletions(-) diff --git a/_maps/map_files/Tycoon/Tycoon2.dmm b/_maps/map_files/Tycoon/Tycoon2.dmm index 47a13f94382..05e400ffdbf 100644 --- a/_maps/map_files/Tycoon/Tycoon2.dmm +++ b/_maps/map_files/Tycoon/Tycoon2.dmm @@ -5219,6 +5219,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, +/obj/item/storage/fancy/coffee_condi_display, /obj/item/reagent_containers/glass/coffeepot, /turf/open/floor/monotile/steel, /area/medical/break_room) @@ -40286,25 +40287,11 @@ /area/crew_quarters/fitness/recreation) "feG" = ( /obj/structure/table/reinforced, -/obj/machinery/button/door{ - name = "Damage Control Supply Access"; - pixel_x = -6; - pixel_y = 8; - id = "dc1"; - req_one_access_txt = "11" - }, -/obj/machinery/button/door{ - name = "Advanced Damage Control Supplies"; - pixel_x = 4; - pixel_y = 8; - id = "dc2"; - req_one_access_txt = "20, 56, 57" - }, -/obj/machinery/button/door{ - name = "Damage Control Central Window Shutters"; - pixel_x = -1; - id = "dcc"; - req_one_access_txt = "11" +/obj/machinery/computer/security/telescreen{ + desc = "Used for watching critical engineering areas"; + name = "Engineering Critical Monitoring"; + network = list("eng"); + pixel_y = 2 }, /turf/open/floor/monotile/steel, /area/nsv/engine/dcc) @@ -41677,8 +41664,29 @@ /turf/open/floor/monotile/steel, /area/nsv/weapons/gauss) "hgf" = ( -/turf/open/floor/plating, -/area/medical/storage) +/obj/structure/table/reinforced, +/obj/machinery/button/door{ + name = "Advanced Damage Control Supplies"; + pixel_x = 4; + pixel_y = 8; + id = "dc2"; + req_one_access_txt = "20, 56, 57" + }, +/obj/machinery/button/door{ + name = "Damage Control Supply Access"; + pixel_x = -6; + pixel_y = 8; + id = "dc1"; + req_one_access_txt = "11" + }, +/obj/machinery/button/door{ + name = "Damage Control Central Window Shutters"; + pixel_x = -1; + id = "dcc"; + req_one_access_txt = "11" + }, +/turf/open/floor/monotile/steel, +/area/nsv/engine/dcc) "hhh" = ( /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating, @@ -42654,13 +42662,12 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/computer/security/telescreen{ - desc = "Used for watching critical engineering areas"; - name = "Engineering Critical Monitoring"; - network = list("eng"); - pixel_y = 2 - }, /obj/structure/table/reinforced, +/obj/item/storage/fancy/coffee_condi_display{ + pixel_y = 6; + pixel_x = 4 + }, +/obj/item/storage/box/coffeepack, /turf/open/floor/monotile/steel, /area/nsv/engine/dcc) "ixq" = ( @@ -47690,7 +47697,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/medical/storage) +/area/maintenance/central) "poc" = ( /obj/structure/cable/yellow, /obj/machinery/computer/monitor{ @@ -81836,9 +81843,9 @@ ahi ahi ahi ahi -hgf +akb pnv -hgf +akb aaK eWa amM @@ -103402,10 +103409,10 @@ chg cae ohH anJ -aJH +hgf feG ixc -aBj +aJH nBU gqR anm From ac81494300ca03819e60e8c67a49b39e3a270464 Mon Sep 17 00:00:00 2001 From: SerynEngi Date: Sun, 15 Dec 2024 22:20:57 -0800 Subject: [PATCH 17/26] added a trash can, moved a door --- _maps/map_files/Tycoon/Tycoon2.dmm | 342 +++++++++++++++++++++-------- 1 file changed, 256 insertions(+), 86 deletions(-) diff --git a/_maps/map_files/Tycoon/Tycoon2.dmm b/_maps/map_files/Tycoon/Tycoon2.dmm index 05e400ffdbf..b3109a98d11 100644 --- a/_maps/map_files/Tycoon/Tycoon2.dmm +++ b/_maps/map_files/Tycoon/Tycoon2.dmm @@ -2664,6 +2664,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, +/obj/machinery/firealarm/directional/south, /turf/open/floor/monotile/steel, /area/medical/medbay/central) "agQ" = ( @@ -3786,11 +3787,11 @@ /turf/open/floor/monotile/light, /area/medical/genetics) "ajZ" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{ - name = "Cryotube Cooler" +/obj/effect/turf_decal/tile/blue{ + dir = 8 }, -/obj/machinery/camera/autoname, -/turf/open/floor/monotile/dark, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/monotile/steel, /area/medical/medbay/central) "aka" = ( /turf/open/floor/carpet/ship, @@ -3832,8 +3833,6 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/machinery/power/apc/auto_name/south, -/obj/structure/cable, /turf/open/floor/monotile/steel, /area/medical/medbay/central) "akh" = ( @@ -3851,7 +3850,7 @@ "aki" = ( /obj/machinery/holopad, /obj/structure/cable{ - icon_state = "2-4" + icon_state = "4-8" }, /turf/open/floor/monotile/dark, /area/medical/medbay/central) @@ -3866,7 +3865,10 @@ /obj/machinery/portable_atmospherics/canister/oxygen{ name = "Cryotube o2 canister" }, -/turf/open/floor/monotile/dark, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/monotile/steel, /area/medical/medbay/central) "akl" = ( /obj/machinery/light{ @@ -4532,8 +4534,10 @@ /turf/open/floor/monotile/light, /area/medical/genetics) "amc" = ( -/obj/machinery/stasis, -/obj/machinery/firealarm/directional/west, +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 10 + }, +/obj/structure/table/reinforced, /turf/open/floor/monotile/light, /area/medical/medbay/central) "amd" = ( @@ -4560,21 +4564,9 @@ /turf/open/floor/monotile/light, /area/medical/genetics) "amh" = ( -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 - }, -/obj/machinery/door/airlock/ship/public/glass{ - name = "Cryogenics Freezer"; - req_one_access_txt = "5" - }, -/turf/open/floor/monotile/dark, -/area/medical/medbay/central) +/obj/structure/disposalpipe/segment, +/turf/open/floor/monotile/light, +/area/medical/medbay/lobby) "ami" = ( /turf/closed/wall/ship, /area/crew_quarters/dorms) @@ -5116,9 +5108,11 @@ /turf/open/floor/carpet/ship, /area/crew_quarters/dorms) "aok" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ - dir = 8 +/obj/machinery/firealarm/directional/west, +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 5 }, +/obj/machinery/stasis, /turf/open/floor/monotile/light, /area/medical/medbay/central) "aol" = ( @@ -8489,8 +8483,8 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 5 +/obj/structure/disposalpipe/junction/flip{ + dir = 4 }, /turf/open/floor/monotile/dark, /area/hallway/nsv/deck2/frame1/port) @@ -14766,10 +14760,6 @@ /turf/open/floor/monotile/dark, /area/janitor) "aPg" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, /obj/machinery/door/airlock/ship/public/glass{ name = "Aft Primary Hallway" }, @@ -14780,6 +14770,10 @@ dir = 4 }, /obj/effect/landmark/zebra_interlock_point, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) "aPh" = ( @@ -16620,7 +16614,7 @@ /area/medical/medbay/central) "aTK" = ( /obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 4 + dir = 1 }, /turf/open/floor/monotile/dark, /area/medical/medbay/central) @@ -16629,6 +16623,8 @@ dir = 4 }, /obj/item/radio/intercom/directional/west, +/obj/structure/table/glass, +/obj/item/storage/box/bodybags, /turf/open/floor/monotile/steel, /area/medical/medbay/central) "aTM" = ( @@ -16665,11 +16661,17 @@ /turf/open/floor/monotile/steel, /area/engine/engineering) "aTV" = ( -/obj/machinery/airalarm/directional/south, -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 5 +/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{ + name = "Cryotube Cooler"; + dir = 1 }, -/turf/open/floor/monotile/dark, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/monotile/steel, /area/medical/medbay/central) "aTW" = ( /obj/structure/cable{ @@ -16685,7 +16687,20 @@ /turf/open/floor/monotile/steel, /area/medical/medbay/central) "aTY" = ( -/turf/open/floor/monotile/dark, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 4 + }, +/mob/living/simple_animal/bot/cleanbot{ + name = "Scrubs, MD"; + trash = 1 + }, +/turf/open/floor/monotile/steel, /area/medical/medbay/central) "aTZ" = ( /obj/item/reagent_containers/glass/beaker{ @@ -16797,9 +16812,10 @@ /area/maintenance/department/medical) "aUt" = ( /obj/structure/table/glass, -/obj/item/wrench/medical, -/obj/item/storage/box/bodybags, -/turf/open/floor/monotile/dark, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/monotile/steel, /area/medical/medbay/central) "aUu" = ( /obj/effect/landmark/nuclear_waste_spawner, @@ -18713,20 +18729,27 @@ "aZb" = ( /obj/structure/closet/secure_closet/medical3, /obj/effect/turf_decal/tile/blue, +/obj/machinery/requests_console{ + department = "Medbay Clinic"; + departmentType = 1; + name = "Medbay RC"; + payment_department = "MED"; + pixel_x = -32 + }, /turf/open/floor/monotile/steel, /area/medical/medbay/central) "aZc" = ( /obj/machinery/light{ dir = 8 }, -/mob/living/simple_animal/bot/cleanbot{ - name = "Scrubs, MD"; - trash = 1 - }, /obj/effect/turf_decal/tile/blue{ dir = 4 }, /obj/effect/turf_decal/tile/blue, +/obj/machinery/power/apc/auto_name/west, +/obj/structure/cable{ + icon_state = "0-4" + }, /turf/open/floor/monotile/steel, /area/medical/medbay/central) "aZd" = ( @@ -19528,10 +19551,15 @@ /turf/open/floor/monotile/dark, /area/medical/surgery) "baS" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 +/obj/effect/turf_decal/tile/blue{ + dir = 1 }, -/turf/open/floor/monotile/dark, +/obj/machinery/camera/autoname{ + dir = 1 + }, +/obj/structure/table/glass, +/obj/item/wrench/medical, +/turf/open/floor/monotile/steel, /area/medical/medbay/central) "baT" = ( /obj/machinery/computer/cloning{ @@ -21183,7 +21211,8 @@ /obj/machinery/portable_atmospherics/canister/oxygen{ name = "Cryotube o2 canister" }, -/turf/open/floor/monotile/dark, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/monotile/steel, /area/medical/medbay/central) "bef" = ( /obj/structure/cable{ @@ -21713,7 +21742,12 @@ /obj/machinery/atmospherics/pipe/manifold/general/visible{ dir = 8 }, -/turf/open/floor/monotile/dark, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/monotile/steel, /area/medical/medbay/central) "bfi" = ( /obj/structure/table, @@ -28595,12 +28629,6 @@ /turf/open/floor/durasteel, /area/engine/engineering) "btC" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, @@ -28611,6 +28639,12 @@ /obj/machinery/door/airlock/ship/public/glass{ name = "Aft Primary Hallway" }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) "btD" = ( @@ -29850,13 +29884,13 @@ /area/hallway/nsv/deck2/frame1/central) "bwi" = ( /obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) "bwk" = ( @@ -38904,6 +38938,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/monotile/steel, /area/medical/medbay/lobby) "dgt" = ( @@ -39072,6 +39107,12 @@ }, /turf/open/floor/wood, /area/library) +"dzG" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/monotile/light, +/area/medical/medbay/lobby) "dzX" = ( /obj/machinery/atmospherics/pipe/multiz/layer2{ dir = 1 @@ -42028,6 +42069,15 @@ /obj/effect/turf_decal/tile/orange, /turf/open/floor/monotile/steel, /area/nsv/weapons/fore) +"hyA" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/monotile/steel, +/area/hallway/nsv/deck2/frame1/central) "hzd" = ( /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -44515,6 +44565,9 @@ }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/monotile/dark, /area/hallway/nsv/deck2/frame1/port) "kLw" = ( @@ -47712,6 +47765,11 @@ }, /turf/open/floor/monotile/steel, /area/science/xenobiology) +"ppj" = ( +/obj/effect/turf_decal/tile/ship/full/blue, +/obj/structure/disposalpipe/segment, +/turf/open/floor/monotile/steel, +/area/medical/medbay/lobby) "ppG" = ( /obj/structure/closet/secure_closet/munitions_technician, /obj/machinery/light, @@ -48265,6 +48323,14 @@ }, /turf/open/space/basic, /area/engine/atmos) +"qfC" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue, +/obj/structure/disposalpipe/segment, +/turf/open/floor/monotile/steel, +/area/hallway/nsv/deck2/frame1/port) "qho" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plasteel/ridged/steel, @@ -48298,6 +48364,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/monotile/dark, /area/hallway/nsv/deck2/frame1/port) "qir" = ( @@ -48983,6 +49052,17 @@ }, /turf/open/floor/monotile/dark, /area/nsv/weapons/fore) +"rfX" = ( +/obj/machinery/door/airlock/ship/public/glass{ + name = "Cryogenics Freezer"; + req_one_access_txt = "5" + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/turf/open/floor/monotile/steel, +/area/medical/medbay/central) "rge" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -49320,6 +49400,16 @@ icon_state = "panelscorched" }, /area/maintenance/nsv/weapons) +"rzb" = ( +/obj/machinery/requests_console{ + department = "Medbay Clinic"; + departmentType = 1; + name = "Medbay RC"; + payment_department = "MED"; + pixel_x = -32 + }, +/turf/open/floor/monotile/light, +/area/medical/medbay/central) "rzw" = ( /obj/item/fuel_rod, /turf/open/indestructible/sound/pool/spentfuel, @@ -50041,16 +50131,20 @@ /turf/open/floor/engine/vacuum, /area/science/mixing/chamber) "sxm" = ( -/obj/structure/table/reinforced, -/obj/machinery/requests_console{ - department = "Medbay Clinic"; - departmentType = 1; - name = "Medbay RC"; - payment_department = "MED"; - pixel_x = -32 +/obj/structure/cable{ + icon_state = "4-8" }, -/turf/open/floor/monotile/light, -/area/medical/medbay/central) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/monotile/dark, +/area/hallway/nsv/deck2/frame1/port) "sxM" = ( /obj/effect/turf_decal/tile/orange{ dir = 4 @@ -50148,7 +50242,10 @@ payment_department = "MED"; pixel_x = -32 }, -/obj/item/kirbyplants/random, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, /turf/open/floor/monotile/light, /area/medical/medbay/lobby) "sHy" = ( @@ -50231,6 +50328,19 @@ /area/bridge{ name = "CIC" }) +"sQy" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/monotile/dark, +/area/hallway/nsv/deck2/frame1/port) "sRd" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/closed/wall/ship, @@ -50263,6 +50373,17 @@ }, /turf/open/floor/monotile/steel, /area/engine/engineering/reactor_core) +"sVK" = ( +/obj/machinery/atmospherics/pipe/simple/general/hidden{ + dir = 8 + }, +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/ship/preopen{ + dir = 4; + id = "medical_traitor_murder_hole" + }, +/turf/open/floor/plating, +/area/medical/medbay/central) "sYQ" = ( /obj/structure/chair/office/light{ dir = 1 @@ -50772,6 +50893,21 @@ }, /turf/open/floor/monotile/dark, /area/nsv/weapons/fore) +"tEy" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/monotile/dark, +/area/hallway/nsv/deck2/frame1/port) "tFb" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -51645,6 +51781,21 @@ }, /turf/open/floor/monotile/dark, /area/nsv/hanger/deck2) +"vdx" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/monotile/dark, +/area/hallway/nsv/deck2/frame1/port) "vew" = ( /obj/structure/bed{ layer = 2.8 @@ -51931,6 +52082,18 @@ /obj/item/storage/toolbox/mechanical, /turf/open/floor/monotile/dark, /area/hallway/nsv/deck2/frame1/port) +"vAX" = ( +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/airlock/ship/public/glass{ + name = "Medbay Lobby Access" + }, +/obj/effect/landmark/zebra_interlock_point, +/obj/structure/disposalpipe/segment, +/turf/open/floor/monotile/light, +/area/medical/medbay/lobby) "vBM" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -52065,6 +52228,9 @@ /obj/machinery/light{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, /turf/open/floor/monotile/light, /area/medical/medbay/lobby) "vMN" = ( @@ -53401,6 +53567,10 @@ }, /turf/open/floor/wood, /area/library) +"xHl" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/monotile/steel, +/area/medical/medbay/lobby) "xIH" = ( /obj/machinery/atmospherics/pipe/simple/dark/visible, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -77744,7 +77914,7 @@ ahm agW aki akg -ahm +rfX ajZ aTK aTV @@ -78260,8 +78430,8 @@ bdB ahm ahm ahm +sVK ahm -amh ahm akQ acF @@ -78514,8 +78684,8 @@ aZM ahm skf pCw +rzb bvX -sxm pdT amc aok @@ -79807,7 +79977,7 @@ akF aUe aUe bwf -ahf +dzG ame ame ylS @@ -80065,13 +80235,13 @@ aUe gub aKh vMi -ame -mib +xHl +ppj dfh -ahf -tsM -acx -bCS +amh +vAX +qfC +tEy mvE abL kcf @@ -80585,7 +80755,7 @@ ame ahf tsM acx -bCS +sxm qLv aZq bCC @@ -81099,7 +81269,7 @@ ahf ajh afV acx -bCH +vdx bmR boz boK @@ -81356,7 +81526,7 @@ aTM afV afV bge -bCS +sxm bmQ abL afB @@ -81613,7 +81783,7 @@ bzM afV ssH acx -bCS +sxm afK abL abL @@ -81870,7 +82040,7 @@ bwo bvl aKh oao -bCR +sQy xMG laZ nWr @@ -82899,7 +83069,7 @@ bFE bHB bwi aRD -aPk +hyA laZ asF kdN From e5b8ff0dbd5e51399d092a6727a19d4938e71616 Mon Sep 17 00:00:00 2001 From: SerynEngi Date: Mon, 16 Dec 2024 13:20:41 -0800 Subject: [PATCH 18/26] Virology as ablative armor Also more usable as antag space- all items within are all access and there is a direct connection with the rest of the ship via disposals, be warned: extremely easy to depressurize. --- _maps/map_files/Tycoon/Tycoon2.dmm | 1076 +++++++++++++++++++++------- 1 file changed, 811 insertions(+), 265 deletions(-) diff --git a/_maps/map_files/Tycoon/Tycoon2.dmm b/_maps/map_files/Tycoon/Tycoon2.dmm index b3109a98d11..c2084568077 100644 --- a/_maps/map_files/Tycoon/Tycoon2.dmm +++ b/_maps/map_files/Tycoon/Tycoon2.dmm @@ -696,9 +696,22 @@ /turf/open/floor/monotile/dark, /area/ai_monitored/security/armory) "abY" = ( -/obj/structure/grille, -/turf/open/space/basic, -/area/space) +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/monotile/dark, +/area/medical/virology) "abZ" = ( /turf/closed/wall/ship, /area/crew_quarters/cafeteria{ @@ -2910,13 +2923,10 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/camera/autoname{ - dir = 8 - }, /obj/structure/cable{ icon_state = "2-8" }, -/turf/open/floor/plating/airless, +/turf/open/floor/monotile/dark, /area/space/nearstation) "ahw" = ( /obj/structure/closet/crate/coffin, @@ -2984,6 +2994,9 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, +/obj/structure/cable{ + icon_state = "1-8" + }, /turf/open/floor/durasteel, /area/medical) "ahC" = ( @@ -4803,6 +4816,9 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plating{ icon_state = "panelscorched" }, @@ -5146,7 +5162,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/structure/grille, +/obj/effect/spawner/structure/window/reinforced/ship, /turf/open/floor/plating/airless, /area/space/nearstation) "aoq" = ( @@ -9133,10 +9149,12 @@ /turf/open/floor/engine, /area/engine/atmospherics_engine) "aCo" = ( -/obj/structure/grille, -/obj/structure/lattice, -/turf/open/space/basic, -/area/space) +/obj/effect/spawner/structure/window/reinforced/ship, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/plating, +/area/medical/virology) "aCp" = ( /obj/machinery/door/airlock/ship/hatch{ name = "Network Administration"; @@ -11865,9 +11883,8 @@ /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) "aIL" = ( -/obj/structure/girder, -/turf/open/floor/plating/airless, -/area/space) +/turf/closed/wall/r_wall/ship, +/area/medical/virology) "aIM" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -12175,9 +12192,10 @@ /turf/open/floor/monotile/dark, /area/science/robotics) "aJF" = ( -/obj/structure/girder/reinforced, +/obj/structure/grille/broken, +/obj/structure/foamedmetal, /turf/open/floor/plating/airless, -/area/space/nearstation) +/area/medical/virology) "aJG" = ( /obj/item/cardboard_cutout{ desc = "They seem to be ignoring you... Typical."; @@ -15013,7 +15031,8 @@ icon_state = "2-8" }, /obj/item/shard, -/turf/open/floor/plating/airless, +/obj/structure/disposalpipe/segment, +/turf/open/floor/monotile/dark, /area/space/nearstation) "aPF" = ( /obj/structure/cable{ @@ -16951,7 +16970,7 @@ /obj/structure/cable{ icon_state = "2-8" }, -/turf/open/floor/plating/airless, +/turf/open/floor/monotile/dark, /area/space/nearstation) "aUQ" = ( /obj/effect/turf_decal/tile/yellow{ @@ -16988,9 +17007,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/structure/sign/warning/biohazard{ pixel_y = 32 }, @@ -17315,9 +17331,17 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "aVL" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/airless, -/area/space) +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/item/shell/airlock, +/turf/open/floor/monotile/dark, +/area/medical/virology) "aVM" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -17585,9 +17609,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/cable{ - icon_state = "1-8" - }, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/disposalpipe/segment{ dir = 4 @@ -29710,8 +29731,20 @@ /turf/open/floor/monotile/light, /area/medical/storage) "bvC" = ( -/turf/open/floor/plating/airless, -/area/space) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/monotile/dark, +/area/medical/virology) "bvD" = ( /obj/machinery/atmospherics/pipe/multiz/layer4{ dir = 4 @@ -29911,9 +29944,8 @@ /turf/open/floor/monotile/light, /area/medical/medbay/lobby) "bwm" = ( -/obj/structure/girder/reinforced, -/turf/open/floor/plating/airless, -/area/space) +/turf/open/floor/monotile/light, +/area/medical/virology) "bwo" = ( /obj/structure/chair/office{ dir = 8 @@ -33653,10 +33685,10 @@ /turf/open/floor/monotile/dark, /area/shuttle/turbolift/shaft) "bEa" = ( -/obj/structure/lattice, -/obj/structure/grille, -/turf/open/space/basic, -/area/space) +/obj/structure/bed, +/obj/item/bedsheet/medical, +/turf/open/floor/plasteel/freezer/airless, +/area/medical/virology) "bEb" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ @@ -36569,8 +36601,14 @@ /turf/open/floor/carpet/blue, /area/hallway/nsv/deck2/frame1/central) "bKQ" = ( -/turf/closed/wall/r_wall/ship, -/area/space) +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/monotile/dark, +/area/medical/virology) "bKR" = ( /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) @@ -37315,6 +37353,12 @@ }, /turf/open/floor/monotile/dark, /area/nsv/weapons/fore) +"bVH" = ( +/obj/structure/chair/office/light{ + dir = 8 + }, +/turf/open/floor/monotile/light, +/area/medical/virology) "bWD" = ( /obj/machinery/light/small, /obj/machinery/portable_atmospherics/canister{ @@ -37621,6 +37665,10 @@ }, /turf/open/floor/monotile/steel, /area/nsv/weapons/fore) +"bYX" = ( +/obj/structure/grille/broken, +/turf/open/floor/plating/airless, +/area/medical/virology) "bYZ" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -38261,6 +38309,13 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"ciY" = ( +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/structure/grille/broken, +/turf/open/floor/plating/airless, +/area/medical/virology) "cjB" = ( /obj/machinery/door/airlock/ship/public/glass{ name = "Arrivals" @@ -38332,6 +38387,11 @@ initial_gas_mix = "TEMP=2.7" }, /area/engine/atmos) +"cmW" = ( +/obj/structure/girder/reinforced, +/obj/structure/foamedmetal, +/turf/open/floor/plating/airless, +/area/medical/virology) "cmZ" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -38553,11 +38613,16 @@ /area/engine/engineering/reactor_core) "cCS" = ( /obj/structure/cable{ - icon_state = "0-4" + icon_state = "1-2" }, -/obj/structure/grille/broken, -/turf/open/floor/plating/airless, -/area/space/nearstation) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/monotile/dark, +/area/medical/virology) "cDF" = ( /turf/open/floor/plating, /area/quartermaster/storage) @@ -38722,9 +38787,13 @@ name = "CIC" }) "cRk" = ( -/obj/item/shard, -/turf/open/floor/plating/airless, -/area/space) +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/monotile/light, +/area/medical/virology) "cSU" = ( /obj/effect/turf_decal/stripes/red/line, /obj/effect/turf_decal/stripes/red/line{ @@ -38898,6 +38967,11 @@ }, /turf/open/floor/monotile/dark, /area/hydroponics) +"daV" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/turf/open/floor/monotile/dark, +/area/medical/virology) "dcT" = ( /obj/machinery/light/small{ dir = 4 @@ -39100,6 +39174,18 @@ }, /turf/open/floor/monotile/steel, /area/engine/gravity_generator) +"dwM" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/plating/airless, +/area/medical/virology) +"dxH" = ( +/obj/item/radio/intercom{ + pixel_y = 26 + }, +/turf/open/floor/monotile/dark, +/area/medical/virology) "dyj" = ( /obj/structure/bookcase/manuals/medical, /obj/machinery/camera/autoname{ @@ -39849,6 +39935,12 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) +"evt" = ( +/obj/machinery/camera/autoname{ + dir = 4 + }, +/turf/open/floor/plasteel/freezer/airless, +/area/medical/virology) "evG" = ( /obj/structure/disposalpipe/segment, /obj/effect/spawner/lootdrop/maintenance, @@ -39879,6 +39971,14 @@ }, /turf/open/floor/monotile/dark, /area/engine/engineering) +"eyX" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/obj/structure/table_frame, +/obj/item/shard, +/turf/open/floor/monotile/light, +/area/medical/virology) "ezP" = ( /obj/structure/lattice/catwalk/over/ship, /turf/open/floor/monotile/steel, @@ -39974,6 +40074,11 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/medical) +"eCU" = ( +/obj/structure/table_frame, +/obj/item/shard, +/turf/open/floor/monotile/light/airless, +/area/medical/virology) "eDI" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -40095,6 +40200,14 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/monotile/steel, /area/medical) +"eMK" = ( +/obj/structure/sink{ + dir = 8; + pixel_x = -12; + pixel_y = 2 + }, +/turf/open/floor/monotile/light, +/area/medical/virology) "eNG" = ( /obj/structure/closet/cardboard, /obj/effect/turf_decal/stripes/line{ @@ -40165,6 +40278,11 @@ }, /turf/open/floor/monotile/steel, /area/engine/engineering/hangar) +"eSm" = ( +/obj/structure/table_frame, +/obj/item/shard, +/turf/open/floor/plating/airless, +/area/medical/virology) "eSX" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -40506,6 +40624,22 @@ /obj/effect/turf_decal/tile/orange, /turf/open/floor/monotile/steel, /area/nsv/weapons/fore) +"ftR" = ( +/obj/machinery/shower{ + dir = 8; + name = "emergency shower" + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/monotile/dark, +/area/medical/virology) "ful" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/monotile/dark, @@ -40557,6 +40691,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/engine/atmos) +"fAK" = ( +/turf/open/floor/monotile/light/airless, +/area/medical/virology) "fBs" = ( /obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/plasma{ dir = 1 @@ -40616,6 +40753,13 @@ }, /turf/open/floor/monotile/steel, /area/engine/engineering/reactor_core) +"fCp" = ( +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/structure/grille, +/turf/open/floor/plating, +/area/medical/virology) "fCZ" = ( /obj/machinery/atmospherics/pipe/layer_manifold/visible{ dir = 4 @@ -40945,6 +41089,10 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/durasteel/techfloor, /area/engine/engineering/reactor_control) +"gfp" = ( +/mob/living/simple_animal/pet/hamster/vector, +/turf/open/floor/plating/airless, +/area/medical/virology) "gfu" = ( /obj/machinery/light{ dir = 4 @@ -41759,6 +41907,18 @@ /obj/machinery/airalarm/directional/south, /turf/open/floor/monotile/steel, /area/crew_quarters/heads/chief) +"hiu" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/ship/public/glass{ + name = "Virology" + }, +/turf/open/floor/monotile/light, +/area/medical/virology) "hiP" = ( /obj/effect/turf_decal/stripes/corner, /obj/structure/reagent_dispensers/fueltank, @@ -41916,6 +42076,12 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"hti" = ( +/obj/structure/cable, +/obj/structure/grille, +/obj/structure/foamedmetal, +/turf/open/floor/plating, +/area/medical/virology) "htk" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -42483,6 +42649,21 @@ /obj/effect/turf_decal/stripes/corner, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) +"icp" = ( +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/machinery/power/apc/unlocked{ + pixel_y = 29 + }, +/turf/open/floor/plating, +/area/medical/virology) "icy" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -42620,6 +42801,11 @@ /obj/effect/turf_decal/tile/orange, /turf/open/floor/durasteel/techfloor, /area/nsv/weapons/fore) +"irc" = ( +/obj/effect/spawner/structure/window/reinforced/ship, +/obj/structure/cable, +/turf/open/floor/plating, +/area/medical/virology) "irj" = ( /obj/effect/spawner/structure/window/reinforced/ship, /turf/open/floor/plating, @@ -43161,6 +43347,16 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/monotile/steel, /area/crew_quarters/bar) +"iVs" = ( +/obj/machinery/shower{ + dir = 8; + name = "emergency shower" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/monotile/dark, +/area/medical/virology) "iVx" = ( /obj/structure/table/reinforced, /obj/machinery/fax{ @@ -43207,6 +43403,38 @@ }, /turf/open/floor/carpet/ship, /area/quartermaster/storage) +"iYI" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/freezer, +/area/medical/virology) +"iZd" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/monotile/dark, +/area/medical/virology) +"jaj" = ( +/obj/structure/grille, +/obj/structure/foamedmetal, +/turf/open/floor/plating, +/area/medical/virology) "jau" = ( /obj/structure/cable{ icon_state = "1-2" @@ -43334,6 +43562,12 @@ }, /turf/open/floor/monotile/steel, /area/crew_quarters/fitness/recreation) +"jjY" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/plasteel/freezer, +/area/medical/virology) "jku" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 @@ -43359,6 +43593,10 @@ }, /turf/open/floor/monotile/dark, /area/crew_quarters/fitness/recreation) +"jlp" = ( +/obj/machinery/light, +/turf/open/floor/monotile/light, +/area/medical/virology) "jlu" = ( /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_toxmix, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -43752,6 +43990,10 @@ }, /turf/open/floor/monotile/steel, /area/engine/gravity_generator) +"jSA" = ( +/obj/machinery/light/broken, +/turf/open/floor/plating/airless, +/area/medical/virology) "jSG" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 4 @@ -43761,6 +44003,10 @@ }, /turf/open/floor/monotile/steel, /area/medical/surgery) +"jTi" = ( +/obj/item/shard, +/turf/open/floor/monotile/dark/airless, +/area/medical/virology) "jTD" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/heat_exchanging/simple, @@ -43950,6 +44196,15 @@ }, /turf/open/floor/monotile/steel, /area/gateway) +"kdq" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/segment, +/turf/open/floor/monotile/steel, +/area/medical/virology) "kdN" = ( /obj/structure/closet/firecloset, /turf/open/floor/plasteel/techmaint, @@ -44462,6 +44717,18 @@ }, /turf/open/floor/monotile/steel, /area/engine/engineering) +"kES" = ( +/obj/machinery/atmospherics/components/unary/tank/air{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/light/broken{ + dir = 4 + }, +/turf/open/floor/monotile/light, +/area/medical/virology) "kEU" = ( /obj/machinery/newscaster{ pixel_y = 32 @@ -44685,6 +44952,12 @@ /obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/plating, /area/hallway/secondary/exit) +"kTf" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/monotile/light/airless, +/area/medical/virology) "kTY" = ( /obj/structure/cable{ icon_state = "1-2" @@ -44952,6 +45225,25 @@ /obj/structure/closet/radiation, /turf/open/floor/monotile/dark, /area/engine/gravity_generator) +"lkS" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/monotile/steel, +/area/medical/virology) "llg" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance, @@ -45101,6 +45393,10 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, /area/engine/engineering/hangar) +"lvS" = ( +/obj/structure/table_frame, +/turf/open/floor/plating/airless, +/area/medical/virology) "lwA" = ( /obj/machinery/ship_weapon/vls, /obj/effect/turf_decal/stripes/line, @@ -45268,6 +45564,13 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/department/engine) +"lHr" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/monotile/light, +/area/medical/virology) "lJd" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb, @@ -45611,6 +45914,10 @@ /obj/effect/turf_decal/tile/ship/full/blue, /turf/open/floor/monotile/steel, /area/medical/medbay/lobby) +"miw" = ( +/obj/structure/lattice, +/turf/open/space/basic, +/area/medical/virology) "miE" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -47183,6 +47490,11 @@ }, /turf/open/floor/carpet/red, /area/nsv/weapons/fore) +"omd" = ( +/obj/structure/grille, +/obj/structure/foamedmetal, +/turf/open/floor/plating/airless, +/area/medical/virology) "ooh" = ( /obj/structure/disposalpipe/segment, /obj/structure/reagent_dispensers/fueltank, @@ -47422,6 +47734,11 @@ }, /turf/open/floor/monotile/dark, /area/crew_quarters/fitness/recreation) +"oHW" = ( +/obj/structure/girder/displaced, +/obj/structure/foamedmetal, +/turf/open/floor/plating, +/area/medical/virology) "oIf" = ( /obj/machinery/computer/ship/dradis/console, /obj/effect/turf_decal/stripes/line{ @@ -47512,6 +47829,9 @@ }, /turf/open/floor/monotile/steel, /area/engine/engineering/reactor_core) +"oRV" = ( +/turf/open/floor/plasteel/freezer/airless, +/area/medical/virology) "oSC" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -47562,6 +47882,10 @@ }, /turf/open/floor/engine/plasma, /area/engine/atmos) +"oYJ" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/medical/virology) "oYN" = ( /obj/machinery/door/airlock/ship/engineering/glass{ name = "Reactor core access"; @@ -47579,6 +47903,19 @@ }, /turf/open/floor/engine/airless, /area/space/nearstation) +"pah" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/airalarm/all_access{ + pixel_y = 23 + }, +/obj/item/dest_tagger{ + pixel_x = 4; + pixel_y = 3 + }, +/turf/open/floor/monotile/light, +/area/medical/virology) "paH" = ( /obj/structure/grille, /obj/machinery/meter, @@ -47806,6 +48143,11 @@ /obj/machinery/light/small, /turf/open/floor/plating, /area/maintenance/department/science) +"pqH" = ( +/obj/structure/grille/broken, +/obj/structure/foamedmetal, +/turf/open/floor/plating, +/area/medical/virology) "prp" = ( /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -47823,6 +48165,11 @@ /obj/effect/landmark/zebra_interlock_point, /turf/open/floor/monotile/steel, /area/nsv/weapons/fore) +"prs" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/monotile/light, +/area/medical/virology) "psx" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -47999,6 +48346,11 @@ }, /turf/open/floor/monotile/light, /area/medical/medbay/central) +"pCT" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/medical/virology) "pCV" = ( /obj/item/radio/intercom{ dir = 4; @@ -48188,6 +48540,9 @@ initial_gas_mix = "TEMP=2.7" }, /area/engine/atmos) +"pQC" = ( +/turf/open/floor/plating/airless, +/area/medical/virology) "pSy" = ( /obj/item/reagent_containers/glass/bucket, /turf/open/floor/monotile/dark, @@ -48272,6 +48627,12 @@ /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/space/nearstation) +"pZw" = ( +/obj/structure/sign/warning/biohazard{ + pixel_y = 26 + }, +/turf/open/floor/monotile/dark, +/area/medical/virology) "qaY" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -48503,12 +48864,24 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /turf/open/floor/monotile/light, /area/medical/genetics) +"qtp" = ( +/obj/structure/girder/reinforced, +/obj/structure/foamedmetal, +/turf/open/floor/plating, +/area/medical/virology) "qvd" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, /turf/open/floor/carpet/ship, /area/crew_quarters/dorms) +"qvf" = ( +/obj/structure/closet/l3closet/virology, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/monotile/dark, +/area/medical/virology) "qvj" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -48559,6 +48932,20 @@ }, /turf/open/floor/monotile/dark, /area/nsv/weapons/fore) +"qzx" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/medical/virology) "qzT" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -49179,6 +49566,10 @@ /obj/machinery/igniter/incinerator_toxmix, /turf/open/floor/engine/vacuum, /area/science/mixing/chamber) +"rnk" = ( +/obj/structure/girder/reinforced, +/turf/open/floor/plating/airless, +/area/medical/virology) "rnZ" = ( /obj/effect/turf_decal/tile/red{ dir = 4 @@ -49390,6 +49781,11 @@ /obj/structure/rack, /turf/open/floor/plating, /area/maintenance/nsv/hangar) +"ryR" = ( +/obj/structure/girder/displaced, +/obj/structure/foamedmetal, +/turf/open/floor/plating/airless, +/area/medical/virology) "ryW" = ( /obj/structure/cable{ icon_state = "1-2" @@ -49600,6 +49996,12 @@ /obj/effect/landmark/start/munitions_tech, /turf/open/floor/durasteel/techfloor, /area/nsv/weapons/fore) +"rIs" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/monotile/light, +/area/medical/virology) "rJv" = ( /obj/machinery/door/airlock/ship/engineering/glass{ name = "Reactor core access"; @@ -49678,6 +50080,16 @@ id = "spentfuel2" }, /area/engine/engineering/reactor_core) +"rOl" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/light, +/turf/open/floor/monotile/steel, +/area/medical/virology) "rOq" = ( /obj/effect/turf_decal/delivery/red, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -49770,6 +50182,13 @@ }, /turf/open/floor/monotile/steel, /area/engine/engineering) +"saR" = ( +/obj/machinery/atmospherics/pipe/layer_manifold, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/monotile/light, +/area/medical/virology) "sbl" = ( /obj/structure/bookcase/random/reference, /turf/open/floor/wood, @@ -49874,6 +50293,10 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/techmaint, /area/maintenance/starboard) +"shj" = ( +/obj/structure/girder/displaced, +/turf/open/floor/plating/airless, +/area/medical/virology) "shm" = ( /obj/machinery/door/morgue{ name = "Confession Booth" @@ -50453,6 +50876,15 @@ initial_gas_mix = "TEMP=2.7" }, /area/engine/atmos) +"tdU" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/segment, +/turf/open/floor/monotile/light, +/area/medical/virology) "teV" = ( /obj/structure/table, /obj/item/clothing/gloves/color/latex/nitrile, @@ -50513,6 +50945,13 @@ }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) +"ths" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/item/shard, +/turf/open/floor/plating/airless, +/area/medical/virology) "tht" = ( /obj/structure/closet, /obj/effect/decal/cleanable/dirt/dust, @@ -50547,6 +50986,20 @@ }, /turf/open/floor/plating, /area/maintenance/department/cargo) +"tlg" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/item/shard, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/monotile/dark, +/area/medical/virology) "tlD" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 1 @@ -51380,6 +51833,10 @@ }, /turf/open/floor/plating, /area/hallway/secondary/exit) +"uib" = ( +/obj/structure/chair/office/light, +/turf/open/floor/plating/airless, +/area/medical/virology) "uir" = ( /turf/open/floor/monotile/dark, /area/shuttle/turbolift/tertiary) @@ -51389,6 +51846,19 @@ }, /turf/open/floor/carpet, /area/library) +"ujs" = ( +/obj/item/radio/intercom{ + pixel_y = 26 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/open/floor/monotile/light, +/area/medical/virology) "uju" = ( /obj/machinery/atmospherics/pipe/layer_manifold/visible, /turf/open/floor/durasteel/techfloor{ @@ -51530,6 +52000,9 @@ }, /turf/open/floor/carpet/ship, /area/nsv/crew_quarters/heads/maa) +"uHZ" = ( +/turf/open/floor/plating, +/area/medical/virology) "uIA" = ( /obj/machinery/power/apc/auto_name/north{ pixel_y = 24 @@ -51830,6 +52303,21 @@ initial_gas_mix = "TEMP=2.7" }, /area/engine/atmos) +"vfR" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/monotile/light, +/area/medical/virology) "vgd" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 @@ -51937,6 +52425,30 @@ /obj/structure/lattice/catwalk/over/ship, /turf/open/floor/monotile/dark, /area/nsv/weapons/fore) +"vlJ" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/airlock/ship/public/glass{ + name = "Virology Decontamination" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/monotile/dark, +/area/medical/virology) "vlL" = ( /obj/machinery/portable_atmospherics/pump, /obj/effect/turf_decal/stripes/line{ @@ -51969,6 +52481,11 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"vri" = ( +/obj/structure/table_frame, +/obj/item/shard, +/turf/open/floor/monotile/light, +/area/medical/virology) "vse" = ( /obj/effect/spawner/lootdrop/minor/beret_or_rabbitears, /obj/structure/table/wood, @@ -53110,6 +53627,10 @@ /area/bridge{ name = "CIC" }) +"wZm" = ( +/obj/structure/grille, +/turf/open/floor/plating/airless, +/area/medical/virology) "wZp" = ( /obj/machinery/newscaster{ pixel_y = 32 @@ -53186,6 +53707,12 @@ /obj/item/storage/box/lights/mixed, /turf/open/floor/durasteel, /area/engine/engineering) +"xeK" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plating/airless, +/area/medical/virology) "xgv" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -53587,6 +54114,16 @@ /obj/machinery/door/airlock/ship/maintenance/defaultaccess, /turf/open/floor/plating, /area/maintenance/nsv/hangar) +"xMu" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/item/shard, +/turf/open/floor/monotile/dark/airless, +/area/medical/virology) "xMG" = ( /obj/structure/extinguisher_cabinet{ pixel_y = -27 @@ -53672,6 +54209,15 @@ /obj/effect/landmark/xeno_spawn, /turf/open/floor/engine/plasma, /area/engine/atmos) +"xSB" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/plating, +/area/medical/virology) "xSZ" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance, @@ -74800,13 +75346,13 @@ aaa aaa aaa aaa -abY -abY -abY -abY -abY -abY -abY +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -75057,13 +75603,13 @@ aaa aaa aaa aaa -abY -bKQ -bKQ -bKQ -bKQ -bKQ -abY +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaJ aaJ @@ -75314,13 +75860,13 @@ bAe aaa aaa aaa -abY -bKQ -abY -abY -abY -bEa -abY +aaa +aaa +aaa +aaa +aaa +aaU +aaa aaa aaJ aaJ @@ -75571,9 +76117,9 @@ aaa aaa aaa aaa -abY -bKQ -abY +aaa +aaa +aaa aaa aaa aaU @@ -75828,9 +76374,9 @@ aaa aaa aaa aaa -abY -bKQ -bEa +aaa +aaa +aaa aaU aaU aZa @@ -76085,11 +76631,11 @@ aaa aaa aaa aaa -abY -bKQ -abY -aaJ -aaJ +aaa +aaa +aaa +aaa +aaa jYf pHV pHV @@ -76330,23 +76876,23 @@ aaa aaa aaa aaa -aaJ -aaJ -aaJ -aaJ -aaJ -aaJ -aaJ -aaJ -aaJ -aaJ -aaJ -aaJ -mLQ -oUI -mLQ -aaJ -aaJ +aaa +aaa +aaa +agz +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa jYf pHV pHV @@ -76587,23 +77133,23 @@ aaa aaa aaa aaa -aaJ -aaJ -aaJ -aaJ -aaJ -aaJ -aaJ -aaJ -aaJ -aaJ -aaJ -aaJ -aaJ -jLQ -aaJ -aaJ -aaJ +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +agz +aaa +aaU +aaa +aaa +aaa jYf pHV pHV @@ -76844,21 +77390,21 @@ aaa aaa aaa aaa -aaJ -aaJ -aaJ -aaJ -aaJ -aaJ -aaJ -aaJ -aaJ -aaJ -aaJ -aaJ -aaJ -jLQ -jLQ +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaU +shj +aIL aaU aaU aZa @@ -77107,15 +77653,15 @@ aaa aaa aaa aaa +agz aaa aaa aaa aaa aaa -aaa -aaa -aaa -aaa +aaU +pQC +bYX aaa aaa aaa @@ -77366,13 +77912,13 @@ aaa aaa aaa aaa -aaa -aaa bAe aaa aaa -aaa -aaa +aaU +pQC +pQC +wZm jLQ jLQ jLQ @@ -77618,18 +78164,18 @@ aaa aaa aaa aaa +agz aaa aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aaU +shj +cmW +ryR +aIL +aIL aaa jLQ aaa @@ -77880,13 +78426,13 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -agz -aaa -aaa +aaU +pQC +omd +eSm +evt +iYI +hti aaa jLQ aaa @@ -78134,16 +78680,16 @@ aaa aaa aaa aaa -aaa -aaa -aaa agz aaa aaa -aaa -aaa -aaa -aaa +pQC +miw +oYJ +bEa +oRV +jjY +irc jLQ jLQ aaa @@ -78392,15 +78938,15 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -bKQ +miw +shj +rnk +aIL +cmW +aJF +ryR +aIL +aIL aaa jLQ jLQ @@ -78648,16 +79194,16 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aaU +pQC +miw +lvS +eCU +pqH bwm +eyX +eMK +aIL aaa jLQ aaa @@ -78904,17 +79450,17 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aaU +miw +pQC +pQC +jTi +pQC +jaj +bVH bKQ bwm -bKQ +aIL aaa jLQ akX @@ -79161,18 +79707,18 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +ciY +xeK +dwM +miw +pQC +fAK +pCT +prs +daV +jlp aIL -bvC -bvC -sdB -cCS +aop aop oWy aZa @@ -79418,13 +79964,13 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -agz -aaa -aaa +fCp +ths +xMu +gfp +uib +jSA +oYJ bwm bvC cRk @@ -79675,18 +80221,18 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -sdB +shj +fAK +kTf +fAK +eCU +eCU +aIL +vri +vfR +vri aIL -aJF +aUR aUR aUR aZa @@ -79932,17 +80478,17 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -bvC +rnk +oHW +hiu +qtp +ryR +aIL +aIL +aIL +vlJ +aIL +aIL jLQ aaJ aaJ @@ -80189,20 +80735,20 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -agz -aaa -aaa -aaa -aaa -aaa +aIL +ujs +lHr +xSB +uHZ +bwm +aIL +dxH +iZd +qvf +irc +aaJ aaJ aaJ -jLQ aZa aZa apa @@ -80446,18 +80992,18 @@ aaa aaa aaa aaa -aaa -abY -abY -abY -abY -abY -abY -abY -abY +aIL +icp +qzx abY -aaa -jLQ +cCS +tdU +tlg +kdq +lkS +rOl +irc +aaJ aaa aZa aZa @@ -80703,17 +81249,17 @@ aaa aaa aaa aaa -aaa -abY -bKQ -bKQ -bKQ -bKQ -bKQ -bKQ -bKQ -aCo -aaU +aIL +pah +saR +kES +rIs +bwm +aIL +pZw +ftR +iVs +irc jLQ aaU aZa @@ -80960,17 +81506,17 @@ aaa aaa aaa aaa -aaa -abY -abY -abY +aIL +aIL aCo -abY -abY aCo aCo -abY -aaa +aIL +aIL +aIL +aIL +aIL +aIL aZa aZa aZa From 4ac822a7ec54471d0d7d850bb5d928644207ccd2 Mon Sep 17 00:00:00 2001 From: SerynEngi Date: Sat, 28 Dec 2024 01:09:25 -0800 Subject: [PATCH 19/26] Munitions: Cargo chute quick fix funny pipe does not end under belt anymore --- _maps/map_files/Tycoon/Tycoon2.dmm | 31 +++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/_maps/map_files/Tycoon/Tycoon2.dmm b/_maps/map_files/Tycoon/Tycoon2.dmm index c2084568077..aaef6bf5b51 100644 --- a/_maps/map_files/Tycoon/Tycoon2.dmm +++ b/_maps/map_files/Tycoon/Tycoon2.dmm @@ -16221,6 +16221,10 @@ /obj/machinery/light{ dir = 8 }, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, /turf/open/floor/durasteel/techfloor, /area/nsv/weapons/fore) "aSG" = ( @@ -16509,6 +16513,9 @@ dir = 1; id = "naval" }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/monotile/dark, /area/nsv/weapons/fore) "aTt" = ( @@ -32423,6 +32430,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/durasteel/techfloor, /area/nsv/weapons/fore) "bBw" = ( @@ -36461,6 +36471,9 @@ /turf/open/floor/monotile/steel, /area/science) "bKv" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/durasteel/techfloor, /area/nsv/weapons/fore) "bKw" = ( @@ -37595,6 +37608,9 @@ name = "Feed Into Gun Room" }, /obj/effect/turf_decal/ship/outline, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/monotile/steel, /area/nsv/weapons/fore) "bYL" = ( @@ -39625,6 +39641,9 @@ dir = 4 }, /obj/effect/turf_decal/tile/orange, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/monotile/dark, /area/nsv/weapons/fore) "egh" = ( @@ -53713,6 +53732,16 @@ }, /turf/open/floor/plating/airless, /area/medical/virology) +"xgp" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/lattice/catwalk/over/ship, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/monotile/dark, +/area/nsv/weapons/fore) "xgv" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -90529,7 +90558,7 @@ aTk bag bBY vly -vly +xgp vly vly dmS From e1d8310c30217f7b4094556088abd3993559d951 Mon Sep 17 00:00:00 2001 From: SerynEngi Date: Sat, 28 Dec 2024 14:15:08 -0800 Subject: [PATCH 20/26] engineering hole fix oops- also camera console fix pending when i figure out why it works in one location and not another --- _maps/map_files/Tycoon/Tycoon2.dmm | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/_maps/map_files/Tycoon/Tycoon2.dmm b/_maps/map_files/Tycoon/Tycoon2.dmm index aaef6bf5b51..c0f1d73a8bd 100644 --- a/_maps/map_files/Tycoon/Tycoon2.dmm +++ b/_maps/map_files/Tycoon/Tycoon2.dmm @@ -48715,17 +48715,6 @@ /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plasteel/ridged/steel, /area/engine/engineering) -"qhr" = ( -/obj/machinery/camera/autoname{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/space/basic, -/area/engine/engineering) "qhy" = ( /obj/structure/closet/emcloset/anchored, /obj/structure/window/reinforced{ @@ -103644,7 +103633,7 @@ ixq ixq ixq ixq -qhr +ixq afz ixq tXv From 41af2c6ad340afb66432e056b914e0719161301c Mon Sep 17 00:00:00 2001 From: SerynEngi Date: Sat, 28 Dec 2024 14:47:43 -0800 Subject: [PATCH 21/26] Camera Console Fix- It works on my machine! Subtypes --- _maps/map_files/Atlas/atlas.dmm | 23 ++++---- _maps/map_files/Atlas/atlas2.dmm | 27 +++++---- _maps/map_files/Tycoon/Tycoon2.dmm | 89 ++++++++++++++---------------- 3 files changed, 67 insertions(+), 72 deletions(-) diff --git a/_maps/map_files/Atlas/atlas.dmm b/_maps/map_files/Atlas/atlas.dmm index 403be80c7ee..f4c9c8dfeb6 100644 --- a/_maps/map_files/Atlas/atlas.dmm +++ b/_maps/map_files/Atlas/atlas.dmm @@ -5890,9 +5890,9 @@ /obj/item/extinguisher, /obj/machinery/airalarm/directional/north, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/machinery/camera{ - network = list("ss13","eng"); - name = "Deck 2 DC" +/obj/machinery/camera/all{ + network = list("ss13","engine"); + name = "Deck 2 DC Locker" }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/primary) @@ -6764,13 +6764,10 @@ }, /obj/effect/turf_decal/tile/yellow, /obj/machinery/firealarm/directional/east, -/obj/machinery/computer/security/telescreen{ - desc = "Used for watching critical engineering areas"; - name = "Engineering Critical Monitoring"; - network = list("eng"); - pixel_y = 2 - }, /obj/structure/table, +/obj/machinery/computer/security/telescreen/ce{ + name = "Engineering Critical Monitoring" + }, /turf/open/floor/monotile/steel, /area/nsv/engine/dcc) "ux" = ( @@ -15069,11 +15066,11 @@ /obj/structure/rack, /obj/item/clothing/gloves/color/yellow, /obj/item/holosign_creator/atmos, -/obj/machinery/camera{ - network = list("ss13","eng"); - name = "Deck 2 Adv. DC" - }, /obj/item/clothing/shoes/magboots, +/obj/machinery/camera/all{ + network = list("ss13","engine"); + name = "Deck 2 Adv. DC Locker" + }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/primary) "VC" = ( diff --git a/_maps/map_files/Atlas/atlas2.dmm b/_maps/map_files/Atlas/atlas2.dmm index e4e8249257c..8f9bb5d3752 100644 --- a/_maps/map_files/Atlas/atlas2.dmm +++ b/_maps/map_files/Atlas/atlas2.dmm @@ -921,10 +921,10 @@ /obj/structure/table/reinforced, /obj/structure/railing, /obj/item/radio/intercom, -/obj/machinery/camera{ - network = list("ss13","eng"); +/obj/machinery/camera/all{ + network = list("ss13","engine"); name = "CIC"; - dir = 1 + dir = 10 }, /turf/open/floor/carpet/royalblack, /area/bridge/cic) @@ -6578,6 +6578,11 @@ name = "Telecomms Control Room APC"; pixel_x = 24 }, +/obj/machinery/camera/all{ + network = list("ss13","engine"); + name = "Telecomms"; + dir = 9 + }, /turf/open/floor/circuit/telecomms/server, /area/tcommsat/server) "Dh" = ( @@ -6790,13 +6795,13 @@ /obj/item/stack/tile/plasteel{ amount = 50 }, -/obj/machinery/camera{ - network = list("ss13","eng"); - name = "Deck 1 DC" - }, /obj/effect/turf_decal/stripes/corner{ dir = 4 }, +/obj/machinery/camera/all{ + network = list("ss13","engine"); + name = "Deck 1 DC Locker" + }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck1/hallway) "DQ" = ( @@ -9040,14 +9045,14 @@ /obj/structure/rack, /obj/item/clothing/gloves/color/yellow, /obj/item/holosign_creator/atmos, -/obj/machinery/camera{ - network = list("ss13","eng"); - name = "Deck 1 Adv. DC" - }, /obj/effect/turf_decal/stripes/corner{ dir = 1 }, /obj/item/clothing/shoes/magboots, +/obj/machinery/camera/all{ + network = list("ss13","engine"); + name = "Deck 1 Adv. DC Locker" + }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck1/hallway) "Nh" = ( diff --git a/_maps/map_files/Tycoon/Tycoon2.dmm b/_maps/map_files/Tycoon/Tycoon2.dmm index c0f1d73a8bd..9e98560f1ae 100644 --- a/_maps/map_files/Tycoon/Tycoon2.dmm +++ b/_maps/map_files/Tycoon/Tycoon2.dmm @@ -2161,10 +2161,10 @@ dir = 1; layer = 2.9 }, -/obj/machinery/camera{ - network = list("ss13","eng"); +/obj/machinery/camera/autoname{ + dir = 4; name = "Forward DC Locker"; - dir = 5 + network = list("ss13","engine") }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) @@ -2735,10 +2735,8 @@ dir = 1; layer = 2.9 }, -/obj/machinery/camera{ - network = list("ss13","eng"); - name = "Aft Adv. DC Locker"; - dir = 5 +/obj/machinery/light{ + dir = 8 }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) @@ -5112,7 +5110,9 @@ /area/gateway) "aod" = ( /obj/machinery/modular_computer/console/preset/engineering, -/obj/machinery/camera/autoname, +/obj/machinery/camera/autoname{ + network = s + }, /obj/machinery/computer/ship/viewscreen, /turf/open/floor/monotile/dark, /area/tcommsat/computer) @@ -15583,10 +15583,10 @@ /area/tcommsat/computer) "aRf" = ( /obj/machinery/telecomms/broadcaster/preset_right, -/obj/machinery/camera{ - network = list("eng"); - name = "Telecomms"; - dir = 1 +/obj/machinery/camera/autoname{ + dir = 1; + network = list("ss13","engine"); + name = "Telecomms" }, /turf/open/floor/circuit/telecomms/server, /area/tcommsat/server) @@ -16756,9 +16756,9 @@ /obj/machinery/computer/turbine_computer{ id = "reactor2" }, -/obj/machinery/camera{ - network = list("ss13","eng"); - name = "Reactor Core #1" +/obj/machinery/camera/autoname{ + name = "Reactor"; + network = list("ss13","engine") }, /turf/open/floor/plasteel/ridged/steel, /area/engine/engineering/reactor_core) @@ -26393,6 +26393,11 @@ dir = 1; layer = 2.9 }, +/obj/machinery/camera/autoname{ + dir = 8; + name = "Aft Adv. DC Locker"; + network = list("ss13","engine") + }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) "bpi" = ( @@ -29551,9 +29556,9 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/machinery/camera{ - network = list("ss13","eng"); - name = "Forward Adv. DC Locker" +/obj/machinery/camera/autoname{ + name = "Forward Adv. DC Locker"; + network = list("ss13","engine") }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) @@ -38383,10 +38388,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/camera{ - network = list("ss13","eng"); - name = "Reactor Core #2"; - dir = 1 +/obj/machinery/camera/autoname{ + name = "Reactor"; + network = list("ss13","engine"); + dir = 10 }, /turf/open/floor/plasteel/ridged/steel, /area/engine/engineering/reactor_core) @@ -40465,11 +40470,8 @@ /area/crew_quarters/fitness/recreation) "feG" = ( /obj/structure/table/reinforced, -/obj/machinery/computer/security/telescreen{ - desc = "Used for watching critical engineering areas"; - name = "Engineering Critical Monitoring"; - network = list("eng"); - pixel_y = 2 +/obj/machinery/computer/security/telescreen/ce{ + name = "Engineering Critical Monitoring" }, /turf/open/floor/monotile/steel, /area/nsv/engine/dcc) @@ -41388,10 +41390,10 @@ /area/engine/engine_room) "gBn" = ( /obj/structure/lattice/catwalk/over/ship, -/obj/machinery/camera{ - network = list("ss13","eng"); - name = "CIC"; - dir = 1 +/obj/machinery/camera/autoname{ + name = "Helm/Tac Console"; + network = list("ss13","engine"); + dir = 10 }, /turf/open/floor/monotile/dark, /area/bridge{ @@ -47404,14 +47406,10 @@ /turf/open/floor/monotile/dark, /area/engine/engineering) "ogX" = ( -/obj/structure/rack, -/obj/item/watertank/atmos, -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/window/reinforced{ +/obj/machinery/camera/autoname{ dir = 1; - layer = 2.9 + name = "Aft DC Locker"; + network = list("ss13","engine") }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) @@ -48040,9 +48038,9 @@ /area/security/execution/transfer) "pjU" = ( /obj/machinery/light_switch/south, -/obj/machinery/camera{ - network = list("ss13","eng"); - name = "Reactor Control"; +/obj/machinery/camera/autoname{ + name = "Reactor Controls"; + network = list("ss13","engine"); dir = 1 }, /turf/open/floor/durasteel/lino, @@ -49218,11 +49216,6 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/camera{ - network = list("ss13","eng"); - name = "Aft DC Locker"; - dir = 5 - }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/port) "qOd" = ( @@ -81329,7 +81322,7 @@ bxm boA bil afW -ogX +aOT bph afD bpL @@ -81583,7 +81576,7 @@ bCC vzQ bxp bxm -aOH +ogX bil bil bil From 12b89a3dc77dca29ba99112040f448de4efc6b22 Mon Sep 17 00:00:00 2001 From: SerynEngi Date: Sat, 28 Dec 2024 15:13:28 -0800 Subject: [PATCH 22/26] Fixed a window --- _maps/map_files/Tycoon/Tycoon2.dmm | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/_maps/map_files/Tycoon/Tycoon2.dmm b/_maps/map_files/Tycoon/Tycoon2.dmm index 9e98560f1ae..918a4c55508 100644 --- a/_maps/map_files/Tycoon/Tycoon2.dmm +++ b/_maps/map_files/Tycoon/Tycoon2.dmm @@ -852,14 +852,6 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/monotile/steel, /area/hydroponics) -"acq" = ( -/obj/effect/spawner/structure/window/plasma/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - name = "DC Central Shutters"; - id = "dcc" - }, -/turf/open/space/basic, -/area/nsv/engine/dcc) "acr" = ( /turf/closed/wall/ship, /area/science/nanite) @@ -21948,7 +21940,7 @@ name = "DC Central Shutters"; id = "dcc" }, -/turf/open/space/basic, +/turf/open/floor/plating, /area/nsv/engine/dcc) "bfy" = ( /obj/item/storage/backpack/duffelbag/med/surgery, @@ -46641,7 +46633,7 @@ name = "DC Central Shutters"; id = "dcc" }, -/turf/open/floor/monotile/steel, +/turf/open/floor/plating, /area/nsv/engine/dcc) "mYZ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ @@ -49699,7 +49691,7 @@ name = "DC Central Shutters"; id = "dcc" }, -/turf/open/floor/monotile/steel, +/turf/open/floor/plating, /area/nsv/engine/dcc) "ruX" = ( /obj/structure/cable{ @@ -103882,8 +103874,8 @@ anJ gqR gqR gqR -acq -acq +mXz +mXz gqR avP ope @@ -105425,7 +105417,7 @@ gqR gqR gqR bfx -acq +mXz gqR anm mKt From 43eb6230f7074639989f622fa03487984351e889 Mon Sep 17 00:00:00 2001 From: SerynEngi Date: Sat, 28 Dec 2024 19:28:35 -0800 Subject: [PATCH 23/26] Borg chargers and Pipe corrections ah, disposals. Also, all the borg chargers. --- _maps/map_files/Tycoon/Tycoon2.dmm | 67 ++++++++++++++++++++++-------- 1 file changed, 50 insertions(+), 17 deletions(-) diff --git a/_maps/map_files/Tycoon/Tycoon2.dmm b/_maps/map_files/Tycoon/Tycoon2.dmm index 918a4c55508..ccf8bfcc0f4 100644 --- a/_maps/map_files/Tycoon/Tycoon2.dmm +++ b/_maps/map_files/Tycoon/Tycoon2.dmm @@ -1692,6 +1692,7 @@ pixel_y = 24 }, /obj/machinery/camera/autoname, +/obj/machinery/recharge_station, /turf/open/floor/monotile/steel, /area/hallway/secondary/exit) "aes" = ( @@ -5341,6 +5342,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/department/medical) "apb" = ( @@ -14861,6 +14865,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/machinery/recharge_station, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/frame1/central) "aPo" = ( @@ -16525,6 +16530,7 @@ /obj/item/radio/intercom{ pixel_y = 26 }, +/obj/machinery/recharge_station, /turf/open/floor/carpet/red, /area/nsv/weapons/fore) "aTw" = ( @@ -16829,10 +16835,10 @@ /turf/template_noop, /area/maintenance/department/medical) "aUt" = ( -/obj/structure/table/glass, /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/machinery/recharge_station, /turf/open/floor/monotile/steel, /area/medical/medbay/central) "aUu" = ( @@ -19464,13 +19470,15 @@ /turf/open/floor/plating, /area/maintenance/department/medical) "baF" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/blue{ - dir = 8 +/obj/effect/turf_decal/tile/neutral{ + dir = 1 }, -/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/recharge_station, /turf/open/floor/monotile/steel, -/area/hallway/nsv/deck2/frame1/port) +/area/crew_quarters/dorms) "baG" = ( /obj/structure/cable{ icon_state = "2-4" @@ -20926,13 +20934,10 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/carpet/ship, +/turf/open/floor/monotile/steel, /area/medical/medbay/central) "bdC" = ( /obj/machinery/atmospherics/pipe/multiz/layer4{ @@ -29906,11 +29911,11 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/landmark/zebra_interlock_point, /obj/machinery/door/airlock/ship/public/glass{ name = "Cryogenics"; req_one_access_txt = "5" }, -/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/monotile/light, /area/medical/medbay/lobby) "bwh" = ( @@ -35118,6 +35123,7 @@ /obj/machinery/camera/autoname{ dir = 4 }, +/obj/machinery/recharge_station, /turf/open/floor/carpet/blue, /area/hallway/nsv/deck2/frame1/central) "bGU" = ( @@ -43806,7 +43812,7 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/space/basic, +/turf/open/floor/plating, /area/maintenance/central) "jyj" = ( /obj/structure/cable{ @@ -45037,6 +45043,11 @@ /area/science/mixing{ name = "Prototype munitions bay" }) +"kZM" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/medical/medbay/lobby) "lay" = ( /obj/machinery/door/airlock/ship/maintenance/defaultaccess, /turf/open/floor/plating, @@ -49857,6 +49868,16 @@ }, /turf/open/floor/plating, /area/maintenance/department/cargo) +"rCt" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/recharge_station, +/turf/open/floor/monotile/steel, +/area/crew_quarters/dorms) "rCv" = ( /obj/machinery/computer/ship/helm/console, /obj/effect/turf_decal/stripes/line{ @@ -53314,6 +53335,18 @@ }, /turf/open/floor/monotile/light, /area/security/prison) +"wAF" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/recharge_station, +/turf/open/floor/monotile/steel, +/area/crew_quarters/cafeteria{ + name = "Mess hall" + }) "wBI" = ( /obj/machinery/door/poddoor/shutters{ id = "firingsquad"; @@ -82844,8 +82877,8 @@ ame bBi aTN aQR -aKh -baF +kZM +qfC aAH aOP laZ @@ -94640,7 +94673,7 @@ aqF aZG btK aqF -aRO +baF amm aol aOY @@ -95172,7 +95205,7 @@ bbU aOR aOR aOR -aVw +wAF aaY akv amf @@ -98494,7 +98527,7 @@ jYW ayM ari bAL -avd +rCt aRZ amm bfW From 03e73260df39014d3cd5dda0f5308c811045ebd6 Mon Sep 17 00:00:00 2001 From: SerynEngi Date: Sat, 28 Dec 2024 19:51:15 -0800 Subject: [PATCH 24/26] Camera --- _maps/map_files/Tycoon/Tycoon2.dmm | 3 --- 1 file changed, 3 deletions(-) diff --git a/_maps/map_files/Tycoon/Tycoon2.dmm b/_maps/map_files/Tycoon/Tycoon2.dmm index ccf8bfcc0f4..e59e9710ff5 100644 --- a/_maps/map_files/Tycoon/Tycoon2.dmm +++ b/_maps/map_files/Tycoon/Tycoon2.dmm @@ -5103,9 +5103,6 @@ /area/gateway) "aod" = ( /obj/machinery/modular_computer/console/preset/engineering, -/obj/machinery/camera/autoname{ - network = s - }, /obj/machinery/computer/ship/viewscreen, /turf/open/floor/monotile/dark, /area/tcommsat/computer) From 142eb7a70be84f2ac26f976f4a7735c305719b39 Mon Sep 17 00:00:00 2001 From: SerynEngi Date: Sat, 4 Jan 2025 13:56:38 -0800 Subject: [PATCH 25/26] Small host of minor corrections Coffee boxes, APC fixing, minor atmos tweaks in medical/viro --- _maps/map_files/Tycoon/Tycoon2.dmm | 77 +++++++++++++++++++++++++----- 1 file changed, 64 insertions(+), 13 deletions(-) diff --git a/_maps/map_files/Tycoon/Tycoon2.dmm b/_maps/map_files/Tycoon/Tycoon2.dmm index e59e9710ff5..45ff56d0bd0 100644 --- a/_maps/map_files/Tycoon/Tycoon2.dmm +++ b/_maps/map_files/Tycoon/Tycoon2.dmm @@ -4546,6 +4546,9 @@ /area/medical/medbay/central) "amd" = ( /obj/effect/landmark/start/paramedic, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, /turf/open/floor/monotile/steel, /area/medical/medbay/lobby) "ame" = ( @@ -9016,6 +9019,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/monotile/light, /area/medical/medbay/lobby) "aBM" = ( @@ -25341,6 +25347,9 @@ /area/hallway/nsv/deck2/frame1/port) "bmS" = ( /obj/machinery/power/apc/auto_name/west, +/obj/structure/cable{ + icon_state = "0-4" + }, /turf/open/floor/monotile/steel, /area/medical) "bmT" = ( @@ -26411,6 +26420,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/monotile/steel, /area/medical/medbay/lobby) "bpl" = ( @@ -29956,6 +29968,9 @@ /obj/structure/chair/office{ dir = 8 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, /turf/open/floor/monotile/steel, /area/medical/medbay/lobby) "bwq" = ( @@ -29978,10 +29993,10 @@ name = "Reception"; req_one_access_txt = "5" }, +/obj/effect/landmark/zebra_interlock_point, /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/plating, /area/medical/medbay/lobby) "bws" = ( @@ -31648,7 +31663,6 @@ /obj/machinery/computer/crew{ dir = 4 }, -/obj/machinery/power/apc/auto_name/south, /turf/open/floor/monotile/light, /area/medical/medbay/lobby) "bzN" = ( @@ -36615,7 +36629,8 @@ /area/hallway/nsv/deck2/frame1/central) "bKQ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 + dir = 4; + on = 0 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -40337,6 +40352,18 @@ /obj/item/stack/cable_coil, /turf/open/floor/monotile/steel, /area/medical/chemistry) +"eTB" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/monotile/dark, +/area/medical) "eTX" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/heat_exchanging/junction, @@ -40697,6 +40724,15 @@ }, /turf/open/floor/monotile/dark, /area/nsv/weapons/fore) +"fza" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/monotile/steel, +/area/medical/medbay/lobby) "fAz" = ( /obj/machinery/door/airlock/ship/external/glass{ name = "Atmospherics Airlock"; @@ -41731,6 +41767,10 @@ /obj/machinery/atmospherics/components/binary/drive_pylon, /turf/open/floor/monotile/dark, /area/engine/engineering) +"gVZ" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/monotile/steel, +/area/medical/medbay/lobby) "gWm" = ( /obj/machinery/space_heater, /obj/effect/decal/cleanable/glass, @@ -42676,7 +42716,8 @@ dir = 10 }, /obj/machinery/power/apc/unlocked{ - pixel_y = 29 + pixel_y = 29; + dir = 1 }, /turf/open/floor/plating, /area/medical/virology) @@ -42919,7 +42960,7 @@ pixel_y = 6; pixel_x = 4 }, -/obj/item/storage/box/coffeepack, +/obj/item/storage/box/coffeepack/arabica, /turf/open/floor/monotile/steel, /area/nsv/engine/dcc) "ixq" = ( @@ -44540,7 +44581,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/item/storage/box/coffeepack, +/obj/item/storage/box/coffeepack/arabica, /obj/item/coffee_cartridge, /obj/item/coffee_cartridge, /obj/item/coffee_cartridge, @@ -45008,7 +45049,10 @@ }, /area/engine/atmos) "kYa" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, /turf/open/floor/monotile/steel, @@ -45981,10 +46025,12 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/monotile/steel, /area/medical/medbay/lobby) "mmu" = ( @@ -48654,6 +48700,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/monotile/light, /area/medical/medbay/lobby) "qbI" = ( @@ -50093,7 +50142,8 @@ /area/engine/engineering/reactor_core) "rOl" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 + dir = 1; + on = 0 }, /obj/structure/cable{ icon_state = "1-2" @@ -54244,7 +54294,8 @@ /area/engine/atmos) "xSB" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 + dir = 1; + on = 0 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -80024,7 +80075,7 @@ bCo bCo bCn bCo -bCo +eTB bCo bnl bCo @@ -81585,7 +81636,7 @@ hzd ahc afV ble -bpk +fza amd ame akE @@ -82614,7 +82665,7 @@ alv bwr olI kYa -ame +gVZ bwo bvl aKh From 1741e5d807303110f07b319db21a0e3934020b86 Mon Sep 17 00:00:00 2001 From: SerynEngi Date: Sun, 5 Jan 2025 10:23:21 -0800 Subject: [PATCH 26/26] Fixed a wire on the top deck --- _maps/map_files/Tycoon/Tycoon1.dmm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/_maps/map_files/Tycoon/Tycoon1.dmm b/_maps/map_files/Tycoon/Tycoon1.dmm index 0054a5e64c7..cad81d1e87b 100644 --- a/_maps/map_files/Tycoon/Tycoon1.dmm +++ b/_maps/map_files/Tycoon/Tycoon1.dmm @@ -3248,9 +3248,6 @@ /turf/open/floor/engine/airless, /area/space/nearstation) "ih" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/machinery/camera/autoname{ dir = 8 }, @@ -35172,8 +35169,8 @@ id au ba cf -ax da +hK de ee fL @@ -35429,7 +35426,7 @@ af hD bY aN -ax +db ih dd ax