From e13c1b418b0df4eefa5f8cfdc6f7fc06f0acee50 Mon Sep 17 00:00:00 2001 From: Iajret Date: Sat, 26 Aug 2023 15:24:42 +0300 Subject: [PATCH 1/6] small fixes --- _maps/map_files/NSSJourney/NSSJourney.dmm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/_maps/map_files/NSSJourney/NSSJourney.dmm b/_maps/map_files/NSSJourney/NSSJourney.dmm index 218f3b2826e..9b7a3918f77 100644 --- a/_maps/map_files/NSSJourney/NSSJourney.dmm +++ b/_maps/map_files/NSSJourney/NSSJourney.dmm @@ -26926,6 +26926,7 @@ /obj/machinery/atmospherics/components/tank/oxygen{ dir = 4 }, +/obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/science/ordnance/storage) "bXt" = ( @@ -51720,6 +51721,7 @@ }, /obj/item/folder/white, /obj/structure/window/reinforced/spawner/directional/east, +/obj/item/radio/intercom/directional/north, /turf/open/floor/iron/dark, /area/station/medical/morgue) "rXY" = ( @@ -53854,13 +53856,9 @@ pixel_x = -5; pixel_y = -1 }, -/obj/item/folder/documents{ - pixel_y = 2; - pixel_x = -5 - }, /obj/item/folder/yellow{ pixel_x = -5; - pixel_y = 5 + pixel_y = 3 }, /obj/item/folder/red{ pixel_y = 7; From 84e43c133a7921618c16166d3097e478865890c8 Mon Sep 17 00:00:00 2001 From: Iajret Date: Thu, 31 Aug 2023 21:38:24 +0300 Subject: [PATCH 2/6] completed --- _maps/map_files/NSSJourney/NSSJourney.dmm | 5428 ++++++++++++--------- 1 file changed, 3083 insertions(+), 2345 deletions(-) diff --git a/_maps/map_files/NSSJourney/NSSJourney.dmm b/_maps/map_files/NSSJourney/NSSJourney.dmm index 9b7a3918f77..69fa2b437f5 100644 --- a/_maps/map_files/NSSJourney/NSSJourney.dmm +++ b/_maps/map_files/NSSJourney/NSSJourney.dmm @@ -487,7 +487,7 @@ /obj/structure/chair/office, /obj/effect/landmark/start/scientist, /turf/open/floor/iron/white, -/area/station/science/circuits) +/area/station/science/explab) "adv" = ( /obj/structure/chair/office{ dir = 8 @@ -595,7 +595,7 @@ "adZ" = ( /obj/structure/sign/poster/official/work_for_a_future, /turf/closed/wall, -/area/station/command/heads_quarters/qm) +/area/station/maintenance/port) "aea" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/brown{ @@ -676,6 +676,19 @@ /obj/structure/closet/radiation, /turf/open/floor/iron/smooth_large, /area/station/engineering/main) +"aev" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "aey" = ( /obj/machinery/door/airlock/command/glass{ name = "Head of Security" @@ -686,6 +699,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 4 }, +/obj/machinery/door/firedoor, /turf/open/floor/carpet, /area/station/command/heads_quarters/hos) "aeC" = ( @@ -1430,6 +1444,18 @@ /obj/structure/table, /turf/open/floor/iron/textured, /area/station/security/prison) +"akK" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/light/directional/west, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "akM" = ( /obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{ dir = 6 @@ -3421,12 +3447,12 @@ /turf/open/floor/iron/solarpanel/airless, /area/station/solars/starboard/aft) "aue" = ( -/obj/machinery/door/airlock/maintenance, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/plating, -/area/station/maintenance/fore) +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured, +/area/station/science/breakroom) "auh" = ( /obj/machinery/vending/wardrobe/det_wardrobe, /obj/item/storage/secure/safe/directional/west, @@ -3522,6 +3548,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/cargo/storage) "auC" = ( @@ -3651,9 +3678,9 @@ /turf/open/floor/iron/dark, /area/station/security/checkpoint/customs) "auW" = ( -/obj/effect/turf_decal/bot_white/left, -/turf/open/floor/iron/dark/textured_large, -/area/station/command/gateway) +/obj/machinery/requests_console/directional/south, +/turf/open/floor/iron/dark/textured, +/area/station/science/breakroom) "auX" = ( /obj/machinery/iv_drip, /obj/effect/decal/cleanable/dirt, @@ -3716,8 +3743,15 @@ /turf/open/floor/iron/grimy, /area/station/security/detectives_office) "ave" = ( -/turf/closed/wall, -/area/station/hallway/primary/fore) +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/machinery/door/airlock/external{ + name = "Port Docking Bay 1" + }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/hallway/secondary/entry) "avf" = ( /obj/machinery/door/airlock/maintenance{ name = "Chemical Storage" @@ -4062,7 +4096,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/station/hallway/primary/fore) +/area/station/maintenance/fore/lesser) "awn" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -4468,10 +4502,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 }, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 9 }, -/obj/effect/mapping_helpers/mail_sorting/service/law_office, /turf/open/floor/plating, /area/station/maintenance/fore) "axx" = ( @@ -4500,6 +4533,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 1 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/cargo/storage) "axF" = ( @@ -4783,15 +4817,21 @@ /turf/open/floor/iron, /area/station/hallway/primary/central) "ayE" = ( -/obj/machinery/door/airlock/maintenance, -/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, -/turf/open/floor/plating, -/area/station/maintenance/fore) -"ayH" = ( -/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, /obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/plating, /area/station/maintenance/fore) +"ayH" = ( +/turf/open/floor/iron/dark/smooth_large, +/area/station/science/breakroom) "ayI" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -4819,18 +4859,22 @@ /turf/open/floor/iron, /area/station/hallway/primary/central) "ayN" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 6 + }, +/obj/machinery/power/apc/auto_name/directional/south, /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 9 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 5 + dir = 4 }, /obj/structure/cable, -/turf/open/floor/plating, -/area/station/maintenance/starboard) +/turf/open/floor/iron/dark/textured, +/area/station/science/genetics) "ayO" = ( /obj/structure/sign/warning/secure_area/directional/east, /obj/structure/cable, @@ -4843,13 +4887,17 @@ /turf/open/floor/plating, /area/station/maintenance/fore) "ayS" = ( -/obj/effect/turf_decal/siding/wideplating/dark, -/obj/machinery/door/poddoor/shutters{ - id = "stationawaygate"; - name = "Gateway Access Shutters" +/obj/effect/turf_decal/siding/purple{ + dir = 4 }, -/turf/open/floor/plating, -/area/station/command/gateway) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured, +/area/station/science/genetics) "ayT" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced/spawner/directional/west, @@ -5053,15 +5101,12 @@ /turf/open/floor/iron, /area/station/security/prison) "azN" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/cable, -/obj/effect/turf_decal/tile/purple{ - dir = 8 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 }, -/turf/open/floor/iron/dark/textured, -/area/station/command/gateway) +/obj/machinery/light/small/directional/south, +/turf/open/floor/grass, +/area/station/science/genetics) "azO" = ( /obj/structure/table/reinforced, /obj/item/stack/cable_coil, @@ -5433,9 +5478,12 @@ /turf/open/floor/plating, /area/station/maintenance/port/fore) "aAW" = ( -/obj/effect/turf_decal/bot_white/right, -/turf/open/floor/iron/dark/textured_large, -/area/station/command/gateway) +/obj/structure/chair/sofa/corp/left{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark/textured, +/area/station/science/breakroom) "aAX" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -5481,17 +5529,13 @@ /turf/open/floor/carpet, /area/station/service/library) "aBg" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 4 - }, -/obj/machinery/camera/directional/east{ - c_tag = "Gateway"; - network = list("ss13","rd") - }, -/turf/open/floor/iron/dark/textured_edge{ - dir = 4 +/obj/effect/turf_decal/siding/purple{ + dir = 8 }, -/area/station/command/gateway) +/obj/structure/chair/stool/directional/west, +/obj/effect/landmark/start/geneticist, +/turf/open/floor/iron/dark/textured, +/area/station/science/genetics) "aBn" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 5 @@ -5505,10 +5549,11 @@ /turf/open/floor/iron, /area/station/hallway/secondary/entry) "aBo" = ( -/obj/machinery/gateway/centerstation, -/obj/effect/turf_decal/tile/neutral/full, -/turf/open/floor/iron/dark/textured_large, -/area/station/command/gateway) +/obj/structure/table/wood, +/obj/machinery/newscaster/directional/north, +/obj/effect/spawner/random/trash/food_packaging, +/turf/open/floor/iron/dark/textured, +/area/station/science/breakroom) "aBr" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -5735,9 +5780,9 @@ /turf/open/floor/iron, /area/station/security/prison/visit) "aCa" = ( -/obj/machinery/space_heater, -/turf/open/floor/plating, -/area/station/maintenance/fore) +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/showroomfloor, +/area/station/security/prison) "aCd" = ( /obj/machinery/airalarm/directional/north, /obj/machinery/cryopod, @@ -6056,14 +6101,15 @@ /turf/open/floor/carpet/executive, /area/blueshield) "aDz" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 }, -/obj/machinery/airalarm/directional/east, -/turf/open/floor/iron/dark/textured_edge{ +/obj/machinery/door/airlock/external, +/obj/effect/mapping_helpers/airlock/unres{ dir = 4 }, -/area/station/command/gateway) +/turf/open/floor/plating, +/area/station/maintenance/starboard) "aDA" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron, @@ -6356,9 +6402,12 @@ /turf/open/floor/iron, /area/station/commons/fitness) "aER" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/station/service/hydroponics/garden/abandoned) +/obj/machinery/light/directional/north, +/obj/effect/turf_decal/stripes/red/line{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/science/explab) "aET" = ( /obj/structure/hoop{ density = 0; @@ -6372,12 +6421,19 @@ /turf/open/floor/iron/dark, /area/station/security/prison) "aEV" = ( -/obj/item/radio/intercom/directional/west, -/obj/machinery/light/directional/west, -/turf/open/floor/iron/dark/textured_edge{ - dir = 8 +/obj/machinery/door/window/right/directional/south{ + dir = 8; + name = "Monkey Pen"; + req_access = list("genetics") }, -/area/station/command/gateway) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/grass, +/area/station/science/genetics) "aFa" = ( /turf/open/floor/iron/white, /area/station/medical/storage) @@ -6438,6 +6494,9 @@ dir = 4; late = 8 }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 8 + }, /turf/open/floor/plating, /area/station/hallway/secondary/entry) "aFj" = ( @@ -6708,10 +6767,8 @@ }, /area/station/holodeck/rec_center) "aGg" = ( -/obj/effect/turf_decal/bot_white, -/obj/structure/cable, -/turf/open/floor/iron/dark/textured_large, -/area/station/command/gateway) +/turf/closed/wall/r_wall, +/area/station/science/explab) "aGh" = ( /obj/effect/landmark/event_spawn, /turf/open/floor/plating, @@ -7086,8 +7143,8 @@ /turf/open/floor/carpet, /area/station/commons/dorms) "aHx" = ( -/turf/open/floor/iron/stairs/left, -/area/station/command/gateway) +/turf/open/floor/iron/dark/textured, +/area/station/science/breakroom) "aHz" = ( /turf/open/floor/iron/dark, /area/station/security/checkpoint/customs) @@ -7200,12 +7257,11 @@ /turf/open/floor/circuit, /area/station/science/robotics/mechbay) "aHN" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/plating, -/area/station/maintenance/fore) +/obj/effect/spawner/random/entertainment/arcade, +/obj/machinery/light/directional/north, +/obj/structure/sign/poster/official/random/directional/north, +/turf/open/floor/iron/dark/textured, +/area/station/science/breakroom) "aHP" = ( /obj/machinery/atmospherics/components/unary/passive_vent{ dir = 1 @@ -7597,14 +7653,11 @@ /turf/open/floor/iron/dark/textured, /area/blueshield) "aJj" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 10 - }, -/turf/open/floor/plating, -/area/station/maintenance/fore) +/obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark/smooth_large, +/area/station/science/breakroom) "aJk" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -7964,18 +8017,23 @@ /turf/open/floor/plating, /area/station/commons/storage/primary) "aKw" = ( -/turf/closed/wall, -/area/station/hallway/primary/port) -"aKy" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/maintenance, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, /obj/effect/mapping_helpers/airlock/unres{ dir = 1 }, +/turf/open/floor/plating, +/area/station/hallway/primary/port) +"aKy" = ( +/obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, /turf/open/floor/plating, -/area/station/maintenance/fore) +/area/blueshield) "aKz" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -7983,9 +8041,9 @@ /turf/open/floor/wood, /area/station/service/bar) "aKA" = ( -/obj/effect/spawner/structure/window/reinforced, +/obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, -/area/blueshield) +/area/station/maintenance/fore) "aKD" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -8184,14 +8242,17 @@ /turf/open/floor/iron, /area/station/hallway/primary/port) "aLm" = ( -/obj/structure/railing{ - dir = 4 +/obj/machinery/door/airlock/research{ + name = "Break Room" }, -/turf/open/floor/iron/stairs/right, -/area/station/command/gateway) +/obj/effect/mapping_helpers/airlock/access/all/science/general, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/firedoor/heavy, +/turf/open/floor/plating, +/area/station/science/breakroom) "aLn" = ( /obj/structure/disposalpipe/segment, -/obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/port) "aLq" = ( @@ -8228,21 +8289,27 @@ "aLw" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/neutral, -/obj/machinery/light/directional/south, /turf/open/floor/iron, /area/station/hallway/secondary/entry) "aLx" = ( -/obj/machinery/computer/gateway_control, -/turf/open/floor/iron/dark/textured_edge{ +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron/white/corner{ dir = 1 }, -/area/station/command/gateway) +/area/station/hallway/secondary/exit) "aLy" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, /obj/effect/landmark/start/assistant, +/obj/machinery/mining_weather_monitor/directional/south, +/obj/machinery/light/directional/south, /turf/open/floor/iron, /area/station/hallway/secondary/entry) "aLz" = ( @@ -8293,9 +8360,18 @@ /turf/open/floor/iron, /area/station/cargo/office) "aLI" = ( -/obj/structure/extinguisher_cabinet/directional/north, -/turf/open/floor/iron, -/area/station/hallway/primary/central) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/plating, +/area/station/maintenance/fore) "aLJ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark/corner{ @@ -8318,23 +8394,19 @@ /turf/open/floor/iron, /area/station/hallway/primary/port) "aLN" = ( -/obj/structure/table, -/obj/item/radio/off{ - pixel_y = 6 - }, -/obj/item/radio/off{ - pixel_x = 6; - pixel_y = 4 +/obj/machinery/door/airlock/maintenance{ + name = "Genetics Lab Maintenance" }, -/obj/item/radio/off{ - pixel_x = -6; - pixel_y = 4 +/obj/effect/mapping_helpers/airlock/access/any/science/genetics, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 }, -/obj/item/radio/off, -/turf/open/floor/iron/dark/textured_edge{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 }, -/area/station/command/gateway) +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/science/genetics) "aLO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -8347,11 +8419,10 @@ }, /area/station/hallway/primary/central) "aLP" = ( -/obj/structure/railing{ - dir = 8 - }, +/obj/effect/turf_decal/stripes/line, /obj/structure/cable, -/turf/open/floor/iron/stairs/left, +/obj/machinery/power/apc/auto_name/directional/west, +/turf/open/floor/iron/dark/textured, /area/station/command/gateway) "aLQ" = ( /obj/machinery/camera/directional/north{ @@ -8382,17 +8453,18 @@ /turf/open/floor/wood, /area/station/service/bar) "aLV" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 4 +/obj/machinery/door/poddoor/shutters/window{ + id = "gatewayshutters"; + name = "Gateway Chamber Shutters" }, -/turf/open/floor/iron, -/area/station/hallway/primary/central) +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "aLW" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Central Hallway North-West" +/obj/machinery/button/door/directional/north{ + id = "gatewayshutters"; + req_access = list("gateway"); + name = "Gateway Shutters" }, -/obj/item/radio/intercom/directional/north, /turf/open/floor/iron, /area/station/hallway/primary/central) "aLX" = ( @@ -8768,7 +8840,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 }, -/obj/machinery/light/directional/north, /turf/open/floor/iron, /area/station/hallway/secondary/entry) "aNi" = ( @@ -9149,7 +9220,7 @@ /turf/open/floor/wood, /area/station/service/bar) "aOK" = ( -/obj/structure/girder, +/obj/effect/spawner/random/structure/girder, /turf/open/floor/plating, /area/station/maintenance/fore) "aOM" = ( @@ -9529,25 +9600,18 @@ /turf/open/floor/engine/cult, /area/station/service/library) "aQx" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ +/obj/machinery/computer/department_orders/science{ dir = 1 }, -/obj/structure/chair/office/light, -/obj/effect/landmark/start/scientist, -/turf/open/floor/iron/dark, -/area/station/science/research) +/turf/open/floor/iron, +/area/station/science/lab) "aQy" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 +/obj/effect/turf_decal/siding/purple{ + dir = 9 }, -/turf/open/floor/iron/dark, -/area/station/science/research) +/obj/structure/extinguisher_cabinet/directional/north, +/turf/open/floor/iron/dark/textured, +/area/station/science/genetics) "aQB" = ( /obj/structure/sign/warning/secure_area/directional/east, /turf/open/space/basic, @@ -9850,8 +9914,10 @@ /turf/open/floor/wood, /area/station/service/bar) "aRv" = ( +/obj/structure/table, +/obj/machinery/coffeemaker, /turf/open/floor/iron/dark/textured, -/area/station/command/gateway) +/area/station/science/breakroom) "aRw" = ( /obj/structure/chair/comfy/brown{ dir = 1 @@ -10272,16 +10338,15 @@ /turf/open/floor/iron, /area/station/commons/storage/tools) "aSX" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple/half{ +/obj/machinery/computer/scan_consolenew{ dir = 4 }, -/turf/open/floor/iron/dark/textured_edge{ - dir = 4 +/obj/effect/turf_decal/siding/purple{ + dir = 8 }, -/area/station/command/gateway) +/obj/machinery/light/directional/west, +/turf/open/floor/iron/dark/textured, +/area/station/science/genetics) "aSY" = ( /obj/structure/table/reinforced, /obj/item/clothing/head/hats/tophat, @@ -10346,6 +10411,9 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, +/obj/effect/spawner/random/entertainment/arcade{ + dir = 4 + }, /turf/open/floor/iron/white/corner{ dir = 1 }, @@ -11738,6 +11806,9 @@ name = "Port Docking Bay 1" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, /turf/open/floor/plating, /area/station/hallway/secondary/entry) "aXJ" = ( @@ -11839,7 +11910,7 @@ dir = 4 }, /turf/closed/wall, -/area/station/service/barber) +/area/station/maintenance/port) "aYg" = ( /obj/effect/landmark/generic_maintenance_landmark, /turf/open/floor/plating, @@ -12855,14 +12926,14 @@ /turf/closed/wall, /area/station/service/bar) "bbz" = ( -/obj/effect/turf_decal/siding/wideplating/dark{ - dir = 1 +/obj/machinery/dna_scannernew, +/obj/effect/turf_decal/siding/purple{ + dir = 8 }, -/obj/structure/railing, -/obj/effect/turf_decal/siding/purple, -/obj/machinery/vending/wardrobe/science_wardrobe, -/turf/open/floor/iron/textured_large, -/area/station/science/research) +/obj/item/radio/intercom/directional/west, +/obj/machinery/light/directional/west, +/turf/open/floor/iron/dark/textured, +/area/station/science/genetics) "bbA" = ( /obj/structure/chair/wood{ dir = 1 @@ -13239,15 +13310,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/effect/turf_decal/siding/thinplating/light, /turf/open/floor/iron, -/area/station/science/circuits) -"bcF" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - id = "cytologysecure"; - name = "Secure Pen Lockdown" - }, -/turf/open/floor/engine, -/area/station/science/genetics) +/area/station/science/explab) "bcG" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 4 @@ -13322,25 +13385,33 @@ /area/station/security/execution/education) "bcT" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/table/glass, -/obj/item/storage/box/monkeycubes{ - pixel_x = 6; - pixel_y = 7 +/obj/machinery/door/poddoor/preopen{ + id = "experilab"; + name = "Experimentation Chamber Lockdown" }, -/obj/item/storage/box/monkeycubes{ - pixel_x = -5 +/obj/machinery/door/window/left/directional/east{ + name = "Maximum Security Test Chamber"; + req_access = list("science") }, -/obj/item/storage/box/bodybags{ - pixel_x = 3; - pixel_y = 3 +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 }, -/turf/open/floor/iron/white, -/area/station/science/genetics) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/science/explab) "bcU" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ +/obj/machinery/door/airlock/research{ + name = "Genetics Lab" + }, +/obj/effect/mapping_helpers/airlock/access/any/science/genetics, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/iron/white, +/obj/effect/landmark/navigate_destination, +/turf/open/floor/iron/dark/textured, /area/station/science/genetics) "bcV" = ( /obj/structure/disposalpipe/segment, @@ -13409,6 +13480,15 @@ /obj/structure/cable, /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/ai_upload) +"bdh" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/science/lab) "bdi" = ( /obj/effect/spawner/random/entertainment/arcade, /turf/open/floor/wood, @@ -13604,6 +13684,11 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port) +"bdT" = ( +/obj/structure/table, +/obj/machinery/recharger, +/turf/open/floor/iron, +/area/station/command/gateway) "bdV" = ( /obj/effect/turf_decal/tile/red{ dir = 4 @@ -13837,10 +13922,6 @@ /turf/open/floor/iron, /area/station/cargo/sorting) "beG" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 5; - pixel_y = -32 - }, /turf/open/floor/iron/white/corner, /area/station/hallway/primary/starboard) "beH" = ( @@ -13848,7 +13929,6 @@ dir = 8 }, /obj/machinery/light/directional/south, -/obj/machinery/newscaster/directional/south, /turf/open/floor/iron/white/corner, /area/station/hallway/secondary/exit) "beI" = ( @@ -13869,7 +13949,10 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/iron/white/corner, /area/station/hallway/secondary/exit) "beK" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, @@ -14260,7 +14343,6 @@ /obj/effect/turf_decal/tile/purple{ dir = 8 }, -/obj/machinery/lapvend, /obj/item/radio/intercom/directional/south, /turf/open/floor/iron, /area/station/hallway/primary/starboard) @@ -14274,46 +14356,31 @@ /turf/open/floor/iron, /area/station/hallway/primary/starboard) "bgb" = ( -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/obj/item/paper_bin{ - pixel_x = -3; - pixel_y = 7 - }, -/obj/item/pen, -/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/purple/anticorner/contrasted, /turf/open/floor/iron, /area/station/hallway/primary/starboard) "bgc" = ( /turf/closed/wall/r_wall, /area/station/science/lab) "bgd" = ( -/obj/machinery/airalarm/directional/south, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 +/obj/machinery/door/firedoor/heavy, +/obj/effect/turf_decal/stripes/corner, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "rnd2"; + name = "Research Lab Shutters" }, -/turf/open/floor/iron/white/corner, -/area/station/hallway/secondary/exit) +/turf/open/floor/iron, +/area/station/science/lab) "bge" = ( -/obj/effect/turf_decal/tile/red{ +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/junction{ - dir = 1 +/obj/machinery/door/airlock/external, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 }, -/turf/open/floor/iron/cafeteria, -/area/station/hallway/secondary/exit) +/turf/open/floor/plating, +/area/station/maintenance/starboard) "bgg" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -14405,9 +14472,10 @@ /turf/open/floor/iron, /area/station/cargo/office) "bgB" = ( -/obj/structure/disposalpipe/segment, -/turf/closed/wall, -/area/station/cargo/sorting) +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/dark/smooth_large, +/area/station/science/breakroom) "bgC" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/cable, @@ -14608,7 +14676,6 @@ /obj/item/stack/medical/mesh, /obj/item/stack/medical/gauze, /obj/item/stack/medical/suture, -/obj/item/stack/medical/splint, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "bhh" = ( @@ -14751,43 +14818,27 @@ /turf/open/floor/iron/white, /area/station/science/research) "bhC" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "rnd"; - name = "Research Lab Shutters" +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 8 }, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/station/science/lab) +/obj/machinery/vending/modularpc, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) "bhE" = ( -/obj/structure/table, -/obj/item/reagent_containers/cup/beaker/large{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/reagent_containers/cup/beaker{ - pixel_x = 8; - pixel_y = 2 - }, -/obj/item/reagent_containers/dropper{ - pixel_y = -6 +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 4 }, -/turf/open/floor/iron/white, -/area/station/science/lab) +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) "bhF" = ( -/obj/structure/table, -/obj/machinery/light/directional/north, -/obj/item/stack/sheet/iron/fifty, -/obj/item/stack/sheet/glass/fifty{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/toolbox/mechanical{ - pixel_x = -2; - pixel_y = -1 +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "gene_desk_shutters"; + name = "Genetics Shutters" }, -/obj/item/clothing/glasses/welding, -/turf/open/floor/iron/white, -/area/station/science/lab) +/turf/open/floor/plating, +/area/station/science/genetics) "bhG" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -14796,15 +14847,12 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "bhH" = ( -/obj/machinery/door/airlock/maintenance, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/airlock/access/any/science/maintenance, -/obj/effect/mapping_helpers/airlock/unres, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating, -/area/station/maintenance/starboard) +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/obj/structure/sink/directional/south, +/turf/open/floor/iron/dark/textured, +/area/station/science/genetics) "bhI" = ( /obj/machinery/conveyor{ id = "garbage" @@ -14833,12 +14881,9 @@ /turf/open/floor/plating, /area/station/maintenance/disposal) "bhK" = ( -/obj/structure/closet/secure_closet/exile, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/command/gateway) +/obj/machinery/photocopier, +/turf/open/floor/iron/dark/textured, +/area/station/science/breakroom) "bhL" = ( /obj/machinery/mineral/stacking_machine{ input_dir = 1; @@ -14917,7 +14962,7 @@ dir = 1 }, /turf/closed/wall, -/area/station/cargo/sorting) +/area/station/maintenance/port) "bia" = ( /obj/structure/disposalpipe/trunk{ dir = 8 @@ -14928,13 +14973,22 @@ /turf/open/floor/plating, /area/station/cargo/sorting) "bib" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 8 +/obj/structure/table/reinforced, +/obj/machinery/door/window/right/directional/south{ + dir = 4; + name = "Genetics Desk"; + req_access = list("genetics") }, -/obj/item/radio/intercom/directional/east, -/turf/open/floor/iron/white, -/area/station/science/lab) +/obj/item/paper, +/obj/item/pen, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "gene_desk_shutters"; + name = "Genetics Shutters" + }, +/turf/open/floor/iron/dark/textured, +/area/station/science/genetics) "bic" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 4 @@ -15232,49 +15286,32 @@ /turf/open/floor/iron, /area/station/cargo/office) "biU" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 4 +/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ + dir = 8 }, -/turf/open/floor/iron/white, -/area/station/science/lab) +/obj/machinery/lapvend, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) "biV" = ( -/obj/structure/chair/stool/directional/south, -/obj/effect/landmark/start/scientist, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/science/lab) +/obj/effect/turf_decal/tile/purple/half/contrasted, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) "biW" = ( /turf/open/floor/iron/white, /area/station/science/lab) "biX" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Research and Development"; - network = list("ss13","rd"); - pixel_x = 22 - }, -/obj/machinery/button/door{ - id = "rnd"; - name = "Shutters Control Button"; - pixel_x = -6; - pixel_y = 24; - req_access = list("science") +/obj/machinery/door/airlock/maintenance{ + name = "Genetics Lab Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment{ - dir = 6 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 + dir = 4 }, -/turf/open/floor/iron/white, -/area/station/science/lab) +/turf/open/floor/plating, +/area/station/maintenance/starboard) "bja" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -15551,10 +15588,7 @@ /turf/open/floor/iron/white, /area/station/science/research) "bka" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/white, /area/station/science/lab) "bkb" = ( @@ -15601,16 +15635,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/circuit, /area/station/science/robotics/mechbay) -"bki" = ( -/obj/structure/table/glass, -/obj/machinery/airalarm/directional/east, -/obj/item/stack/cable_coil{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/stack/cable_coil, -/turf/open/floor/iron/white, -/area/station/science/lab) "bkk" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 5 @@ -15654,18 +15678,8 @@ /area/station/science/research) "bks" = ( /obj/machinery/rnd/destructive_analyzer, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/requests_console{ - department = "Science"; - name = "Science Requests Console"; - pixel_x = -30 - }, -/obj/effect/mapping_helpers/requests_console/ore_update, -/obj/effect/mapping_helpers/requests_console/assistance, -/obj/effect/mapping_helpers/requests_console/information, -/turf/open/floor/iron, +/obj/structure/extinguisher_cabinet/directional/west, +/turf/open/floor/iron/checker, /area/station/science/lab) "bkt" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -15677,6 +15691,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, /turf/open/floor/iron/white, /area/station/science/lab) "bkw" = ( @@ -15864,12 +15882,14 @@ /turf/open/floor/plating, /area/station/maintenance/central) "bkZ" = ( -/obj/structure/closet/l3closet/scientist, -/obj/effect/turf_decal/stripes/line{ - dir = 5 +/obj/effect/spawner/structure/window, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "rndbreak"; + name = "Break Room Privacy Shutters" }, -/turf/open/floor/iron, -/area/station/command/gateway) +/turf/open/floor/plating, +/area/station/science/breakroom) "bla" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -16041,6 +16061,9 @@ dir = 1 }, /obj/machinery/airalarm/directional/south, +/obj/machinery/camera/directional/south{ + c_tag = "Mechbay" + }, /turf/open/floor/iron, /area/station/science/robotics/mechbay) "bly" = ( @@ -16128,21 +16151,35 @@ /turf/open/floor/iron/white, /area/station/science/research) "blI" = ( -/obj/machinery/computer/rdconsole{ - dir = 4 +/obj/machinery/rnd/production/protolathe/department/science, +/obj/machinery/camera/directional/west{ + c_tag = "Research Lab" }, -/obj/machinery/light/directional/west, -/turf/open/floor/iron, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/iron/checker, /area/station/science/lab) "blJ" = ( -/obj/machinery/rnd/production/circuit_imprinter/department/science, -/turf/open/floor/iron, -/area/station/science/lab) +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/spawner/random/entertainment/arcade{ + dir = 4 + }, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/station/hallway/secondary/exit) "blK" = ( -/turf/open/floor/iron, +/turf/open/floor/iron/checker, /area/station/science/lab) "blL" = ( -/obj/machinery/holopad, +/obj/structure/table/glass, +/obj/machinery/cell_charger{ + pixel_y = 5 + }, +/obj/item/stock_parts/cell/high{ + pixel_y = 6 + }, /turf/open/floor/iron/white, /area/station/science/lab) "blM" = ( @@ -16162,12 +16199,14 @@ /turf/open/floor/iron, /area/station/command/bridge) "blP" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 +/obj/machinery/door/airlock/maintenance{ + name = "Genetics Lab Maintenance" }, -/obj/machinery/door/airlock/external, -/obj/effect/mapping_helpers/airlock/access/any/engineering/external, -/turf/open/floor/plating/airless, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/any/science/maintenance, +/turf/open/floor/plating, /area/station/maintenance/starboard) "blQ" = ( /turf/open/floor/plating/airless, @@ -16214,35 +16253,27 @@ /turf/open/floor/iron, /area/station/cargo/storage) "blZ" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 }, -/obj/structure/cable, -/turf/open/floor/iron/white, -/area/station/science/lab) -"bma" = ( -/obj/structure/table/glass, -/obj/item/stock_parts/servo, -/obj/item/stock_parts/capacitor, -/obj/item/stock_parts/capacitor, -/obj/item/stock_parts/servo, -/obj/machinery/firealarm/directional/east, -/obj/item/stock_parts/micro_laser{ - pixel_x = -5; - pixel_y = 5 +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 }, -/obj/item/stock_parts/micro_laser{ - pixel_x = -5; - pixel_y = 5 +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/item/stack/sheet/glass{ - amount = 3; - pixel_y = 2 +/turf/open/floor/plating, +/area/station/maintenance/starboard) +"bma" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "gene_shutters"; + name = "Genetics Shutters" }, -/turf/open/floor/iron/white, -/area/station/science/lab) +/turf/open/floor/plating, +/area/station/science/genetics) "bmb" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ @@ -16683,10 +16714,11 @@ /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) "bng" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ +/obj/structure/chair/stool/directional/west, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, -/turf/open/floor/iron/white, +/turf/open/floor/iron/checker, /area/station/science/lab) "bnh" = ( /obj/structure/table/reinforced, @@ -16733,11 +16765,12 @@ /turf/open/floor/iron, /area/station/science/robotics/lab) "bnk" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/iron/white, -/area/station/science/lab) +/obj/machinery/computer/scan_consolenew, +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured, +/area/station/science/genetics) "bnm" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ @@ -16756,17 +16789,23 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai_upload) "bnq" = ( -/obj/structure/plasticflaps/opaque, -/turf/open/floor/plating, -/area/station/science/lab) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured, +/area/station/science/genetics) "bnr" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/navbeacon{ - codes_txt = "delivery;dir=8"; - location = "Research Division" +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/floor/iron, -/area/station/science/lab) +/turf/open/floor/iron/dark/textured, +/area/station/science/genetics) "bns" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ @@ -16813,18 +16852,22 @@ /turf/open/floor/iron, /area/station/cargo/storage) "bnx" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 +/obj/structure/chair/office/light{ + dir = 1; + pixel_y = 3 }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 5 +/obj/structure/disposalpipe/segment{ + dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 5 + dir = 4 }, -/turf/open/floor/plating, -/area/station/maintenance/starboard) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, +/obj/effect/landmark/start/geneticist, +/turf/open/floor/iron/dark/textured, +/area/station/science/genetics) "bny" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -17195,7 +17238,14 @@ /turf/open/floor/iron, /area/station/science/research) "boA" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/holopad, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/white, /area/station/science/lab) "boB" = ( @@ -17290,14 +17340,11 @@ /turf/open/floor/iron, /area/station/science/xenobiology) "boQ" = ( -/obj/effect/spawner/structure/window, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "rnd2"; - name = "Research Lab Shutters" - }, -/obj/machinery/door/firedoor/heavy, -/turf/open/floor/plating, -/area/station/science/research) +/obj/structure/disposalpipe/segment, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/science/lab) "boR" = ( /obj/effect/turf_decal/delivery, /turf/open/floor/iron, @@ -17384,8 +17431,10 @@ /area/station/command/heads_quarters/hop) "bpf" = ( /obj/effect/turf_decal/stripes/line{ - dir = 1 + dir = 8 }, +/obj/structure/frame/machine, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/white, /area/station/science/lab) "bpg" = ( @@ -17454,18 +17503,9 @@ /turf/open/floor/iron, /area/station/hallway/primary/central) "bpo" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "rnd2"; - name = "Research Lab Shutters" - }, -/obj/machinery/door/firedoor/heavy, -/obj/structure/cable, -/turf/open/floor/iron/white/side{ - dir = 10 - }, -/area/station/science/research) +/obj/effect/decal/cleanable/oil/streak, +/turf/open/floor/iron/white, +/area/station/science/lab) "bpp" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -17480,9 +17520,11 @@ /turf/open/floor/iron/dark, /area/station/medical/morgue) "bpq" = ( -/obj/structure/sign/warning/biohazard/directional/east, -/turf/closed/wall, -/area/station/science/research) +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured, +/area/station/science/genetics) "bpr" = ( /obj/machinery/door/airlock/external{ name = "Mining Dock" @@ -17628,16 +17670,11 @@ /turf/open/floor/iron/white/side, /area/station/science/research) "bpZ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "rnd2"; - name = "Research Lab Shutters" - }, -/obj/machinery/door/firedoor/heavy, -/turf/open/floor/iron/white/side{ - dir = 10 +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, -/area/station/science/research) +/turf/open/floor/iron/white, +/area/station/science/lab) "bqb" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -17736,34 +17773,31 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 }, -/turf/open/floor/iron/white/side{ +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 10 }, -/area/station/science/research) +/obj/structure/cable, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/science/lab) "bqg" = ( /obj/structure/chair/stool/directional/west, /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "bqh" = ( -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 10 +/obj/effect/turf_decal/siding/purple{ + dir = 5 }, -/turf/open/floor/plating, -/area/station/maintenance/starboard) +/obj/machinery/vending/wardrobe/gene_wardrobe, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/dark/textured, +/area/station/science/genetics) "bqi" = ( /obj/machinery/conveyor{ dir = 4; @@ -17784,18 +17818,10 @@ /turf/open/floor/plating, /area/station/cargo/storage) "bqk" = ( -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/iron/white/side{ - dir = 10 - }, -/area/station/science/research) +/obj/structure/window/reinforced/spawner/directional/west, +/mob/living/carbon/human/species/monkey, +/turf/open/floor/grass, +/area/station/science/genetics) "bql" = ( /obj/machinery/conveyor{ dir = 4; @@ -18064,17 +18090,17 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/aft) "brn" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/white/side{ - dir = 9 +/obj/effect/turf_decal/stripes/corner{ + dir = 8 }, -/area/station/science/research) +/obj/machinery/newscaster/directional/east, +/turf/open/floor/iron/white, +/area/station/science/lab) "bro" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/white/side{ - dir = 9 - }, -/area/station/science/research) +/obj/effect/turf_decal/stripes/line, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/white, +/area/station/science/lab) "brp" = ( /obj/structure/toilet{ pixel_y = 8 @@ -18101,33 +18127,23 @@ /turf/open/floor/iron, /area/station/science/robotics/lab) "brx" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 6 - }, -/turf/open/floor/iron/white/side{ - dir = 10 - }, -/area/station/science/research) -"bry" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ +/obj/effect/turf_decal/siding/purple{ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 }, -/obj/machinery/door/airlock/maintenance{ - name = "Gateway Maintenance" +/obj/machinery/requests_console/directional/east{ + department = "Genetics"; + name = "Genetics Requests Console" }, -/obj/effect/mapping_helpers/airlock/access/any/command/gateway, +/obj/effect/mapping_helpers/requests_console/supplies, /turf/open/floor/iron/dark/textured, -/area/station/maintenance/starboard) +/area/station/science/genetics) +"bry" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/grass, +/area/station/science/genetics) "brC" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -18146,7 +18162,8 @@ /obj/effect/mapping_helpers/airlock/unres{ dir = 4 }, -/obj/effect/mapping_helpers/airlock/access/any/science/ordnance, +/obj/effect/mapping_helpers/airlock/access/any/science/maintenance, +/obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/station/maintenance/starboard) "brG" = ( @@ -18219,14 +18236,12 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/aft) "brQ" = ( -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 1 - }, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/station/maintenance/starboard) "brR" = ( @@ -18690,6 +18705,13 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 10 + }, +/obj/structure/cable, /turf/open/floor/iron/white, /area/station/science/research) "bta" = ( @@ -18747,17 +18769,16 @@ /turf/open/floor/iron/white, /area/station/medical/chemistry) "bth" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 4 +/obj/structure/disposalpipe/segment{ + dir = 9 }, +/obj/structure/frame/machine, +/obj/effect/decal/cleanable/dirt, +/obj/item/stack/cable_coil/five, +/obj/item/circuitboard/machine/bepis, /obj/structure/cable, -/turf/open/floor/iron/white/side{ - dir = 10 - }, -/area/station/science/research) +/turf/open/floor/iron/white, +/area/station/science/lab) "bti" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -18774,11 +18795,11 @@ /obj/effect/mapping_helpers/airlock/access/any/science/xenobio, /obj/structure/cable, /turf/open/floor/plating, -/area/station/maintenance/aft) +/area/station/science/xenobiology) "btk" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/closed/wall, -/area/station/medical/psychology) +/area/station/maintenance/aft) "btm" = ( /obj/structure/disposalpipe/sorting/mail/flip{ dir = 2 @@ -18786,6 +18807,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/mapping_helpers/mail_sorting/science/research, +/obj/effect/mapping_helpers/mail_sorting/science/genetics, /turf/open/floor/iron/white, /area/station/science/research) "bto" = ( @@ -19631,8 +19653,17 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/aft) "bvp" = ( -/turf/open/floor/catwalk_floor/iron_dark, -/area/station/command/gateway) +/obj/effect/turf_decal/siding/purple{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured, +/area/station/science/genetics) "bvq" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -20150,11 +20181,18 @@ /obj/machinery/door/firedoor/heavy, /obj/structure/disposalpipe/segment, /obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/obj/machinery/door/airlock/atmos{ + name = "Turbine Access" + }, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "bxo" = ( -/turf/closed/wall, -/area/station/maintenance/disposal/incinerator) +/obj/machinery/light/directional/south, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) "bxr" = ( /obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /turf/closed/wall, @@ -20934,9 +20972,17 @@ /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "bAR" = ( -/obj/effect/turf_decal/bot_white, -/turf/open/floor/iron/dark/textured_large, -/area/station/command/gateway) +/obj/structure/chair/sofa/corp/left{ + dir = 4; + pixel_x = -4 + }, +/obj/effect/landmark/start/scientist, +/obj/machinery/button/door/directional/north{ + id = "rndbreak"; + name = "Privacy Shutters" + }, +/turf/open/floor/iron/dark/textured, +/area/station/science/breakroom) "bAT" = ( /obj/machinery/vending/wardrobe/jani_wardrobe, /turf/open/floor/iron, @@ -22507,7 +22553,7 @@ "bGj" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/closed/wall/r_wall, -/area/station/maintenance/disposal/incinerator) +/area/station/maintenance/aft) "bGk" = ( /obj/effect/landmark/event_spawn, /obj/effect/decal/cleanable/dirt, @@ -23111,11 +23157,6 @@ /turf/open/floor/iron, /area/station/hallway/primary/aft) "bIf" = ( -/obj/machinery/door_buttons/access_button{ - dir = 4; - pixel_x = -12; - pixel_y = 2 - }, /obj/effect/turf_decal/stripes/line{ dir = 9 }, @@ -23238,7 +23279,7 @@ "bIz" = ( /obj/structure/sign/warning/biohazard, /turf/closed/wall/r_wall, -/area/station/science/xenobiology) +/area/station/maintenance/aft) "bIA" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -23632,7 +23673,7 @@ }, /obj/effect/mapping_helpers/airlock/access/any/science/general, /turf/open/floor/iron, -/area/station/science/circuits) +/area/station/science/explab) "bJP" = ( /obj/machinery/door/poddoor/incinerator_atmos_main, /turf/open/floor/engine, @@ -24840,8 +24881,9 @@ /obj/effect/turf_decal/siding/thinplating/light{ dir = 4 }, +/obj/effect/landmark/event_spawn, /turf/open/floor/iron, -/area/station/science/circuits) +/area/station/science/explab) "bOw" = ( /obj/structure/table, /obj/item/storage/box/beakers{ @@ -24858,14 +24900,21 @@ /obj/effect/mapping_helpers/requests_console/ore_update, /obj/effect/mapping_helpers/requests_console/supplies, /turf/open/floor/iron, -/area/station/science/circuits) +/area/station/science/explab) "bOx" = ( /obj/machinery/holopad, /turf/open/floor/iron/white, /area/station/science/xenobiology) "bOB" = ( -/turf/open/floor/iron, -/area/station/science/circuits) +/obj/machinery/camera/directional/east{ + network = list("test","rd"); + c_tag = "Experimentation Chamber" + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/science/explab) "bOC" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -25088,7 +25137,7 @@ "bPK" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, -/area/station/science/circuits) +/area/station/science/explab) "bPL" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/yellow{ @@ -25112,7 +25161,7 @@ /area/station/hallway/secondary/entry) "bPN" = ( /turf/closed/wall, -/area/station/science/circuits) +/area/station/science/explab) "bPP" = ( /obj/effect/decal/cleanable/oil, /turf/open/floor/plating, @@ -25335,7 +25384,7 @@ /obj/structure/extinguisher_cabinet/directional/west, /obj/structure/closet/bombcloset, /turf/open/floor/iron, -/area/station/science/circuits) +/area/station/science/explab) "bQQ" = ( /obj/machinery/door/firedoor, /obj/structure/cable, @@ -25358,8 +25407,11 @@ /turf/open/floor/iron, /area/station/science/ordnance/storage) "bQZ" = ( -/turf/closed/wall/r_wall, -/area/station/science/circuits) +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "bRa" = ( /turf/closed/wall/r_wall, /area/station/maintenance/aft) @@ -25545,6 +25597,23 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +"bRM" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/iron/white/corner, +/area/station/hallway/secondary/exit) "bRN" = ( /turf/closed/wall, /area/station/medical/virology) @@ -25594,8 +25663,11 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/siding/thinplating/light{ + dir = 4 + }, /turf/open/floor/iron/white, -/area/station/science/circuits) +/area/station/science/explab) "bSd" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -25603,15 +25675,15 @@ /turf/open/floor/iron, /area/station/tcommsat/computer) "bSe" = ( -/obj/effect/turf_decal/siding/wood{ +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 }, -/obj/machinery/camera{ - c_tag = "Nanotrasen Representitive's Office"; - dir = 8 +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 }, -/turf/open/floor/wood, -/area/command/heads_quarters/captain/private/nt_rep) +/obj/structure/cable, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "bSh" = ( /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, @@ -25836,10 +25908,6 @@ /turf/open/floor/iron/dark, /area/station/medical/virology) "bST" = ( -/obj/machinery/door_buttons/airlock_controller{ - pixel_x = -5; - pixel_y = 30 - }, /obj/effect/turf_decal/trimline/green/filled/line{ dir = 1 }, @@ -26374,8 +26442,14 @@ /turf/open/floor/plating, /area/station/maintenance/port/aft) "bVI" = ( -/turf/closed/wall/r_wall, -/area/station/tcommsat/server) +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "experilab"; + name = "Experimentation Chamber Lockdown" + }, +/turf/open/floor/plating, +/area/station/science/explab) "bVJ" = ( /turf/closed/wall/r_wall, /area/station/tcommsat/computer) @@ -26617,30 +26691,10 @@ /turf/open/floor/plating, /area/station/maintenance/port/aft) "bWA" = ( -/obj/structure/table, -/obj/item/wirecutters{ - pixel_y = -3 - }, -/obj/item/stock_parts/cell{ - pixel_x = -7; - pixel_y = 10 - }, -/obj/item/stack/cable_coil/cut{ - pixel_y = 6 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark, -/area/station/maintenance/fore) +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/engine, +/area/station/science/explab) "bWB" = ( /turf/open/floor/circuit/telecomms/mainframe, /area/station/tcommsat/server) @@ -26864,7 +26918,7 @@ /obj/structure/filingcabinet/chestdrawer, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, -/area/station/science/circuits) +/area/station/science/explab) "bXk" = ( /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=AIE"; @@ -26930,13 +26984,11 @@ /turf/open/floor/iron, /area/station/science/ordnance/storage) "bXt" = ( -/obj/machinery/vending/wardrobe/gene_wardrobe, -/obj/effect/turf_decal/stripes/line{ - dir = 10 +/obj/effect/turf_decal/stripes/red/line{ + dir = 1 }, -/obj/machinery/light/directional/north, -/turf/open/floor/iron/dark, -/area/station/science/genetics) +/turf/open/floor/engine, +/area/station/science/explab) "bXv" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -26948,26 +27000,25 @@ /turf/open/floor/plating, /area/station/maintenance/port/aft) "bXw" = ( -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 4 +/obj/structure/window/reinforced/spawner/directional/north, +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 +/obj/structure/closet/crate{ + name = "E.X.P.E.R.I-MENTOR Supply Crate" }, -/obj/structure/trash_pile, +/obj/item/target/syndicate, +/obj/item/target/clown, +/obj/item/target/alien, /turf/open/floor/iron/dark, -/area/station/maintenance/fore) +/area/station/science/explab) "bXx" = ( -/obj/item/restraints/handcuffs/cable/zipties/used, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/station/maintenance/fore) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/wood, +/area/blueshield) "bXz" = ( /obj/machinery/telecomms/processor/preset_four, /turf/open/floor/iron/dark/telecomms, @@ -27157,17 +27208,18 @@ /turf/open/floor/iron, /area/station/medical/virology) "bYi" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - id = "genShutters"; - name = "Privacy Shutters" +/obj/machinery/computer/scan_consolenew{ + dir = 4 }, -/turf/open/floor/plating, +/obj/effect/turf_decal/siding/purple{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured, /area/station/science/genetics) "bYj" = ( /obj/structure/cable, /turf/open/floor/iron, -/area/station/science/circuits) +/area/station/science/explab) "bYm" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/railing{ @@ -27175,7 +27227,7 @@ }, /obj/machinery/module_duplicator, /turf/open/floor/iron/white, -/area/station/science/circuits) +/area/station/science/explab) "bYn" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/yellow, @@ -27227,33 +27279,21 @@ /turf/closed/wall, /area/station/maintenance/port/aft) "bYv" = ( -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/neutral, -/obj/structure/sign/poster/official/do_not_question/directional/east, -/turf/open/floor/iron/dark, -/area/station/maintenance/fore) +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/stripes/red/line, +/turf/open/floor/engine, +/area/station/science/explab) "bYw" = ( -/obj/effect/turf_decal/tile/red{ +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark/smooth_large, +/area/station/science/breakroom) +"bYx" = ( +/obj/structure/window/reinforced/spawner/directional/south, +/obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, /turf/open/floor/iron/dark, -/area/station/maintenance/fore) -"bYx" = ( -/obj/structure/chair/office/light{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/station/maintenance/fore) +/area/station/science/explab) "bYy" = ( /obj/effect/turf_decal/siding/wood, /obj/structure/table/wood, @@ -27432,7 +27472,7 @@ "bYZ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/closed/wall/r_wall, -/area/station/medical/virology) +/area/station/maintenance/aft) "bZb" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -27441,8 +27481,13 @@ /turf/open/floor/iron, /area/station/science/xenobiology) "bZc" = ( -/turf/open/floor/iron/white, -/area/station/science/genetics) +/obj/structure/railing{ + dir = 8; + pixel_x = -5 + }, +/obj/machinery/vending/wardrobe/science_wardrobe, +/turf/open/floor/iron/dark/textured, +/area/station/science/breakroom) "bZe" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -27466,13 +27511,10 @@ /turf/open/floor/plating, /area/station/maintenance/starboard) "bZk" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron/dark, -/area/station/maintenance/fore) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark/textured, +/area/station/science/breakroom) "bZl" = ( /obj/structure/closet/secure_closet/freezer/kitchen/maintenance, /turf/open/floor/iron/cafeteria, @@ -27595,7 +27637,7 @@ "bZP" = ( /obj/structure/disposalpipe/segment, /turf/closed/wall/r_wall, -/area/station/medical/virology) +/area/station/maintenance/aft) "bZQ" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -27637,9 +27679,13 @@ /turf/open/floor/plating, /area/station/maintenance/aft) "bZZ" = ( -/obj/machinery/firealarm/directional/south, -/turf/open/floor/iron/dark/textured, -/area/station/command/gateway) +/obj/structure/table, +/obj/machinery/microwave, +/obj/machinery/camera/directional/south{ + c_tag = "Science Break Room East" + }, +/turf/open/floor/iron/dark, +/area/station/science/breakroom) "cac" = ( /obj/structure/chair/stool, /turf/open/floor/plating, @@ -27868,17 +27914,17 @@ dir = 8 }, /turf/open/floor/iron, -/area/station/science/circuits) +/area/station/science/explab) "cba" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, -/area/station/science/circuits) +/area/station/science/explab) "cbc" = ( /obj/machinery/light/directional/south, /turf/open/floor/iron, -/area/station/science/circuits) +/area/station/science/explab) "cbh" = ( /obj/structure/table, /obj/item/folder/white, @@ -28064,7 +28110,7 @@ dir = 6 }, /turf/open/floor/engine, -/area/station/science/genetics) +/area/station/science/cytology) "cce" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -28642,8 +28688,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/poddoor/preopen{ - id = "cytologysecure"; - name = "Secure Pen Lockdown" + id = "experilab"; + name = "Experimentation Lab Lockdown" }, /turf/open/floor/engine, /area/station/science/cytology) @@ -28657,9 +28703,12 @@ /area/station/maintenance/starboard/aft) "ceV" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/station/maintenance/fore) +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/structure/training_machine, +/turf/open/floor/iron/dark, +/area/station/science/explab) "ceW" = ( /obj/machinery/space_heater, /turf/open/floor/plating, @@ -28667,6 +28716,13 @@ "ceX" = ( /obj/structure/disposalpipe/segment, /obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 10 + }, +/obj/structure/cable, /turf/open/floor/iron/white, /area/station/science/research) "ceY" = ( @@ -28835,7 +28891,6 @@ dir = 10 }, /obj/machinery/newscaster/directional/north, -/obj/item/clothing/suit/apron/purple_bartender, /obj/item/clothing/suit/toggle/lawyer/purple, /turf/open/floor/iron, /area/station/command/heads_quarters/rd) @@ -28905,7 +28960,10 @@ dir = 1 }, /obj/machinery/disposal/bin, -/turf/open/floor/iron, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron/white/corner, /area/station/hallway/secondary/exit) "cgo" = ( /obj/structure/disposalpipe/segment, @@ -28922,7 +28980,7 @@ dir = 10 }, /turf/open/floor/engine, -/area/station/science/genetics) +/area/station/science/cytology) "cgw" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ @@ -29542,7 +29600,7 @@ "cjG" = ( /obj/structure/sign/warning/electric_shock, /turf/closed/wall/r_wall, -/area/station/maintenance/solars/starboard/aft) +/area/station/maintenance/starboard/aft) "cjI" = ( /obj/effect/spawner/random/structure/crate, /turf/open/floor/plating, @@ -29619,10 +29677,18 @@ /turf/open/floor/iron/smooth_large, /area/station/command/heads_quarters/ce) "cka" = ( -/obj/structure/table, -/obj/machinery/recharger, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/machinery/door/window/right/directional/east{ + base_state = "left"; + dir = 8; + icon_state = "left"; + name = "Research Division Delivery"; + req_access = list("research") + }, +/obj/effect/turf_decal/delivery, +/obj/machinery/light/small/directional/south, /turf/open/floor/iron/dark/textured, -/area/station/command/gateway) +/area/station/science/breakroom) "ckb" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/smart/simple/green/visible, @@ -29645,7 +29711,7 @@ "cko" = ( /obj/structure/disposalpipe/segment, /turf/closed/wall, -/area/station/service/hydroponics/garden/abandoned) +/area/station/maintenance/starboard/aft) "cks" = ( /obj/structure/cable, /turf/open/floor/plating, @@ -30032,7 +30098,7 @@ /turf/open/floor/iron/smooth_large, /area/station/engineering/engine_smes) "cnC" = ( -/obj/structure/rack, +/obj/machinery/portable_atmospherics/canister/air, /turf/open/floor/plating, /area/station/maintenance/starboard) "cnX" = ( @@ -30146,13 +30212,10 @@ /turf/open/floor/plating, /area/station/engineering/main) "cpi" = ( -/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/port) +/turf/open/floor/iron/dark/smooth_large, +/area/station/science/breakroom) "cpl" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -31697,13 +31760,23 @@ /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat/maint) "cvO" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 4 +/obj/machinery/rnd/production/circuit_imprinter/department/science, +/obj/machinery/light/directional/west, +/obj/machinery/button/door/directional/west{ + pixel_y = 6; + pixel_x = -36; + name = "Desk Shutters"; + id = "rnd" }, -/obj/effect/landmark/start/geneticist, -/obj/structure/chair/office/light, -/turf/open/floor/iron/white, -/area/station/science/genetics) +/obj/machinery/light_switch/directional/west, +/obj/machinery/button/door/directional/west{ + pixel_y = -7; + pixel_x = -36; + name = "Lab Shutters"; + id = "rnd2" + }, +/turf/open/floor/iron/checker, +/area/station/science/lab) "cvP" = ( /turf/closed/wall, /area/station/common/cryopods) @@ -32083,6 +32156,7 @@ /obj/machinery/door/airlock/external{ name = "Port Docking Bay 4" }, +/obj/effect/mapping_helpers/airlock/unres, /turf/open/floor/plating, /area/station/hallway/secondary/entry) "cyu" = ( @@ -32092,15 +32166,19 @@ /obj/machinery/door/airlock/external{ name = "Port Docking Bay 3" }, +/obj/effect/mapping_helpers/airlock/unres, /turf/open/floor/plating, /area/station/hallway/secondary/entry) "cyC" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 }, -/obj/machinery/door/airlock/external, -/obj/effect/mapping_helpers/airlock/access/any/engineering/external, -/turf/open/floor/plating/airless, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, /area/station/maintenance/starboard) "cyD" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -32665,6 +32743,8 @@ "cBp" = ( /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/bot, +/obj/structure/closet/crate, +/obj/effect/spawner/random/maintenance/two, /turf/open/floor/iron, /area/station/cargo/storage) "cBq" = ( @@ -33964,12 +34044,12 @@ /turf/open/floor/iron/dark, /area/station/common/cryopods) "cKA" = ( -/obj/machinery/light/directional/south, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/chair/sofa/corp/right{ + dir = 4; + pixel_x = -4 }, -/turf/open/floor/iron, -/area/station/hallway/secondary/exit) +/turf/open/floor/iron/dark/textured, +/area/station/science/breakroom) "cKC" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -34030,6 +34110,12 @@ /obj/effect/spawner/structure/window/reinforced/plasma, /turf/open/floor/plating, /area/station/engineering/supermatter) +"cMU" = ( +/obj/effect/turf_decal/bot, +/obj/structure/closet/crate, +/obj/effect/spawner/random/maintenance/three, +/turf/open/floor/iron, +/area/station/cargo/storage) "cMX" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/corner{ dir = 1 @@ -34097,7 +34183,8 @@ /obj/effect/mapping_helpers/airlock/unres{ dir = 4 }, -/obj/effect/mapping_helpers/airlock/access/any/science/ordnance, +/obj/effect/mapping_helpers/airlock/access/any/science/maintenance, +/obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/station/maintenance/starboard) "cNW" = ( @@ -34581,6 +34668,13 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/atmos) +"cYo" = ( +/obj/machinery/light/directional/west, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "cYt" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/broken_floor, @@ -34721,9 +34815,14 @@ /turf/open/floor/plating, /area/station/security/prison) "ddy" = ( -/obj/structure/cable, -/turf/open/floor/iron/dark/textured, -/area/station/command/gateway) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/grass, +/area/station/science/genetics) "ddz" = ( /obj/effect/turf_decal/bot_red, /obj/machinery/camera/directional/east{ @@ -34825,10 +34924,18 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "dgS" = ( -/obj/machinery/light_switch{ - pixel_x = -20 +/obj/machinery/computer/rdconsole{ + dir = 4 }, -/turf/open/floor/iron/white, +/obj/machinery/requests_console/directional/west{ + department = "Science"; + name = "Science Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/supplies, +/obj/effect/mapping_helpers/requests_console/ore_update, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/mapping_helpers/requests_console/information, +/turf/open/floor/iron/checker, /area/station/science/lab) "dhG" = ( /obj/structure/cable, @@ -35043,6 +35150,11 @@ }, /turf/open/floor/plating, /area/station/science/xenobiology) +"dqt" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/railing, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "dqL" = ( /obj/structure/cable, /obj/structure/tank_holder, @@ -35074,7 +35186,7 @@ /obj/item/integrated_circuit/loaded/hello_world, /obj/item/integrated_circuit/loaded/speech_relay, /turf/open/floor/iron/white, -/area/station/science/circuits) +/area/station/science/explab) "dtO" = ( /obj/structure/cable, /obj/effect/spawner/random/maintenance, @@ -35184,7 +35296,7 @@ }, /obj/item/beacon, /turf/open/floor/catwalk_floor/iron, -/area/station/science/circuits) +/area/station/science/explab) "dAi" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -35200,6 +35312,7 @@ name = "Equipment Room" }, /obj/effect/mapping_helpers/airlock/access/any/security/brig, +/obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/station/security/office) "dBu" = ( @@ -35230,7 +35343,7 @@ dir = 9 }, /turf/open/floor/iron/white, -/area/station/science/circuits) +/area/station/science/explab) "dCE" = ( /obj/structure/bookcase/random, /turf/open/floor/wood, @@ -35496,6 +35609,7 @@ name = "Equipment Room" }, /obj/effect/mapping_helpers/airlock/access/any/security/brig, +/obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/station/security/office) "dRe" = ( @@ -35553,6 +35667,13 @@ /obj/item/radio/intercom/directional/north, /turf/open/floor/wood, /area/station/service/lawoffice) +"dTK" = ( +/obj/item/radio/intercom/directional/north, +/obj/machinery/camera/directional/north{ + c_tag = "Central Hallway North-West" + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) "dUe" = ( /obj/effect/landmark/start/hangover, /obj/machinery/door/firedoor, @@ -35577,11 +35698,8 @@ pixel_y = -3 }, /obj/machinery/airalarm/directional/west, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, /turf/open/floor/iron, -/area/station/science/circuits) +/area/station/science/explab) "dUT" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/yellow/filled/line, @@ -35911,7 +36029,7 @@ /obj/effect/decal/cleanable/dirt, /obj/item/hand_labeler, /turf/open/floor/iron, -/area/station/science/circuits) +/area/station/science/explab) "egw" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -35949,11 +36067,28 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron, /area/station/hallway/primary/fore) +"eiV" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) +"eji" = ( +/obj/machinery/camera{ + c_tag = "Nanotrasen Representitive's Office"; + dir = 8 + }, +/turf/open/floor/wood, +/area/command/heads_quarters/captain/private/nt_rep) "ejn" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/siding/thinplating/light{ + dir = 4 + }, /turf/open/floor/iron/white, -/area/station/science/circuits) +/area/station/science/explab) "ejL" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -36130,7 +36265,7 @@ dir = 4 }, /turf/open/floor/iron/white, -/area/station/science/circuits) +/area/station/science/explab) "esn" = ( /obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ dir = 4 @@ -36153,14 +36288,25 @@ /turf/open/floor/iron, /area/station/cargo/storage) "eth" = ( -/obj/structure/trash_pile, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark/textured_large, -/area/station/maintenance/fore) +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/camera/directional/south{ + c_tag = "Gateway"; + network = list("ss13","rd") + }, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "euc" = ( /obj/structure/sign/poster/official/random/directional/south, /turf/closed/wall/r_wall, /area/station/science/ordnance/freezerchamber) +"euq" = ( +/obj/effect/spawner/random/vending/snackvend, +/obj/structure/sign/poster/official/random/directional/east, +/turf/open/floor/iron/dark/textured, +/area/station/science/breakroom) "euL" = ( /obj/machinery/camera/directional/south{ c_tag = "Prison - Entrance"; @@ -36342,6 +36488,10 @@ /obj/machinery/igniter/incinerator_atmos, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) +"eDP" = ( +/obj/effect/turf_decal/bot_white, +/turf/open/floor/iron/dark/textured_large, +/area/station/command/gateway) "eEe" = ( /obj/structure/chair/office, /obj/effect/turf_decal/tile/red{ @@ -36355,9 +36505,15 @@ /turf/open/floor/iron/dark, /area/station/security/checkpoint/escape) "eEw" = ( -/obj/item/food/canned/beans, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/machinery/door/airlock/external{ + name = "Port Docking Bay 1" + }, +/obj/effect/mapping_helpers/airlock/unres, /turf/open/floor/plating, -/area/station/maintenance/fore) +/area/station/hallway/secondary/entry) "eFj" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/binary/pump/layer4{ @@ -36511,15 +36667,20 @@ /turf/open/floor/iron/dark, /area/station/common/cryopods) "eNB" = ( -/obj/machinery/computer/scan_consolenew{ - dir = 8 - }, -/obj/structure/extinguisher_cabinet/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 }, -/turf/open/floor/iron/white, -/area/station/science/genetics) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/red/corner{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/red/corner{ + dir = 8 + }, +/turf/open/floor/engine, +/area/station/science/explab) "eNI" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -36641,12 +36802,12 @@ /turf/open/floor/iron/dark, /area/station/security/brig) "eRU" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 4 +/obj/structure/chair/office/light{ + dir = 8 }, -/obj/machinery/light/directional/west, +/obj/effect/landmark/start/geneticist, /turf/open/floor/iron/dark/textured, -/area/station/command/gateway) +/area/station/science/genetics) "eSa" = ( /mob/living/basic/pet/bumbles, /turf/open/floor/grass, @@ -36958,6 +37119,16 @@ /obj/machinery/status_display/ai/directional/north, /turf/open/floor/iron, /area/station/hallway/primary/central) +"fhQ" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/machinery/camera/directional/west{ + c_tag = "Gateway Storage" + }, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "fic" = ( /obj/machinery/door/window/left/directional/east{ name = "Medbay Delivery"; @@ -37190,19 +37361,11 @@ }, /area/station/security/prison) "fqQ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/dark/textured, -/area/station/command/gateway) +/mob/living/carbon/human/species/monkey, +/obj/machinery/light/small/directional/north, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/grass, +/area/station/science/genetics) "frk" = ( /obj/structure/cable, /obj/item/radio/intercom/directional/south, @@ -37279,25 +37442,22 @@ "fsD" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/directional/north, -/obj/item/circuitboard/machine/experimentor, -/obj/structure/closet/crate{ - name = "E.X.P.E.R.I-MENTOR Supply Crate" - }, -/obj/item/stock_parts/scanning_module, -/obj/item/stock_parts/micro_laser, -/obj/item/stock_parts/micro_laser, -/obj/item/stock_parts/servo, -/obj/item/stock_parts/servo, -/obj/item/stack/sheet/iron/five, -/obj/item/stack/cable_coil, +/obj/structure/table, +/obj/item/gun/energy/laser/practice, +/obj/item/gun/energy/laser/practice, /turf/open/floor/iron, -/area/station/science/circuits) +/area/station/science/explab) "fsQ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, /area/station/engineering/main) +"fsZ" = ( +/obj/effect/turf_decal/bot_white, +/obj/effect/decal/cleanable/greenglow, +/turf/open/floor/iron/dark/textured_large, +/area/station/command/gateway) "ftd" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ @@ -37310,12 +37470,12 @@ /turf/open/floor/wood, /area/station/maintenance/abandon_cafeteria) "ftB" = ( -/obj/machinery/power/apc/auto_name/directional/east, /obj/effect/decal/cleanable/dirt, -/obj/structure/cable, /obj/effect/turf_decal/siding/thinplating/light, +/obj/effect/turf_decal/siding/thinplating/light/corner, +/obj/structure/cable, /turf/open/floor/iron, -/area/station/science/circuits) +/area/station/science/explab) "ftL" = ( /obj/machinery/biogenerator, /obj/effect/turf_decal/trimline/green/filled/line{ @@ -37571,17 +37731,14 @@ /turf/open/floor/wood, /area/station/security/prison) "fHQ" = ( -/obj/machinery/door/window/right/directional/east{ - base_state = "left"; - dir = 8; - icon_state = "left"; - name = "Research Division Delivery"; - req_access = list("science") +/obj/effect/turf_decal/siding/purple{ + dir = 8 }, -/obj/effect/turf_decal/delivery, -/obj/machinery/door/firedoor/heavy, -/turf/open/floor/iron, -/area/station/science/lab) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured, +/area/station/science/genetics) "fHZ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ name = "Server Vent" @@ -37595,6 +37752,15 @@ /obj/effect/mapping_helpers/airlock/access/any/cent_com/rep_door, /turf/open/floor/plating, /area/command/heads_quarters/captain/private/nt_rep) +"fJd" = ( +/obj/effect/turf_decal/bot_white/right, +/obj/effect/decal/cleanable/greenglow, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured_large, +/area/station/command/gateway) "fJu" = ( /obj/item/radio/intercom/directional/west, /obj/structure/table/reinforced/rglass, @@ -37706,18 +37872,31 @@ /turf/open/floor/iron, /area/station/security/prison) "fNH" = ( -/obj/effect/turf_decal/stripes/line{ +/obj/machinery/modular_computer/preset/cargochat/science{ dir = 1 }, -/obj/machinery/photocopier, -/turf/open/floor/iron/dark, -/area/station/science/research) +/obj/machinery/airalarm/directional/south, +/turf/open/floor/iron, +/area/station/science/lab) "fNJ" = ( /obj/machinery/shower/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/showroomfloor, /area/station/security/prison) +"fOd" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "fOI" = ( /turf/open/floor/iron, /area/station/security/execution/transfer) @@ -37989,7 +38168,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, -/area/station/science/circuits) +/area/station/science/explab) "fYd" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -38128,6 +38307,17 @@ /obj/structure/cable, /turf/open/floor/iron/cafeteria, /area/station/security/prison) +"gcP" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "gdg" = ( /obj/structure/sink/directional/south, /obj/effect/decal/cleanable/dirt, @@ -38196,6 +38386,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/mapping_helpers/airlock/access/any/security/armory, +/obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/station/security/office) "ghh" = ( @@ -38212,8 +38403,12 @@ /turf/open/floor/wood, /area/station/service/library) "ghE" = ( -/turf/closed/wall, -/area/station/maintenance/abandon_arcade) +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/decal/cleanable/dirt, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/dark/textured, +/area/station/science/breakroom) "gia" = ( /obj/effect/turf_decal/bot_white/right, /obj/machinery/ore_silo, @@ -38235,6 +38430,18 @@ }, /turf/open/floor/iron/dark, /area/station/security/checkpoint/escape) +"giH" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/airalarm/directional/east, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "giT" = ( /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -38265,6 +38472,10 @@ }, /turf/open/floor/iron, /area/station/commons/fitness) +"gjO" = ( +/obj/effect/decal/cleanable/dirt, +/turf/closed/wall/r_wall, +/area/station/maintenance/fore) "gjY" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -38344,29 +38555,22 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/fore) "gnX" = ( -/obj/effect/turf_decal/siding/purple, -/obj/effect/turf_decal/siding/purple{ - dir = 1 - }, -/obj/effect/turf_decal/siding/purple{ +/obj/structure/chair, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 }, -/obj/effect/turf_decal/siding/purple{ - dir = 8 - }, -/obj/effect/turf_decal/siding/purple/corner, -/obj/effect/turf_decal/siding/purple/corner{ - dir = 1 - }, -/obj/effect/turf_decal/siding/purple/corner{ +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 4 }, -/obj/effect/turf_decal/siding/purple/corner{ +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/effect/turf_decal/tile/red{ dir = 8 }, -/obj/structure/flora/bush/sunny/style_random, -/turf/open/floor/grass, -/area/station/science/research) +/turf/open/floor/iron, +/area/station/hallway/secondary/exit) "goT" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -38388,6 +38592,12 @@ /obj/item/watertank, /turf/open/floor/iron, /area/station/service/hydroponics) +"gps" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/holopad, +/obj/effect/spawner/random/engineering/tracking_beacon, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "gpz" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/left/directional/north{ @@ -38710,10 +38920,25 @@ /turf/open/floor/iron/dark, /area/station/medical/medbay/central) "gHj" = ( -/obj/structure/railing/corner, -/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/siding/purple, +/obj/structure/table, +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = 2 + }, +/obj/item/storage/pill_bottle/mutadone{ + pixel_x = 11; + pixel_y = 7 + }, +/obj/item/clothing/gloves/latex{ + pixel_y = 3 + }, +/obj/item/radio/headset/headset_medsci{ + pixel_x = -7; + pixel_y = 4 + }, +/obj/machinery/light/directional/south, /turf/open/floor/iron/dark/textured, -/area/station/command/gateway) +/area/station/science/genetics) "gIk" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -38794,7 +39019,7 @@ pixel_y = 9 }, /turf/open/floor/iron/white, -/area/station/science/circuits) +/area/station/science/explab) "gKI" = ( /obj/structure/fence, /obj/machinery/door/poddoor/shutters/preopen{ @@ -38807,11 +39032,18 @@ }, /area/station/security/prison/safe) "gLd" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/structure/table/glass, +/obj/item/experi_scanner{ + pixel_y = -3 }, -/turf/open/floor/iron/dark, -/area/station/science/research) +/obj/item/experi_scanner{ + pixel_y = 1 + }, +/obj/item/experi_scanner{ + pixel_y = 6 + }, +/turf/open/floor/iron/white, +/area/station/science/lab) "gLH" = ( /obj/machinery/door/airlock/external{ name = "External Access" @@ -38939,11 +39171,18 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/airalarm/directional/north, -/turf/open/floor/iron/white/side{ +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 10 }, -/area/station/science/research) +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/science/lab) "gSY" = ( /obj/structure/cable, /obj/effect/landmark/start/hangover, @@ -38966,7 +39205,7 @@ dir = 8 }, /turf/open/floor/iron/white, -/area/station/science/circuits) +/area/station/science/explab) "gTG" = ( /obj/machinery/status_display/ai{ pixel_y = -32 @@ -39123,7 +39362,7 @@ "gZY" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, -/area/station/science/circuits) +/area/station/science/explab) "hag" = ( /obj/machinery/gravity_generator/main, /obj/effect/turf_decal/bot_white, @@ -39165,9 +39404,23 @@ /turf/open/floor/iron/showroomfloor, /area/station/security/prison) "hfv" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/station/command/gateway) +/obj/effect/turf_decal/siding/purple{ + dir = 10 + }, +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -6 + }, +/obj/item/pen{ + pixel_y = 2; + pixel_x = -6 + }, +/obj/item/folder/white{ + pixel_x = 7; + pixel_y = -2 + }, +/turf/open/floor/iron/dark/textured, +/area/station/science/genetics) "hfx" = ( /obj/structure/chair{ dir = 1 @@ -39487,6 +39740,9 @@ cycle_id = "escape1" }, /obj/effect/landmark/navigate_destination/dockescpod1, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 8 + }, /turf/open/floor/plating, /area/station/hallway/secondary/entry) "hsx" = ( @@ -39631,8 +39887,9 @@ /turf/open/floor/plating, /area/station/maintenance/aft) "hyy" = ( -/obj/effect/spawner/random/maintenance/two, -/obj/structure/rack, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/plating, /area/station/maintenance/fore) "hzc" = ( @@ -39728,6 +39985,10 @@ }, /turf/open/floor/iron/grimy, /area/station/security/detectives_office) +"hBU" = ( +/obj/effect/spawner/random/structure/steam_vent, +/turf/open/floor/plating, +/area/station/maintenance/fore) "hCG" = ( /turf/open/floor/iron, /area/station/science/ordnance/bomb) @@ -39934,6 +40195,10 @@ /obj/structure/curtain/cloth, /turf/open/floor/plating, /area/station/security/prison) +"hIJ" = ( +/obj/effect/turf_decal/bot_white/left, +/turf/open/floor/iron/dark/textured_large, +/area/station/command/gateway) "hIM" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 9 @@ -40015,6 +40280,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/science/ordnance/bomb) +"hNx" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "hOx" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 8 @@ -40687,11 +40959,8 @@ /turf/open/floor/iron/white, /area/station/medical/virology) "itG" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/science/genetics) +/turf/open/floor/engine, +/area/station/science/explab) "itT" = ( /obj/structure/loom, /turf/open/floor/vault/rock, @@ -40874,6 +41143,14 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/plating, /area/station/hallway/secondary/entry) +"iER" = ( +/obj/structure/railing{ + dir = 8; + pixel_x = -5 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark/textured, +/area/station/science/breakroom) "iFn" = ( /obj/machinery/airalarm/directional/west, /turf/open/floor/iron/dark, @@ -41055,9 +41332,12 @@ /turf/open/floor/iron/dark, /area/station/security/processing) "iNp" = ( -/obj/machinery/dna_infuser, -/turf/open/floor/iron, -/area/station/science/cytology) +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark/smooth_large, +/area/station/science/breakroom) "iNO" = ( /obj/structure/window/reinforced/tinted/spawner/directional/west{ pixel_x = -5 @@ -41438,28 +41718,22 @@ /turf/open/floor/plating, /area/station/maintenance/aft) "jfk" = ( -/obj/effect/turf_decal/siding/wideplating/dark{ - dir = 1 +/obj/machinery/door/airlock/research{ + name = "Break Room" }, -/obj/structure/railing, -/obj/effect/turf_decal/siding/purple, -/obj/structure/table/glass, -/obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high, -/obj/item/stock_parts/cell/high, -/turf/open/floor/iron/textured_large, -/area/station/science/research) +/obj/effect/mapping_helpers/airlock/access/all/science/general, +/obj/machinery/door/firedoor/heavy, +/turf/open/floor/iron/dark/textured, +/area/station/science/lab) "jfQ" = ( /obj/effect/turf_decal/tile/red{ dir = 8 }, -/obj/structure/closet/firecloset, -/obj/effect/landmark/start/hangover/closet, /obj/effect/turf_decal/tile/red{ dir = 8 }, -/turf/open/floor/iron/cafeteria, -/area/station/hallway/secondary/exit) +/turf/closed/wall/r_wall, +/area/station/science/genetics) "jgi" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/cardboard, @@ -41532,6 +41806,8 @@ dir = 4 }, /obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/primary/port) "jib" = ( @@ -41778,11 +42054,23 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/extinguisher_cabinet/directional/north, -/turf/open/floor/iron/white/side{ +/obj/machinery/door/firedoor/heavy, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 10 }, -/area/station/science/research) +/obj/structure/cable, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "rnd2"; + name = "Research Lab Shutters" + }, +/turf/open/floor/iron, +/area/station/science/lab) "jst" = ( /obj/structure/table/wood, /turf/open/floor/wood, @@ -41833,6 +42121,14 @@ "jud" = ( /turf/open/floor/iron/dark, /area/station/security/corrections_officer) +"jux" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/requests_console/directional/east{ + department = "Gateway"; + name = "Gateway Requests Console" + }, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "juQ" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/tile/bar, @@ -41887,6 +42183,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/textured, /area/station/security/prison) +"jwC" = ( +/obj/effect/landmark/start/scientist, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/dark/smooth_large, +/area/station/science/breakroom) "jwX" = ( /obj/effect/turf_decal/tile/purple{ dir = 1 @@ -41918,7 +42219,7 @@ pixel_y = 5 }, /turf/open/floor/iron/white, -/area/station/science/circuits) +/area/station/science/explab) "jyk" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/decal/cleanable/dirt, @@ -42179,7 +42480,7 @@ /obj/item/stack/sheet/mineral/plasma, /obj/machinery/firealarm/directional/north, /turf/open/floor/iron, -/area/station/science/circuits) +/area/station/science/explab) "jIb" = ( /obj/structure/bookcase/random/fiction, /turf/open/floor/wood, @@ -42338,6 +42639,9 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ cycle_id = "dock3" }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 8 + }, /turf/open/floor/plating, /area/station/hallway/secondary/entry) "jQb" = ( @@ -42580,12 +42884,11 @@ /turf/open/floor/iron/white, /area/station/medical/surgery/fore) "jXz" = ( -/obj/structure/closet/radiation, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/science/genetics) +/obj/effect/turf_decal/stripes/red/line{ + dir = 10 + }, +/turf/open/floor/engine, +/area/station/science/explab) "jXG" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -42833,7 +43136,7 @@ "kfs" = ( /obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden, /turf/closed/wall/r_wall, -/area/station/maintenance/disposal/incinerator) +/area/station/maintenance/aft) "kfE" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -43197,13 +43500,9 @@ /turf/open/floor/iron, /area/station/science/ordnance/storage) "kwC" = ( -/obj/structure/reagent_dispensers/fueltank, -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark/textured_large, -/area/station/maintenance/fore) +/obj/effect/spawner/random/vending/colavend, +/turf/open/floor/iron/dark/textured, +/area/station/science/breakroom) "kwD" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/carbon_input{ dir = 8 @@ -43211,12 +43510,14 @@ /turf/open/floor/engine/co2, /area/station/engineering/atmos) "kwH" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/landmark/start/scientist, -/turf/open/floor/iron/dark, -/area/station/science/research) +/obj/structure/table/glass, +/obj/machinery/light/directional/south, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/glass/fifty, +/obj/item/storage/toolbox/mechanical, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron, +/area/station/science/lab) "kwT" = ( /obj/vehicle/ridden/wheelchair{ dir = 4 @@ -43255,10 +43556,16 @@ /turf/open/floor/iron, /area/station/medical/medbay/central) "kxC" = ( -/obj/structure/railing, -/obj/effect/turf_decal/tile/purple/half, -/turf/open/floor/iron/dark/textured_edge, -/area/station/command/gateway) +/obj/effect/turf_decal/siding/purple{ + dir = 6 + }, +/obj/machinery/dna_infuser, +/obj/machinery/camera/directional/south{ + c_tag = "Genetics South" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark/textured, +/area/station/science/genetics) "kxX" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 10 @@ -43559,13 +43866,9 @@ /turf/open/floor/iron, /area/station/hallway/primary/port) "kGS" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/turf/open/floor/iron/dark/textured_edge{ - dir = 8 - }, -/area/station/command/gateway) +/obj/effect/spawner/random/entertainment/arcade, +/turf/open/floor/iron/dark/textured, +/area/station/science/breakroom) "kHy" = ( /obj/machinery/door/airlock/security/glass{ name = "Permabrig Visitation" @@ -43640,10 +43943,10 @@ /area/station/command/heads_quarters/hop) "kLM" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 + dir = 1 }, -/turf/open/floor/iron/white, -/area/station/science/genetics) +/turf/open/floor/engine, +/area/station/science/explab) "kMi" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/cable, @@ -43868,12 +44171,18 @@ /turf/open/floor/wood, /area/station/hallway/secondary/service) "kXt" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/extinguisher_cabinet/directional/east, -/turf/open/floor/iron/white/side{ +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable, +/obj/structure/disposalpipe/junction/flip{ dir = 8 }, -/area/station/science/research) +/turf/open/floor/iron, +/area/station/hallway/secondary/exit) "kXS" = ( /obj/structure/chair{ dir = 4; @@ -43937,6 +44246,11 @@ }, /turf/open/floor/iron, /area/station/construction/mining/aux_base) +"kZH" = ( +/obj/machinery/gateway/centerstation, +/obj/structure/cable, +/turf/open/floor/iron/dark/textured_large, +/area/station/command/gateway) "kZJ" = ( /turf/open/floor/iron/dark/side{ dir = 1 @@ -43972,10 +44286,9 @@ /turf/open/floor/wood, /area/station/service/bar) "lcg" = ( -/obj/machinery/light/directional/east, -/obj/effect/spawner/liquids_spawner, -/turf/open/floor/iron/pool, -/area/station/science/research) +/obj/effect/spawner/random/engineering/atmospherics_portable, +/turf/open/floor/plating, +/area/station/maintenance/starboard) "lcp" = ( /obj/machinery/light/directional/north, /turf/open/floor/iron, @@ -44105,10 +44418,22 @@ /turf/open/floor/iron, /area/station/hallway/primary/port) "lmn" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/dna_scannernew, -/turf/open/floor/iron/white, -/area/station/science/genetics) +/obj/structure/table, +/obj/effect/spawner/random/food_or_drink/donkpockets{ + pixel_y = 4; + pixel_x = -6 + }, +/obj/machinery/airalarm/directional/south, +/obj/item/coffee_cartridge{ + pixel_x = 8 + }, +/obj/item/coffee_cartridge/decaf{ + pixel_y = 7; + pixel_x = 8 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/dark/textured, +/area/station/science/breakroom) "lmU" = ( /obj/structure/closet/secure_closet/security/sec, /obj/effect/turf_decal/bot_blue, @@ -44142,6 +44467,10 @@ }, /turf/open/floor/engine, /area/station/science/xenobiology) +"lqI" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron/showroomfloor, +/area/station/security/prison) "lrg" = ( /obj/effect/landmark/start/chemist, /turf/open/floor/iron/white, @@ -44176,7 +44505,6 @@ /area/station/engineering/storage/tech) "ltd" = ( /obj/structure/disposalpipe/segment, -/obj/structure/sign/warning/secure_area/directional/west, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 }, @@ -44204,7 +44532,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, -/area/station/science/circuits) +/area/station/science/explab) "luc" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/condiment/peppermill, @@ -44269,12 +44597,11 @@ /turf/open/floor/iron/dark/corner, /area/station/commons/dorms) "lvL" = ( -/obj/machinery/door/airlock/maintenance, -/obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, -/obj/effect/mapping_helpers/airlock/unres, -/turf/open/floor/plating, -/area/station/maintenance/fore) +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/science/breakroom) "lwn" = ( /turf/open/floor/iron/airless, /area/space/nearstation) @@ -44390,7 +44717,7 @@ }, /obj/structure/bed/dogbed/mcgriff, /mob/living/basic/pet/dog/pug/mcgriff, -/obj/machinery/light/directional/west, +/obj/machinery/light/directional/north, /turf/open/floor/iron/showroomfloor, /area/station/security/warden) "lzS" = ( @@ -44417,15 +44744,18 @@ /turf/open/floor/iron, /area/station/hallway/primary/port) "lAB" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 4 +/obj/effect/turf_decal/siding/purple, +/obj/structure/table, +/obj/machinery/computer/records/medical/laptop{ + dir = 1; + pixel_x = -4 }, -/obj/machinery/door/poddoor/preopen{ - id = "genShutters"; - name = "Privacy Shutters" +/obj/item/infuser_book{ + pixel_y = -1; + pixel_x = 9 }, -/turf/open/floor/plating, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark/textured, /area/station/science/genetics) "lAN" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -44525,6 +44855,9 @@ }, /turf/open/floor/plating, /area/station/maintenance/fore/lesser) +"lEx" = ( +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "lEW" = ( /obj/effect/turf_decal/delivery, /obj/machinery/airalarm/directional/south, @@ -44566,11 +44899,16 @@ /turf/open/floor/iron/pool, /area/station/commons/fitness) "lFP" = ( -/obj/machinery/light/directional/east, -/turf/open/floor/iron/dark/textured_edge{ +/obj/effect/turf_decal/siding/purple/corner{ dir = 4 }, -/area/station/command/gateway) +/obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/dark/textured, +/area/station/science/genetics) "lFS" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -44579,6 +44917,10 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/service/chapel/office) +"lGE" = ( +/obj/structure/closet/l3closet/scientist, +/turf/open/floor/iron, +/area/station/command/gateway) "lHg" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -44683,6 +45025,12 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/central) +"lKw" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "lKx" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -44716,7 +45064,7 @@ dir = 4 }, /turf/closed/wall, -/area/station/service/hydroponics/garden/abandoned) +/area/station/maintenance/starboard/aft) "lLZ" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -44846,7 +45194,7 @@ }, /obj/effect/spawner/liquids_spawner, /turf/open/floor/iron/pool, -/area/station/science/research) +/area/station/science/breakroom) "lQp" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /obj/machinery/holopad, @@ -44856,12 +45204,13 @@ /turf/open/floor/iron/dark, /area/station/command/heads_quarters/cmo) "lQG" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock/research{ - name = "Genetics Lab" +/obj/machinery/dna_scannernew, +/obj/effect/turf_decal/siding/purple{ + dir = 1 }, -/obj/effect/mapping_helpers/airlock/access/any/science/genetics, -/turf/open/floor/iron/white, +/obj/machinery/light/directional/north, +/obj/machinery/status_display/evac/directional/north, +/turf/open/floor/iron/dark/textured, /area/station/science/genetics) "lQR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -44913,6 +45262,9 @@ /area/station/security/office) "lST" = ( /obj/machinery/smartfridge/petri/preloaded, +/obj/machinery/camera/directional/west{ + c_tag = "Cytology Lab" + }, /turf/open/floor/iron, /area/station/science/cytology) "lSU" = ( @@ -45193,6 +45545,11 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port) +"mgV" = ( +/obj/item/radio/intercom/directional/west, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "mhs" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -45398,6 +45755,13 @@ /obj/machinery/firealarm/directional/east, /turf/open/floor/iron, /area/station/hallway/primary/central) +"msW" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "mtl" = ( /obj/structure/chair/plastic{ dir = 1 @@ -45623,6 +45987,10 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit) +"mEI" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/cargo/storage) "mEM" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -45660,6 +46028,12 @@ /obj/structure/closet/secure_closet/psychology, /turf/open/floor/iron/white, /area/station/medical/psychology) +"mFw" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark/smooth_large, +/area/station/science/breakroom) "mFT" = ( /obj/machinery/camera/directional/east{ c_tag = "Locker Room South" @@ -45691,9 +46065,6 @@ /obj/structure/table, /obj/structure/microscope, /obj/machinery/light/directional/west, -/obj/item/infuser_book{ - pixel_x = -8 - }, /turf/open/floor/iron, /area/station/science/cytology) "mIp" = ( @@ -45872,6 +46243,17 @@ /obj/effect/spawner/armory_spawn/cmg, /turf/open/floor/iron/smooth, /area/station/ai_monitored/security/armory) +"mRg" = ( +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 1 + }, +/obj/effect/mapping_helpers/mail_sorting/service/law_office, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/fore) "mRk" = ( /obj/structure/cable, /turf/open/floor/iron/kitchen, @@ -46139,6 +46521,13 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/science/ordnance) +"ncg" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/machinery/computer/crew, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "ncB" = ( /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/brown{ @@ -46278,7 +46667,7 @@ dir = 4 }, /turf/open/floor/iron, -/area/station/science/circuits) +/area/station/science/explab) "nko" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/right/directional/east{ @@ -46401,6 +46790,13 @@ /area/station/hallway/primary/starboard) "nqJ" = ( /obj/structure/chair, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/secondary/exit) "nqN" = ( @@ -46426,7 +46822,7 @@ "nsn" = ( /obj/structure/cable, /turf/closed/wall/r_wall, -/area/station/engineering/engine_smes) +/area/station/maintenance/port/aft) "nsM" = ( /obj/structure/table/wood, /obj/machinery/chem_dispenser/drinks/beer, @@ -46508,16 +46904,22 @@ /turf/open/floor/plating, /area/station/security/prison) "nwg" = ( -/turf/open/floor/iron/dark/textured_large, -/area/station/maintenance/fore) +/obj/machinery/button/door/directional/south{ + id = "gatewayshutters"; + req_access = list("gateway"); + name = "Gateway Shutters" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "nwJ" = ( -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 8 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 }, -/obj/machinery/vending/modularpc, -/turf/open/floor/iron, -/area/station/hallway/primary/starboard) +/turf/open/floor/iron/dark/textured, +/area/station/science/genetics) "nxx" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -46540,6 +46942,11 @@ /obj/structure/bed/roller, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) +"nxH" = ( +/obj/structure/table, +/obj/machinery/cell_charger, +/turf/open/floor/iron, +/area/station/command/gateway) "nxP" = ( /obj/machinery/door/firedoor, /obj/effect/landmark/event_spawn, @@ -46592,9 +46999,13 @@ /turf/open/floor/plating, /area/station/construction) "nyZ" = ( -/obj/machinery/bluespace_vendor/directional/south, -/turf/open/floor/iron, -/area/station/hallway/primary/starboard) +/obj/machinery/firealarm/directional/south, +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron/white/corner, +/area/station/hallway/secondary/exit) "nzh" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, @@ -46711,6 +47122,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"nDY" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/junction/flip{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard) "nDZ" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/iron, @@ -46809,15 +47229,11 @@ /area/station/maintenance/port/fore) "nHo" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/chair/office/light{ - dir = 4 - }, -/obj/effect/landmark/start/geneticist, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 4 }, -/turf/open/floor/iron/white, -/area/station/science/genetics) +/turf/open/floor/engine, +/area/station/science/explab) "nHu" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -46835,14 +47251,20 @@ /turf/open/floor/carpet, /area/station/command/heads_quarters/hos) "nIe" = ( -/obj/machinery/firealarm/directional/east, -/obj/effect/spawner/random/vending/colavend, /obj/effect/turf_decal/tile/red{ dir = 8 }, /obj/effect/turf_decal/tile/red{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/white/corner, /area/station/hallway/secondary/exit) "nJe" = ( @@ -47165,6 +47587,19 @@ /obj/effect/turf_decal/siding/white, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) +"nVD" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) "nWd" = ( /turf/open/floor/iron/chapel{ dir = 1 @@ -47306,6 +47741,12 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) +"ocM" = ( +/obj/effect/turf_decal/bot, +/obj/structure/closet/crate, +/obj/effect/spawner/random/maintenance/two, +/turf/open/floor/iron, +/area/station/cargo/storage) "ocV" = ( /obj/structure/cable, /obj/machinery/door/firedoor, @@ -47319,11 +47760,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/security/execution/transfer) -"odl" = ( -/obj/machinery/light/small/directional/north, -/obj/effect/spawner/random/structure/crate, -/turf/open/floor/plating, -/area/station/maintenance/starboard) "odp" = ( /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 1 @@ -47340,7 +47776,9 @@ /turf/open/floor/iron/dark, /area/station/maintenance/port/aft) "ofM" = ( -/obj/structure/cable, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk, +/obj/machinery/light/directional/east, /turf/open/floor/iron/white, /area/station/science/lab) "ofT" = ( @@ -47401,10 +47839,11 @@ /turf/open/floor/iron, /area/station/hallway/secondary/exit) "ohV" = ( +/obj/effect/decal/cleanable/dirt, /turf/closed/wall, -/area/station/service/hydroponics/garden/abandoned) +/area/station/maintenance/fore) "oiF" = ( -/obj/effect/spawner/random/maintenance, +/obj/effect/spawner/random/engineering/atmospherics_portable, /turf/open/floor/plating, /area/station/maintenance/fore) "ojq" = ( @@ -47448,7 +47887,14 @@ dir = 4 }, /turf/open/floor/iron, -/area/station/science/circuits) +/area/station/science/explab) +"olX" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "omf" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/broken_floor, @@ -47668,6 +48114,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/mapping_helpers/airlock/access/any/security/brig, +/obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/station/security/office) "ouV" = ( @@ -47692,6 +48139,29 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/security/office) +"ovF" = ( +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) +"ovS" = ( +/obj/structure/table, +/obj/item/paper/pamphlet/gateway{ + pixel_x = 7 + }, +/obj/item/paper/pamphlet/gateway{ + pixel_y = 4; + pixel_x = 7 + }, +/obj/item/paper/pamphlet/gateway{ + pixel_x = -6 + }, +/obj/item/paper/pamphlet/gateway{ + pixel_x = -6; + pixel_y = 3 + }, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/iron, +/area/station/command/gateway) "owa" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/white, @@ -47876,7 +48346,7 @@ /obj/structure/cable, /obj/effect/turf_decal/siding/thinplating/light/corner, /turf/open/floor/iron, -/area/station/science/circuits) +/area/station/science/explab) "oDo" = ( /obj/machinery/door/airlock/maintenance{ name = "Detective Maintenance" @@ -47929,6 +48399,14 @@ /obj/structure/grille, /turf/open/space/basic, /area/space/nearstation) +"oHa" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/hallway/primary/port) "oHk" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -47944,16 +48422,10 @@ /turf/open/floor/plating, /area/station/security/prison/safe) "oHU" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/emcloset, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/requests_console{ - department = "Genetics"; - name = "Genetics Requests Console"; - pixel_y = 30 - }, -/turf/open/floor/iron/dark, -/area/station/science/genetics) +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/science/explab) "oIi" = ( /obj/structure/grille, /obj/structure/window/spawner/directional/north, @@ -47965,6 +48437,18 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/white, /area/station/science/ordnance) +"oIs" = ( +/obj/machinery/door/airlock/command, +/obj/effect/mapping_helpers/airlock/access/any/command/gateway, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "oIB" = ( /obj/machinery/light_switch{ pixel_y = -23 @@ -48007,29 +48491,9 @@ /turf/open/floor/iron/dark, /area/station/security/warden) "oMN" = ( -/obj/effect/turf_decal/siding/purple, -/obj/effect/turf_decal/siding/purple{ - dir = 1 - }, -/obj/effect/turf_decal/siding/purple{ - dir = 4 - }, -/obj/effect/turf_decal/siding/purple{ - dir = 8 - }, -/obj/effect/turf_decal/siding/purple/corner, -/obj/effect/turf_decal/siding/purple/corner{ - dir = 1 - }, -/obj/effect/turf_decal/siding/purple/corner{ - dir = 4 - }, -/obj/effect/turf_decal/siding/purple/corner{ - dir = 8 - }, -/obj/structure/flora/bush/reed/style_random, -/turf/open/floor/grass, -/area/station/science/research) +/obj/effect/spawner/liquids_spawner, +/turf/open/floor/iron/pool, +/area/station/science/breakroom) "oNd" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -48077,6 +48541,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/mapping_helpers/airlock/access/any/security/armory, /obj/structure/cable, +/obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/station/security/warden) "oQe" = ( @@ -48290,8 +48755,9 @@ /turf/open/floor/iron/freezer, /area/station/commons/toilet/locker) "oZy" = ( -/turf/closed/wall, -/area/station/science/cytology) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark/textured, +/area/station/science/breakroom) "oZV" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 9 @@ -48375,6 +48841,10 @@ "pee" = ( /turf/open/floor/iron/showroomfloor, /area/station/security/prison) +"peo" = ( +/obj/structure/railing/corner, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "peL" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -48461,6 +48931,13 @@ /obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/plating, /area/station/engineering/main) +"pht" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/machinery/computer/gateway_control, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "phz" = ( /obj/machinery/vending/wardrobe/law_wardrobe, /obj/machinery/camera/directional/south{ @@ -48669,6 +49146,15 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/commons/storage/primary) +"ppn" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/science/explab) "ppW" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/plating, @@ -48855,12 +49341,18 @@ }, /area/station/science/research) "pxC" = ( -/obj/machinery/dna_scannernew, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 }, -/turf/open/floor/iron/white, -/area/station/science/genetics) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard) "pxV" = ( /obj/structure/cable, /turf/open/floor/plating, @@ -49032,7 +49524,7 @@ /obj/structure/cable, /obj/effect/turf_decal/siding/thinplating/light, /turf/open/floor/iron, -/area/station/science/circuits) +/area/station/science/explab) "pEK" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -49214,18 +49706,8 @@ /turf/open/floor/plating, /area/station/maintenance/port/aft) "pOJ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/open/floor/iron/dark/textured, -/area/station/command/gateway) +/area/station/science/genetics) "pOR" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -49273,7 +49755,7 @@ }, /obj/effect/mapping_helpers/airlock/access/any/science/general, /turf/open/floor/plating, -/area/station/maintenance/starboard/aft) +/area/station/science/cytology) "pQf" = ( /obj/structure/cable, /turf/open/floor/iron, @@ -49373,7 +49855,7 @@ dir = 4 }, /turf/closed/wall, -/area/station/cargo/sorting) +/area/station/maintenance/port) "pVi" = ( /obj/structure/bedsheetbin, /obj/structure/table, @@ -49413,7 +49895,7 @@ /obj/item/compact_remote, /obj/item/compact_remote, /turf/open/floor/iron/white, -/area/station/science/circuits) +/area/station/science/explab) "pXD" = ( /obj/machinery/door/poddoor/shutters{ id = "evashutters"; @@ -49520,11 +50002,28 @@ /turf/open/floor/iron, /area/station/hallway/primary/central) "qbD" = ( -/obj/item/storage/medkit/regular, -/obj/item/paper/pamphlet/gateway, -/obj/structure/table, +/obj/effect/turf_decal/siding/purple{ + dir = 8 + }, +/obj/machinery/light_switch/directional/west{ + pixel_x = -35; + pixel_y = -4 + }, +/obj/machinery/button/door/directional/west{ + id = "gene_desk_shutters"; + name = "Genetics Desk Shutters"; + pixel_y = 6; + req_access = list("genetics") + }, +/obj/machinery/button/door/directional/west{ + id = "gene_shutters"; + name = "Genetics Privacy Shutters"; + pixel_y = -4; + req_access = list("genetics") + }, +/obj/item/kirbyplants/random, /turf/open/floor/iron/dark/textured, -/area/station/command/gateway) +/area/station/science/genetics) "qcC" = ( /obj/structure/sign/warning/pods/directional/east, /obj/effect/turf_decal/stripes/line{ @@ -49537,9 +50036,10 @@ /turf/open/floor/iron/dark, /area/station/security/office) "qcH" = ( -/obj/item/chair, -/turf/open/floor/plating, -/area/station/maintenance/fore) +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/secure_closet/exile, +/turf/open/floor/iron, +/area/station/command/gateway) "qcV" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -49730,6 +50230,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/security/office) +"qiu" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/iron/dark/textured, +/area/station/science/breakroom) "qjL" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -49772,7 +50281,7 @@ /obj/effect/mapping_helpers/airlock/access/any/science/general, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, -/area/station/science/circuits) +/area/station/science/cytology) "qmt" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -49850,13 +50359,11 @@ /turf/open/floor/iron/dark, /area/station/security/processing) "qpM" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ +/obj/effect/turf_decal/stripes/red/line{ dir = 4 }, -/turf/open/floor/iron/white, -/area/station/science/genetics) +/turf/open/floor/engine, +/area/station/science/explab) "qqW" = ( /obj/structure/rack, /obj/machinery/status_display/evac{ @@ -49921,13 +50428,24 @@ /turf/open/floor/iron/dark, /area/station/security/execution/transfer) "qrU" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ +/obj/effect/turf_decal/siding/purple{ dir = 4 }, -/turf/open/floor/iron/dark/textured_edge{ - dir = 8 +/obj/effect/turf_decal/siding/purple{ + dir = 1 }, -/area/station/command/gateway) +/obj/effect/turf_decal/siding/purple, +/obj/effect/turf_decal/siding/purple/corner{ + dir = 4 + }, +/obj/effect/turf_decal/siding/purple/corner, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/sunny/style_random{ + pixel_y = 6; + pixel_x = -16 + }, +/turf/open/floor/grass, +/area/station/science/breakroom) "qsl" = ( /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating, @@ -49978,6 +50496,70 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron/dark/side, /area/station/commons/dorms) +"qve" = ( +/obj/item/clothing/suit/hazardvest{ + desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; + name = "emergency lifejacket" + }, +/obj/item/clothing/suit/hazardvest{ + desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; + name = "emergency lifejacket" + }, +/obj/item/clothing/suit/hazardvest{ + desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; + name = "emergency lifejacket" + }, +/obj/item/clothing/suit/hazardvest{ + desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; + name = "emergency lifejacket" + }, +/obj/item/tank/internals/emergency_oxygen{ + pixel_x = 3 + }, +/obj/item/tank/internals/emergency_oxygen{ + pixel_x = 3 + }, +/obj/item/tank/internals/emergency_oxygen{ + pixel_x = 3 + }, +/obj/item/tank/internals/emergency_oxygen{ + pixel_x = 3 + }, +/obj/item/clothing/mask/breath{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/clothing/mask/breath{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/clothing/mask/breath{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/clothing/mask/breath{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/clothing/head/utility/hardhat/orange{ + name = "protective hat"; + pixel_y = 9 + }, +/obj/item/clothing/head/utility/hardhat/orange{ + name = "protective hat"; + pixel_y = 9 + }, +/obj/item/clothing/head/utility/hardhat/orange{ + name = "protective hat"; + pixel_y = 9 + }, +/obj/item/clothing/head/utility/hardhat/orange{ + name = "protective hat"; + pixel_y = 9 + }, +/obj/structure/closet/crate/internals, +/turf/open/floor/iron, +/area/station/command/gateway) "qvC" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -50040,6 +50622,7 @@ /obj/effect/mapping_helpers/airlock/access/any/security/brig, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, +/obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/station/security/interrogation) "qzU" = ( @@ -50347,6 +50930,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply, /turf/open/floor/plating, /area/station/maintenance/port) +"qMR" = ( +/obj/structure/extinguisher_cabinet/directional/north, +/turf/open/floor/iron, +/area/station/hallway/primary/port) "qMW" = ( /obj/machinery/hydroponics/constructable, /turf/open/misc/dirt/planet, @@ -50389,19 +50976,14 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "qOQ" = ( -/obj/structure/table/glass, -/obj/item/stock_parts/matter_bin, -/obj/item/stock_parts/matter_bin, -/obj/item/stock_parts/scanning_module{ - pixel_x = 2; - pixel_y = 3 +/obj/structure/plasticflaps/opaque, +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=8"; + location = "Research Division" }, -/obj/item/stock_parts/scanning_module, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable, -/obj/machinery/light/directional/east, -/turf/open/floor/iron/white, -/area/station/science/lab) +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/dark/textured, +/area/station/maintenance/starboard) "qPm" = ( /obj/structure/table/glass, /obj/item/storage/fancy/candle_box, @@ -50578,10 +51160,11 @@ /turf/open/floor/catwalk_floor, /area/station/engineering/main) "qWN" = ( -/obj/effect/spawner/random/entertainment/arcade, /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/structure/closet/emcloset, +/obj/effect/landmark/start/hangover/closet, /turf/open/floor/iron/white/corner, /area/station/hallway/secondary/exit) "qWV" = ( @@ -50935,6 +51518,14 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +"ril" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "riN" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/structure/cable, @@ -51426,15 +52017,19 @@ /turf/open/floor/iron, /area/station/construction/mining/aux_base) "rHV" = ( -/obj/machinery/computer/scan_consolenew{ - dir = 1 +/obj/machinery/door/window/left/directional/west{ + name = "Maximum Security Test Chamber"; + req_access = list("science") }, -/obj/machinery/button/door/directional/south{ - id = "genShutters"; - name = "Genetics Shutter Control" +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 }, -/turf/open/floor/iron/white, -/area/station/science/genetics) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/science/explab) "rIe" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/corner, @@ -51571,7 +52166,7 @@ dir = 4 }, /turf/closed/wall/r_wall, -/area/station/science/ordnance/burnchamber) +/area/station/maintenance/starboard/aft) "rOo" = ( /obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden, /turf/closed/wall, @@ -51582,8 +52177,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 6 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron, -/area/station/science/circuits) +/area/station/science/explab) "rPi" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/red/filled/warning, @@ -51611,6 +52207,12 @@ "rQR" = ( /turf/closed/wall, /area/station/commons/fitness) +"rQU" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "rSv" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/dark_blue/filled/warning{ @@ -51751,9 +52353,13 @@ /turf/open/floor/iron/dark, /area/station/security/checkpoint/medical) "rYG" = ( -/obj/structure/chair/stool/directional/west, -/turf/open/floor/plating, -/area/station/maintenance/fore) +/turf/closed/wall/r_wall, +/area/station/command/gateway) +"rYS" = ( +/obj/effect/turf_decal/bot, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/cargo/storage) "rYV" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/dark_blue/filled/line{ @@ -51903,6 +52509,13 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron, /area/station/security/prison) +"sgk" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/machinery/status_display/evac/directional/east, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "sgA" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -51959,20 +52572,12 @@ /turf/open/floor/plating, /area/station/maintenance/aft) "sjr" = ( -/obj/effect/turf_decal/siding/wideplating/dark{ - dir = 1 - }, -/obj/structure/railing, -/obj/effect/turf_decal/siding/purple, -/obj/structure/table/glass, -/obj/machinery/light/directional/west, -/obj/machinery/fax{ - fax_name = "Research Division"; - name = "Research Division Fax Machine"; - pixel_x = 1 +/obj/effect/turf_decal/siding/purple{ + dir = 4 }, -/turf/open/floor/iron/textured_large, -/area/station/science/research) +/obj/machinery/airalarm/directional/east, +/turf/open/floor/iron/dark/textured, +/area/station/science/genetics) "sjK" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -52210,6 +52815,14 @@ /obj/effect/decal/cleanable/cobweb, /turf/closed/wall/r_wall, /area/station/science/xenobiology) +"stu" = ( +/obj/effect/turf_decal/bot_white/left, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured_large, +/area/station/command/gateway) "stP" = ( /obj/structure/disposalpipe/trunk{ dir = 4 @@ -52241,22 +52854,6 @@ /obj/item/shovel, /turf/open/floor/grass, /area/station/service/hydroponics/garden/abandoned) -"suU" = ( -/obj/effect/turf_decal/siding/wideplating/dark{ - dir = 1 - }, -/obj/structure/railing, -/obj/effect/turf_decal/siding/purple, -/obj/structure/table/glass, -/obj/item/experi_scanner{ - pixel_x = -4 - }, -/obj/item/experi_scanner, -/obj/item/experi_scanner{ - pixel_x = 4 - }, -/turf/open/floor/iron/textured_large, -/area/station/science/research) "sve" = ( /obj/machinery/light/directional/north, /obj/effect/turf_decal/tile/red{ @@ -52276,6 +52873,16 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/central) +"swD" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/railing{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "swH" = ( /obj/effect/spawner/structure/window, /obj/structure/curtain/cloth/fancy/mechanical{ @@ -52297,6 +52904,14 @@ /obj/item/radio/intercom/prison/directional/south, /turf/open/floor/iron/dark/side, /area/station/security/prison) +"sxi" = ( +/obj/structure/closet/crate/medical, +/obj/item/storage/medkit/brute, +/obj/item/storage/medkit/fire, +/obj/item/storage/medkit/regular, +/obj/item/storage/medkit/regular, +/turf/open/floor/iron, +/area/station/command/gateway) "sxl" = ( /obj/structure/rack, /turf/open/floor/plating, @@ -52322,6 +52937,10 @@ }, /turf/open/floor/iron/smooth_large, /area/station/service/hydroponics) +"syU" = ( +/obj/structure/railing, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "szO" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/effect/turf_decal/stripes/line{ @@ -52348,22 +52967,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"sBx" = ( -/obj/structure/table/glass, -/obj/item/storage/pill_bottle/mutadone{ - pixel_x = 11; - pixel_y = 7 - }, -/obj/item/folder/white{ - pixel_x = 2 - }, -/obj/item/reagent_containers/spray/cleaner, -/obj/item/radio/headset/headset_medsci{ - pixel_y = 7; - pixel_x = -6 - }, -/turf/open/floor/iron/white, -/area/station/science/genetics) "sBZ" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -52424,14 +53027,18 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) "sEX" = ( +/obj/effect/turf_decal/siding/purple/corner, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/tile/red{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 }, -/turf/open/floor/iron, -/area/station/hallway/secondary/exit) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured, +/area/station/science/genetics) "sFb" = ( /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 9 @@ -52506,7 +53113,7 @@ dir = 4 }, /turf/open/floor/catwalk_floor/iron, -/area/station/science/circuits) +/area/station/science/explab) "sHn" = ( /turf/open/floor/plating, /area/station/cargo/drone_bay) @@ -52518,6 +53125,9 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ cycle_id = "dock3" }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 8 + }, /turf/open/floor/plating, /area/station/hallway/secondary/entry) "sHX" = ( @@ -52591,6 +53201,11 @@ /obj/machinery/power/port_gen/pacman, /turf/open/floor/plating, /area/station/maintenance/department/electrical) +"sKq" = ( +/obj/structure/railing, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "sKS" = ( /obj/effect/turf_decal/tile/red{ dir = 4 @@ -52622,13 +53237,12 @@ /turf/open/floor/iron/kitchen, /area/station/security/prison) "sLi" = ( -/obj/structure/closet/emcloset, -/obj/effect/landmark/start/hangover/closet, /obj/effect/turf_decal/tile/red{ dir = 8 }, -/obj/item/radio/intercom/directional/south, -/turf/open/floor/iron/white/corner, +/obj/effect/landmark/start/hangover/closet, +/obj/structure/closet/firecloset, +/turf/open/floor/iron/cafeteria, /area/station/hallway/secondary/exit) "sLm" = ( /obj/structure/cable, @@ -52729,15 +53343,9 @@ /area/station/engineering/gravity_generator) "sOL" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/window/reinforced/spawner/directional/west, -/obj/structure/window/reinforced/spawner/directional/north, -/mob/living/carbon/human/species/monkey, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/obj/machinery/light/directional/south, +/obj/effect/turf_decal/stripes/red/line, /turf/open/floor/engine, -/area/station/science/genetics) +/area/station/science/explab) "sOP" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/effect/landmark/start/hangover, @@ -52848,6 +53456,23 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) +"sVP" = ( +/obj/structure/table, +/obj/item/radio/off{ + pixel_y = 6 + }, +/obj/item/radio/off{ + pixel_x = 6; + pixel_y = 4 + }, +/obj/item/radio/off{ + pixel_x = -6; + pixel_y = 4 + }, +/obj/item/radio/off, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/iron, +/area/station/command/gateway) "sVZ" = ( /obj/effect/landmark/event_spawn, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, @@ -52934,17 +53559,9 @@ /turf/open/floor/wood, /area/station/service/lawoffice) "taM" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/cable, -/obj/effect/turf_decal/tile/purple/half{ - dir = 8 - }, -/turf/open/floor/iron/dark/textured_edge{ - dir = 8 - }, -/area/station/command/gateway) +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron/white, +/area/station/science/lab) "taR" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -52955,13 +53572,11 @@ /turf/open/floor/iron, /area/station/science/ordnance) "tbd" = ( -/obj/machinery/airalarm/directional/north, -/obj/machinery/camera/directional/north{ - c_tag = "Genetics Lab"; - network = list("ss13","rd") +/obj/effect/turf_decal/stripes/red/line{ + dir = 6 }, -/turf/open/floor/iron/white, -/area/station/science/genetics) +/turf/open/floor/engine, +/area/station/science/explab) "tbr" = ( /obj/item/reagent_containers/cup/beaker, /turf/open/floor/plating, @@ -53073,29 +53688,22 @@ /turf/open/floor/wood, /area/station/security/prison) "tgl" = ( -/obj/effect/turf_decal/siding/purple, -/obj/effect/turf_decal/siding/purple{ - dir = 1 - }, -/obj/effect/turf_decal/siding/purple{ - dir = 4 - }, /obj/effect/turf_decal/siding/purple{ dir = 8 }, -/obj/effect/turf_decal/siding/purple/corner, -/obj/effect/turf_decal/siding/purple/corner{ +/obj/effect/turf_decal/siding/purple{ dir = 1 }, +/obj/effect/turf_decal/siding/purple, /obj/effect/turf_decal/siding/purple/corner{ - dir = 4 + dir = 1 }, /obj/effect/turf_decal/siding/purple/corner{ dir = 8 }, /obj/structure/flora/bush/flowers_br/style_random, /turf/open/floor/grass, -/area/station/science/research) +/area/station/science/breakroom) "tgp" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/white/smooth_large, @@ -53251,12 +53859,12 @@ /turf/closed/wall/r_wall, /area/station/science/ordnance/burnchamber) "toF" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/white, -/area/station/science/genetics) +/obj/effect/turf_decal/stripes/red/line{ + dir = 8 + }, +/turf/open/floor/engine, +/area/station/science/explab) "toL" = ( /obj/structure/sink/kitchen/directional/west, /obj/effect/decal/cleanable/dirt, @@ -53268,7 +53876,7 @@ "tpq" = ( /obj/effect/decal/cleanable/dirt, /turf/closed/wall/r_wall, -/area/station/science/genetics) +/area/station/science/cytology) "tpv" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -53291,7 +53899,9 @@ /obj/machinery/cryopod{ dir = 1 }, -/obj/machinery/camera/directional/south, +/obj/machinery/camera/directional/south{ + c_tag = "Cryopods" + }, /turf/open/floor/iron/dark, /area/station/common/cryopods) "tqp" = ( @@ -53435,12 +54045,28 @@ /turf/open/floor/wood, /area/station/hallway/secondary/service) "tvl" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/structure/table/reinforced, +/obj/machinery/door/window/right/directional/south{ + name = "Research and Development Desk"; + req_access = list("science") }, -/obj/machinery/rnd/production/protolathe/department/science, -/turf/open/floor/iron, -/area/station/science/lab) +/obj/machinery/door/firedoor, +/obj/structure/desk_bell{ + pixel_x = 7 + }, +/obj/item/paper_bin{ + pixel_x = -9; + pixel_y = 7 + }, +/obj/item/pen{ + pixel_x = -6 + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "rnd"; + name = "Research Lab Shutters" + }, +/turf/open/floor/plating, +/area/station/hallway/primary/starboard) "tvo" = ( /obj/structure/fence, /obj/machinery/door/poddoor/shutters/preopen{ @@ -53617,7 +54243,7 @@ }, /obj/structure/cable, /turf/open/floor/iron, -/area/station/science/circuits) +/area/station/science/explab) "tDC" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -53662,6 +54288,12 @@ dir = 1 }, /area/station/hallway/primary/central) +"tFG" = ( +/obj/effect/turf_decal/bot, +/obj/structure/closet/crate/preopen, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/iron, +/area/station/cargo/storage) "tGv" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -53926,7 +54558,7 @@ }, /obj/item/stock_parts/cell/high, /turf/open/floor/iron/white, -/area/station/science/circuits) +/area/station/science/explab) "tQk" = ( /obj/machinery/camera/directional/north{ c_tag = "Auxiliary Tool Storage" @@ -54078,7 +54710,17 @@ "tVK" = ( /obj/structure/sign/warning/electric_shock, /turf/closed/wall, -/area/station/maintenance/department/electrical) +/area/station/maintenance/starboard/fore) +"tXu" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) "tXK" = ( /obj/structure/table, /obj/structure/window/reinforced/tinted/spawner/directional/east, @@ -54209,6 +54851,16 @@ }, /turf/open/floor/iron/dark, /area/station/security/warden) +"udy" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/port) "udE" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -54340,9 +54992,12 @@ /turf/open/floor/plating, /area/station/maintenance/fore) "ulo" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/white, -/area/station/science/genetics) +/obj/structure/chair/sofa/corp/right{ + dir = 8 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/dark/textured, +/area/station/science/breakroom) "ulw" = ( /turf/open/floor/wood, /area/station/security/prison) @@ -54355,6 +55010,7 @@ name = "Evidence Storage" }, /obj/effect/mapping_helpers/airlock/access/any/security/brig, +/obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/station/security/brig) "umk" = ( @@ -54366,11 +55022,11 @@ /turf/open/floor/iron/dark, /area/station/security/brig) "umu" = ( -/obj/effect/turf_decal/siding/thinplating/dark/corner{ - dir = 8 - }, -/turf/open/floor/plating, -/area/station/maintenance/fore) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark/smooth_large, +/area/station/science/breakroom) "umx" = ( /obj/structure/chair/sofa/right/brown, /obj/item/toy/plush/moth{ @@ -54507,7 +55163,7 @@ dir = 4 }, /turf/open/floor/iron/white, -/area/station/science/circuits) +/area/station/science/explab) "uvC" = ( /obj/machinery/light/directional/west, /turf/open/floor/iron/recharge_floor, @@ -54520,17 +55176,10 @@ /turf/open/floor/iron/smooth_large, /area/station/engineering/gravity_generator) "uvX" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/window/right/directional/south{ - name = "Research and Development Desk"; - req_access = list("science") - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "rnd"; - name = "Research Lab Shutters" - }, -/obj/machinery/door/firedoor, -/turf/open/floor/plating, +/obj/structure/chair/stool/directional/west, +/obj/effect/decal/cleanable/oil/slippery, +/obj/effect/landmark/start/scientist, +/turf/open/floor/iron/checker, /area/station/science/lab) "uvZ" = ( /obj/machinery/door/window/brigdoor/security/cell{ @@ -54637,29 +55286,12 @@ /turf/open/floor/iron, /area/station/service/hydroponics) "uzl" = ( -/obj/effect/turf_decal/siding/purple, -/obj/effect/turf_decal/siding/purple{ - dir = 1 - }, -/obj/effect/turf_decal/siding/purple{ - dir = 4 - }, -/obj/effect/turf_decal/siding/purple{ - dir = 8 - }, -/obj/effect/turf_decal/siding/purple/corner, -/obj/effect/turf_decal/siding/purple/corner{ - dir = 1 - }, -/obj/effect/turf_decal/siding/purple/corner{ - dir = 4 - }, -/obj/effect/turf_decal/siding/purple/corner{ - dir = 8 +/obj/structure/railing{ + dir = 8; + pixel_x = -5 }, -/obj/structure/flora/bush/flowers_yw/style_random, -/turf/open/floor/grass, -/area/station/science/research) +/turf/open/floor/iron/dark/textured, +/area/station/science/breakroom) "uzr" = ( /obj/item/kirbyplants/random, /turf/open/floor/iron/dark/textured_large, @@ -54700,12 +55332,12 @@ /obj/structure/cable, /obj/effect/landmark/blobstart, /turf/open/floor/iron, -/area/station/science/circuits) +/area/station/science/explab) "uCO" = ( /obj/machinery/light/directional/south, /obj/effect/spawner/liquids_spawner, /turf/open/floor/iron/pool, -/area/station/science/research) +/area/station/science/breakroom) "uDy" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ @@ -54738,11 +55370,11 @@ /turf/open/floor/plating, /area/station/maintenance/department/electrical) "uEB" = ( -/obj/structure/closet/emcloset, -/obj/effect/landmark/start/hangover/closet, /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/effect/landmark/start/hangover/closet, +/obj/structure/closet/emcloset, /turf/open/floor/iron/white/corner, /area/station/hallway/secondary/exit) "uES" = ( @@ -54803,28 +55435,27 @@ /turf/open/floor/iron, /area/station/science/cytology) "uHA" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/button/door{ - id = "stationawaygate"; - name = "Gateway Access Shutter Control"; - pixel_y = 24; - req_access = list("gateway") - }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/table/glass, +/obj/machinery/fax{ + fax_name = "Research Division"; + name = "Research Division Fax Machine"; + pixel_x = 1 }, +/obj/machinery/airalarm/directional/south, +/obj/machinery/light/directional/south, /turf/open/floor/iron/dark/textured, -/area/station/command/gateway) +/area/station/science/breakroom) "uIv" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 10 + }, +/obj/structure/cable, /turf/open/floor/iron/white, /area/station/science/research) "uIQ" = ( @@ -55002,11 +55633,15 @@ /turf/open/floor/iron/smooth_large, /area/station/engineering/main) "uTf" = ( -/obj/structure/closet/firecloset{ - welded = 1 +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 }, -/turf/open/floor/plating, -/area/station/maintenance/fore) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/science/explab) "uTo" = ( /obj/structure/table, /obj/item/stack/license_plates/empty/fifty, @@ -55128,6 +55763,12 @@ /obj/effect/spawner/random/clothing/gloves, /turf/open/floor/plating, /area/station/security/prison/safe) +"uWI" = ( +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "uXt" = ( /obj/machinery/door/airlock/mining{ name = "Mining Dock" @@ -55219,6 +55860,7 @@ name = "Interrogation" }, /obj/effect/mapping_helpers/airlock/access/any/security/brig, +/obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/station/security/interrogation) "vbw" = ( @@ -55244,6 +55886,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"vcg" = ( +/turf/open/floor/iron/dark, +/area/station/science/breakroom) "vci" = ( /obj/structure/table/wood, /turf/open/floor/wood, @@ -55253,22 +55898,6 @@ /obj/effect/turf_decal/siding/wood/end, /turf/open/floor/iron/dark/textured_large, /area/station/service/library) -"vdl" = ( -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 4 - }, -/obj/machinery/firealarm/directional/north, -/turf/open/floor/iron/white/side{ - dir = 8 - }, -/area/station/science/research) "ves" = ( /obj/structure/cable, /obj/effect/landmark/start/depsec/medical, @@ -55288,6 +55917,18 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/medical/surgery/fore) +"vfD" = ( +/obj/structure/table, +/obj/machinery/button/door{ + id = "experilab"; + name = "Chamber Shutters" + }, +/obj/machinery/computer/security/telescreen{ + pixel_y = 32; + network = list("test") + }, +/turf/open/floor/iron, +/area/station/science/explab) "vfR" = ( /obj/effect/turf_decal/siding/thinplating{ dir = 1 @@ -55549,18 +56190,18 @@ /turf/open/floor/iron, /area/station/commons/locker) "vqI" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ +/obj/effect/turf_decal/siding/purple{ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 }, -/turf/open/floor/plating, -/area/station/maintenance/starboard) +/obj/machinery/camera/directional/east{ + c_tag = "Genetics North" + }, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron/dark/textured, +/area/station/science/genetics) "vsA" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ @@ -55648,14 +56289,11 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "vxx" = ( -/obj/machinery/requests_console/directional/east{ - department = "Gateway"; - name = "Gateway Requests Console" +/obj/effect/turf_decal/tile/purple{ + dir = 8 }, -/obj/effect/mapping_helpers/requests_console/ore_update, -/obj/effect/mapping_helpers/requests_console/supplies, -/turf/open/floor/iron/dark/textured, -/area/station/command/gateway) +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) "vxy" = ( /obj/structure/table/reinforced, /obj/item/flashlight{ @@ -55689,13 +56327,11 @@ /area/station/security/prison) "vyk" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/window/reinforced/spawner/directional/north, -/mob/living/carbon/human/species/monkey, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 +/obj/effect/turf_decal/stripes/red/line{ + dir = 9 }, /turf/open/floor/engine, -/area/station/science/genetics) +/area/station/science/explab) "vyO" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/carpet, @@ -55732,14 +56368,21 @@ /turf/open/floor/wood, /area/command/heads_quarters/captain/private/nt_rep) "vAk" = ( -/obj/machinery/door/window/left/directional/west{ - dir = 1; - name = "Monkey Pen"; - req_access = list("genetics") +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 }, -/mob/living/carbon/human/species/monkey, -/turf/open/floor/engine, -/area/station/science/genetics) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron/white/corner, +/area/station/hallway/secondary/exit) "vAv" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -55767,13 +56410,23 @@ /turf/open/floor/iron/cafeteria, /area/station/security/prison) "vAW" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 4 +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "experilab"; + name = "Experimentation Chamber Lockdown" }, -/turf/open/floor/wood, -/area/blueshield) +/turf/open/floor/plating, +/area/station/science/explab) +"vBb" = ( +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/machinery/light/directional/east, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "vBc" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, @@ -55940,23 +56593,16 @@ /turf/open/floor/iron, /area/station/hallway/primary/central) "vGb" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/door/firedoor/heavy, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 4 - }, -/obj/machinery/door/airlock/research{ - name = "Gateway Access" +/obj/machinery/dna_scannernew, +/obj/effect/turf_decal/siding/purple{ + dir = 8 }, -/obj/effect/mapping_helpers/airlock/access/any/command/gateway, -/obj/effect/landmark/navigate_destination/gateway, /turf/open/floor/iron/dark/textured, +/area/station/science/genetics) +"vGe" = ( +/obj/effect/turf_decal/bot_white/right, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark/textured_large, /area/station/command/gateway) "vGg" = ( /obj/machinery/holopad, @@ -56061,7 +56707,7 @@ "vHt" = ( /obj/structure/closet/l3closet/scientist, /turf/open/floor/iron, -/area/station/science/circuits) +/area/station/science/explab) "vHB" = ( /obj/machinery/door/window/left/directional/west{ name = "Janitorial Delivery"; @@ -56128,6 +56774,10 @@ "vKD" = ( /turf/open/floor/carpet, /area/station/commons/vacant_room/office) +"vLn" = ( +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/plating, +/area/station/maintenance/fore) "vLr" = ( /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 8 @@ -56203,18 +56853,25 @@ /turf/open/floor/iron/dark/textured_large, /area/station/maintenance/fore) "vOZ" = ( +/mob/living/carbon/human/species/monkey, +/turf/open/floor/grass, +/area/station/science/genetics) +"vPt" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 }, -/obj/machinery/light/directional/east, -/turf/open/floor/iron/dark/textured, -/area/station/command/gateway) -"vPt" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, /obj/structure/cable, -/turf/open/floor/iron/dark/textured_edge{ - dir = 1 +/obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/maintenance{ + name = "Genetics Lab Maintenance" }, -/area/station/command/gateway) +/obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/any/science/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/starboard) "vPx" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -56349,16 +57006,23 @@ /turf/open/floor/iron/dark, /area/station/cargo/drone_bay) "vWX" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Genetics Lab Maintenance" +/obj/effect/decal/cleanable/dirt, +/obj/item/circuitboard/machine/experimentor, +/obj/structure/closet/crate{ + name = "E.X.P.E.R.I-MENTOR Supply Crate" }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 4 +/obj/item/stock_parts/scanning_module, +/obj/item/stock_parts/micro_laser, +/obj/item/stock_parts/micro_laser, +/obj/item/stock_parts/servo, +/obj/item/stock_parts/servo, +/obj/item/stack/sheet/iron/five, +/obj/item/stack/cable_coil, +/obj/effect/turf_decal/stripes/line{ + dir = 10 }, -/obj/effect/mapping_helpers/airlock/access/any/science/genetics, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/science/genetics) +/turf/open/floor/iron/dark, +/area/station/science/explab) "vXe" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ @@ -56487,9 +57151,13 @@ /area/station/security/execution/transfer) "wem" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/turf/open/floor/iron/white, -/area/station/science/genetics) +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/fore) "weA" = ( /obj/effect/turf_decal/bot_red, /obj/machinery/airalarm/directional/east, @@ -56506,6 +57174,20 @@ /obj/item/gun/grenadelauncher, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) +"weD" = ( +/obj/machinery/door/airlock/command, +/obj/effect/mapping_helpers/airlock/access/any/command/gateway, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/landmark/navigate_destination/gateway, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "weJ" = ( /obj/structure/closet/secure_closet/chief_medical, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -56604,16 +57286,9 @@ /turf/open/floor/iron, /area/station/maintenance/starboard/fore) "wgE" = ( -/obj/effect/turf_decal/siding/wideplating/dark{ - dir = 1 - }, -/obj/effect/turf_decal/siding/purple, -/obj/structure/railing, -/obj/machinery/computer/department_orders/science{ - dir = 1 - }, -/turf/open/floor/iron/textured_large, -/area/station/science/research) +/obj/machinery/vending/cigarette, +/turf/open/floor/iron/dark/textured, +/area/station/science/breakroom) "wgU" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -56693,10 +57368,6 @@ /area/station/service/hydroponics/garden) "wkN" = ( /obj/effect/spawner/structure/window, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "rnd2"; - name = "Research Lab Shutters" - }, /turf/open/floor/plating, /area/station/science/research) "wlB" = ( @@ -56732,12 +57403,14 @@ "wns" = ( /obj/structure/sign/painting/large/library, /turf/closed/wall, -/area/station/service/library) +/area/station/maintenance/starboard/fore) "wnD" = ( -/obj/structure/reagent_dispensers/watertank, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark/textured_large, -/area/station/maintenance/fore) +/obj/effect/turf_decal/stripes/red/line{ + dir = 5 + }, +/turf/open/floor/engine, +/area/station/science/explab) "wnG" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -56971,11 +57644,10 @@ /turf/open/floor/iron/dark, /area/station/security/execution/transfer) "wzU" = ( -/obj/machinery/modular_computer/preset/civilian{ - dir = 8 - }, -/turf/open/floor/plating, -/area/station/maintenance/fore) +/obj/structure/table/wood, +/obj/effect/spawner/random/food_or_drink/snack, +/turf/open/floor/iron/dark/textured, +/area/station/science/breakroom) "wzW" = ( /obj/effect/turf_decal/box, /obj/structure/closet/crate, @@ -57005,6 +57677,10 @@ /obj/item/radio/intercom/directional/north, /turf/open/floor/iron, /area/station/hallway/primary/central) +"wAX" = ( +/obj/structure/cable, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "wBd" = ( /obj/effect/turf_decal/siding/brown{ dir = 1 @@ -57158,16 +57834,13 @@ /turf/open/floor/iron/smooth_large, /area/station/engineering/gravity_generator) "wIk" = ( -/obj/effect/turf_decal/siding/wideplating/dark{ - dir = 1 - }, -/obj/effect/turf_decal/siding/purple, -/obj/machinery/modular_computer/preset/cargochat/science{ - dir = 1 +/obj/effect/spawner/structure/window, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "rnd2"; + name = "Research Lab Shutters" }, -/obj/structure/railing, -/turf/open/floor/iron/textured_large, -/area/station/science/research) +/turf/open/floor/plating, +/area/station/science/lab) "wIx" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, @@ -57236,11 +57909,27 @@ /turf/open/floor/iron/white, /area/station/science/ordnance) "wJU" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 4 +/obj/effect/turf_decal/siding/purple, +/obj/structure/table, +/obj/item/storage/box/monkeycubes{ + pixel_x = 6; + pixel_y = 9 + }, +/obj/item/storage/box/monkeycubes{ + pixel_x = 7; + pixel_y = -1 + }, +/obj/item/storage/box/bodybags{ + pixel_x = -7; + pixel_y = 8 + }, +/obj/item/storage/box/disks{ + pixel_x = -7; + pixel_y = -2 }, +/obj/machinery/newscaster/directional/south, /turf/open/floor/iron/dark/textured, -/area/station/command/gateway) +/area/station/science/genetics) "wKl" = ( /obj/structure/cable, /obj/machinery/camera{ @@ -57373,6 +58062,12 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit) +"wPN" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "wQc" = ( /obj/structure/table/reinforced, /obj/item/wrench, @@ -57620,6 +58315,13 @@ /area/station/maintenance/abandon_cafeteria) "wZy" = ( /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 10 + }, +/obj/structure/cable, /turf/open/floor/iron/white, /area/station/science/research) "wZQ" = ( @@ -57664,6 +58366,15 @@ }, /turf/open/floor/iron/dark, /area/station/security/office) +"xbO" = ( +/obj/effect/turf_decal/bot_white, +/obj/structure/cable, +/obj/effect/decal/cleanable/greenglow, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured_large, +/area/station/command/gateway) "xcn" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/decal/cleanable/dirt, @@ -57704,6 +58415,15 @@ /obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/iron/dark, /area/station/commons/fitness) +"xeh" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "xey" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -57848,6 +58568,11 @@ /obj/item/storage/crayons, /turf/open/floor/wood, /area/station/security/prison) +"xhQ" = ( +/obj/machinery/door/airlock/command, +/obj/effect/mapping_helpers/airlock/access/any/cent_com/rep_door, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "xhV" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ @@ -58256,6 +58981,9 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ cycle_id = "dock3" }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 8 + }, /turf/open/floor/plating, /area/station/hallway/secondary/entry) "xzV" = ( @@ -58327,9 +59055,12 @@ /turf/open/floor/iron, /area/station/security/office) "xEM" = ( -/obj/effect/spawner/liquids_spawner, -/turf/open/floor/iron/pool, -/area/station/science/research) +/obj/item/kirbyplants/random, +/obj/machinery/camera/directional/north{ + c_tag = "Science Break Room West" + }, +/turf/open/floor/iron/dark/textured, +/area/station/science/breakroom) "xFt" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -58405,11 +59136,11 @@ /turf/open/floor/iron/dark, /area/station/maintenance/port/fore) "xIY" = ( -/obj/machinery/door/airlock/maintenance{ - name = "DOOMSDAY PREPPER ZONE KEEPPP OUT" +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 }, -/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, -/obj/effect/mapping_helpers/airlock/unres, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/fore) "xJe" = ( @@ -58479,8 +59210,14 @@ /turf/open/floor/plating, /area/station/maintenance/department/electrical) "xKN" = ( -/turf/closed/wall/r_wall, -/area/station/command/gateway) +/obj/effect/turf_decal/siding/purple{ + dir = 8 + }, +/obj/structure/closet/secure_closet/personal/patient{ + name = "test subject's closet" + }, +/turf/open/floor/iron/dark/textured, +/area/station/science/genetics) "xKO" = ( /obj/structure/cable, /turf/open/floor/wood, @@ -58665,11 +59402,13 @@ /turf/open/floor/iron/dark, /area/station/science/ordnance/freezerchamber) "xQe" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "rnd"; + name = "Research Lab Shutters" }, -/turf/open/floor/iron, -/area/station/science/lab) +/turf/open/floor/plating, +/area/station/hallway/primary/starboard) "xQg" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster/random/directional/east, @@ -58800,8 +59539,12 @@ /turf/open/floor/iron, /area/station/service/hydroponics/garden) "xUT" = ( -/turf/open/floor/iron/stairs/right, -/area/station/command/gateway) +/obj/structure/disposalpipe/sorting/mail{ + dir = 1 + }, +/obj/effect/mapping_helpers/mail_sorting/science/genetics, +/turf/open/floor/iron/white, +/area/station/science/lab) "xVA" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -58869,11 +59612,8 @@ /turf/open/floor/plating, /area/station/engineering/gravity_generator) "xXe" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/iron/dark/textured, -/area/station/command/gateway) +/turf/open/floor/grass, +/area/station/science/genetics) "xXl" = ( /obj/structure/chair/sofa/middle/brown{ dir = 1 @@ -59178,14 +59918,12 @@ /area/station/medical/medbay/lobby) "yiW" = ( /obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/effect/turf_decal/siding/purple{ + dir = 5 }, -/turf/open/floor/iron/dark, -/area/station/science/research) +/obj/structure/disposalpipe/trunk, +/turf/open/floor/iron/dark/textured, +/area/station/science/genetics) "ykf" = ( /obj/structure/table/wood, /obj/item/toy/nuke, @@ -68638,7 +69376,7 @@ awZ ayk aPv auP -gfa +eEw uRx xzh xzh @@ -70694,7 +71432,7 @@ aAH aOh aPv auP -gfa +eEw uRx xzh xzh @@ -70702,7 +71440,7 @@ xzh xzh xzh uRx -aPv +ave auP fUa jly @@ -71709,15 +72447,15 @@ xzh alU alU alU -apJ -apJ -apJ -apJ -apJ -apJ -apJ -apJ -apJ +alU +alU +alU +alU +alU +alU +alU +alU +alU aCp aFN atP @@ -72227,11 +72965,11 @@ alU akF amC aol -aBI -aBI -aBI -aBI -aBI +alU +alU +alU +alU +alU aKj aLw asE @@ -72498,7 +73236,7 @@ auP auP auP asE -aOk +nVD ayl czK srx @@ -72741,7 +73479,7 @@ alU ank alU alU -aBI +alU atX aHu tux @@ -72998,7 +73736,7 @@ bvv aKY axe ays -aBI +alU auq aHz dvD @@ -73255,7 +73993,7 @@ auX avS bvN aKY -aBI +alU auV aHz lif @@ -73512,7 +74250,7 @@ auZ bsU axf bVA -aBI +alU avv aHz iZi @@ -73769,7 +74507,7 @@ auY bvN bvN ayt -aBI +alU aDa gYm tkd @@ -74026,13 +74764,13 @@ ava bvO axg ayu -azF +alU azF azF azF azF aKl -lHg +aLA asE auP auP @@ -74040,7 +74778,7 @@ auP auP auP asE -aSd +aSe ayl czK srx @@ -74278,18 +75016,18 @@ alU aiP alU jXl -azF -azF -azF -azF -azF -azF +alU +alU +alU +alU +alU +alU aDg vIU aIP azF fwA -aLA +lHg asE asE awW @@ -74297,7 +75035,7 @@ awW awW asE asE -aSe +aSd mbz czK aUQ @@ -74535,7 +75273,7 @@ ali aiR amC aol -azF +alU aAS aRo vks @@ -74792,7 +75530,7 @@ ali ajw amC aol -azF +alU aAT fFQ fFQ @@ -75306,7 +76044,7 @@ apP ajw amC aol -azF +alU bbV miW miW @@ -75563,7 +76301,7 @@ aol ajK aol aol -azF +alU koe wkI mbo @@ -75820,12 +76558,12 @@ anJ aFJ apD aol -azF -azF -azF -azF -azF -azF +alU +alU +alU +alU +alU +alU aAP iHT aAQ @@ -76082,8 +76820,8 @@ aol aol aol aol -azF -azF +alU +alU azF azF aEL @@ -76341,7 +77079,7 @@ alU aol aol aAV -aBQ +alU aDh aDo aFQ @@ -76855,7 +77593,7 @@ aKY ayx alU asK -aBQ +alU nux aDo aFY @@ -77112,7 +77850,7 @@ aKY qBw alU asK -aBQ +alU seq bxk aFS @@ -77369,7 +78107,7 @@ axj uOx alU asK -aBQ +alU ndr aDo asZ @@ -77395,7 +78133,7 @@ pzP nCT bhR bgw -aZE +aPz blY aFn blW @@ -77626,7 +78364,7 @@ nGy cYt alU asK -aBQ +alU pOe aDo asZ @@ -77652,7 +78390,7 @@ hSw iRI aPz bgw -aZE +aPz ajb aCx boJ @@ -77883,7 +78621,7 @@ tKe wos alU asK -aBQ +alU ozM aDo asZ @@ -77909,10 +78647,10 @@ aPz aPz aPz bgw -aZE +aPz ajF ofT -ofT +mEI bps ofT ofT @@ -78140,7 +78878,7 @@ alU alU alU asK -aBQ +alU kGt aDo aFU @@ -78173,7 +78911,7 @@ cCo cCo cCo cCo -ofT +mEI bvV blW xzh @@ -78397,7 +79135,7 @@ ayh atN atN aAO -aBQ +alU mFY aDo aDo @@ -78421,13 +79159,13 @@ aZA aPA xOo bgw -aZE -aZE -aZE +aPz +aPz +aPz bkn bmh ofT -ofT +mEI ofT axE ofT @@ -78654,7 +79392,7 @@ axn alU aoX atJ -aBQ +alU aDq aDo aFZ @@ -78678,7 +79416,7 @@ bbs aPA aSg bgw -aZE +aPz azV aBD bkt @@ -78687,7 +79425,7 @@ boK bpz boK bkt -boK +tFG ofT blW xzh @@ -78911,7 +79649,7 @@ neA alU alU alU -aBQ +alU aBQ aBQ aBQ @@ -78935,12 +79673,12 @@ mFT mQN kQe aFB -aZE +aPz aAq aTo xGy bmh -boK +tFG aKM boK ofT @@ -79182,17 +79920,17 @@ aPG aPG aPG aPG -aPG -aPA -aPA -aPA -aPA -aPA -aPA -aPA +aPz +aPz +aPz +aPz +aPz +aPz +aPz +aPz aSg aFB -aZE +aPz aAr ofT ofT @@ -79200,8 +79938,8 @@ bmh boK aKM cBp -ofT -boK +mEI +ocM fRc xUu xUu @@ -79426,7 +80164,7 @@ arP wnG arP arP -dFo +arP dTG rAC mRE @@ -79439,7 +80177,7 @@ aPF aQY aSk bml -aPG +aPz aWu asx asx @@ -79449,16 +80187,16 @@ asx asx asx yfx -aZE +aPz bjo -ofT -ofT +mEI +mEI bmh boK aKM -boK +cMU ofT -boK +rYS aKd xUu bZp @@ -79683,7 +80421,7 @@ arP wnG wnG bVF -dFo +arP ecS bhe sSX @@ -79696,22 +80434,22 @@ cOF ken ken nSw -aPG +aPz aFB -bxu -bxu -bxu -bxu -bxu -bxu -bxu -bxu -aZE +aPz +aPz +aPz +aPz +aPz +aPz +aPz +aPz +aPz epD bmh fpc bmh -ofT +mEI aKM ofT ofT @@ -79740,11 +80478,11 @@ bCq bLu vLX bHE -hFS -hFS -hFS -hFS -hFS +bCq +bCq +bCq +bCq +bCq vLX vLX iOA @@ -79940,7 +80678,7 @@ arP wnG kOn bWw -dFo +arP eRH kqE rAC @@ -79953,9 +80691,9 @@ aPF aQZ aRa aTF -aPG +aPz aFB -bxu +aPz aav abK abX @@ -79972,7 +80710,7 @@ ofT aKg ofT ofT -ofT +mEI ofT wst vWE @@ -79997,11 +80735,11 @@ bCq bVC vLX bWy -hFS +bCq bZl xRn cdY -hFS +bCq mjq lrN bCq @@ -80195,9 +80933,9 @@ aqR axq arP wnG -wnG -bWw -dFo +ohV +ohV +arP sHc kQu nSd @@ -80206,13 +80944,13 @@ uGw aLE aMQ aNU -aPG -aPG -aPG -aPG -aPG +aPz +aPz +aPz +aPz +aPz aFB -bxu +aPz aaD abL abZ @@ -80254,11 +80992,11 @@ bCq jCY vLX vLX -hFS +bCq pAk tKm oYb -hFS +bCq vLX qhN jyk @@ -80449,17 +81187,17 @@ aqQ aqQ aqQ arP -axq -arP +aLI +hyy wnG +bwI +aKA +arP +arP +arP +arP arP arP -dFo -dFo -dFo -dFo -dFo -dFo wxF aMQ aNT @@ -80469,7 +81207,7 @@ aRb aRb aRb aWx -bxu +aPz abt abL acc @@ -80511,7 +81249,7 @@ bCq bVE vLX vLX -hFS +bCq fLp eCU toL @@ -80706,25 +81444,25 @@ xzh xzh xzh aqQ -axq -arP -wnG ayE -wnG -wnG -bYw -aqR +mRg +wem +xIY +wem +wem +xIY +xIY +xIY xIY -eEw aKw -aLE +oHa jhN -aOn -aPK -aPK -aPK -aPK -aPK +bxo +aPz +aPz +aPz +aPz +aPz nQH aXM abv @@ -80768,7 +81506,7 @@ bCq bCq bCq nhY -hFS +bCq hFS muH hFS @@ -80967,31 +81705,31 @@ axq arP arP arP -bWA -bXx -bYx -bZk -arP -qcH -aKw +aph +aph +aph +aph +aph +aph +aph epJ -jhN +llv aOl tsw aPK aSl aTH -aPK +aPz wAb -bxu -bxu -bxu -bxu -bxu +aPz +aPz +aPz +aPz +aPz adZ -bxu -bxu -aZE +aPz +aPz +aPz bju biv bmf @@ -81025,7 +81763,7 @@ vLX bVG vLX vLX -hFS +bCq nsM iMH wCp @@ -81223,14 +81961,14 @@ aqQ btX arP tRC -arP -bXw -bYv wnG -ceV -arP -wzU -aKw +rGG +aDj +bjj +aFX +aHj +aJa +rGG aLE llv ieC @@ -81238,7 +81976,7 @@ aNl uAu rHn aTJ -aPK +aPz xrs dfx dfx @@ -81248,7 +81986,7 @@ clK aPz bdW trZ -aZE +aPz bgz biT boU @@ -81279,10 +82017,10 @@ ydd vLX bCq vLX -hFS -hFS -hFS -hFS +bCq +bCq +bCq +bCq oWX gYQ oac @@ -81481,13 +82219,13 @@ btX arP arP arP -arP -arP -arP -nfj -arP -arP -aKw +rGG +aDi +bjn +ewj +aJA +rID +rGG aLl cyT aOl @@ -81495,16 +82233,16 @@ aPL aPK hkT aTI -tav -tav -tav -tav +aPz +aPz +aPz +aPz aYf bbU hSa rPX pVb -bgB +rPX bhX bgv aCy @@ -81536,7 +82274,7 @@ bRg vLX cTF vLX -hFS +bCq wqq iXm fgW @@ -81735,15 +82473,15 @@ axx arP bli axu -ayH -ayH -ayH -ayH -ayH -ayH -ayH -ayH -ayH +aqR +aqR +oiF +rGG +aDx +aFW +apg +bCx +aps aKy aLn aMU @@ -81758,8 +82496,8 @@ fJu jRF aYf oXE -tav -tav +aPz +aPz bfj aZK bia @@ -81793,7 +82531,7 @@ bRg bHE bCq vLX -hFS +bCq hdl phF luK @@ -81992,17 +82730,17 @@ aMr arP awf aqR -aqR -aqR +arP +hBU oiF rGG -rGG -rGG -rGG -rGG -rGG -rGG -lcp +reK +kvF +kvF +aHv +bXx +atc +tXu jTW aLE aPQ @@ -82044,13 +82782,13 @@ bxy bxy kDy kDy -ghE -ghE +bCq +bCq imJ vLX bCq vLX -hFS +bCq qgC tlT aIi @@ -82248,16 +82986,16 @@ asQ aqR arP awf -aqR -arP -arP +aOK arP +vLn +aph rGG -aDj -bjj -aFX -aHj -aJa +rGG +rGG +aJi +fdc +vmT rGG aLE aMV @@ -82302,12 +83040,12 @@ wJz wJz wJz jyo -ghE +bCq vLX vLX bCq bHE -hFS +bCq tlT wqq bYb @@ -82505,16 +83243,16 @@ asP aqR aqR awf -aqR -arP -uTf -wnG +rQj +aph +aph +gjO +sxi +qve +rGG +rGG +rGG rGG -aDi -bjn -ewj -aJA -rID rGG aLE jTW @@ -82548,9 +83286,9 @@ bwd qdt gQO iav -bwe +bCq bAn -bxy +bCq bxy bxy bxy @@ -82762,17 +83500,17 @@ arP arP arP awf -aqR -lvL -wnG -aqR -rGG -aDx -aFW -apg -bCx -aps -aKA +bwI +gjO +qcH +aev +eiV +eiV +fhQ +mgV +cYo +lEx +rYG aLE gRS kGQ @@ -82805,10 +83543,10 @@ bwd vyS izx eaa -bwe +bCq cay rFJ -ghE +bCq bHD uAj bOK @@ -82816,12 +83554,12 @@ gZj gZj isC fQR -ghE +bCq hjX xap bCq nQl -hFS +bCq wqq tlT lIK @@ -83019,18 +83757,18 @@ asR tgp arP awf -bwI -arP -rYG -rQj -rGG -reK -kvF -kvF -aHv -vAW -atc -cpi +aqR +aph +lGE +xeh +wPN +bSe +gcP +bSe +bSe +giH +weD +udy jTW aLE aSs @@ -83062,10 +83800,10 @@ bwd smo xdM vaK -bwe +bCq cay cjI -ghE +bCq bHC bGo bYy @@ -83073,12 +83811,12 @@ kdz jeB bYt hrP -ghE +bCq sgA jkh bCq nQl -hFS +bCq jzw iTo wqq @@ -83089,7 +83827,7 @@ wqq wqq vVc vOr -hFS +bCq bUt bCq sUX @@ -83276,18 +84014,18 @@ asT tgp avf awf -aOK -arP -arP -arP -rGG -rGG -rGG -aJi -fdc -vmT -rGG -aLE +aqR +aph +rYG +rYG +rYG +oIs +rYG +rYG +rYG +rYG +rYG +qMR jTW aLE aPQ @@ -83319,10 +84057,10 @@ bwd wTw ekG weZ -bwe +bCq bAJ ccu -ghE +bCq ufp uAj hGy @@ -83330,23 +84068,23 @@ wJz rZU bYt hrP -ghE +bCq hgn yhZ bCq nQl -hFS -hFS -hFS -hFS +bCq +bCq +bCq +bCq nHF nHF nHF nHF -hFS -hFS -hFS -hFS +bCq +bCq +bCq +bCq qhN bCq xzh @@ -83533,17 +84271,17 @@ asS whr arP qKp -aqR -aqQ -xzh -xzh -xWd -xzh -rGG -rGG -rGG -rGG -rGG +hBU +aph +peo +msW +rQU +fOd +akK +aLP +sVP +nxH +rYG aHQ qPT aHQ @@ -83576,18 +84314,18 @@ bwe bwe bwe bwe -bwe +bCq bAI bCd -ghE -ghE -ghE -ghE -ghE -ghE +bCq +bCq +bCq +bCq +bCq +bCq iPE -ghE -ghE +bCq +bCq bCq bCq bCq @@ -83611,7 +84349,7 @@ bCq bCq bCq bCq -ccw +tau wba wba hsx @@ -83790,18 +84528,18 @@ arP arP arP awf -aqR -aqQ -xzh -xzh -xWd -xzh -arP -wnD -nwg +aOK +aph +syU +vGe +fsZ +stu +ncg +ril +bQZ eth -aJw -aLI +rYG +aMm ova aki aRh @@ -83849,17 +84587,17 @@ caq caq caq bUx -bVI -bVI -bVI -bVI -bVI -bVI -bVI -bVI -bVI -bVI -bVI +tau +tau +tau +tau +tau +tau +tau +tau +tau +tau +tau bCq pIS ccu @@ -84048,17 +84786,17 @@ apS apS awe aqR -arP -arP -aqQ -aqQ -arP -arP -kwC -vOH -nwg -aJw -aMm +aph +sKq +eDP +kZH +xbO +wAX +lKw +gps +lEx +aLV +aJq bUm izp cpE @@ -84106,7 +84844,7 @@ bLv bCq bCq cay -bVI +tau bWB bWB bYz @@ -84116,7 +84854,7 @@ cbl bYz bWB bWB -bVI +tau cax cbx cdh @@ -84125,7 +84863,7 @@ bQa bHE vLX iFY -ccw +tau ccw chB ckH @@ -84305,16 +85043,16 @@ aqR aqR axt aqR -aqR -aqR -aqR -aqR -aqR -umu -arR -arR -arR -aJw +aph +dqt +hIJ +eDP +fJd +pht +ovF +olX +nwg +rYG aLW aaa aJq @@ -84363,7 +85101,7 @@ xzh bCq ciT cay -bVI +tau bWD bXA bYB @@ -84373,7 +85111,7 @@ bvy ccg cdd cea -bVI +tau caz cby cdj @@ -84561,18 +85299,18 @@ arP aOK aqR btX -aHN -aHN -aHN -aHN -aHN -aHN -aHN -aHN -aHN -aJj -aue -aLV +aqR +aph +uWI +hNx +sgk +swD +vBb +jux +ovS +bdT +rYG +dTK aaa sRO aJn @@ -84620,7 +85358,7 @@ xzh bCq rFJ cay -bVI +tau bWC bXz bYA @@ -84630,16 +85368,16 @@ bXC ccf cdc cdZ -bVI +tau cay -cjJ -cjJ -cjJ -cjJ -cjJ -cjJ -cjJ -cjJ +tau +tau +tau +tau +tau +tau +tau +tau cfL kja cBO @@ -84783,7 +85521,7 @@ akJ cZy acd qat -pee +lqI agB umE awR @@ -84820,10 +85558,10 @@ nTO axt arP arP -arP -arP -aCa -hyy +aph +aph +rYG +xhQ qcW qcW qcW @@ -84877,7 +85615,7 @@ bLv bCq bCq cay -bVI +tau lTE bXC bXC @@ -84887,9 +85625,9 @@ bXC bWB bWB cec -bVI +tau cay -cjJ +tau chY igH cjM @@ -85078,10 +85816,10 @@ axt arP iGD ukZ -arP -qcW -qcW +aqR qcW +uyx +eji vzN jiY jMg @@ -85134,7 +85872,7 @@ caz caq caq caC -bVI +tau bWE bXB bYC @@ -85144,9 +85882,9 @@ bXC cch cde ceb -bVI +tau cay -cjJ +tau chY xwN ciW @@ -85338,7 +86076,7 @@ aqR aqR fIr qQR -bSe +qQR qQR jdM wgU @@ -85389,9 +86127,9 @@ bNI bNI cce bNI -bNI +bCq bHE -bVI +tau bWG bXD bYz @@ -85401,9 +86139,9 @@ cSE bYz cdf ced -bVI +tau cay -cjJ +tau xwN xwN xwN @@ -85646,9 +86384,9 @@ bRl bNJ bLC cCf -bNI +bCq bHE -bVI +tau kPm bWB bYz @@ -85658,9 +86396,9 @@ bWI bYz bWB bWB -bVI +tau cay -cjJ +tau cjJ ciY ciY @@ -85903,9 +86641,9 @@ bNJ bNJ xhV gWd -bNI +bCq bHE -bVJ +tau bWI bWI bWI @@ -85915,9 +86653,9 @@ bWI bWI bWI bWI -bVJ +tau cay -cjJ +tau sGc cjb cjb @@ -86160,9 +86898,9 @@ bNJ bKx cjL gWd -bNI +bCq bHE -bVJ +tau sOu bXE bYD @@ -86172,9 +86910,9 @@ cbn cci cdg cee -bVJ +tau cay -cjJ +tau cia cSN ecF @@ -86325,7 +87063,7 @@ uWe uQn acd pee -pee +aCa oQH vxL aeZ @@ -86358,9 +87096,9 @@ hBN bbc wYB wYB -wYB +arP axt -ayL +aph ayL azS ayL @@ -86417,9 +87155,9 @@ bNJ bNJ cjL nyF -bNI +bCq bHE -bVJ +tau bOo bOD bQb @@ -86429,9 +87167,9 @@ bXG bOC bWt cBK -bVJ +tau cay -cjJ +tau cid cSQ cen @@ -86615,9 +87353,9 @@ jBV xZo maq jXI -wYB +arP axt -ayL +aph viw azR aBr @@ -86674,9 +87412,9 @@ bQc bKA rKP bSv -bNI +bCq bHE -bVJ +tau bOl gyr bPQ @@ -86686,9 +87424,9 @@ bTI bUy bWs ceg -bVJ +tau cay -cjJ +tau cic cSQ cST @@ -86872,9 +87610,9 @@ nGv qWV lRl eQT -wYB +arP axt -ayL +aph ayT aBP aio @@ -86931,9 +87669,9 @@ cCd aYg bNJ cCc -bNI +bCq bHE -bVJ +tau bVJ bOM bQd @@ -86943,9 +87681,9 @@ bUc bVb bWv cei -bVJ +tau cay -cjJ +tau cid cSQ cSU @@ -87129,9 +87867,9 @@ oSg aau frn frW -wYB +arP axt -ayL +aph azW ayU azO @@ -87188,7 +87926,7 @@ cCd cCd bNJ cCb -bNI +bCq bHE tau bVJ @@ -87200,9 +87938,9 @@ bVJ bVJ bWu bVJ -bVJ +tau cay -cjJ +tau cie cdT cCY @@ -87386,9 +88124,9 @@ xKQ dbK jOV tme -wYB +arP axt -ayL +aph xOy azY afP @@ -87445,7 +88183,7 @@ bJu cCd cmX bSz -bNI +bCq tyR cls hBx @@ -87457,9 +88195,9 @@ fgm bVd bWK bYp -cls +bCq cay -cjJ +tau kul cSR cSV @@ -87643,9 +88381,9 @@ wYB wYB wYB wYB -wYB +arP awj -ayL +aph ayL ayL pXD @@ -87702,7 +88440,7 @@ bNI bKU bNI bNI -bNI +bCq xPV bdo bQg @@ -87716,7 +88454,7 @@ bWJ bYn bZB caC -cjJ +tau cSM cSN cSW @@ -87971,7 +88709,7 @@ bUl bVf bel bYE -cls +bCq bUt nsn cij @@ -88228,9 +88966,9 @@ cbr cau bXk bYq -cls +bCq ceW -cjJ +tau cdk cMC cSY @@ -88485,9 +89223,9 @@ cbt bVh beT bYM -cfb -cfb -cfb +tau +tau +tau cfb cfb cfb @@ -88665,23 +89403,23 @@ qGW poE fBI jmA -ave -ave -ave -ave -ave -ave -ave +ahn +ahn +ahn +ahn +ahn +ahn +ahn awm -ave -ave -ave -ave -ave -ave -ave -ave -aJw +ahn +ahn +ahn +ahn +ahn +ahn +ahn +ahn +ahn oHk aJq aMd @@ -88922,7 +89660,7 @@ spV poE fBI jmA -ave +ahn aqf wLh wLh @@ -89179,23 +89917,23 @@ amU tOF fBI kfd -ave +ahn aqh -arf -arf -arf -arf -arf -arf -arf -arf -arf -cvP -cvP -cvP -cvP -cvP -cvP +ahn +ahn +ahn +ahn +ahn +ahn +ahn +ahn +ahn +ahn +ahn +ahn +ahn +ahn +ahn aJn aJn aJq @@ -89436,9 +90174,9 @@ rat poE fBI fzG -ave +ahn aqh -arf +ahn aqa atf arf @@ -89693,9 +90431,9 @@ vad ahT fBI jmA -ave +ahn aqh -arf +ahn apY ate arf @@ -89950,9 +90688,9 @@ uDy poE fBI fyP -ave +ahn aqh -arf +ahn aqn ath arf @@ -90207,9 +90945,9 @@ aiX rzp wui jmA -ave +ahn aqh -arf +ahn arf atg arf @@ -90464,7 +91202,7 @@ aiX tOF oeg rZD -ave +ahn aqh arh asg @@ -90721,9 +91459,9 @@ aiX tOF oeg eWy -ave +ahn aqh -arf +ahn asf ati auk @@ -90978,9 +91716,9 @@ aiX cZr mXr kuA -ave +ahn aqh -arf +ahn arf arf arf @@ -91235,9 +91973,9 @@ wHs anC anU anC -ajo +ahn aqh -arf +ahn aqo asp aHF @@ -91492,9 +92230,9 @@ amY amY ajp aoH -ajo +ahn aqh -arf +ahn asm blU blU @@ -91748,10 +92486,10 @@ amr amY dtT anV -ajo -ajo +ahn +ahn aqh -arf +ahn ari asu aHG @@ -92005,10 +92743,10 @@ amr amY amY anY -ajo +ahn eys aqh -arf +ahn arf arf arf @@ -92262,10 +93000,10 @@ amt ajp ajp anX -ajo +ahn gbL awn -arf +ahn ask atm phX @@ -92519,10 +93257,10 @@ amr amY amY agR -ajo +ahn aIn dDR -arf +ahn tqd aHw aup @@ -92776,10 +93514,10 @@ amr amY wTY gNu -ajo +ahn hlK dDR -arf +ahn ark asL aHU @@ -92829,11 +93567,11 @@ bwv bwv hTU hTU -hTU +bRa bCB -hTU -hTU -hTU +bRa +bRa +bRa hxs bLK bMS @@ -93033,14 +93771,14 @@ amr amY amY agZ -ajo +ahn apt dDR -arf -arf -arf -arf -arf +ahn +ahn +ahn +ahn +ahn awz axV awr @@ -93090,7 +93828,7 @@ bAX bCF bwx bFB -hTU +bRa bKJ rgU bMV @@ -93290,7 +94028,7 @@ ajo ajo ajo ahw -ajo +ahn apt lEl tix @@ -93347,7 +94085,7 @@ bFv bCE bFv tbT -hTU +bRa hxs bLK bMU @@ -93550,11 +94288,11 @@ anb aoJ anZ apu -arf -arf -arf -arf -arf +ahn +ahn +ahn +ahn +ahn ldB axV sed @@ -93604,7 +94342,7 @@ bip xYA bip bId -hTU +bRa hxs bLK bMX @@ -93807,7 +94545,7 @@ bkV anc anD qps -arf +ahn apY mWI aHw @@ -93861,7 +94599,7 @@ bxb bCH bip bIc -hTU +bRa hxs bLK bMW @@ -94060,11 +94798,11 @@ axR ahn and ahn -arf -arf -arf -arf -arf +ahn +ahn +ahn +ahn +ahn asr phX hJT @@ -94118,7 +94856,7 @@ bzS bCJ bip cCp -hTU +bRa hxs bLK hUf @@ -94317,7 +95055,7 @@ axR aAd aAl anE -arf +ahn gDr apw aqp @@ -94375,7 +95113,7 @@ bip xYA bip vEn -hTU +bRa hxs bLK bLK @@ -94574,7 +95312,7 @@ axR aAf aAm anG -arf +ahn aoL apy arf @@ -94632,7 +95370,7 @@ bip xYA bip cCp -hTU +bRa hxs bzs hLb @@ -94824,14 +95562,14 @@ xzh xzh ahn arp -rQR -rQR +ahn +ahn avm -rQR -rQR -rQR -rQR -arf +ahn +ahn +ahn +ahn +ahn arf arf arf @@ -94889,7 +95627,7 @@ bDZ urC bip cCp -hTU +bRa hxs bzs hLb @@ -95146,7 +95884,7 @@ peL bip bip bIc -hTU +bRa hxs bzs hLb @@ -95403,7 +96141,7 @@ pva lrg wTp xFt -hTU +bRa hxs bzs hLb @@ -95660,7 +96398,7 @@ mrM bCT hnt cCp -hTU +bRa hxs bzs hLb @@ -95917,7 +96655,7 @@ jtt kCY hTU bIi -hTU +bRa hxs bzs hLb @@ -96174,7 +96912,7 @@ lOZ vki kbG rrA -hTU +bRa hxs bzs hLb @@ -96431,7 +97169,7 @@ bxO fGg nsl bIk -wvq +bzs hxs bzs bzs @@ -96452,7 +97190,7 @@ bPn bzs bzs bzs -cmd +bRa cqs byw bzr @@ -96688,7 +97426,7 @@ wtb ubJ lCT bIn -wvq +bzs bKL nEs nEs @@ -96709,7 +97447,7 @@ bXZ bzs bBR caK -bxo +bzs bxs byO cjr @@ -96945,11 +97683,11 @@ bEa pHl bFA wXA -bpI +bzs btk -bpI -bpI -bpI +bzs +bzs +bzs xQZ ciF xQZ @@ -96966,7 +97704,7 @@ bAw bAw bAw bAw -bxo +bzs bxB byw bGJ @@ -97206,12 +97944,12 @@ bpI mNe cHn isO -bIJ -bNd -bNd -bNd -bNd -bNd +bRa +bRa +bRa +bRa +bRa +bRa buh cze bAw @@ -97223,7 +97961,7 @@ bzs ccF bAw bwc -bxo +bzs bxD byO bzB @@ -97468,7 +98206,7 @@ dEq bQD bLY bMa -bNd +bRa ubj bAw bAw @@ -97725,7 +98463,7 @@ xSa kJc bRO bSQ -bNd +bRa bul bup bLT @@ -97737,7 +98475,7 @@ wzx wzx cdI bAw -bxo +bzs akE wLA bfx @@ -97982,19 +98720,19 @@ bPp bQF xUi bSS -bNd -bNd -bNd -bNd -bNd -bNd +bRa +bRa +bRa +bRa +bRa +bRa bZO hxs bzs ccG ciF ceF -bxo +bzs cga chm bAc @@ -98244,17 +98982,17 @@ bVa bWf bWX dJJ -bNd -bNd +bRa +bRa hxs bzs bzs bzs bzs -cmd -cmd -cmd -cmd +bRa +bRa +bRa +bRa bGj bGj bGj @@ -98502,7 +99240,7 @@ bWW bWW bYa bYX -bNd +bRa mXW ccM keW @@ -99015,8 +99753,8 @@ bNh bWg bWY bYc -bNd -bNd +bRa +bRa bzs bzs mUx @@ -99471,7 +100209,7 @@ gBW rQR aoe aAu -cVb +alP aNP hFi pIW @@ -99529,7 +100267,7 @@ bNj bNs bXa sgR -bNd +bRa bZQ caP cbO @@ -99728,7 +100466,7 @@ hgK rQR aoe aCD -cVb +alP kCD wBd aFm @@ -99786,7 +100524,7 @@ uZR bNk bXc bYe -bNd +bRa bZS caR bzs @@ -99985,11 +100723,11 @@ hQC rQR aoe aIk -cVb -cVb -cVb +alP +alP +alP atn -aIp +alP aRJ aRJ aMt @@ -100043,7 +100781,7 @@ pSb bWj bWj bWj -bNd +bRa bzs bzs bzs @@ -100246,7 +100984,7 @@ aCA uGz awD aGW -aIp +alP rAx aRJ aMA @@ -100300,7 +101038,7 @@ baR bNk gIB bbE -bNd +bRa bZU yeE nEs @@ -100503,7 +101241,7 @@ aCz aUx aUx aGW -aIp +alP aBc awE iYg @@ -100557,7 +101295,7 @@ bNl bNW bXd bcw -bNd +bRa bZT hxs bAw @@ -100760,7 +101498,7 @@ alP awF anf bKK -aIp +alP aJO aKU aME @@ -100792,29 +101530,29 @@ lHs lHs buG bvA -bsM +bzs rhx rhx bAw sUi -xXp -xXp -xXp -xXp +bzs +bzs +bzs +bzs lUc -xXp -xXp -xXp -bNd -bNd -bNd -bNd -bNd -bNd -bNd -bNd -bNd -bNd +bzs +bzs +bzs +bRa +bRa +bRa +bRa +bRa +bRa +bRa +bRa +bRa +bRa sUi pjk bFr @@ -101017,7 +101755,7 @@ alP awG anf bKK -aIp +alP aJN aRJ aRJ @@ -101274,7 +102012,7 @@ alP ffa anf aGF -aIp +alP aJN aRJ aRJ @@ -101306,34 +102044,34 @@ bfV bto buL bvB -bhA +bzs bxg bBR -bDb -bDb -bDb -bDb -bDb -bDb -bDb -bDb +bRa +bRa +bRa +bRa +bRa +bRa +bRa +bRa bti bIz -bDb -bDb -bDb -bDb -bDb -bDb -bDb -bDb -bDb -bDb -bDb -bDb -bDb -bDb -bDb +bRa +bRa +bRa +bRa +bRa +bRa +bRa +bRa +bRa +bRa +bRa +bRa +bRa +bRa +bRa bDb bDb bDb @@ -101531,7 +102269,7 @@ alP jaH aFs aGE -aIp +alP aCt goZ bsq @@ -101787,8 +102525,8 @@ wgt alP anf aGW -aFu -aFu +alP +alP aFu aFu aFu @@ -102044,7 +102782,7 @@ alP alP aVL hRy -aFu +alP nTD bav aLf @@ -102557,8 +103295,8 @@ aAt aty aCC aED -aFu -aFu +alP +alP aIs xKO xKO @@ -103071,7 +103809,7 @@ aAv anf alP aED -aFu +alP iiZ aIv aJR @@ -103328,7 +104066,7 @@ anf mdr alP aED -aFu +alP aHd aIx aJF @@ -103585,8 +104323,8 @@ alP alP awG aED -aFw -aFw +alP +alP aFw aFw aFw @@ -103843,7 +104581,7 @@ aBF aBF aED anf -aFw +alP aIB aJJ aKZ @@ -104356,8 +105094,8 @@ aEe aEe aEe aEe -aFw -aFw +alP +alP aFw aFw aLb @@ -104373,7 +105111,7 @@ aYW aBf tUY aFu -tej +aYV qXW aYV bfX @@ -104613,7 +105351,7 @@ apE anf anf aEe -aFw +alP aHf aIz aJM @@ -104870,7 +105608,7 @@ apE arx arx aEe -aFw +alP aGU aIC aJU @@ -104890,7 +105628,7 @@ hSf bcs qXW aYV -nwJ +bfX bfV bfV bfV @@ -104929,7 +105667,7 @@ bPN bPN bPN bPN -bQZ +aGg bDb srU bDb @@ -105118,16 +105856,16 @@ atD tzD tAd xka -asB -asB +alP +alP tVK avo tVK -asB -asB +alP +alP aoQ aEe -aFw +alP aHg aIA aJT @@ -105186,7 +105924,7 @@ bQO vHt dUO egr -bQZ +aGg xaZ dqL dtO @@ -105375,16 +106113,16 @@ aqD arz atD atD -asB +alP lBh awQ uEk fMb biJ -asB +alP aoP aEe -aFw +alP aGY aII aJW @@ -105455,14 +106193,14 @@ fsg nKi czS cNW -ohV -ohV -ohV -ohV -ohV -ohV +cNW +cNW +cNW +cNW +cNW +cNW lLM -ohV +cNW cNW cNW cNW @@ -105632,16 +106370,16 @@ aqC alP alP atC -asB +alP auI awT xKh awQ cIP -asB +alP auD aEe -aFw +alP aHi aHi gVj @@ -105700,7 +106438,7 @@ uCq dyN sHk caY -bQZ +mtK cNW cNW nWA @@ -105889,16 +106627,16 @@ cfm tIw kwd rmB -asB +alP sJN awT mAK iYU nYb -asB +alP anf qNW -aFw +alP aID aID fwJ @@ -105919,17 +106657,17 @@ aYV qXW aYV bfX -bgc -bgc -bgc +bvx +bvx +bvx bgc bgc boB -bhA +boB jrH -bBD -bhA -bhA +bgd +boB +boB bhA wkN wkN @@ -105957,7 +106695,7 @@ tDw cba gZY cbc -bQZ +mtK sHZ suJ cPA @@ -105969,14 +106707,14 @@ cNW cdu lSv tkC -ohV +cNW lOk vhE kZR pHs bJE eeg -ohV +cNW xzh xzh xzh @@ -106146,18 +106884,18 @@ clq alP dVt hkj -asB +alP asB asB waf ygt aAz -asB +alP anf qNW alP alP -hSf +alP uYf fSN nAp @@ -106175,22 +106913,22 @@ ggc aYV qXW aYV -bfX +vxx bhC biU -bks +xQe blI -bpf +cvO dgS -bhA +bks gSR -bBD +taM fNH -sjr -xEM -xEM -xEM -xEM +boB +oMN +oMN +oMN +oMN lQm bEC bEC @@ -106214,7 +106952,7 @@ oDg olh bOv njZ -bQZ +mtK cdR hYR ceO @@ -106226,14 +106964,14 @@ cNW bYs lSv lSv -ohV +cNW ftL pAH suQ qtQ fnM dRe -aER +cOT xzh xzh xzh @@ -106403,13 +107141,13 @@ aqE alP sPd fhc -asB +alP avN reH kBN azw asB -asB +alP eDG arW aCz @@ -106432,23 +107170,23 @@ ggc hXL qXW aYV -bfX -uvX +aYV +aYV biV xQe blK -bpf +uvX bng -boQ -brx +blK +gSR bro aQx -suU -xEM +wIk +oMN +oMN tgl -xEM oMN -xEM +oMN bEC bCk vxa @@ -106471,7 +107209,7 @@ pEA dCn gTC gKC -bQZ +mtK cdR nLD dwb @@ -106483,14 +107221,14 @@ cNW hql xEp lSv -ohV +cNW lCy keS pHs tIk igy eeg -aER +cOT xzh xzh xzh @@ -106660,18 +107398,18 @@ alP alP alP alP -asB +alP auJ awS awQ qCg iBZ -asB +alP alP aCQ alP alP -hSf +alP nAp nAp nAp @@ -106689,22 +107427,22 @@ ggc aYV sqp aYV -bgb -bhC -biU +tej +aYV +biV tvl -blJ +bpZ bpf boA -bpZ +bdh bqf -bBD +taM gLd wIk -xEM -xEM -xEM -xEM +oMN +oMN +qrU +oMN uCO bEC bxi @@ -106728,11 +107466,11 @@ pEA pWN adu jxP -bQZ -oZy -oZy -oZy -oZy +mtK +cNW +cNW +cNW +cNW cNW bhG cNW @@ -106740,14 +107478,14 @@ xzh cNW wOK lSv -ohV -ohV +cNW +cNW lxl kCw eeg eeg jAv -ohV +cNW xzh xzh xzh @@ -106923,12 +107661,12 @@ awU ayj qYR biM -asB +alP auG fzr fzr mrX -hSf +alP nAp qPm gPR @@ -106945,24 +107683,24 @@ nAp ggc aYV qXW -nyZ -bgc -bgc -biX +aYV +aYV +aYV +biV +xQe bka +biW bka -blZ -bnk bpo -bqk -bBD +bkv +bro kwH -wgE -xEM -xEM -xEM -xEM -xEM +boB +oMN +oMN +oMN +oMN +oMN bEC bIA taR @@ -106985,11 +107723,11 @@ bcD bYm uvi tPN -bQZ +cbv eyF mIg lST -iNp +ciD cNW bhG cOT @@ -106998,13 +107736,13 @@ cOT lSv vXe fGm -ohV -ohV -aER -aER -aER -ohV -ohV +cNW +cNW +cOT +cOT +cOT +cNW +cNW xzh xzh xzh @@ -107180,12 +107918,12 @@ asB asB asB asB -asB +alP avF ilg auG fzr -hSf +alP gIC hSf hSf @@ -107203,23 +107941,23 @@ hSf bcy qXW beG -bgc bhE -bkv -biW +bhE +bgb +xQe blL ofM -biW +xUT boQ bth brn -aQy +bpZ jfk -xEM -gnX -xEM uzl -xEM +iER +uzl +uzl +bZc bEC dkZ hFU @@ -107237,12 +107975,12 @@ aYY bSh kwA cas -bOB +vfD pEA erZ uvi dtw -bQZ +cbv tKG gQT ciD @@ -107460,23 +108198,23 @@ hSf xMJ vsG beI -bgc +bWq bhF bib -bki +bWq bma -qOQ -biW -bpq -vdl -kXt -yiW -bbz -xEM -lcg -xEM -xEM +bWq +bcU +bWq +bma +bWq +bWq +bWq xEM +ayH +cpi +lvL +wgE bEC cKR byu @@ -107494,9 +108232,9 @@ ogm ogm ogm cas -bOB +oHU ftB -erZ +uTf bSc ejn qlQ @@ -107708,7 +108446,7 @@ hSf hSf hSf aTl -aXD +blJ aVW aXD aZj @@ -107717,23 +108455,23 @@ bbG jEC nlx beH -bgc -bgc -bgc -bgc -bgc -bgc +bWq +aQy +aBg +qbD +bYi +bbz fHQ xKN vGb -xKN -hfv -hfv -hfv -xKN +aSX hfv -xKN -xKN +bWq +aHN +jwC +cpi +bYw +uHA bEC pEr vsA @@ -107750,18 +108488,18 @@ tjy lWd piD upN -bWq -lQG -bWq -bYi -lAB -bYi -bWq +aGg +ceV +bYx +rHV +bXw +vWX +cbv iwV kNm kNm lOU -oZy +cNW chz cNW cNW @@ -107974,22 +108712,22 @@ baE bcA bdz beJ -bge +bWq bhH -kyZ -kyZ -bnx -boB +pOJ +nwJ +eRU +pOJ bnr -xKN +pOJ pOJ eRU wJU -qrU +bWq kGS -aEV +oZy +bZk aHx -aRv bhK bEC flN @@ -108007,18 +108745,18 @@ vzp xCG xCG oUq -bWq -ulo -sBx +aGg +bVI +vAW bcT -cvO -rHV +vAW +vAW tpq tds cmo kWk iqX -oZy +cNW chC ciL wZQ @@ -108230,23 +108968,23 @@ wDE aPq bcz aPq -aWh -bgd -sRR -sRR -btp +bRM +bWq +bqh +sjr +brx vqI -boB +lFP bnq -xKN -uHA -aRv +bpq +pOJ +pOJ gHj -aSX -aSX -aSX +bWq +bkZ +bkZ aLm -aRv +bkZ bkZ bEC mXH @@ -108264,18 +109002,18 @@ dGF dGF dGF bEC -bWq +aGg tbd -wem -bcU toF -lmn -bWq +eNB +toF +wnD +cbv tDr nzE qLd lBc -oZy +cNW ccp ydc ydc @@ -108487,23 +109225,23 @@ aPq aPq bcC pdi -aWh -sEX +vAk +bWq jfQ -sRR -odl -bqh -kyZ +gEp +gEp +gEp +bnk bnx -ayS pOJ -bvp -kxC -aAW +pOJ +pOJ +lAB +bWq bAR -auW -aLx -aRv +cKA +bZk +vcg bZZ bEC sOU @@ -108521,18 +109259,18 @@ kzT bFT bMu sUX -bWq +aGg bXt -ulo -bcU +bWA +ppn itG sOL -bWq -bcF +cbv +iRQ tte ceS iRQ -cbv +mtK jVl ciL cjE @@ -108744,24 +109482,24 @@ aPq wDE bcB mCy -nqJ -bgg +gnX +aLx sLi -sRR +bky cnC -btp -btp -ayN +gEp +lQG +sEX +ayS ayS -pOJ bvp kxC -bAR +bWq aBo -aGg -vPt -ddy -aRv +wzU +umu +iNp +lmn bEC wQc coK @@ -108778,24 +109516,24 @@ bGk dyk bMu sUX -bWq -oHU -bZc +aGg +aER +itG nHo kLM -vAk +bYv tpq cbV wCU ceR qRt -cbv +mtK fnz cNW -cjD -cjD -cjD -cjD +mtK +mtK +mtK +mtK cnj xzh xzh @@ -109004,20 +109742,20 @@ bdA nqJ ohN uEB -sRR -bky -blP bky +lcg +gEp +yiW ayN -ayS -pOJ -bvp -kxC -auW -bAR +bWq +bry +aEV +bqk +bWq +ulo aAW -aLN -ddy +aJj +ayH aRv bEC iEr @@ -109035,21 +109773,21 @@ lNB vPE bMu sUX -bWq +aGg jXz qpM -eNB -pxC +bOB +qpM vyk -bWq +cbv cgu cOx qWu ckS -cbv +mtK jVl cds -cjD +mtK ppZ cly cmw @@ -109261,49 +109999,49 @@ bdA nqJ bgg qWN -sRR -lLa -blR bky -ayN -xKN +blP +gEp +gEp +aLN +gEp fqQ ddy azN -taM -taM -taM -aLP -ddy -qbD +bWq +ghE +bgB +mFw +bYw +auW bEC bEC bEC bKb bEC bEC -bEC -bEC -bEC -dGF +mtK +mtK +mtK +mtK rNG -dGF -dGF -dGF -dGF -dGF -bWq -bWq -vWX -bWq -bWq -bWq -bWq -bWq -cbv -cbv -cbv -cbv +mtK +mtK +mtK +mtK +mtK +mtK +mtK +mtK +mtK +mtK +mtK +mtK +mtK +mtK +mtK +mtK +mtK jVl pxV cjF @@ -109516,24 +110254,24 @@ aPq bcB gZS nqJ -bgg +kXt nIe -sRR -bky +vPt cyC -bky -ayN -xKN -pOJ +cyC +cyC +pxC +gEp +vOZ vOZ xXe -aBg -aDz -lFP -xUT -vxx +bWq +kwC +euq +qiu +aue cka -xKN +bEC nFa luH bGK @@ -109773,24 +110511,24 @@ aPq deF afE aPq -cKA -sRR -sRR -uRx -uRx +bgg +nyZ bky -ayN -xKN -bry -xKN -xKN -xKN -xKN -xKN -xKN -xKN -xKN -xKN +bky +aDz +bky +blZ +gEp +gEp +gEp +gEp +gEp +gEp +gEp +biX +gEp +qOQ +gEp psY kES bGG @@ -110032,9 +110770,9 @@ wPI mQo qEE cgk -sRR -xzh -xzh +bky +lLa +blR bky boH ltd @@ -110044,7 +110782,7 @@ kyZ kyZ kyZ kyZ -kyZ +nDY kyZ kyZ fph @@ -110289,9 +111027,9 @@ cyr sRR xey xey -sRR -xzh -xzh +bky +bky +bge bky bky bky @@ -110310,8 +111048,8 @@ cpu bIS cpu cpu -cpu -cpu +mtK +mtK cNW dlH cNW @@ -110547,9 +111285,9 @@ xey xzh xzh xzh -xzh -xzh -xzh +uVE +uRx +uRx xzh xzh xzh @@ -110562,13 +111300,13 @@ bky bky cNV bky -cpu +mtK izU jIm bIW bXe tCN -cpu +mtK bNC cOe wZQ @@ -110819,13 +111557,13 @@ bxt cNT bCm cHC -cpu +mtK bMx jIm xsR atB teX -cpu +mtK bNB cac bPP @@ -111076,13 +111814,13 @@ wWu brG brG bDg -cpu +mtK bGh kDo hCG kwa jXH -cpu +mtK rmX xIa vxh @@ -111333,13 +112071,13 @@ xqJ byx qfs mPv -cpu +mtK fXd lQR tOg bGe bGe -cpu +mtK cOT cOT cOT @@ -111590,7 +112328,7 @@ bky bky bky bky -cpu +mtK qCr vgd hCG From a0ffebdfe5f988df7990604d8485ba25a05b8895 Mon Sep 17 00:00:00 2001 From: Iajret Date: Thu, 31 Aug 2023 23:34:53 +0300 Subject: [PATCH 3/6] Update NSSJourney.dmm --- _maps/map_files/NSSJourney/NSSJourney.dmm | 1302 +++++++++++---------- 1 file changed, 665 insertions(+), 637 deletions(-) diff --git a/_maps/map_files/NSSJourney/NSSJourney.dmm b/_maps/map_files/NSSJourney/NSSJourney.dmm index 69fa2b437f5..e386d4e7f99 100644 --- a/_maps/map_files/NSSJourney/NSSJourney.dmm +++ b/_maps/map_files/NSSJourney/NSSJourney.dmm @@ -676,19 +676,6 @@ /obj/structure/closet/radiation, /turf/open/floor/iron/smooth_large, /area/station/engineering/main) -"aev" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/machinery/light/directional/west, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/iron/dark/textured, -/area/station/command/gateway) "aey" = ( /obj/machinery/door/airlock/command/glass{ name = "Head of Security" @@ -1417,6 +1404,11 @@ /obj/effect/turf_decal/tile/brown, /turf/open/floor/iron, /area/station/cargo/storage) +"akv" = ( +/obj/effect/turf_decal/bot_white/right, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark/textured_large, +/area/station/command/gateway) "akB" = ( /obj/structure/cable, /turf/open/floor/plating, @@ -1444,18 +1436,6 @@ /obj/structure/table, /turf/open/floor/iron/textured, /area/station/security/prison) -"akK" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/light/directional/west, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/turf/open/floor/iron/dark/textured, -/area/station/command/gateway) "akM" = ( /obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{ dir = 6 @@ -4507,6 +4487,18 @@ }, /turf/open/floor/plating, /area/station/maintenance/fore) +"axv" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/light/directional/west, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "axx" = ( /obj/structure/sign/warning/vacuum/external/directional/north, /obj/effect/spawner/random/maintenance, @@ -4863,9 +4855,6 @@ dir = 6 }, /obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 }, @@ -4873,6 +4862,10 @@ dir = 4 }, /obj/structure/cable, +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 4 + }, +/obj/effect/mapping_helpers/mail_sorting/science/genetics, /turf/open/floor/iron/dark/textured, /area/station/science/genetics) "ayO" = ( @@ -5105,6 +5098,7 @@ dir = 1 }, /obj/machinery/light/small/directional/south, +/obj/structure/flora/bush/flowers_yw/style_random, /turf/open/floor/grass, /area/station/science/genetics) "azO" = ( @@ -8405,6 +8399,9 @@ dir = 4 }, /obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plating, /area/station/science/genetics) "aLO" = ( @@ -8418,12 +8415,6 @@ dir = 4 }, /area/station/hallway/primary/central) -"aLP" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/west, -/turf/open/floor/iron/dark/textured, -/area/station/command/gateway) "aLQ" = ( /obj/machinery/camera/directional/north{ c_tag = "Central Hallway North-East" @@ -9610,6 +9601,7 @@ dir = 9 }, /obj/structure/extinguisher_cabinet/directional/north, +/obj/item/kirbyplants/random, /turf/open/floor/iron/dark/textured, /area/station/science/genetics) "aQB" = ( @@ -12906,6 +12898,10 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron, /area/station/commons/locker) +"bbt" = ( +/obj/structure/closet/l3closet/scientist, +/turf/open/floor/iron, +/area/station/command/gateway) "bbv" = ( /obj/structure/cable, /obj/machinery/status_display/evac/directional/north, @@ -13480,15 +13476,6 @@ /obj/structure/cable, /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/ai_upload) -"bdh" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/science/lab) "bdi" = ( /obj/effect/spawner/random/entertainment/arcade, /turf/open/floor/wood, @@ -13684,11 +13671,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port) -"bdT" = ( -/obj/structure/table, -/obj/machinery/recharger, -/turf/open/floor/iron, -/area/station/command/gateway) "bdV" = ( /obj/effect/turf_decal/tile/red{ dir = 4 @@ -18142,6 +18124,7 @@ /area/station/science/genetics) "bry" = ( /obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/flora/bush/jungle/b, /turf/open/floor/grass, /area/station/science/genetics) "brC" = ( @@ -20119,6 +20102,70 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/white, /area/station/medical/chemistry) +"bxc" = ( +/obj/item/clothing/suit/hazardvest{ + desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; + name = "emergency lifejacket" + }, +/obj/item/clothing/suit/hazardvest{ + desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; + name = "emergency lifejacket" + }, +/obj/item/clothing/suit/hazardvest{ + desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; + name = "emergency lifejacket" + }, +/obj/item/clothing/suit/hazardvest{ + desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; + name = "emergency lifejacket" + }, +/obj/item/tank/internals/emergency_oxygen{ + pixel_x = 3 + }, +/obj/item/tank/internals/emergency_oxygen{ + pixel_x = 3 + }, +/obj/item/tank/internals/emergency_oxygen{ + pixel_x = 3 + }, +/obj/item/tank/internals/emergency_oxygen{ + pixel_x = 3 + }, +/obj/item/clothing/mask/breath{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/clothing/mask/breath{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/clothing/mask/breath{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/clothing/mask/breath{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/clothing/head/utility/hardhat/orange{ + name = "protective hat"; + pixel_y = 9 + }, +/obj/item/clothing/head/utility/hardhat/orange{ + name = "protective hat"; + pixel_y = 9 + }, +/obj/item/clothing/head/utility/hardhat/orange{ + name = "protective hat"; + pixel_y = 9 + }, +/obj/item/clothing/head/utility/hardhat/orange{ + name = "protective hat"; + pixel_y = 9 + }, +/obj/structure/closet/crate/internals, +/turf/open/floor/iron, +/area/station/command/gateway) "bxd" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -24999,6 +25046,11 @@ /obj/machinery/holopad, /turf/open/floor/iron, /area/station/engineering/atmos) +"bOV" = ( +/obj/structure/table, +/obj/machinery/recharger, +/turf/open/floor/iron, +/area/station/command/gateway) "bOW" = ( /obj/machinery/computer/atmos_control{ dir = 8 @@ -25407,11 +25459,11 @@ /turf/open/floor/iron, /area/station/science/ordnance/storage) "bQZ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/iron/dark/textured, -/area/station/command/gateway) +/obj/effect/turf_decal/bot, +/obj/structure/closet/crate, +/obj/effect/spawner/random/maintenance/three, +/turf/open/floor/iron, +/area/station/cargo/storage) "bRa" = ( /turf/closed/wall/r_wall, /area/station/maintenance/aft) @@ -25597,23 +25649,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) -"bRM" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/machinery/airalarm/directional/south, -/turf/open/floor/iron/white/corner, -/area/station/hallway/secondary/exit) "bRN" = ( /turf/closed/wall, /area/station/medical/virology) @@ -25675,13 +25710,10 @@ /turf/open/floor/iron, /area/station/tcommsat/computer) "bSe" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 4 +/obj/structure/railing{ + dir = 8 }, -/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark/textured, /area/station/command/gateway) "bSh" = ( @@ -34110,12 +34142,6 @@ /obj/effect/spawner/structure/window/reinforced/plasma, /turf/open/floor/plating, /area/station/engineering/supermatter) -"cMU" = ( -/obj/effect/turf_decal/bot, -/obj/structure/closet/crate, -/obj/effect/spawner/random/maintenance/three, -/turf/open/floor/iron, -/area/station/cargo/storage) "cMX" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/corner{ dir = 1 @@ -34277,6 +34303,12 @@ /obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating/airless, /area/station/maintenance/starboard/aft) +"cPS" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "cQe" = ( /obj/effect/turf_decal/tile/blue, /obj/item/radio/intercom/directional/east, @@ -34668,13 +34700,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/atmos) -"cYo" = ( -/obj/machinery/light/directional/west, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/turf/open/floor/iron/dark/textured, -/area/station/command/gateway) "cYt" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/broken_floor, @@ -34821,6 +34846,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 }, +/obj/structure/flora/bush/sunny/style_random, /turf/open/floor/grass, /area/station/science/genetics) "ddz" = ( @@ -35150,11 +35176,6 @@ }, /turf/open/floor/plating, /area/station/science/xenobiology) -"dqt" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/railing, -/turf/open/floor/iron/dark/textured, -/area/station/command/gateway) "dqL" = ( /obj/structure/cable, /obj/structure/tank_holder, @@ -35181,6 +35202,13 @@ /obj/machinery/computer/records/medical, /turf/open/floor/iron/grimy, /area/station/security/detectives_office) +"dtg" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "dtw" = ( /obj/structure/rack, /obj/item/integrated_circuit/loaded/hello_world, @@ -35375,6 +35403,15 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/fore/lesser) +"dDU" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/science/lab) "dEq" = ( /obj/effect/turf_decal/tile/green{ dir = 8 @@ -35667,13 +35704,6 @@ /obj/item/radio/intercom/directional/north, /turf/open/floor/wood, /area/station/service/lawoffice) -"dTK" = ( -/obj/item/radio/intercom/directional/north, -/obj/machinery/camera/directional/north{ - c_tag = "Central Hallway North-West" - }, -/turf/open/floor/iron, -/area/station/hallway/primary/central) "dUe" = ( /obj/effect/landmark/start/hangover, /obj/machinery/door/firedoor, @@ -35714,6 +35744,18 @@ }, /turf/open/floor/iron, /area/station/engineering/storage/tech) +"dUX" = ( +/obj/machinery/door/airlock/command, +/obj/effect/mapping_helpers/airlock/access/any/command/gateway, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "dVh" = ( /obj/structure/chair/office/light{ dir = 8 @@ -36067,20 +36109,6 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron, /area/station/hallway/primary/fore) -"eiV" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark/textured, -/area/station/command/gateway) -"eji" = ( -/obj/machinery/camera{ - c_tag = "Nanotrasen Representitive's Office"; - dir = 8 - }, -/turf/open/floor/wood, -/area/command/heads_quarters/captain/private/nt_rep) "ejn" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -36098,6 +36126,17 @@ }, /turf/open/floor/iron/dark, /area/station/security/checkpoint/escape) +"ekk" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "ekG" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -36289,13 +36328,8 @@ /area/station/cargo/storage) "eth" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/camera/directional/south{ - c_tag = "Gateway"; - network = list("ss13","rd") - }, +/obj/structure/cable, +/obj/effect/landmark/event_spawn, /turf/open/floor/iron/dark/textured, /area/station/command/gateway) "euc" = ( @@ -36373,6 +36407,11 @@ /obj/effect/turf_decal/tile/dark_blue, /turf/open/floor/iron/white, /area/station/security/brig) +"exl" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/railing, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "eyd" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -36488,10 +36527,6 @@ /obj/machinery/igniter/incinerator_atmos, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) -"eDP" = ( -/obj/effect/turf_decal/bot_white, -/turf/open/floor/iron/dark/textured_large, -/area/station/command/gateway) "eEe" = ( /obj/structure/chair/office, /obj/effect/turf_decal/tile/red{ @@ -36821,6 +36856,13 @@ /obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/engine, /area/station/engineering/main) +"eTj" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/machinery/computer/crew, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "eTo" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -36922,6 +36964,11 @@ }, /turf/open/floor/iron, /area/station/security/office) +"faV" = ( +/obj/machinery/gateway/centerstation, +/obj/structure/cable, +/turf/open/floor/iron/dark/textured_large, +/area/station/command/gateway) "fbE" = ( /obj/machinery/door/morgue{ name = "Confession Booth" @@ -36981,6 +37028,13 @@ }, /turf/open/floor/iron/dark/textured, /area/blueshield) +"fde" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/machinery/status_display/evac/directional/east, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "fdf" = ( /obj/machinery/power/apc/auto_name/directional/west, /obj/machinery/camera/directional/south{ @@ -37119,16 +37173,6 @@ /obj/machinery/status_display/ai/directional/north, /turf/open/floor/iron, /area/station/hallway/primary/central) -"fhQ" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/machinery/camera/directional/west{ - c_tag = "Gateway Storage" - }, -/obj/effect/landmark/event_spawn, -/turf/open/floor/iron/dark/textured, -/area/station/command/gateway) "fic" = ( /obj/machinery/door/window/left/directional/east{ name = "Medbay Delivery"; @@ -37453,11 +37497,6 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/main) -"fsZ" = ( -/obj/effect/turf_decal/bot_white, -/obj/effect/decal/cleanable/greenglow, -/turf/open/floor/iron/dark/textured_large, -/area/station/command/gateway) "ftd" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ @@ -37723,6 +37762,10 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) +"fHv" = ( +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "fHI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/chair{ @@ -37752,14 +37795,13 @@ /obj/effect/mapping_helpers/airlock/access/any/cent_com/rep_door, /turf/open/floor/plating, /area/command/heads_quarters/captain/private/nt_rep) -"fJd" = ( -/obj/effect/turf_decal/bot_white/right, -/obj/effect/decal/cleanable/greenglow, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 4 +"fIt" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/requests_console/directional/east{ + department = "Gateway"; + name = "Gateway Requests Console" }, -/turf/open/floor/iron/dark/textured_large, +/turf/open/floor/iron/dark/textured, /area/station/command/gateway) "fJu" = ( /obj/item/radio/intercom/directional/west, @@ -37884,19 +37926,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/showroomfloor, /area/station/security/prison) -"fOd" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/iron/dark/textured, -/area/station/command/gateway) "fOI" = ( /turf/open/floor/iron, /area/station/security/execution/transfer) @@ -38307,17 +38336,6 @@ /obj/structure/cable, /turf/open/floor/iron/cafeteria, /area/station/security/prison) -"gcP" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 4 - }, -/obj/structure/cable, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark/textured, -/area/station/command/gateway) "gdg" = ( /obj/structure/sink/directional/south, /obj/effect/decal/cleanable/dirt, @@ -38430,18 +38448,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/checkpoint/escape) -"giH" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/airalarm/directional/east, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark/textured, -/area/station/command/gateway) "giT" = ( /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -38472,10 +38478,6 @@ }, /turf/open/floor/iron, /area/station/commons/fitness) -"gjO" = ( -/obj/effect/decal/cleanable/dirt, -/turf/closed/wall/r_wall, -/area/station/maintenance/fore) "gjY" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -38592,12 +38594,6 @@ /obj/item/watertank, /turf/open/floor/iron, /area/station/service/hydroponics) -"gps" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/holopad, -/obj/effect/spawner/random/engineering/tracking_beacon, -/turf/open/floor/iron/dark/textured, -/area/station/command/gateway) "gpz" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/left/directional/north{ @@ -38665,6 +38661,15 @@ }, /turf/open/floor/plating, /area/station/maintenance/aft) +"gsL" = ( +/obj/effect/turf_decal/bot_white, +/obj/structure/cable, +/obj/effect/decal/cleanable/greenglow, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured_large, +/area/station/command/gateway) "gtu" = ( /obj/structure/table/wood, /obj/machinery/fax{ @@ -39757,6 +39762,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/smooth_large, /area/station/engineering/gravity_generator) +"htb" = ( +/obj/structure/railing, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "hte" = ( /obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/dirt, @@ -39886,6 +39895,13 @@ }, /turf/open/floor/plating, /area/station/maintenance/aft) +"hym" = ( +/obj/item/radio/intercom/directional/north, +/obj/machinery/camera/directional/north{ + c_tag = "Central Hallway North-West" + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) "hyy" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -39941,6 +39957,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/plating, /area/station/maintenance/disposal/incinerator) +"hAE" = ( +/obj/effect/turf_decal/bot_white/right, +/obj/effect/decal/cleanable/greenglow, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured_large, +/area/station/command/gateway) "hAO" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -39985,10 +40010,6 @@ }, /turf/open/floor/iron/grimy, /area/station/security/detectives_office) -"hBU" = ( -/obj/effect/spawner/random/structure/steam_vent, -/turf/open/floor/plating, -/area/station/maintenance/fore) "hCG" = ( /turf/open/floor/iron, /area/station/science/ordnance/bomb) @@ -40195,10 +40216,6 @@ /obj/structure/curtain/cloth, /turf/open/floor/plating, /area/station/security/prison) -"hIJ" = ( -/obj/effect/turf_decal/bot_white/left, -/turf/open/floor/iron/dark/textured_large, -/area/station/command/gateway) "hIM" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 9 @@ -40280,13 +40297,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/science/ordnance/bomb) -"hNx" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark/textured, -/area/station/command/gateway) "hOx" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 8 @@ -40303,6 +40313,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/security/execution/transfer) +"hOT" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/port) "hPj" = ( /obj/structure/disposalpipe/trunk{ dir = 4 @@ -40890,6 +40910,12 @@ /obj/machinery/drone_dispenser, /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) +"iqc" = ( +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "iqK" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -41080,6 +41106,19 @@ /obj/item/reagent_containers/cup/glass/waterbottle, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"iAt" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/dark/textured, +/area/station/science/genetics) "iAM" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ @@ -41772,6 +41811,19 @@ /obj/item/gun/syringe, /turf/open/floor/iron/white, /area/station/medical/storage) +"jgQ" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "jgZ" = ( /obj/effect/decal/cleanable/oil, /obj/machinery/power/apc/auto_name/directional/east, @@ -42121,14 +42173,6 @@ "jud" = ( /turf/open/floor/iron/dark, /area/station/security/corrections_officer) -"jux" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/requests_console/directional/east{ - department = "Gateway"; - name = "Gateway Requests Console" - }, -/turf/open/floor/iron/dark/textured, -/area/station/command/gateway) "juQ" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/tile/bar, @@ -42183,6 +42227,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/textured, /area/station/security/prison) +"jwo" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "jwC" = ( /obj/effect/landmark/start/scientist, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, @@ -42446,6 +42496,19 @@ /obj/machinery/space_heater, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +"jHJ" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "jHN" = ( /turf/open/floor/iron, /area/station/maintenance/port/fore) @@ -42748,6 +42811,10 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay) +"jTl" = ( +/obj/effect/turf_decal/bot_white/left, +/turf/open/floor/iron/dark/textured_large, +/area/station/command/gateway) "jTr" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/fakebasalt, @@ -42975,6 +43042,14 @@ /obj/machinery/light/directional/west, /turf/open/floor/iron/white, /area/station/medical/chemistry) +"kcp" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "kct" = ( /obj/machinery/button/door{ id = "armory"; @@ -43278,6 +43353,11 @@ }, /turf/open/floor/iron, /area/station/service/hydroponics/garden) +"koI" = ( +/mob/living/carbon/human/species/monkey, +/obj/structure/flora/bush/flowers_yw/style_random, +/turf/open/floor/grass, +/area/station/science/genetics) "koN" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -44246,11 +44326,6 @@ }, /turf/open/floor/iron, /area/station/construction/mining/aux_base) -"kZH" = ( -/obj/machinery/gateway/centerstation, -/obj/structure/cable, -/turf/open/floor/iron/dark/textured_large, -/area/station/command/gateway) "kZJ" = ( /turf/open/floor/iron/dark/side{ dir = 1 @@ -44434,6 +44509,12 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron/dark/textured, /area/station/science/breakroom) +"lmT" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/west, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "lmU" = ( /obj/structure/closet/secure_closet/security/sec, /obj/effect/turf_decal/bot_blue, @@ -44548,6 +44629,20 @@ }, /turf/open/floor/iron/kitchen, /area/station/security/prison) +"luf" = ( +/obj/machinery/door/airlock/command, +/obj/effect/mapping_helpers/airlock/access/any/command/gateway, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/landmark/navigate_destination/gateway, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "luh" = ( /obj/structure/sign/warning/electric_shock/directional/north, /obj/effect/turf_decal/trimline/dark_blue/filled/line{ @@ -44646,6 +44741,11 @@ }, /turf/open/floor/iron/white, /area/station/medical/break_room) +"lyo" = ( +/obj/structure/railing, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "lyz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, @@ -44720,6 +44820,11 @@ /obj/machinery/light/directional/north, /turf/open/floor/iron/showroomfloor, /area/station/security/warden) +"lzK" = ( +/obj/effect/turf_decal/bot, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/cargo/storage) "lzS" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ @@ -44855,9 +44960,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/fore/lesser) -"lEx" = ( -/turf/open/floor/iron/dark/textured, -/area/station/command/gateway) "lEW" = ( /obj/effect/turf_decal/delivery, /obj/machinery/airalarm/directional/south, @@ -44917,10 +45019,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/service/chapel/office) -"lGE" = ( -/obj/structure/closet/l3closet/scientist, -/turf/open/floor/iron, -/area/station/command/gateway) "lHg" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -45025,12 +45123,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/central) -"lKw" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/obj/effect/landmark/event_spawn, -/turf/open/floor/iron/dark/textured, -/area/station/command/gateway) "lKx" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -45514,6 +45606,18 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/station/maintenance/port/aft) +"mfL" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/camera/directional/south{ + c_tag = "Gateway"; + network = list("ss13","rd") + }, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "mfT" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -45545,11 +45649,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port) -"mgV" = ( -/obj/item/radio/intercom/directional/west, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark/textured, -/area/station/command/gateway) "mhs" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -45755,13 +45854,6 @@ /obj/machinery/firealarm/directional/east, /turf/open/floor/iron, /area/station/hallway/primary/central) -"msW" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark/textured, -/area/station/command/gateway) "mtl" = ( /obj/structure/chair/plastic{ dir = 1 @@ -45987,10 +46079,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit) -"mEI" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/station/cargo/storage) "mEM" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -46034,6 +46122,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/smooth_large, /area/station/science/breakroom) +"mFN" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "mFT" = ( /obj/machinery/camera/directional/east{ c_tag = "Locker Room South" @@ -46508,6 +46606,13 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay) +"nbJ" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/machinery/computer/gateway_control, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "nce" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -46521,13 +46626,6 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/science/ordnance) -"ncg" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/machinery/computer/crew, -/turf/open/floor/iron/dark/textured, -/area/station/command/gateway) "ncB" = ( /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/brown{ @@ -46760,6 +46858,10 @@ /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/space/nearstation) +"nmS" = ( +/obj/structure/railing/corner, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "nmV" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -46904,13 +47006,11 @@ /turf/open/floor/plating, /area/station/security/prison) "nwg" = ( -/obj/machinery/button/door/directional/south{ - id = "gatewayshutters"; - req_access = list("gateway"); - name = "Gateway Shutters" +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 }, /obj/effect/turf_decal/stripes/line{ - dir = 4 + dir = 1 }, /turf/open/floor/iron/dark/textured, /area/station/command/gateway) @@ -46942,11 +47042,6 @@ /obj/structure/bed/roller, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) -"nxH" = ( -/obj/structure/table, -/obj/machinery/cell_charger, -/turf/open/floor/iron, -/area/station/command/gateway) "nxP" = ( /obj/machinery/door/firedoor, /obj/effect/landmark/event_spawn, @@ -47345,6 +47440,11 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/commons/dorms) +"nNv" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/secure_closet/exile, +/turf/open/floor/iron, +/area/station/command/gateway) "nNA" = ( /obj/machinery/light/directional/south, /turf/open/floor/iron, @@ -47376,6 +47476,16 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/station/security/brig) +"nOG" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/machinery/camera/directional/west{ + c_tag = "Gateway Storage" + }, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "nPg" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -47741,12 +47851,6 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) -"ocM" = ( -/obj/effect/turf_decal/bot, -/obj/structure/closet/crate, -/obj/effect/spawner/random/maintenance/two, -/turf/open/floor/iron, -/area/station/cargo/storage) "ocV" = ( /obj/structure/cable, /obj/machinery/door/firedoor, @@ -47888,13 +47992,6 @@ }, /turf/open/floor/iron, /area/station/science/explab) -"olX" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark/textured, -/area/station/command/gateway) "omf" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/broken_floor, @@ -47926,6 +48023,12 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"ooF" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "ooJ" = ( /obj/machinery/door/window/brigdoor/security/holding{ id = "Holding Cell"; @@ -48139,29 +48242,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/security/office) -"ovF" = ( -/obj/effect/turf_decal/stripes/corner, -/turf/open/floor/iron/dark/textured, -/area/station/command/gateway) -"ovS" = ( -/obj/structure/table, -/obj/item/paper/pamphlet/gateway{ - pixel_x = 7 - }, -/obj/item/paper/pamphlet/gateway{ - pixel_y = 4; - pixel_x = 7 - }, -/obj/item/paper/pamphlet/gateway{ - pixel_x = -6 - }, -/obj/item/paper/pamphlet/gateway{ - pixel_x = -6; - pixel_y = 3 - }, -/obj/machinery/airalarm/directional/east, -/turf/open/floor/iron, -/area/station/command/gateway) "owa" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/white, @@ -48324,6 +48404,13 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/wood, /area/station/security/prison) +"oCj" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "oCu" = ( /obj/structure/chair{ dir = 8 @@ -48360,6 +48447,18 @@ /obj/machinery/light/directional/south, /turf/open/floor/plating, /area/station/engineering/main) +"oDP" = ( +/obj/machinery/button/door/directional/south{ + id = "gatewayshutters"; + req_access = list("gateway"); + name = "Gateway Shutters" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "oEv" = ( /obj/effect/turf_decal/delivery/white{ color = "#00ff00"; @@ -48437,18 +48536,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/white, /area/station/science/ordnance) -"oIs" = ( -/obj/machinery/door/airlock/command, -/obj/effect/mapping_helpers/airlock/access/any/command/gateway, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/iron/dark/textured, -/area/station/command/gateway) "oIB" = ( /obj/machinery/light_switch{ pixel_y = -23 @@ -48841,10 +48928,6 @@ "pee" = ( /turf/open/floor/iron/showroomfloor, /area/station/security/prison) -"peo" = ( -/obj/structure/railing/corner, -/turf/open/floor/iron/dark/textured, -/area/station/command/gateway) "peL" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -48931,13 +49014,6 @@ /obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/plating, /area/station/engineering/main) -"pht" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/machinery/computer/gateway_control, -/turf/open/floor/iron/dark/textured, -/area/station/command/gateway) "phz" = ( /obj/machinery/vending/wardrobe/law_wardrobe, /obj/machinery/camera/directional/south{ @@ -49348,8 +49424,8 @@ dir = 4 }, /obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 5 +/obj/structure/disposalpipe/junction/yjunction{ + dir = 1 }, /turf/open/floor/plating, /area/station/maintenance/starboard) @@ -49680,6 +49756,10 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron, /area/station/service/barber) +"pNy" = ( +/obj/structure/cable, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "pOe" = ( /obj/structure/table, /obj/item/assembly/signaler, @@ -49804,6 +49884,10 @@ /obj/structure/tank_holder/oxygen/red, /turf/open/floor/iron/dark, /area/station/security/execution/education) +"pSy" = ( +/obj/effect/turf_decal/bot_white, +/turf/open/floor/iron/dark/textured_large, +/area/station/command/gateway) "pSQ" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ @@ -50037,9 +50121,8 @@ /area/station/security/office) "qcH" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/closet/secure_closet/exile, -/turf/open/floor/iron, -/area/station/command/gateway) +/turf/closed/wall/r_wall, +/area/station/maintenance/fore) "qcV" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -50239,6 +50322,16 @@ }, /turf/open/floor/iron/dark/textured, /area/station/science/breakroom) +"qiH" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/railing{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "qjL" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -50496,70 +50589,6 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron/dark/side, /area/station/commons/dorms) -"qve" = ( -/obj/item/clothing/suit/hazardvest{ - desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; - name = "emergency lifejacket" - }, -/obj/item/clothing/suit/hazardvest{ - desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; - name = "emergency lifejacket" - }, -/obj/item/clothing/suit/hazardvest{ - desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; - name = "emergency lifejacket" - }, -/obj/item/clothing/suit/hazardvest{ - desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; - name = "emergency lifejacket" - }, -/obj/item/tank/internals/emergency_oxygen{ - pixel_x = 3 - }, -/obj/item/tank/internals/emergency_oxygen{ - pixel_x = 3 - }, -/obj/item/tank/internals/emergency_oxygen{ - pixel_x = 3 - }, -/obj/item/tank/internals/emergency_oxygen{ - pixel_x = 3 - }, -/obj/item/clothing/mask/breath{ - pixel_x = -3; - pixel_y = -3 - }, -/obj/item/clothing/mask/breath{ - pixel_x = -3; - pixel_y = -3 - }, -/obj/item/clothing/mask/breath{ - pixel_x = -3; - pixel_y = -3 - }, -/obj/item/clothing/mask/breath{ - pixel_x = -3; - pixel_y = -3 - }, -/obj/item/clothing/head/utility/hardhat/orange{ - name = "protective hat"; - pixel_y = 9 - }, -/obj/item/clothing/head/utility/hardhat/orange{ - name = "protective hat"; - pixel_y = 9 - }, -/obj/item/clothing/head/utility/hardhat/orange{ - name = "protective hat"; - pixel_y = 9 - }, -/obj/item/clothing/head/utility/hardhat/orange{ - name = "protective hat"; - pixel_y = 9 - }, -/obj/structure/closet/crate/internals, -/turf/open/floor/iron, -/area/station/command/gateway) "qvC" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -51518,14 +51547,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) -"ril" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/iron/dark/textured, -/area/station/command/gateway) "riN" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/structure/cable, @@ -51823,6 +51844,16 @@ /obj/item/target/syndicate, /turf/open/floor/iron, /area/station/security/office) +"ryU" = ( +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/machinery/light/directional/east, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "rzh" = ( /obj/structure/chair{ dir = 1 @@ -52103,6 +52134,10 @@ /obj/structure/chair, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) +"rLa" = ( +/obj/effect/spawner/random/structure/steam_vent, +/turf/open/floor/plating, +/area/station/maintenance/fore) "rLn" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ @@ -52207,12 +52242,13 @@ "rQR" = ( /turf/closed/wall, /area/station/commons/fitness) -"rQU" = ( -/obj/structure/railing{ - dir = 4 +"rRz" = ( +/obj/machinery/camera{ + c_tag = "Nanotrasen Representitive's Office"; + dir = 8 }, -/turf/open/floor/iron/dark/textured, -/area/station/command/gateway) +/turf/open/floor/wood, +/area/command/heads_quarters/captain/private/nt_rep) "rSv" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/dark_blue/filled/warning{ @@ -52355,11 +52391,6 @@ "rYG" = ( /turf/closed/wall/r_wall, /area/station/command/gateway) -"rYS" = ( -/obj/effect/turf_decal/bot, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/station/cargo/storage) "rYV" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/dark_blue/filled/line{ @@ -52505,17 +52536,16 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/iron, /area/station/commons/storage/primary) +"seO" = ( +/obj/effect/turf_decal/bot, +/obj/structure/closet/crate/preopen, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/iron, +/area/station/cargo/storage) "seW" = ( /obj/machinery/light/directional/south, /turf/open/floor/iron, /area/station/security/prison) -"sgk" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/machinery/status_display/evac/directional/east, -/turf/open/floor/iron/dark/textured, -/area/station/command/gateway) "sgA" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -52873,16 +52903,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/central) -"swD" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/railing{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/iron/dark/textured, -/area/station/command/gateway) "swH" = ( /obj/effect/spawner/structure/window, /obj/structure/curtain/cloth/fancy/mechanical{ @@ -52904,14 +52924,6 @@ /obj/item/radio/intercom/prison/directional/south, /turf/open/floor/iron/dark/side, /area/station/security/prison) -"sxi" = ( -/obj/structure/closet/crate/medical, -/obj/item/storage/medkit/brute, -/obj/item/storage/medkit/fire, -/obj/item/storage/medkit/regular, -/obj/item/storage/medkit/regular, -/turf/open/floor/iron, -/area/station/command/gateway) "sxl" = ( /obj/structure/rack, /turf/open/floor/plating, @@ -52937,10 +52949,6 @@ }, /turf/open/floor/iron/smooth_large, /area/station/service/hydroponics) -"syU" = ( -/obj/structure/railing, -/turf/open/floor/iron/dark/textured, -/area/station/command/gateway) "szO" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/effect/turf_decal/stripes/line{ @@ -52952,6 +52960,11 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/commons/locker) +"sAk" = ( +/obj/machinery/door/airlock/command, +/obj/effect/mapping_helpers/airlock/access/any/cent_com/rep_door, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "sAw" = ( /obj/structure/disposalpipe/segment, /obj/structure/sign/poster/random/directional/east, @@ -53201,11 +53214,6 @@ /obj/machinery/power/port_gen/pacman, /turf/open/floor/plating, /area/station/maintenance/department/electrical) -"sKq" = ( -/obj/structure/railing, -/obj/machinery/light/directional/north, -/turf/open/floor/iron/dark/textured, -/area/station/command/gateway) "sKS" = ( /obj/effect/turf_decal/tile/red{ dir = 4 @@ -53456,23 +53464,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) -"sVP" = ( -/obj/structure/table, -/obj/item/radio/off{ - pixel_y = 6 - }, -/obj/item/radio/off{ - pixel_x = 6; - pixel_y = 4 - }, -/obj/item/radio/off{ - pixel_x = -6; - pixel_y = 4 - }, -/obj/item/radio/off, -/obj/item/radio/intercom/directional/west, -/turf/open/floor/iron, -/area/station/command/gateway) "sVZ" = ( /obj/effect/landmark/event_spawn, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, @@ -53544,6 +53535,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/security/brig) +"sZv" = ( +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/plating, +/area/station/maintenance/fore) "sZT" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, @@ -54288,12 +54283,6 @@ dir = 1 }, /area/station/hallway/primary/central) -"tFG" = ( -/obj/effect/turf_decal/bot, -/obj/structure/closet/crate/preopen, -/obj/effect/spawner/random/maintenance, -/turf/open/floor/iron, -/area/station/cargo/storage) "tGv" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -54439,6 +54428,9 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/iron, /area/station/science/cytology) +"tKS" = ( +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "tLv" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ @@ -54851,16 +54843,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/warden) -"udy" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/hallway/primary/port) "udE" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -55158,6 +55140,30 @@ /obj/item/clothing/head/utility/bomb_hood/security, /turf/open/floor/iron/dark, /area/station/security/office) +"utT" = ( +/obj/machinery/light/directional/west, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) +"uuD" = ( +/obj/structure/table, +/obj/item/radio/off{ + pixel_y = 6 + }, +/obj/item/radio/off{ + pixel_x = 6; + pixel_y = 4 + }, +/obj/item/radio/off{ + pixel_x = -6; + pixel_y = 4 + }, +/obj/item/radio/off, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/iron, +/area/station/command/gateway) "uvi" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 4 @@ -55338,6 +55344,12 @@ /obj/effect/spawner/liquids_spawner, /turf/open/floor/iron/pool, /area/station/science/breakroom) +"uDn" = ( +/obj/effect/turf_decal/bot, +/obj/structure/closet/crate, +/obj/effect/spawner/random/maintenance/two, +/turf/open/floor/iron, +/area/station/cargo/storage) "uDy" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ @@ -55518,6 +55530,18 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/security/corrections_officer) +"uNC" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/airalarm/directional/east, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "uOe" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -55619,6 +55643,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/virology) +"uSo" = ( +/obj/structure/table, +/obj/machinery/cell_charger, +/turf/open/floor/iron, +/area/station/command/gateway) +"uSQ" = ( +/obj/item/radio/intercom/directional/west, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "uSW" = ( /obj/structure/table, /obj/machinery/cell_charger, @@ -55763,12 +55797,6 @@ /obj/effect/spawner/random/clothing/gloves, /turf/open/floor/plating, /area/station/security/prison/safe) -"uWI" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/floor/iron/dark/textured, -/area/station/command/gateway) "uXt" = ( /obj/machinery/door/airlock/mining{ name = "Mining Dock" @@ -55944,6 +55972,14 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/science/ordnance/bomb) +"vgP" = ( +/obj/structure/closet/crate/medical, +/obj/item/storage/medkit/brute, +/obj/item/storage/medkit/fire, +/obj/item/storage/medkit/regular, +/obj/item/storage/medkit/regular, +/turf/open/floor/iron, +/area/station/command/gateway) "vhn" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -56417,16 +56453,6 @@ }, /turf/open/floor/plating, /area/station/science/explab) -"vBb" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/machinery/light/directional/east, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/turf/open/floor/iron/dark/textured, -/area/station/command/gateway) "vBc" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, @@ -56599,11 +56625,6 @@ }, /turf/open/floor/iron/dark/textured, /area/station/science/genetics) -"vGe" = ( -/obj/effect/turf_decal/bot_white/right, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark/textured_large, -/area/station/command/gateway) "vGg" = ( /obj/machinery/holopad, /turf/open/floor/iron/white, @@ -56774,10 +56795,6 @@ "vKD" = ( /turf/open/floor/carpet, /area/station/commons/vacant_room/office) -"vLn" = ( -/obj/structure/reagent_dispensers/watertank, -/turf/open/floor/plating, -/area/station/maintenance/fore) "vLr" = ( /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 8 @@ -57174,20 +57191,6 @@ /obj/item/gun/grenadelauncher, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) -"weD" = ( -/obj/machinery/door/airlock/command, -/obj/effect/mapping_helpers/airlock/access/any/command/gateway, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 4 - }, -/obj/structure/cable, -/obj/effect/landmark/navigate_destination/gateway, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/dark/textured, -/area/station/command/gateway) "weJ" = ( /obj/structure/closet/secure_closet/chief_medical, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -57673,14 +57676,16 @@ /obj/machinery/light/directional/east, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) +"wAK" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/holopad, +/obj/effect/spawner/random/engineering/tracking_beacon, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "wAO" = ( /obj/item/radio/intercom/directional/north, /turf/open/floor/iron, /area/station/hallway/primary/central) -"wAX" = ( -/obj/structure/cable, -/turf/open/floor/iron/dark/textured, -/area/station/command/gateway) "wBd" = ( /obj/effect/turf_decal/siding/brown{ dir = 1 @@ -57763,6 +57768,25 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port) +"wFf" = ( +/obj/structure/table, +/obj/item/paper/pamphlet/gateway{ + pixel_x = 7 + }, +/obj/item/paper/pamphlet/gateway{ + pixel_y = 4; + pixel_x = 7 + }, +/obj/item/paper/pamphlet/gateway{ + pixel_x = -6 + }, +/obj/item/paper/pamphlet/gateway{ + pixel_x = -6; + pixel_y = 3 + }, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/iron, +/area/station/command/gateway) "wFw" = ( /obj/structure/window/reinforced/tinted/spawner/directional/east, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -58056,18 +58080,19 @@ }, /turf/open/floor/iron/dark, /area/station/security/office) +"wPF" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark/textured, +/area/station/command/gateway) "wPI" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, /turf/open/floor/iron, /area/station/hallway/secondary/exit) -"wPN" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/iron/dark/textured, -/area/station/command/gateway) "wQc" = ( /obj/structure/table/reinforced, /obj/item/wrench, @@ -58366,15 +58391,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/office) -"xbO" = ( -/obj/effect/turf_decal/bot_white, -/obj/structure/cable, -/obj/effect/decal/cleanable/greenglow, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/iron/dark/textured_large, -/area/station/command/gateway) "xcn" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/decal/cleanable/dirt, @@ -58415,15 +58431,6 @@ /obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/iron/dark, /area/station/commons/fitness) -"xeh" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/iron/dark/textured, -/area/station/command/gateway) "xey" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -58568,11 +58575,6 @@ /obj/item/storage/crayons, /turf/open/floor/wood, /area/station/security/prison) -"xhQ" = ( -/obj/machinery/door/airlock/command, -/obj/effect/mapping_helpers/airlock/access/any/cent_com/rep_door, -/turf/open/floor/iron/dark/textured, -/area/station/command/gateway) "xhV" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ @@ -59051,6 +59053,10 @@ /obj/structure/girder, /turf/closed/wall, /area/station/maintenance/starboard/aft) +"xEB" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/cargo/storage) "xEJ" = ( /turf/open/floor/iron, /area/station/security/office) @@ -59482,6 +59488,23 @@ }, /turf/open/floor/plating, /area/station/maintenance/port) +"xSQ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/iron/white/corner, +/area/station/hallway/secondary/exit) "xSX" = ( /obj/structure/table/wood/fancy, /obj/machinery/light/directional/south, @@ -59545,6 +59568,11 @@ /obj/effect/mapping_helpers/mail_sorting/science/genetics, /turf/open/floor/iron/white, /area/station/science/lab) +"xUW" = ( +/obj/effect/turf_decal/bot_white, +/obj/effect/decal/cleanable/greenglow, +/turf/open/floor/iron/dark/textured_large, +/area/station/command/gateway) "xVA" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -78650,7 +78678,7 @@ bgw aPz ajF ofT -mEI +xEB bps ofT ofT @@ -78911,7 +78939,7 @@ cCo cCo cCo cCo -mEI +xEB bvV blW xzh @@ -79165,7 +79193,7 @@ aPz bkn bmh ofT -mEI +xEB ofT axE ofT @@ -79425,7 +79453,7 @@ boK bpz boK bkt -tFG +seO ofT blW xzh @@ -79678,7 +79706,7 @@ aAq aTo xGy bmh -tFG +seO aKM boK ofT @@ -79938,8 +79966,8 @@ bmh boK aKM cBp -mEI -ocM +xEB +uDn fRc xUu xUu @@ -80189,14 +80217,14 @@ asx yfx aPz bjo -mEI -mEI +xEB +xEB bmh boK aKM -cMU +bQZ ofT -rYS +lzK aKd xUu bZp @@ -80449,7 +80477,7 @@ epD bmh fpc bmh -mEI +xEB aKM ofT ofT @@ -80710,7 +80738,7 @@ ofT aKg ofT ofT -mEI +xEB ofT wst vWE @@ -82731,7 +82759,7 @@ arP awf aqR arP -hBU +rLa oiF rGG reK @@ -82988,7 +83016,7 @@ arP awf aOK arP -vLn +sZv aph rGG rGG @@ -83246,9 +83274,9 @@ awf rQj aph aph -gjO -sxi -qve +qcH +vgP +bxc rGG rGG rGG @@ -83501,15 +83529,15 @@ arP arP awf bwI -gjO qcH -aev -eiV -eiV -fhQ -mgV -cYo -lEx +nNv +jHJ +oCj +oCj +nOG +uSQ +utT +tKS rYG aLE gRS @@ -83759,16 +83787,16 @@ arP awf aqR aph -lGE -xeh -wPN -bSe -gcP -bSe -bSe -giH -weD -udy +bbt +nwg +ooF +mFN +ekk +mFN +mFN +uNC +luf +hOT jTW aLE aSs @@ -84019,7 +84047,7 @@ aph rYG rYG rYG -oIs +dUX rYG rYG rYG @@ -84271,16 +84299,16 @@ asS whr arP qKp -hBU +rLa aph -peo -msW -rQU -fOd -akK -aLP -sVP -nxH +nmS +wPF +cPS +jgQ +axv +lmT +uuD +uSo rYG aHQ qPT @@ -84530,14 +84558,14 @@ arP awf aOK aph -syU -vGe -fsZ +htb +akv +xUW stu -ncg -ril -bQZ -eth +eTj +kcp +jwo +mfL rYG aMm ova @@ -84787,14 +84815,14 @@ apS awe aqR aph -sKq -eDP -kZH -xbO -wAX -lKw -gps -lEx +lyo +pSy +faV +gsL +pNy +eth +wAK +tKS aLV aJq bUm @@ -85044,14 +85072,14 @@ aqR axt aqR aph -dqt -hIJ -eDP -fJd -pht -ovF -olX -nwg +exl +jTl +pSy +hAE +nbJ +fHv +dtg +oDP rYG aLW aaa @@ -85301,16 +85329,16 @@ aqR btX aqR aph -uWI -hNx -sgk -swD -vBb -jux -ovS -bdT +iqc +bSe +fde +qiH +ryU +fIt +wFf +bOV rYG -dTK +hym aaa sRO aJn @@ -85561,7 +85589,7 @@ arP aph aph rYG -xhQ +sAk qcW qcW qcW @@ -85819,7 +85847,7 @@ ukZ aqR qcW uyx -eji +rRz vzN jiY jMg @@ -107434,7 +107462,7 @@ tvl bpZ bpf boA -bdh +dDU bqf taM gLd @@ -108968,7 +108996,7 @@ wDE aPq bcz aPq -bRM +xSQ bWq bqh sjr @@ -109490,7 +109518,7 @@ cnC gEp lQG sEX -ayS +iAt ayS bvp kxC @@ -110263,7 +110291,7 @@ cyC pxC gEp vOZ -vOZ +koI xXe bWq kwC From 8b4fb53ea45269999e43edfee621558bf74f5295 Mon Sep 17 00:00:00 2001 From: Iajret Date: Sat, 21 Oct 2023 16:38:01 +0300 Subject: [PATCH 4/6] gateway and other stuff --- _maps/map_files/NSSJourney/NSSJourney.dmm | 126 +++++++++++++++------- 1 file changed, 86 insertions(+), 40 deletions(-) diff --git a/_maps/map_files/NSSJourney/NSSJourney.dmm b/_maps/map_files/NSSJourney/NSSJourney.dmm index e386d4e7f99..aa72b84c83a 100644 --- a/_maps/map_files/NSSJourney/NSSJourney.dmm +++ b/_maps/map_files/NSSJourney/NSSJourney.dmm @@ -15911,7 +15911,7 @@ /obj/effect/mapping_helpers/airlock/access/any/command/captain, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/plating, -/area/station/maintenance/starboard/lesser) +/area/station/maintenance/central/lesser) "ble" = ( /obj/structure/disposalpipe/segment, /obj/structure/extinguisher_cabinet{ @@ -16451,7 +16451,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, -/area/station/maintenance/starboard/lesser) +/area/station/maintenance/central/lesser) "bmE" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/iron, @@ -17941,7 +17941,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/mapping_helpers/airlock/access/any/command/teleporter, /turf/open/floor/plating, -/area/station/maintenance/starboard/lesser) +/area/station/maintenance/central/lesser) "bqL" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, @@ -20632,6 +20632,7 @@ /obj/structure/sign/warning/no_smoking{ pixel_x = -28 }, +/obj/structure/closet/secure_closet/atmospherics, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "bzs" = ( @@ -24378,7 +24379,7 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{ dir = 8 }, -/obj/machinery/light/directional/south, +/obj/machinery/light/small/dim/directional/south, /turf/open/floor/iron/dark, /area/station/science/ordnance/freezerchamber) "bMu" = ( @@ -30493,12 +30494,8 @@ /turf/open/floor/iron, /area/station/hallway/secondary/entry) "cqs" = ( -/obj/effect/decal/cleanable/cobweb, -/obj/structure/cable, -/obj/structure/closet/secure_closet/atmospherics, /obj/effect/turf_decal/bot, -/obj/machinery/power/apc/auto_name/directional/west, -/turf/open/floor/iron/dark, +/turf/closed/wall/r_wall, /area/station/maintenance/disposal/incinerator) "cqt" = ( /obj/effect/decal/cleanable/dirt, @@ -34307,6 +34304,8 @@ /obj/structure/railing{ dir = 4 }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, /turf/open/floor/iron/dark/textured, /area/station/command/gateway) "cQe" = ( @@ -34897,6 +34896,7 @@ dir = 10 }, /obj/effect/turf_decal/bot, +/obj/machinery/portable_atmospherics/canister/oxygen, /turf/open/floor/iron, /area/station/science/ordnance) "dfp" = ( @@ -35020,6 +35020,7 @@ /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/dirt, +/obj/machinery/portable_atmospherics/canister, /turf/open/floor/iron, /area/station/science/ordnance) "dkZ" = ( @@ -35745,7 +35746,6 @@ /turf/open/floor/iron, /area/station/engineering/storage/tech) "dUX" = ( -/obj/machinery/door/airlock/command, /obj/effect/mapping_helpers/airlock/access/any/command/gateway, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 @@ -35754,6 +35754,9 @@ dir = 4 }, /obj/structure/cable, +/obj/machinery/door/airlock/command/glass{ + name = "Gateway" + }, /turf/open/floor/iron/dark/textured, /area/station/command/gateway) "dVh" = ( @@ -41657,6 +41660,9 @@ }, /turf/open/floor/plating/airless, /area/space/nearstation) +"jbA" = ( +/turf/closed/wall/r_wall, +/area/station/maintenance/central/lesser) "jbJ" = ( /obj/machinery/door/airlock/maintenance{ name = "Cargo Bay Maintenance" @@ -43672,6 +43678,15 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line, /turf/open/floor/iron/dark, /area/station/security/brig) +"kyW" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 4 + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "kyZ" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -44512,7 +44527,6 @@ "lmT" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/west, /turf/open/floor/iron/dark/textured, /area/station/command/gateway) "lmU" = ( @@ -44630,7 +44644,9 @@ /turf/open/floor/iron/kitchen, /area/station/security/prison) "luf" = ( -/obj/machinery/door/airlock/command, +/obj/machinery/door/airlock/command{ + name = "Gateway" + }, /obj/effect/mapping_helpers/airlock/access/any/command/gateway, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 @@ -45336,7 +45352,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/power/apc/auto_name/directional/east, /turf/open/floor/plating, -/area/station/maintenance/starboard/lesser) +/area/station/maintenance/central/lesser) "lSv" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ @@ -45599,7 +45615,10 @@ /obj/machinery/computer/atmos_control/ordnancemix{ dir = 4 }, -/turf/open/floor/iron/white, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron, /area/station/science/ordnance) "meR" = ( /obj/item/kirbyplants/random/dead, @@ -50474,6 +50493,7 @@ network = list("ss13","rd") }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/portable_atmospherics/canister/oxygen, /turf/open/floor/iron, /area/station/science/ordnance) "qrt" = ( @@ -52388,6 +52408,9 @@ }, /turf/open/floor/iron/dark, /area/station/security/checkpoint/medical) +"rYt" = ( +/turf/closed/wall, +/area/station/maintenance/central/lesser) "rYG" = ( /turf/closed/wall/r_wall, /area/station/command/gateway) @@ -52961,7 +52984,9 @@ /turf/open/floor/iron, /area/station/commons/locker) "sAk" = ( -/obj/machinery/door/airlock/command, +/obj/machinery/door/airlock/command{ + name = "Gateway" + }, /obj/effect/mapping_helpers/airlock/access/any/cent_com/rep_door, /turf/open/floor/iron/dark/textured, /area/station/command/gateway) @@ -54703,6 +54728,10 @@ /obj/structure/sign/warning/electric_shock, /turf/closed/wall, /area/station/maintenance/starboard/fore) +"tWV" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/command/gateway) "tXu" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ @@ -54953,7 +54982,10 @@ /obj/machinery/modular_computer/preset/civilian{ dir = 4 }, -/turf/open/floor/iron/white, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/iron, /area/station/science/ordnance) "uku" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -55031,6 +55063,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/security/prison) +"uov" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Engineering Supermatter Fore" + }, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "uoD" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -55161,7 +55199,6 @@ pixel_y = 4 }, /obj/item/radio/off, -/obj/item/radio/intercom/directional/west, /turf/open/floor/iron, /area/station/command/gateway) "uvi" = ( @@ -55646,6 +55683,7 @@ "uSo" = ( /obj/structure/table, /obj/machinery/cell_charger, +/obj/item/radio/intercom/directional/south, /turf/open/floor/iron, /area/station/command/gateway) "uSQ" = ( @@ -59640,6 +59678,7 @@ /turf/open/floor/plating, /area/station/engineering/gravity_generator) "xXe" = ( +/obj/structure/flora/rock/pile/jungle/style_random, /turf/open/floor/grass, /area/station/science/genetics) "xXl" = ( @@ -59718,6 +59757,13 @@ }, /turf/open/floor/circuit/telecomms, /area/station/science/xenobiology) +"ycm" = ( +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "ycI" = ( /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -84045,12 +84091,12 @@ awf aqR aph rYG -rYG +tWV rYG dUX rYG -rYG -rYG +tWV +tWV rYG rYG qMR @@ -85585,7 +85631,7 @@ nTO nTO axt arP -arP +aph aph aph rYG @@ -89023,7 +89069,7 @@ cGV csd cGV noK -csd +uov ccw xzh bJc @@ -92039,11 +92085,11 @@ bbw bbw bbw bjH -aZV -bmx -bmx -bmx -bqH +jbA +rYt +rYt +rYt +jbA bsm btL buX @@ -92553,11 +92599,11 @@ aZV aZV aZV aZV -aZV -bmx -bmx -bmx -bqH +jbA +rYt +rYt +rYt +jbA bqH btM bqH @@ -96961,7 +97007,7 @@ hLb hLb hLb hLb -cmd +hLb cmd gBq cmd @@ -97220,7 +97266,7 @@ bzs bzs bRa cqs -byw +kyW bzr bAP bCf @@ -97475,9 +97521,9 @@ bXZ bzs bBR caK -bzs +bRa bxs -byO +ycm cjr bvt bvu @@ -97732,7 +97778,7 @@ bAw bAw bAw bAw -bzs +bRa bxB byw bGJ @@ -97989,7 +98035,7 @@ bzs ccF bAw bwc -bzs +bRa bxD byO bzB @@ -98503,7 +98549,7 @@ wzx wzx cdI bAw -bzs +bRa akE wLA bfx @@ -98760,7 +98806,7 @@ bzs ccG ciF ceF -bzs +bRa cga chm bAc From 0d3bbbd2c61c03e6fa865dd5747115183e5c0a65 Mon Sep 17 00:00:00 2001 From: Iajret Date: Sat, 21 Oct 2023 17:33:12 +0300 Subject: [PATCH 5/6] conflict resolution --- _maps/map_files/NSSJourney/NSSJourney.dmm | 130 +++++++++++++--------- 1 file changed, 76 insertions(+), 54 deletions(-) diff --git a/_maps/map_files/NSSJourney/NSSJourney.dmm b/_maps/map_files/NSSJourney/NSSJourney.dmm index f9944cc47b7..58daf4c02c0 100644 --- a/_maps/map_files/NSSJourney/NSSJourney.dmm +++ b/_maps/map_files/NSSJourney/NSSJourney.dmm @@ -2218,7 +2218,7 @@ pixel_y = -2 }, /turf/open/floor/carpet/executive, -/area/blueshield) +/area/station/command/heads_quarters/blueshield) "aph" = ( /turf/closed/wall/r_wall, /area/station/maintenance/fore) @@ -2248,7 +2248,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, -/area/blueshield) +/area/station/command/heads_quarters/blueshield) "apt" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -5865,12 +5865,12 @@ "aDi" = ( /obj/structure/sign/poster/official/no_erp/directional/north, /turf/open/floor/carpet/executive, -/area/blueshield) +/area/station/command/heads_quarters/blueshield) "aDj" = ( /obj/machinery/photocopier, /obj/machinery/airalarm/directional/west, /turf/open/floor/carpet/executive, -/area/blueshield) +/area/station/command/heads_quarters/blueshield) "aDo" = ( /turf/open/floor/iron, /area/station/commons/storage/primary) @@ -5921,7 +5921,7 @@ /obj/machinery/light/directional/north, /obj/machinery/newscaster/directional/north, /turf/open/floor/carpet/executive, -/area/blueshield) +/area/station/command/heads_quarters/blueshield) "aDA" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron, @@ -6479,13 +6479,13 @@ fax_name = "Blueshield's Office" }, /turf/open/floor/carpet/executive, -/area/blueshield) +/area/station/command/heads_quarters/blueshield) "aFX" = ( /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/pen/fountain, /turf/open/floor/carpet/executive, -/area/blueshield) +/area/station/command/heads_quarters/blueshield) "aFY" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 4 @@ -6862,7 +6862,6 @@ /area/station/service/chapel/office) "aHj" = ( /obj/structure/closet/secure_closet/blueshield, -/obj/item/bedsheet/centcom, /obj/item/clothing/under/rank/centcom/officer_skirt/replica{ desc = "A cheaper, unarmored CentCom skirtleneck meant for everyday wear. Somewhat of a status symbol."; name = "\improper Civilian CentCom skirtleneck" @@ -6875,7 +6874,7 @@ dir = 1 }, /turf/open/floor/wood, -/area/blueshield) +/area/station/command/heads_quarters/blueshield) "aHk" = ( /obj/machinery/holopad, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -7376,7 +7375,7 @@ /area/station/commons/storage/primary) "aJa" = ( /turf/open/floor/wood, -/area/blueshield) +/area/station/command/heads_quarters/blueshield) "aJb" = ( /obj/effect/turf_decal/delivery, /turf/open/floor/iron, @@ -7524,7 +7523,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/wood, -/area/blueshield) +/area/station/command/heads_quarters/blueshield) "aJC" = ( /turf/closed/wall, /area/station/service/bar) @@ -14676,7 +14675,7 @@ dir = 4 }, /turf/open/floor/carpet/executive, -/area/blueshield) +/area/station/command/heads_quarters/blueshield) "bjl" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -14694,7 +14693,7 @@ /obj/structure/chair/comfy/brown, /obj/effect/landmark/start/blueshield, /turf/open/floor/carpet/executive, -/area/blueshield) +/area/station/command/heads_quarters/blueshield) "bjo" = ( /obj/machinery/camera/directional/north{ c_tag = "Cargo Bay North" @@ -19725,7 +19724,6 @@ /turf/open/floor/iron/dark, /area/station/science/server) "bAB" = ( -/obj/machinery/door/firedoor, /obj/machinery/door/airlock/command/glass{ name = "Server Room" }, @@ -20211,7 +20209,7 @@ dir = 1 }, /turf/open/floor/wood, -/area/blueshield) +/area/station/command/heads_quarters/blueshield) "bCA" = ( /obj/machinery/vending/cigarette, /turf/open/floor/iron/dark, @@ -30796,6 +30794,13 @@ dir = 9 }, /obj/structure/rack, +/obj/item/stack/sheet/iron/twenty, +/obj/item/stack/sheet/glass{ + amount = 20; + pixel_x = -3; + pixel_y = 6 + }, +/obj/item/stack/cable_coil/five, /turf/open/floor/iron/dark, /area/station/maintenance/port/aft) "cAz" = ( @@ -30866,8 +30871,9 @@ dir = 10 }, /obj/effect/decal/cleanable/dirt, -/obj/structure/frame/machine, -/obj/item/stack/cable_coil/five, +/obj/structure/table/reinforced, +/obj/machinery/cell_charger, +/obj/item/stock_parts/cell/high/empty, /turf/open/floor/iron/dark, /area/station/maintenance/port/aft) "cAI" = ( @@ -33214,7 +33220,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ cycle_id = "lower-airlock-bend" }, -/obj/effect/mapping_helpers/airlock/access/any/engineering/external, +/obj/effect/mapping_helpers/airlock/unres, /turf/open/floor/plating/airless, /area/station/maintenance/starboard/aft) "deg" = ( @@ -34843,7 +34849,7 @@ /obj/structure/table/wood, /obj/item/storage/fancy/donut_box, /turf/open/floor/carpet/executive, -/area/blueshield) +/area/station/command/heads_quarters/blueshield) "ewk" = ( /obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, @@ -35019,7 +35025,7 @@ /obj/effect/turf_decal/tile/purple/anticorner/contrasted{ dir = 8 }, -/obj/machinery/lapvend, +/obj/machinery/vending/cart, /turf/open/floor/iron, /area/station/hallway/primary/starboard) "eDG" = ( @@ -35515,7 +35521,6 @@ dir = 4 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/station/maintenance/port/aft) "fbW" = ( @@ -40953,9 +40958,6 @@ }, /area/station/engineering/main) "jjy" = ( -/obj/machinery/door/airlock/atmos/glass{ - name = "Turbine Access" - }, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -43586,7 +43588,6 @@ /obj/structure/frame/machine, /obj/effect/decal/cleanable/dirt, /obj/item/stack/cable_coil/five, -/obj/item/circuitboard/machine/bepis, /obj/structure/cable, /turf/open/floor/iron/white, /area/station/science/lab) @@ -44708,7 +44709,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/obj/effect/mapping_helpers/airlock/access/any/engineering/external, +/obj/effect/mapping_helpers/airlock/unres, /turf/open/floor/plating, /area/station/maintenance/port/aft) "lWC" = ( @@ -47239,17 +47240,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/mapping_helpers/mail_sorting/science/research, /obj/effect/mapping_helpers/mail_sorting/science/genetics, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/mail_sorting/science/research, /obj/structure/cable, /turf/open/floor/iron/white, /area/station/science/research) @@ -49326,7 +49316,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, /turf/open/floor/plating, -/area/blueshield) +/area/station/command/heads_quarters/blueshield) "pLL" = ( /obj/effect/turf_decal/delivery/blue, /obj/structure/extinguisher_cabinet{ @@ -51039,6 +51029,11 @@ /obj/structure/girder, /turf/open/floor/plating, /area/station/maintenance/port) +"rbV" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/bedsheet/centcom, +/turf/open/floor/plating, +/area/station/maintenance/fore) "rcG" = ( /obj/effect/spawner/liquids_spawner, /obj/machinery/light/floor, @@ -51733,9 +51728,6 @@ /obj/machinery/airalarm/directional/south, /turf/open/floor/iron, /area/station/hallway/primary/starboard) -"rGG" = ( -/turf/closed/wall/r_wall, -/area/blueshield) "rGH" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -51797,7 +51789,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, -/area/blueshield) +/area/station/command/heads_quarters/blueshield) "rJl" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ @@ -52800,6 +52792,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"sBG" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/fore) "sBZ" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -52967,6 +52968,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, /turf/open/floor/iron/white, /area/station/science/ordnance) +"sIZ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/fore) "sJf" = ( /obj/effect/landmark/start/paramedic, /obj/structure/cable, @@ -55435,6 +55445,18 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/security/corrections_officer) +"uNc" = ( +/obj/machinery/door/airlock/external{ + name = "External Access" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "lower-airlock-bend" + }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 8 + }, +/turf/open/floor/plating/airless, +/area/station/maintenance/starboard/aft) "uNf" = ( /obj/machinery/computer/libraryconsole/bookmanagement{ pixel_y = 8 @@ -80361,7 +80383,7 @@ xzh aqQ axq arP -wnG +sIZ arP arP arP @@ -81132,7 +81154,7 @@ aqR aqR axq arP -wnG +sBG mOf mOf arP @@ -82161,14 +82183,14 @@ aqQ btX arP tRC -wnG -rGG +rbV +aph aDj bjj aFX aHj aJa -rGG +iNM aLE llv ieC @@ -82419,13 +82441,13 @@ btX arP arP arP -rGG +aph aDi bjn ewj aJA rID -rGG +iNM aLl cyT aOl @@ -82676,7 +82698,7 @@ fKI aqR aqR syN -rGG +aph aDx aFW apg @@ -82933,7 +82955,7 @@ aqR arP qnX syN -iNM +aph jnf fXT fXT @@ -82982,7 +83004,7 @@ bxy qhp qhp qhp -bCq +qhp bCq imJ vLX @@ -83190,7 +83212,7 @@ dJG arP xkT aph -iNM +aph iNM iNM dhN @@ -105375,7 +105397,7 @@ xzh mtK cNW cNW -dee +uNc cOT uRx xzh From fbda5ed6ce2367362fed4e9241b2f13181ebc2d3 Mon Sep 17 00:00:00 2001 From: Iajret Date: Sat, 21 Oct 2023 18:20:13 +0300 Subject: [PATCH 6/6] airlock name fixes --- _maps/map_files/NSSJourney/NSSJourney.dmm | 41 ++++++++++++----------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/_maps/map_files/NSSJourney/NSSJourney.dmm b/_maps/map_files/NSSJourney/NSSJourney.dmm index 58daf4c02c0..fd957186a93 100644 --- a/_maps/map_files/NSSJourney/NSSJourney.dmm +++ b/_maps/map_files/NSSJourney/NSSJourney.dmm @@ -16724,11 +16724,7 @@ /obj/item/stack/sheet/iron/fifty, /obj/item/stack/sheet/iron/fifty, /obj/item/stack/sheet/iron/fifty, -/obj/item/stack/sheet/glass{ - amount = 20; - pixel_x = -3; - pixel_y = 6 - }, +/obj/item/stack/sheet/glass/fifty, /turf/open/floor/iron, /area/station/science/robotics/lab) "bpX" = ( @@ -32286,11 +32282,7 @@ /obj/item/stack/sheet/iron/fifty, /obj/item/stack/sheet/iron/fifty, /obj/item/stack/sheet/iron/fifty, -/obj/item/stack/sheet/glass{ - amount = 20; - pixel_x = -3; - pixel_y = 6 - }, +/obj/item/stack/sheet/glass/fifty, /turf/open/floor/iron, /area/station/science/robotics/lab) "cHR" = ( @@ -35529,9 +35521,7 @@ /turf/open/floor/wood, /area/station/security/prison) "fcw" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Genetics Lab Maintenance" - }, +/obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/unres{ dir = 8 }, @@ -40525,9 +40515,7 @@ /turf/open/floor/iron/dark, /area/station/medical/morgue) "iTn" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Genetics Lab Maintenance" - }, +/obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/access/all/science/general, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -44069,6 +44057,9 @@ /obj/item/radio/headset/headset_sci{ pixel_x = -3 }, +/obj/item/borg/upgrade/rename{ + pixel_y = 16 + }, /turf/open/floor/iron, /area/station/science/robotics/lab) "lzS" = ( @@ -48589,6 +48580,10 @@ }, /turf/open/floor/iron/dark/textured, /area/station/science/breakroom) +"plF" = ( +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/fore) "plW" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /obj/item/radio/intercom/directional/south, @@ -49370,8 +49365,14 @@ "pOK" = ( /obj/structure/table/glass, /obj/machinery/light/directional/south, -/obj/item/stack/sheet/iron/fifty, -/obj/item/stack/sheet/glass/fifty, +/obj/item/stack/sheet/iron/fifty{ + pixel_x = -7; + pixel_y = 7 + }, +/obj/item/stack/sheet/glass/fifty{ + pixel_x = 7; + pixel_y = 7 + }, /obj/item/storage/toolbox/mechanical, /obj/machinery/firealarm/directional/south, /turf/open/floor/iron, @@ -85521,7 +85522,7 @@ arP dJG aqR btX -aqR +bwI aph wuW sUy @@ -86032,7 +86033,7 @@ arP arP akN arP -aqR +plF aqR axt arP