diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 17f5db9bddf9..1a7f55715313 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -202,8 +202,6 @@ /turf/open/floor/iron/dark/smooth_large, /area/station/cargo/miningoffice) "adw" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/trimline/red/filled/line{ dir = 4 }, @@ -214,12 +212,6 @@ /obj/machinery/airalarm/directional/east, /turf/open/floor/iron/dark, /area/station/security/office) -"adN" = ( -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/turf/open/floor/plating, -/area/station/maintenance/port) "aeg" = ( /turf/closed/wall, /area/station/commons/toilet) @@ -546,6 +538,7 @@ /obj/machinery/door/airlock/security/glass{ name = "Departures Security Post" }, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron/dark, /area/station/security/checkpoint/escape) "ajX" = ( @@ -644,9 +637,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden{ - dir = 4 - }, /obj/machinery/door/airlock/external{ name = "Escape Pod Two" }, @@ -948,8 +938,6 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/trimline/red/filled/warning{ dir = 4 }, @@ -1172,7 +1160,6 @@ /obj/machinery/door/airlock/external{ name = "Engineering External Access" }, -/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden, /obj/effect/mapping_helpers/airlock/access/any/engineering/general, /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -1455,7 +1442,6 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) "aCw" = ( @@ -1611,7 +1597,6 @@ dir = 4 }, /obj/machinery/portable_atmospherics/canister/air, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) "aEJ" = ( @@ -1638,8 +1623,6 @@ /turf/open/floor/iron/dark/corner, /area/station/commons/storage/primary) "aFq" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/sign/warning/vacuum/external/directional/east, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) @@ -1789,18 +1772,7 @@ }, /turf/open/floor/iron/white, /area/station/science/research) -"aIs" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/on/layer4{ - dir = 1 - }, -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron/dark/smooth_large, -/area/station/hallway/secondary/entry) "aIx" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden{ - dir = 4 - }, /obj/machinery/door/airlock/external{ name = "Security Departure Airlock" }, @@ -1838,11 +1810,6 @@ }, /turf/open/floor/iron, /area/station/service/hydroponics) -"aIU" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, -/turf/open/floor/plating, -/area/station/hallway/secondary/entry) "aJb" = ( /obj/effect/spawner/structure/window, /obj/machinery/door/firedoor, @@ -2175,7 +2142,6 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "aPp" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden, /obj/machinery/door/airlock/external{ name = "External Access" }, @@ -2654,20 +2620,10 @@ /turf/open/floor/plating, /area/station/maintenance/port/fore) "aXX" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/door/airlock/external{ - name = "Port Docking Bay 1" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/turf/open/floor/iron/dark/textured_large, -/area/station/hallway/secondary/entry) +/obj/structure/lattice/catwalk, +/obj/structure/cable, +/turf/open/space/basic, +/area/space/nearstation) "aYb" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -3563,10 +3519,6 @@ /turf/open/floor/plating, /area/station/maintenance/fore) "boJ" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/on/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/smooth_large, /area/station/hallway/secondary/exit/departure_lounge) "boY" = ( @@ -3714,8 +3666,7 @@ /turf/open/floor/carpet/cyan, /area/station/commons/dorms) "btz" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden/layer1, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/on, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, /turf/open/floor/iron/dark/smooth_large, /area/station/hallway/secondary/entry) "btA" = ( @@ -4274,10 +4225,10 @@ /turf/open/floor/iron/white, /area/station/medical/storage) "bEB" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/turf/open/floor/plating, -/area/station/hallway/secondary/entry) +/obj/structure/lattice/catwalk, +/obj/structure/cable, +/turf/open/space, +/area/space/nearstation) "bED" = ( /turf/open/floor/wood, /area/station/service/lawoffice) @@ -4494,8 +4445,6 @@ /obj/machinery/door/airlock/external{ name = "Engineering External Access" }, -/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/engineering/general, /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -4980,8 +4929,6 @@ /turf/open/floor/plating, /area/station/maintenance/fore) "bTu" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/trimline/yellow/filled/warning{ dir = 6 }, @@ -5077,8 +5024,6 @@ dir = 1 }, /obj/structure/sign/warning/vacuum/external/directional/north, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) "bVp" = ( @@ -5460,9 +5405,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden{ - dir = 4 - }, /obj/machinery/door/airlock/external{ name = "Escape Pod Three" }, @@ -5981,10 +5923,6 @@ /turf/open/floor/iron/dark, /area/station/command/bridge) "cng" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/on/layer4{ - dir = 4 - }, /turf/open/floor/iron/dark/smooth_large, /area/station/security/checkpoint/escape) "cnk" = ( @@ -6150,8 +6088,6 @@ /turf/open/floor/iron/large, /area/station/security/prison/mess) "cpV" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/sign/warning/vacuum/external/directional/west, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) @@ -6599,9 +6535,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden{ - dir = 4 - }, /obj/machinery/door/airlock/external{ name = "MiniSat External Access" }, @@ -6609,6 +6542,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat_interior) "czq" = ( @@ -6828,9 +6762,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden{ - dir = 4 - }, /obj/structure/cable, /obj/machinery/door/airlock/external{ name = "Solar Maintenance" @@ -6890,7 +6821,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden, /obj/structure/cable, /obj/machinery/door/airlock/external{ name = "Solar Maintenance" @@ -7025,7 +6955,7 @@ /area/space) "cFZ" = ( /obj/structure/disposalpipe/segment{ - dir = 6 + dir = 4 }, /obj/effect/spawner/random/structure/crate, /turf/open/floor/plating, @@ -7056,10 +6986,6 @@ /turf/open/floor/iron, /area/station/security/prison/workout) "cGB" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/on/layer4{ - dir = 4 - }, /obj/machinery/light/small/directional/south, /turf/open/floor/plating, /area/station/maintenance/fore) @@ -7130,7 +7056,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) "cIi" = ( @@ -8070,6 +7995,7 @@ name = "Security Post - Engineering" }, /obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron/dark, /area/station/security/checkpoint/engineering) "cYh" = ( @@ -8372,8 +8298,6 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "ddn" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/on/layer4, /turf/open/floor/iron/dark/smooth_large, /area/station/science/explab) "ddt" = ( @@ -9992,7 +9916,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/any/supply/mining, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, /obj/structure/cable, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -10702,11 +10626,7 @@ /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) "dWZ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/on/layer4{ - dir = 1 - }, /turf/open/floor/plating, /area/station/maintenance/solars/port/fore) "dXc" = ( @@ -11181,8 +11101,6 @@ /turf/open/floor/iron/dark, /area/station/security/brig) "eeZ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/access/all/science/general, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -11440,8 +11358,6 @@ /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) "ejO" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/light/small/directional/east, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) @@ -11675,8 +11591,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/airlock/external{ name = "Escape Pod Two" }, @@ -11890,7 +11804,6 @@ /obj/machinery/computer/shuttle/mining/common{ dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) "ewm" = ( @@ -11974,8 +11887,6 @@ /area/station/hallway/primary/central) "eyl" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/science/research/abandoned) "eyo" = ( @@ -12317,20 +12228,14 @@ /turf/open/floor/iron/stairs/medium, /area/station/hallway/secondary/exit/departure_lounge) "eFK" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/door/airlock/external{ - name = "External Access" - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/external, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ +/obj/effect/turf_decal/trimline/neutral/filled/line, +/obj/effect/turf_decal/trimline/neutral/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden, -/turf/open/floor/plating, -/area/station/maintenance/starboard/aft) +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/entry) "eFL" = ( /obj/structure/cable, /turf/open/floor/iron/dark, @@ -12668,14 +12573,6 @@ /obj/structure/sign/warning/electric_shock, /turf/open/floor/plating, /area/station/science/xenobiology) -"eMK" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/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/port) "eML" = ( /obj/effect/turf_decal/stripes/box, /obj/machinery/rnd/production/techfab/department/medical, @@ -12897,8 +12794,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/solars/port/fore) @@ -13206,10 +13101,6 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/starboard) "eYj" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/on/layer4{ - dir = 8 - }, /obj/machinery/light/small/directional/south, /turf/open/floor/plating, /area/station/maintenance/port/fore) @@ -13274,7 +13165,7 @@ /turf/open/floor/iron/showroomfloor, /area/station/security/lockers) "eZU" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden/layer1, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, /obj/machinery/light/small/directional/south, /turf/open/floor/iron/dark/smooth_large, /area/station/hallway/secondary/entry) @@ -13348,10 +13239,6 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "faV" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/on/layer4{ - dir = 1 - }, /obj/machinery/light/small/directional/west, /turf/open/floor/plating, /area/station/maintenance/department/security) @@ -14968,8 +14855,6 @@ /turf/open/floor/iron, /area/station/engineering/storage) "fEL" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 4 }, @@ -15021,10 +14906,19 @@ /turf/open/floor/plating, /area/station/maintenance/department/eva) "fFG" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/on/layer4, -/turf/open/floor/plating, -/area/station/maintenance/starboard/aft) +/obj/effect/turf_decal/trimline/neutral/filled/warning{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/neutral/warning, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/entry) "fFK" = ( /turf/open/floor/carpet/royalblue, /area/station/command/heads_quarters/hop) @@ -15943,8 +15837,6 @@ /area/station/engineering/atmos) "fXS" = ( /obj/effect/turf_decal/trimline/yellow/filled/line, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/engineering/storage) "fYa" = ( @@ -16367,7 +16259,7 @@ pixel_y = 12 }, /obj/machinery/camera/directional/north{ - c_tag = "MedSci - Cloning"; + c_tag = "MedSci - Cloning, North"; name = "medsci camera"; network = list("ss13","rd","medbay") }, @@ -16469,8 +16361,6 @@ /turf/open/floor/engine, /area/station/science/xenobiology) "ggn" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, @@ -17712,7 +17602,6 @@ dir = 1 }, /obj/structure/sign/warning/vacuum/external/directional/north, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) @@ -18432,7 +18321,7 @@ }, /obj/machinery/airalarm/directional/north, /obj/machinery/atmospherics/components/unary/portables_connector/visible, -/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/machinery/portable_atmospherics/canister/anesthetic_mix, /turf/open/floor/engine, /area/station/medical/cryo) "gXo" = ( @@ -18865,10 +18754,6 @@ }, /turf/open/floor/iron/dark, /area/station/cargo/sorting) -"hgD" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, -/turf/open/floor/plating/airless, -/area/space/nearstation) "hgE" = ( /turf/open/floor/plating, /area/station/commons/vacant_room/commissary) @@ -19141,7 +19026,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden, /obj/machinery/door/airlock/external{ name = "Security External Access" }, @@ -19491,7 +19375,6 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 9 }, -/obj/machinery/vending/medical, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "hpO" = ( @@ -20161,9 +20044,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden{ - dir = 4 - }, /obj/machinery/door/airlock/external{ name = "External Access" }, @@ -20198,8 +20078,6 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/airlock/external{ name = "Port Docking Bay 1" }, @@ -21172,10 +21050,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/security/brig) -"hVk" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/turf/open/floor/plating/airless, -/area/space/nearstation) "hVt" = ( /obj/effect/spawner/random/structure/crate, /turf/open/floor/plating, @@ -21607,13 +21481,6 @@ }, /turf/open/floor/iron, /area/station/science/explab) -"idb" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plating, -/area/station/hallway/secondary/entry) "idf" = ( /obj/machinery/vending/cola/red, /obj/machinery/camera/autoname/directional/south, @@ -21631,8 +21498,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) "ido" = ( @@ -22644,7 +22509,6 @@ dir = 9 }, /obj/effect/turf_decal/stripes/corner, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) @@ -22857,8 +22721,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/airlock/external{ name = "Escape Pod Three" }, @@ -23086,7 +22948,6 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden, /obj/machinery/door/airlock/external{ name = "Port Docking Bay 1" }, @@ -23923,10 +23784,7 @@ /turf/open/floor/engine, /area/station/science/ordnance/storage) "iXV" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/on/layer4{ - dir = 4 - }, +/obj/structure/cable, /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat_interior) "iXY" = ( @@ -24075,8 +23933,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /obj/machinery/door/airlock/external{ name = "Solar Maintenance" @@ -24573,10 +24429,6 @@ /turf/open/floor/carpet/royalblue, /area/station/command/meeting_room) "jke" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/on/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/light/small/directional/north, /turf/open/floor/iron/dark/smooth_large, /area/station/hallway/secondary/exit/departure_lounge) @@ -24741,12 +24593,6 @@ /obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/grass, /area/station/command/bridge) -"jnS" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/on/layer4, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/maintenance/solars/starboard/aft) "jnV" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 @@ -24899,8 +24745,7 @@ output_dir = 4 }, /obj/machinery/door/window/left/directional/east{ - name = "Ore Redemtion Window"; - req_access = list("mineral_storeroom") + name = "Ore Redemption Window" }, /turf/open/floor/iron, /area/station/cargo/office) @@ -26091,8 +25936,6 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) "jNs" = ( @@ -26952,8 +26795,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/light/small/directional/south, /turf/open/floor/plating, /area/station/maintenance/port) @@ -27024,6 +26865,9 @@ /obj/machinery/camera/autoname/directional/south, /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, /turf/open/floor/plating, /area/station/maintenance/solars/port/aft) "kgx" = ( @@ -27047,14 +26891,12 @@ /turf/open/floor/carpet/royalblue, /area/station/command/heads_quarters/captain) "kgT" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/trimline/red/filled/warning{ dir = 5 }, /obj/effect/turf_decal/trimline/yellow/corner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) "khg" = ( @@ -27063,8 +26905,6 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) "khh" = ( @@ -27329,7 +27169,6 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden, /obj/machinery/door/airlock/external{ name = "External Access" }, @@ -28058,8 +27897,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/airlock/maintenance/external, /obj/effect/mapping_helpers/airlock/access/any/security/maintenance, /obj/effect/mapping_helpers/airlock/unres{ @@ -28444,7 +28281,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden, /obj/machinery/door/airlock/external{ name = "Port Docking Bay 2" }, @@ -28533,8 +28369,6 @@ /turf/open/floor/iron/dark, /area/station/medical/morgue) "kGU" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) @@ -29003,12 +28837,16 @@ /turf/open/floor/iron, /area/station/science/ordnance) "kRp" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/on/layer4{ - dir = 4 +/obj/effect/turf_decal/trimline/neutral/filled/warning{ + dir = 1 }, -/turf/open/floor/iron/dark/smooth_large, -/area/station/maintenance/department/security) +/obj/effect/turf_decal/trimline/neutral/warning, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/entry) "kRw" = ( /obj/machinery/light_switch/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -29965,9 +29803,6 @@ /turf/open/floor/carpet/royalblue, /area/station/command/heads_quarters/captain) "ljg" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden{ - dir = 4 - }, /obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/access/all/science/general, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -30030,8 +29865,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /obj/machinery/door/airlock/external{ name = "Solar Maintenance" @@ -30525,8 +30358,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/airlock/external{ name = "Port Docking Bay 2" }, @@ -31018,20 +30849,6 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet) -"lzN" = ( -/obj/effect/turf_decal/trimline/neutral/filled/corner{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/neutral/line{ - dir = 5 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/dark, -/area/station/hallway/secondary/entry) "lzZ" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 9 @@ -31318,8 +31135,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/airlock/external{ name = "Security External Access" }, @@ -31732,9 +31547,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/layer_manifold/general/hidden{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, /obj/machinery/door/airlock/external{ name = "Common Mining Dock" }, @@ -32926,8 +32739,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/airlock/external{ name = "External Access" }, @@ -33444,10 +33255,17 @@ /turf/open/floor/iron/dark, /area/station/security/checkpoint/supply) "mAf" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/neutral/filled/warning, +/obj/effect/turf_decal/trimline/neutral/warning{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/plating, -/area/station/maintenance/starboard/aft) +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/entry) "mAm" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -33595,7 +33413,6 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) @@ -34083,8 +33900,6 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /obj/machinery/door/airlock/external{ name = "Solar Maintenance" @@ -34604,10 +34419,6 @@ /area/station/hallway/secondary/entry) "mVm" = ( /obj/machinery/light/small/directional/south, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/on/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/smooth_large, /area/station/hallway/secondary/exit/departure_lounge) "mVz" = ( @@ -34791,8 +34602,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/airlock/external{ name = "MiniSat External Access" }, @@ -34800,6 +34609,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/structure/cable, /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat_interior) "mYz" = ( @@ -35361,7 +35171,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden, /obj/structure/cable, /obj/machinery/door/airlock/external{ name = "Solar Maintenance" @@ -35936,7 +35745,6 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) @@ -36160,11 +35968,6 @@ /obj/structure/closet/emcloset/anchored, /turf/open/floor/iron/white, /area/station/medical/virology) -"nCt" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, -/area/station/engineering/storage) "nDn" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -36188,6 +35991,9 @@ "nDI" = ( /obj/machinery/power/apc/auto_name/directional/west, /obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, /turf/open/floor/plating, /area/station/maintenance/solars/starboard/aft) "nDU" = ( @@ -36928,8 +36734,6 @@ /area/space/nearstation) "nRK" = ( /obj/structure/cable, -/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/solars/starboard/aft) "nRL" = ( @@ -37001,8 +36805,6 @@ /turf/open/space/basic, /area/space) "nTr" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/airlock/external{ name = "Departure Lounge Airlock" }, @@ -37286,9 +37088,6 @@ /turf/open/floor/iron/dark, /area/station/science/research/abandoned) "nYW" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden{ - dir = 4 - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, @@ -38228,14 +38027,12 @@ /turf/open/floor/iron/white, /area/station/medical/virology) "opA" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/trimline/red/filled/warning{ dir = 4 }, /obj/effect/turf_decal/trimline/yellow/warning{ dir = 8 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) "opI" = ( @@ -38474,7 +38271,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/effect/spawner/random/structure/girder, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/plating, /area/station/maintenance/port) "owa" = ( @@ -38729,17 +38528,12 @@ /turf/closed/wall, /area/station/security/interrogation) "oBJ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden, -/obj/machinery/door/airlock/external{ - name = "Port Docking Bay 1" +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment{ + dir = 6 }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/turf/open/floor/iron/dark/textured_large, -/area/station/hallway/secondary/entry) +/turf/open/floor/plating, +/area/station/maintenance/port) "oBL" = ( /obj/effect/turf_decal/trimline/neutral/filled/warning, /obj/effect/turf_decal/trimline/neutral/warning{ @@ -38812,8 +38606,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/airlock/external{ name = "Escape Pod One" }, @@ -41397,8 +41189,6 @@ /turf/open/floor/iron/dark, /area/station/engineering/gravity_generator) "pyx" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/on/layer4, /obj/structure/cable/layer1, /turf/open/floor/iron/dark/smooth_large, /area/station/engineering/main) @@ -41746,10 +41536,6 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "pEs" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/on/layer4{ - dir = 8 - }, /turf/open/floor/iron/dark/smooth_large, /area/station/hallway/secondary/entry) "pEy" = ( @@ -42856,8 +42642,6 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/airlock/external{ name = "Port Docking Bay 1" }, @@ -43666,7 +43450,6 @@ /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central) "qoi" = ( -/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/solars/port/aft) @@ -43789,8 +43572,6 @@ }, /area/station/medical/office) "qqZ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/trimline/red/filled/corner, /obj/effect/turf_decal/trimline/red/line{ dir = 9 @@ -44105,8 +43886,6 @@ /turf/open/floor/plating, /area/station/maintenance/port) "qwZ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/airlock/external{ name = "External Access" }, @@ -44273,6 +44052,7 @@ /area/station/engineering/atmos/hfr_room) "qAY" = ( /obj/machinery/firealarm/directional/north, +/obj/machinery/light/small/directional/north, /turf/open/floor/wood, /area/station/commons/locker) "qBe" = ( @@ -44288,8 +44068,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/airlock/external{ name = "Port Docking Bay 3" }, @@ -44696,8 +44474,6 @@ /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "qJn" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/airlock/external{ name = "Escape Pod Four" }, @@ -45066,7 +44842,6 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden, /obj/machinery/door/airlock/external{ name = "External Access" }, @@ -45609,11 +45384,6 @@ /obj/machinery/ntnet_relay, /turf/open/floor/circuit/telecomms/mainframe, /area/station/tcommsat/server) -"rbM" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/on/layer4, -/turf/open/floor/plating, -/area/station/maintenance/port) "rco" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -45806,13 +45576,9 @@ /turf/open/floor/plating, /area/station/medical/pharmacy) "rgr" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/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/port) +/obj/machinery/rnd/server/master, +/turf/open/floor/circuit/telecomms/server, +/area/station/science/server) "rgK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -45910,8 +45676,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /obj/machinery/door/airlock/external{ name = "Solar Maintenance" @@ -46621,9 +46385,6 @@ /turf/open/floor/grass, /area/station/service/hydroponics) "rwB" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden{ - dir = 4 - }, /obj/machinery/door/airlock/external{ name = "Labor Camp Shuttle Airlock"; shuttledocked = 1 @@ -46702,6 +46463,11 @@ /obj/effect/turf_decal/trimline/purple/filled/line, /obj/effect/turf_decal/box, /obj/machinery/light/small/directional/south, +/obj/machinery/camera/directional/south{ + c_tag = "MedSci - Cloning, South"; + name = "medsci camera"; + network = list("ss13","rd","medbay") + }, /turf/open/floor/iron/dark/smooth_large, /area/station/science/genetics/cloning) "rxM" = ( @@ -46743,8 +46509,6 @@ /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) "ryQ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/on/layer4, /obj/machinery/light/small/directional/west, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) @@ -46866,9 +46630,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden{ - dir = 4 - }, /obj/machinery/door/airlock/external{ name = "External Access" }, @@ -47546,8 +47307,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/security/processing) "rOV" = ( @@ -48426,8 +48185,6 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) "sgN" = ( @@ -48822,6 +48579,7 @@ /area/station/commons/vacant_room) "snz" = ( /obj/machinery/vending/coffee, +/obj/machinery/light/small/directional/north, /turf/open/floor/wood, /area/station/commons/locker) "snS" = ( @@ -49184,7 +48942,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden, /obj/structure/cable, /obj/machinery/door/airlock/external{ name = "Solar Maintenance" @@ -51117,8 +50874,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/airlock/external{ name = "External Access" }, @@ -51164,6 +50919,9 @@ /obj/machinery/power/apc/auto_name/directional/west, /obj/structure/cable, /obj/effect/mapping_helpers/burnt_floor, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, /turf/open/floor/plating, /area/station/maintenance/solars/port/fore) "tff" = ( @@ -51227,10 +50985,6 @@ /turf/open/floor/iron, /area/station/maintenance/department/electrical) "tgp" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/on/layer4{ - dir = 8 - }, /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/solars/port/aft) @@ -51395,8 +51149,6 @@ /turf/open/floor/plating, /area/station/science/robotics/mechbay) "tkp" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood, /area/station/hallway/secondary/exit/departure_lounge) "tkC" = ( @@ -51706,7 +51458,6 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/central) "tra" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden, /obj/machinery/door/airlock/external{ name = "Escape Pod Four" }, @@ -52036,8 +51787,6 @@ /area/station/hallway/primary/central) "tyV" = ( /obj/structure/cable, -/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/solars/starboard/fore) "tzb" = ( @@ -52149,8 +51898,6 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "tAE" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/camera/autoname/directional/west, /turf/open/floor/iron/dark/smooth_large, /area/station/maintenance/department/security) @@ -52423,8 +52170,6 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/eva) "tHd" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/on/layer4, /obj/machinery/light/small/directional/east, /turf/open/floor/iron/dark/smooth_large, /area/station/hallway/secondary/entry) @@ -52626,7 +52371,6 @@ /area/station/maintenance/port) "tJo" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) "tJx" = ( @@ -52821,7 +52565,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden, /obj/machinery/door/airlock/external{ name = "External Access" }, @@ -53162,8 +52905,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 1 }, @@ -53644,10 +53385,6 @@ /turf/open/floor/iron/vaporwave, /area/station/service/library/printer) "uaT" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/on/layer4{ - dir = 4 - }, /obj/machinery/light/small/directional/north, /turf/open/floor/iron/dark/smooth_large, /area/station/science/research/abandoned) @@ -53735,10 +53472,6 @@ /turf/open/floor/engine/vacuum, /area/station/science/ordnance/burnchamber) "uez" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/on/layer4{ - dir = 1 - }, /obj/machinery/light/small/directional/west, /turf/open/floor/iron/dark/smooth_large, /area/station/hallway/secondary/entry) @@ -54078,14 +53811,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating/airless, /area/space/nearstation) -"ulk" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/on/layer4{ - dir = 1 - }, -/turf/open/floor/plating, -/area/station/maintenance/solars/starboard/fore) "ulI" = ( /obj/effect/turf_decal/trimline/red/filled/line, /obj/effect/turf_decal/trimline/red/line{ @@ -54237,8 +53962,6 @@ /turf/open/floor/iron/dark, /area/station/maintenance/port/fore) "uoa" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/airlock/external{ name = "Labor Camp Shuttle Airlock" }, @@ -54290,7 +54013,6 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos) "upC" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden, /obj/machinery/door/airlock/external{ name = "External Access" }, @@ -54392,8 +54114,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/airlock/external{ name = "Port Docking Bay 2" }, @@ -55034,12 +54754,15 @@ /turf/open/floor/iron/white, /area/station/medical/exam_room) "uFE" = ( +/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/on/layer4{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/open/floor/plating, -/area/station/maintenance/port/fore) +/area/station/maintenance/port) "uFH" = ( /obj/effect/landmark/event_spawn, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -55694,13 +55417,14 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) "uRu" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/west, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, /turf/open/floor/plating, /area/station/maintenance/solars/starboard/fore) "uRJ" = ( @@ -56210,8 +55934,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/airlock/external{ name = "External Access" }, @@ -56628,12 +56350,6 @@ /obj/item/reagent_containers/spray/cleaner, /turf/open/floor/iron/dark, /area/station/medical/exam_room) -"vit" = ( -/obj/effect/turf_decal/tile/red/fourcorners, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/escape) "viy" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ dir = 8 @@ -56924,9 +56640,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/dark, /area/station/security/processing) "vpq" = ( @@ -57896,10 +57610,6 @@ /turf/open/floor/plating, /area/station/maintenance/department/science) "vHV" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/on/layer4{ - dir = 8 - }, /turf/open/floor/iron/dark/smooth_large, /area/station/security/processing) "vHZ" = ( @@ -58168,9 +57878,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden{ - dir = 4 - }, /obj/machinery/door/airlock/external{ name = "Port Docking Bay 3" }, @@ -58193,8 +57900,6 @@ /turf/open/floor/iron/dark, /area/station/command/bridge) "vNs" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/airlock/external{ name = "Departure Lounge Airlock" }, @@ -58743,8 +58448,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/airlock/external{ name = "External Access" }, @@ -59604,13 +59307,6 @@ /obj/structure/closet/l3closet/virology, /turf/open/floor/iron/white, /area/station/medical/virology) -"wqb" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/plating, -/area/station/hallway/secondary/entry) "wqe" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 @@ -59925,12 +59621,6 @@ /obj/structure/closet/crate, /turf/open/floor/iron/dark, /area/station/command/teleporter) -"wwG" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/on/layer4, -/obj/machinery/light/small/directional/west, -/turf/open/floor/iron/dark/smooth_large, -/area/station/hallway/secondary/entry) "wwJ" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 1 @@ -60863,9 +60553,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden{ - dir = 4 - }, /obj/machinery/door/airlock/external{ name = "Escape Pod One" }, @@ -61237,7 +60924,6 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) @@ -61609,9 +61295,8 @@ /area/station/hallway/secondary/entry) "xdP" = ( /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 6 }, -/obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/station/maintenance/port) "xdW" = ( @@ -62165,8 +61850,6 @@ /turf/open/floor/carpet/red, /area/station/command/heads_quarters/hos) "xmJ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark/smooth_large, /area/station/maintenance/department/security) "xmU" = ( @@ -62273,8 +61956,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/airlock/external{ name = "External Access" }, @@ -62327,11 +62008,6 @@ /obj/effect/turf_decal/trimline/green/filled/line, /turf/open/floor/iron, /area/station/engineering/storage/tech) -"xoU" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/on/layer4, -/turf/open/floor/iron/dark/smooth_large, -/area/station/engineering/storage) "xpd" = ( /obj/machinery/power/apc/auto_name/directional/west, /obj/structure/cable, @@ -62530,10 +62206,6 @@ /turf/open/floor/iron/dark/textured, /area/station/maintenance/starboard/fore) "xtj" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/on/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/light/small/directional/east, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) @@ -63202,8 +62874,6 @@ /turf/open/floor/plating, /area/station/maintenance/fore) "xHL" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/trimline/neutral/filled/warning{ dir = 4 }, @@ -63266,7 +62936,7 @@ /area/station/solars/port/fore) "xJd" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible, -/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/machinery/portable_atmospherics/canister/anesthetic_mix, /turf/open/floor/engine, /area/station/medical/cryo) "xJe" = ( @@ -63838,8 +63508,6 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/airlock/external{ name = "External Access" }, @@ -63961,8 +63629,6 @@ /turf/open/floor/iron/dark/side, /area/station/service/hydroponics) "xWs" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/airlock/external{ name = "Security Departure Airlock" }, @@ -63998,8 +63664,6 @@ }, /obj/effect/turf_decal/stripes/line, /obj/structure/sign/warning/vacuum/external/directional/south, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) "xWI" = ( @@ -64312,9 +63976,6 @@ }, /area/station/service/janitor) "ybs" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden{ - dir = 4 - }, /obj/machinery/door/airlock/external{ name = "Departure Lounge Airlock" }, @@ -64475,7 +64136,6 @@ }, /obj/effect/turf_decal/stripes/line, /obj/structure/sign/warning/vacuum/external/directional/south, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/camera/directional/south{ c_tag = "Arrivals - Docking Bay 2 & 3" @@ -74456,7 +74116,7 @@ flB nYj uRb pYL -wwG +uez iIu xNp xNp @@ -74465,9 +74125,9 @@ xNp xNp xNp xNp -oBJ +pYL uez -aXX +iIu jNf fyi flB @@ -74484,7 +74144,7 @@ flB aOC uRb uqR -wwG +uez kFQ xPP xNp @@ -74968,7 +74628,7 @@ liV ovb pFN vZW -lzN +pez cmU qUZ kJb @@ -74982,7 +74642,7 @@ xNp kJb wuZ drI -mCL +sqE uZO kJb xNp @@ -75225,7 +74885,7 @@ amY jIO xjh cNo -uUg +tJo cDb eem kJb @@ -75239,7 +74899,7 @@ xNp kJb jCd dmk -uUg +tJo uZO kJb xNp @@ -75253,7 +74913,7 @@ xNp xNp kJb oLi -uUg +tJo cDb gwf kJb @@ -75496,7 +75156,7 @@ xNp kJb nOm jxz -uUg +tJo uZO kJb xNp @@ -75510,7 +75170,7 @@ xNp xNp kJb oLi -uUg +tJo jxz gwf kJb @@ -76010,7 +75670,7 @@ xNp kJb kJb kJb -idm +kRp uZO kJb xNp @@ -76024,7 +75684,7 @@ xNp xNp kJb oLi -khg +eFK kJb kJb kJb @@ -76264,10 +75924,10 @@ xNp xNp xNp xNp -oBJ -aIs +pYL +tHd hCg -jNf +fFG fyi flB xNp @@ -76281,7 +75941,7 @@ xNp xNp flB aOC -uRb +mAf ltp tHd kFQ @@ -76529,11 +76189,11 @@ uZO kJb xNp hZa -hVk -bEB +var +kJb btz -aIU -hgD +kJb +var hZa xNp kJb @@ -76786,11 +76446,11 @@ fGq flB xNp flB -idb +kJb flB eZU flB -wqb +kJb flB xNp flB @@ -77781,10 +77441,10 @@ cul cul cul kmk -uFE +wMU xTC -tyF -tyF +wMU +wMU hDz hDz hDz @@ -78608,9 +78268,9 @@ udK udK hQh udK -eMK +jIx qwZ -rbM +eWo aPp oel xNp @@ -78865,7 +78525,7 @@ jXx jXx tIZ eWo -rgr +qwC tIZ bhn tIZ @@ -79142,7 +78802,7 @@ xNp xNp vfG hwJ -rzp +tgp nSA vfG xNp @@ -79365,7 +79025,7 @@ tIZ wwR tIZ tIZ -adN +qwC eWo aEF tIZ @@ -79379,7 +79039,7 @@ jXx jXx tIZ eWo -rgr +qwC tIZ ehJ pPZ @@ -79616,13 +79276,13 @@ tIZ hjc eWo eWo -fDQ -lMQ +oBJ +uFV uFV uFV rTw uFV -coB +uFE coB wGi fel @@ -84189,7 +83849,7 @@ xNp oJx uXX mqc -tyF +wMU oJx hDz fSn @@ -84446,7 +84106,7 @@ xNp oJx xJU wMU -tyF +wMU kzS hDz fSn @@ -87382,11 +87042,11 @@ uMS xab kvY ohe -nCt -nCt +xab +xab fXS qJn -xoU +ofg tra fgq xNp @@ -88671,6 +88331,7 @@ qJh rko whn rko +rko eSD xNp xNp @@ -88690,7 +88351,6 @@ xNp xNp xNp xNp -xNp kQT xNp fYa @@ -89079,7 +88739,7 @@ lay hmB wsQ vjc -lON +vjc guI ohM vpo @@ -89185,9 +88845,9 @@ rko rko rko rko +rko cbl xNp -xNp uYZ xNp xNp @@ -99605,7 +99265,7 @@ vDH aYn vDH dZw -kRp +xmJ jze vDH aIz @@ -99613,7 +99273,7 @@ qwo qwo qwo fdl -xzs +qwo qwo qwo koJ @@ -99990,7 +99650,7 @@ xNp xNp xNp xNp -oel +aXX xNp oel ebs @@ -100247,7 +99907,7 @@ xNp xNp xNp xNp -oel +aXX xNp cEm vMM @@ -100504,7 +100164,7 @@ xNp xNp xNp xNp -oel +aXX xNp xNp xNp @@ -100761,7 +100421,7 @@ xNp xNp xNp xNp -oel +aXX xNp xNp xNp @@ -101018,7 +100678,7 @@ xNp xNp xNp xNp -oel +aXX xNp xNp xNp @@ -101275,7 +100935,7 @@ xNp xNp xNp xNp -oel +aXX xNp xNp xNp @@ -101532,7 +101192,7 @@ xNp xNp xNp xNp -oel +aXX xNp xNp xNp @@ -101789,7 +101449,7 @@ xNp xNp xNp xNp -oel +aXX xNp xNp xNp @@ -102046,7 +101706,7 @@ xNp xNp xNp xNp -oel +aXX xNp xNp xNp @@ -102303,7 +101963,7 @@ xNp xNp xNp xNp -oel +aXX xNp xNp xNp @@ -102560,7 +102220,7 @@ xNp xNp xNp xNp -oel +aXX xNp xNp xNp @@ -102817,7 +102477,7 @@ xNp xNp xNp xNp -oel +aXX xNp xNp xNp @@ -103074,7 +102734,7 @@ xNp xNp xNp xNp -oel +aXX xNp xNp xNp @@ -103331,7 +102991,7 @@ xNp xNp xNp xNp -oel +aXX xNp xNp xNp @@ -103588,7 +103248,7 @@ xNp xNp xNp xNp -oel +aXX xNp xNp xNp @@ -103845,7 +103505,7 @@ xNp xNp xNp xNp -oel +aXX cqx xNp xNp @@ -104102,7 +103762,7 @@ uYZ uYZ wlq ylE -cul +bEB ylE hOB wlq @@ -105028,8 +104688,8 @@ qRJ xtj vYb aFq -lgd -lgd +uOK +uOK lgd lgd lgd @@ -105130,7 +104790,7 @@ xhR pOP pwt ayX -kSw +kxp jYG tXE cct @@ -106047,7 +105707,7 @@ hHB mdn pEA cEw -ulk +tyV jbO tyV tgD @@ -106651,10 +106311,10 @@ oFU oFU oFU boZ -mAf +bck tej ejO -fFG +bck tMi var var @@ -107387,7 +107047,7 @@ fld jcy wMy eQF -wMy +rgr jcy nLz nLz @@ -110767,13 +110427,13 @@ tSg tSg tSg kGU -mAf -mAf -mAf +bck +bck +bck cpV tej ryQ -eFK +tMi var rTP xNp @@ -114880,7 +114540,7 @@ kjo hcS nRK mKT -jnS +nRK stI gju lKC @@ -116354,7 +116014,7 @@ dsd mVQ meQ dsd -vit +dsd wkE tkp phQ diff --git a/monkestation/_maps/RandomBars/Box/default_bar.dmm b/monkestation/_maps/RandomBars/Box/default_bar.dmm index a78009fed06b..c06ed2f08544 100644 --- a/monkestation/_maps/RandomBars/Box/default_bar.dmm +++ b/monkestation/_maps/RandomBars/Box/default_bar.dmm @@ -125,6 +125,9 @@ name = "Bar Shutters" }, /obj/machinery/door/firedoor, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/open/floor/iron, /area/station/service/bar) "hG" = ( @@ -410,6 +413,9 @@ name = "Bar Shutters" }, /obj/machinery/door/firedoor, +/obj/structure/window/reinforced{ + dir = 4 + }, /turf/open/floor/iron, /area/station/service/bar) "DR" = ( @@ -684,7 +690,7 @@ }, /obj/machinery/door/window/right/directional/south{ name = "Bar Door"; - req_access = list("bar","kitchen") + req_access = list("bar") }, /obj/machinery/door/poddoor/shutters/preopen{ id = "bar_sec_shutters"; diff --git a/monkestation/_maps/RandomEngines/BoxStation/particle_accelerator.dmm b/monkestation/_maps/RandomEngines/BoxStation/particle_accelerator.dmm index aafa692efdd8..82fcba696d12 100644 --- a/monkestation/_maps/RandomEngines/BoxStation/particle_accelerator.dmm +++ b/monkestation/_maps/RandomEngines/BoxStation/particle_accelerator.dmm @@ -59,7 +59,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden, /obj/machinery/door/airlock/external{ name = "Engine Access Airlock" }, @@ -178,8 +177,6 @@ /area/space/nearstation) "kH" = ( /obj/effect/turf_decal/tile/yellow/fourcorners, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable/layer1, /turf/open/floor/iron, /area/station/engineering/main) @@ -339,8 +336,6 @@ /obj/effect/turf_decal/stripes/end{ dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/on/layer4, /obj/machinery/button/door/directional/east{ id = "engine_storage"; name = "Engine Storage Control"; @@ -353,7 +348,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden, /obj/machinery/door/airlock/external{ name = "Engine Access Airlock" }, @@ -373,8 +367,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/airlock/external{ name = "Engine Access Airlock" }, @@ -388,6 +380,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, +/obj/machinery/airalarm/directional/north, /turf/open/floor/iron/dark, /area/station/engineering/main) "vF" = ( @@ -565,8 +558,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/airlock/external{ name = "Engine Access Airlock" }, @@ -713,8 +704,6 @@ /obj/effect/turf_decal/stripes/end{ dir = 8 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/on/layer4, /obj/structure/cable/layer1, /turf/open/floor/plating, /area/station/engineering/main) @@ -1605,7 +1594,7 @@ cA Fz Fz qo -qo +Fz DP ti tq