From f8abd3ed09a542384cb16e0a0d20c26e1508d043 Mon Sep 17 00:00:00 2001 From: DexeeXI <120314509+DexeeXI@users.noreply.github.com> Date: Tue, 28 Nov 2023 10:12:35 -0700 Subject: [PATCH 01/14] Tram: dj wiring fix heh, forgot that the dj booth still needed the wiring installed. --- _maps/map_files/tramstation/tramstation.dmm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 012def877128..a5766ae35720 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -37445,6 +37445,7 @@ c_tag = "Civilian - Library East" }, /obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, /turf/open/floor/iron/vaporwave, /area/station/service/library/upper) "kWp" = ( @@ -64399,6 +64400,7 @@ /obj/machinery/cassette/adv_cassette_deck, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, /turf/open/floor/iron/vaporwave, /area/station/service/library/upper) "tBN" = ( @@ -68768,6 +68770,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/airalarm/directional/south, +/obj/structure/cable, /turf/open/floor/iron/vaporwave, /area/station/service/library/upper) "uWi" = ( From 43c182bb821cdc447c8a0fcc4346cbb8f650b51e Mon Sep 17 00:00:00 2001 From: DexeeXI <120314509+DexeeXI@users.noreply.github.com> Date: Wed, 29 Nov 2023 13:43:49 -0700 Subject: [PATCH 02/14] tram: redesignate certain areas as maints near sci --- _maps/map_files/tramstation/tramstation.dmm | 23 +++++++-------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index a5766ae35720..559dfe68ec50 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -5424,7 +5424,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /turf/open/floor/catwalk_floor, -/area/station/asteroid) +/area/station/maintenance/starboard/lesser) "aKy" = ( /obj/machinery/rnd/destructive_analyzer, /obj/effect/turf_decal/trimline/purple/filled/line{ @@ -23303,15 +23303,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/port/central) -"gtM" = ( -/obj/structure/disposalpipe/segment{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/catwalk_floor, -/area/station/asteroid) "gtQ" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ dir = 4 @@ -122468,13 +122459,13 @@ qXI wQP gUD qFq -gtM -gtM -gtM -gtM -gtM +qFq +qFq +qFq +qFq +qFq aKr -iZl +ocx aaa aaa aaa From 0de69e31271f1db3ea061d2d9addf0664e4ca1f8 Mon Sep 17 00:00:00 2001 From: DexeeXI <120314509+DexeeXI@users.noreply.github.com> Date: Wed, 29 Nov 2023 21:54:48 -0700 Subject: [PATCH 03/14] Meta: Whoopsie a zapper in the wall --- _maps/map_files/MetaStation/MetaStation.dmm | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 75915bede965..fb7e0feade87 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -19548,13 +19548,6 @@ }, /turf/open/floor/iron/cafeteria, /area/station/commons/dorms) -"hoT" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, -/obj/machinery/artifact_zapper{ - dir = 8 - }, -/turf/closed/wall/r_wall, -/area/station/science/ordnance/burnchamber) "hoY" = ( /obj/structure/chair/office{ dir = 4 @@ -99667,7 +99660,7 @@ huj fhi xEU iqx -hoT +deY gil deY oet From 240798569a00a32ea7aef74f362f01b13a33dd7a Mon Sep 17 00:00:00 2001 From: DexeeXI <120314509+DexeeXI@users.noreply.github.com> Date: Wed, 29 Nov 2023 21:56:03 -0700 Subject: [PATCH 04/14] Tram: more fixed the area between mid and right station on lower deck to properly not provide rad protection removed 2 redundant apcs from the ordinance lab fixed areas around sci maints to properly give rad protection. --- _maps/map_files/tramstation/tramstation.dmm | 137 ++++++++------------ 1 file changed, 52 insertions(+), 85 deletions(-) diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 559dfe68ec50..b78adc32609c 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -7283,7 +7283,7 @@ "bhe" = ( /obj/item/pickaxe, /turf/open/misc/asteroid, -/area/station/maintenance/starboard/greater) +/area/station/asteroid) "bhf" = ( /obj/effect/spawner/random/engineering/tracking_beacon, /obj/effect/landmark/event_spawn, @@ -8659,9 +8659,6 @@ }, /turf/open/floor/iron, /area/station/commons/storage/primary) -"bDZ" = ( -/turf/closed/wall/rock/porous, -/area/station/maintenance/starboard/greater) "bEi" = ( /obj/machinery/atmospherics/miner/oxygen, /turf/open/floor/engine/o2, @@ -11097,10 +11094,6 @@ }, /turf/open/floor/carpet, /area/station/commons/vacant_room/office) -"crh" = ( -/obj/effect/turf_decal/sand/plating, -/turf/open/floor/plating, -/area/station/maintenance/starboard/greater) "crj" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 @@ -19531,10 +19524,6 @@ }, /turf/open/floor/iron/white, /area/station/science/lower) -"feQ" = ( -/obj/structure/ore_box, -/turf/open/misc/asteroid, -/area/station/maintenance/starboard/greater) "feU" = ( /obj/effect/turf_decal/trimline/purple/filled/corner, /obj/structure/disposalpipe/segment, @@ -20231,10 +20220,6 @@ /obj/item/construction/plumbing, /turf/open/floor/iron/white, /area/station/medical/chemistry) -"foS" = ( -/obj/structure/cable, -/turf/open/floor/iron/white, -/area/station/science/ordnance) "foY" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -24842,6 +24827,12 @@ /obj/structure/lattice/catwalk, /turf/open/floor/plating, /area/station/maintenance/department/medical) +"gSI" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/science/explab) "gSQ" = ( /obj/machinery/door/airlock{ name = "Custodial Closet" @@ -30183,9 +30174,6 @@ /obj/effect/landmark/navigate_destination/tram/bankofcargo, /turf/open/floor/iron/dark, /area/station/cargo/miningdock/oresilo) -"iIW" = ( -/turf/closed/mineral/random/stationside/asteroid/porus, -/area/station/maintenance/starboard/greater) "iJd" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ dir = 4 @@ -37048,9 +37036,6 @@ "kPC" = ( /turf/closed/wall/rust, /area/station/security/prison/workout) -"kPE" = ( -/turf/open/misc/asteroid, -/area/station/maintenance/starboard/greater) "kPT" = ( /obj/vehicle/ridden/wheelchair, /obj/effect/turf_decal/bot, @@ -41832,6 +41817,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/storage) +"mrh" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/science/explab) "mrr" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/neutral/filled/line, @@ -44103,7 +44094,7 @@ /obj/structure/girder, /obj/item/stack/sheet/iron, /turf/open/floor/plating, -/area/station/maintenance/starboard/greater) +/area/station/asteroid) "nfU" = ( /obj/effect/turf_decal/sand, /obj/structure/closet, @@ -54156,10 +54147,6 @@ }, /turf/open/floor/noslip, /area/station/hallway/primary/tram/left) -"qtg" = ( -/obj/item/shovel, -/turf/open/misc/asteroid, -/area/station/maintenance/starboard/greater) "qti" = ( /obj/effect/turf_decal/siding/wood{ dir = 9 @@ -55986,7 +55973,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, /obj/item/radio/intercom/directional/east, /turf/open/floor/iron/white, /area/station/science/ordnance) @@ -57531,7 +57517,6 @@ /turf/open/floor/iron, /area/station/hallway/primary/tram/right) "rsQ" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/machinery/camera/directional/north{ c_tag = "Science Firing Range"; network = list("ss13","rd") @@ -58520,10 +58505,6 @@ /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 4 }, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/east{ - areastring = "/area/station/science/ordnance/burnchamber" - }, /obj/structure/sign/warning/hot_temp/directional/south, /turf/open/floor/iron/white, /area/station/science/ordnance) @@ -59610,10 +59591,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/plating, /area/station/engineering/break_room) -"seu" = ( -/obj/item/stack/ore/glass, -/turf/open/misc/asteroid/dug, -/area/station/maintenance/starboard/greater) "seG" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/neutral/filled/line, @@ -69808,9 +69785,6 @@ /obj/effect/spawner/random/trash/hobo_squat, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) -"vlD" = ( -/turf/open/misc/asteroid/dug, -/area/station/maintenance/starboard/greater) "vlE" = ( /obj/structure/railing, /obj/structure/cable, @@ -71582,11 +71556,7 @@ dir = 8 }, /obj/effect/turf_decal/box/red, -/obj/machinery/power/apc/auto_name/directional/south{ - areastring = "/area/station/science/ordnance/freezerchamber" - }, /obj/effect/turf_decal/stripes/corner, -/obj/structure/cable, /turf/open/floor/iron/white, /area/station/science/ordnance) "vMR" = ( @@ -75816,9 +75786,6 @@ /turf/open/misc/asteroid, /area/station/maintenance/starboard/lesser) "xim" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, /obj/machinery/suit_storage_unit/standard_unit, /turf/open/floor/iron/dark, /area/station/science/explab) @@ -118314,10 +118281,10 @@ lYV quF quF iRL -iIW -iIW -iIW -iIW +aaa +aaa +aaa +aaa abM acx abM @@ -118571,10 +118538,10 @@ iRL iRL iRL iRL -qtg +gHm bhe -kPE -kPE +abM +abM acw acx acI @@ -118825,13 +118792,13 @@ hjN quF mSY iRL -iIW -iIW -bDZ -kPE -kPE -vlD -kPE +aaa +aaa +aap +abM +abM +bIs +abM acx bMb swZ @@ -119082,13 +119049,13 @@ qpW lRV iRL iRL -iIW -crh -kPE -kPE -vlD -seu -vlD +aaa +bXk +abM +abM +bIs +vfm +bIs acy acx acJ @@ -119339,13 +119306,13 @@ pWy quF joZ iRL -crh -crh +bXk +bXk nfT -kPE -kPE -seu -iIW +abM +abM +vfm +aaa abM acx abM @@ -119596,13 +119563,13 @@ pWy quF quF wOp -crh -crh -iIW -iIW -feQ -iIW -iIW +bXk +bXk +aaa +aaa +vyF +aaa +aaa abM acx abW @@ -129406,8 +129373,8 @@ pfh yfU dfz xPs -foS -foS +qOo +qOo vMP dIK qDL @@ -131722,7 +131689,7 @@ ghB leh bFN bFN -xLN +gSI uuy vmE tUX @@ -132490,7 +132457,7 @@ ign frV pSs xLN -xLN +mrh xLN xLN rkx From d5914f249ba2713d0e212fcdd3c5daa64290e184 Mon Sep 17 00:00:00 2001 From: DexeeXI <120314509+DexeeXI@users.noreply.github.com> Date: Thu, 30 Nov 2023 06:12:31 -0700 Subject: [PATCH 05/14] tram: consistency removed the public autolathe because it doesn't belong. --- _maps/map_files/tramstation/tramstation.dmm | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index b78adc32609c..dae408fb2b01 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -46235,15 +46235,6 @@ "nPe" = ( /turf/open/floor/carpet, /area/station/medical/psychology) -"nPv" = ( -/obj/machinery/autolathe, -/obj/machinery/door/window/left/directional/west{ - dir = 1; - name = "Cargo Autolathe"; - req_access = list("cargo") - }, -/turf/open/floor/plating, -/area/station/cargo/office) "nPA" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate, @@ -189983,7 +189974,7 @@ cwG sFc cwG ccj -nPv +vYl tRT cbH kMc From 6d5b651445f8e64ba2a2fa9ee7da484039bbbe0a Mon Sep 17 00:00:00 2001 From: DexeeXI <120314509+DexeeXI@users.noreply.github.com> Date: Thu, 30 Nov 2023 08:54:56 -0700 Subject: [PATCH 06/14] Delta: removed extraneous telescience book removed book of obsolete reference. --- _maps/map_files/Deltastation/DeltaStation2.dmm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 0ae526448a5d..9f005431263c 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -17231,10 +17231,6 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, -/obj/item/book/manual/wiki/telescience{ - pixel_x = -2; - pixel_y = 2 - }, /obj/machinery/door/poddoor/preopen{ id = "sci_experimentor"; name = "Experimentor Blast Door" From 7a162878b197301871928784bcdca165eb74358d Mon Sep 17 00:00:00 2001 From: DexeeXI <120314509+DexeeXI@users.noreply.github.com> Date: Thu, 30 Nov 2023 08:56:05 -0700 Subject: [PATCH 07/14] meta: move nanites redesignated a circuits lab redesigned the circuits lab, moved all of the nanites equipment to that space. made the lab look nice. --- _maps/map_files/MetaStation/MetaStation.dmm | 379 ++++++++++---------- 1 file changed, 199 insertions(+), 180 deletions(-) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index fb7e0feade87..3c3bdfb01373 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -145,12 +145,12 @@ /turf/open/floor/carpet, /area/station/service/library) "acH" = ( -/obj/effect/turf_decal/tile/purple, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, +/obj/effect/turf_decal/tile/purple/opposingcorners, /turf/open/floor/iron/white, -/area/station/science/research) +/area/station/science/circuits) "adp" = ( /turf/closed/wall, /area/station/hallway/primary/starboard) @@ -433,8 +433,11 @@ /obj/item/stock_parts/cell/high, /obj/item/radio/intercom/directional/north, /obj/machinery/firealarm/directional/west, +/obj/effect/turf_decal/tile/purple/anticorner{ + dir = 1 + }, /turf/open/floor/iron/white, -/area/station/science/research) +/area/station/science/circuits) "air" = ( /obj/structure/table/reinforced, /obj/item/tank/internals/anesthetic{ @@ -1321,9 +1324,12 @@ /turf/open/floor/iron, /area/station/engineering/break_room) "ayz" = ( -/obj/machinery/light/small/directional/north, -/turf/open/floor/iron/white, -/area/station/science/research) +/obj/machinery/nanite_program_hub, +/obj/effect/turf_decal/tile/purple/anticorner{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/science/circuits) "ayH" = ( /obj/effect/spawner/random/engineering/atmospherics_portable, /turf/open/floor/plating, @@ -1433,11 +1439,12 @@ /turf/open/floor/iron/dark, /area/station/command/bridge) "aBH" = ( -/obj/effect/turf_decal/trimline/purple/filled/warning{ - dir = 9 +/obj/machinery/computer/nanite_cloud_controller, +/obj/effect/turf_decal/tile/purple/half{ + dir = 4 }, -/turf/open/floor/iron/dark, -/area/station/science/research) +/turf/open/floor/iron, +/area/station/science/circuits) "aBJ" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/delivery, @@ -1864,7 +1871,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/nanite_chamber, /turf/open/floor/iron/dark, /area/station/science/robotics/lab) "aJd" = ( @@ -2994,7 +3000,7 @@ /obj/effect/turf_decal/tile/purple, /obj/effect/landmark/start/scientist, /turf/open/floor/iron/white, -/area/station/science/research) +/area/station/science/circuits) "bau" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -3126,11 +3132,20 @@ c_tag = "Science Firing Range"; network = list("ss13","rd") }, -/obj/effect/turf_decal/trimline/purple/filled/warning{ - dir = 6 +/obj/structure/table/reinforced, +/obj/item/storage/box/disks_nanite, +/obj/item/storage/box/disks_nanite{ + pixel_y = 4 }, -/turf/open/floor/iron/dark, -/area/station/science/research) +/obj/item/nanite_remote, +/obj/item/nanite_remote, +/obj/item/nanite_scanner, +/obj/item/nanite_scanner, +/obj/effect/turf_decal/tile/purple/half{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/science/circuits) "bcQ" = ( /obj/structure/window/reinforced/spawner/directional/south, /obj/structure/window/reinforced/spawner/directional/west, @@ -5675,6 +5690,13 @@ }, /turf/open/floor/iron/dark, /area/station/command/bridge) +"cdL" = ( +/obj/machinery/nanite_programmer, +/obj/effect/turf_decal/tile/purple/half{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/science/circuits) "cdX" = ( /turf/closed/wall, /area/station/engineering/storage/tech) @@ -10322,12 +10344,6 @@ /obj/item/radio/intercom/directional/south, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"dVa" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/station/science/research) "dVb" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plating, @@ -12309,8 +12325,12 @@ /area/station/service/bar/backroom) "eEl" = ( /obj/effect/landmark/start/scientist, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple/opposingcorners, /turf/open/floor/iron/white, -/area/station/science/research) +/area/station/science/circuits) "eEx" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, @@ -13726,10 +13746,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/holopad, -/obj/effect/landmark/start/scientist, -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/iron/white, -/area/station/science/research) +/area/station/science/circuits) "fip" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 @@ -13959,8 +13980,9 @@ /obj/machinery/light/directional/south, /obj/machinery/module_duplicator, /obj/machinery/light_switch/directional/south, +/obj/effect/turf_decal/tile/purple/half, /turf/open/floor/iron/white, -/area/station/science/research) +/area/station/science/circuits) "fkW" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -14540,6 +14562,9 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"fzG" = ( +/turf/open/floor/iron/white, +/area/station/science/circuits) "fzM" = ( /obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ dir = 1 @@ -15008,13 +15033,13 @@ /turf/closed/wall/r_wall, /area/station/maintenance/department/engine) "fJJ" = ( -/obj/effect/turf_decal/trimline/blue/filled/line, /obj/structure/cable, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/purple/half, /turf/open/floor/iron/white, -/area/station/science/research) +/area/station/science/circuits) "fJW" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -15179,13 +15204,12 @@ /turf/open/floor/iron, /area/station/hallway/primary/central) "fMx" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/table, +/obj/item/pen, +/obj/item/paper_bin, +/obj/effect/turf_decal/tile/purple/opposingcorners, /turf/open/floor/iron/white, -/area/station/science/research) +/area/station/science/circuits) "fMF" = ( /obj/structure/window/reinforced/spawner/directional/east, /obj/structure/window/reinforced/spawner/directional/north, @@ -15452,14 +15476,14 @@ /turf/open/floor/iron, /area/station/command/teleporter) "fRB" = ( -/obj/machinery/door/airlock/research/glass{ - name = "Testing Labs" - }, /obj/effect/mapping_helpers/airlock/access/all/science/research, /obj/effect/turf_decal/tile/purple/fourcorners, /obj/machinery/door/firedoor, +/obj/machinery/door/airlock/research/glass{ + name = "Nanites and Circuits Lab" + }, /turf/open/floor/iron/white, -/area/station/science/research) +/area/station/science/circuits) "fRG" = ( /obj/machinery/firealarm/directional/east, /obj/effect/decal/cleanable/dirt, @@ -15729,9 +15753,6 @@ dir = 8 }, /obj/effect/mapping_helpers/mail_sorting/science/robotics, -/obj/machinery/computer/nanite_chamber_control{ - dir = 4 - }, /turf/open/floor/iron/dark, /area/station/science/robotics/lab) "fXj" = ( @@ -15831,6 +15852,10 @@ /obj/machinery/vending/games, /turf/open/floor/wood, /area/station/service/library) +"fZm" = ( +/obj/effect/turf_decal/tile/purple/opposingcorners, +/turf/open/floor/iron/white, +/area/station/science/circuits) "fZG" = ( /obj/item/radio/intercom/directional/north, /obj/machinery/computer/security, @@ -16153,7 +16178,9 @@ /obj/structure/sign/poster/random/directional/east, /obj/effect/mapping_helpers/airlock/access/any/science/maintenance, /obj/structure/cable, -/obj/machinery/door/airlock/research/glass, +/obj/machinery/door/airlock/research/glass{ + name = "Artifact Science Lab" + }, /turf/open/floor/plating, /area/station/science/explab) "gfk" = ( @@ -18721,11 +18748,24 @@ /turf/open/floor/iron, /area/station/engineering/main) "gZL" = ( +/obj/structure/table, +/obj/item/compact_remote, +/obj/item/compact_remote, +/obj/item/controller, +/obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/item/multitool/circuit{ + pixel_x = -8 + }, +/obj/item/multitool/circuit, +/obj/item/multitool/circuit{ + pixel_x = 7 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, -/area/station/science/research) +/area/station/science/circuits) "gZQ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -19354,7 +19394,7 @@ dir = 5 }, /turf/open/floor/iron, -/area/station/science/research) +/area/station/science/circuits) "hlF" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -22898,12 +22938,6 @@ /obj/item/multitool, /obj/item/clothing/head/utility/welding, /obj/item/clothing/glasses/welding, -/obj/item/storage/box/disks_nanite, -/obj/item/storage/box/disks_nanite, -/obj/item/nanite_scanner, -/obj/item/nanite_scanner, -/obj/item/nanite_remote, -/obj/item/nanite_remote, /turf/open/floor/iron, /area/station/science/robotics/lab) "iwO" = ( @@ -23955,7 +23989,6 @@ /turf/open/floor/iron/dark, /area/station/command/gateway) "iMG" = ( -/obj/structure/chair/stool/directional/south, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/disposalpipe/junction/flip{ dir = 8 @@ -24904,7 +24937,7 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, -/area/station/science/research) +/area/station/science/circuits) "jcd" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -30991,8 +31024,9 @@ dir = 4 }, /obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/south, /turf/open/floor/iron, -/area/station/science/research) +/area/station/science/circuits) "ljf" = ( /obj/structure/table, /obj/item/wirecutters, @@ -32294,17 +32328,6 @@ /obj/machinery/power/apc/auto_name/directional/west, /turf/open/floor/carpet, /area/station/service/chapel) -"lHP" = ( -/obj/machinery/door/window/right/directional/north{ - dir = 8; - name = "Research Test Chamber"; - req_access = list("science") - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/station/science/research) "lIa" = ( /obj/structure/table/wood, /obj/item/folder, @@ -33595,6 +33618,11 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) +"mfL" = ( +/obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/white, +/area/station/science/circuits) "mgc" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 1 @@ -34038,16 +34066,13 @@ /turf/open/floor/plating, /area/station/maintenance/aft/greater) "moe" = ( -/obj/structure/table, -/obj/effect/turf_decal/tile/purple{ - dir = 1 +/obj/effect/turf_decal/delivery, +/obj/structure/disposalpipe/trunk{ + dir = 8 }, -/obj/item/paper_bin, -/obj/item/pen, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/disposal/bin, /turf/open/floor/iron/white, -/area/station/science/research) +/area/station/science/circuits) "mos" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 @@ -34183,10 +34208,9 @@ /turf/open/floor/iron, /area/station/security/execution/transfer) "mqZ" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/obj/machinery/light/small/directional/south, +/obj/effect/turf_decal/tile/purple/half, /turf/open/floor/iron/white, -/area/station/science/research) +/area/station/science/circuits) "mrC" = ( /obj/effect/turf_decal/tile/green{ dir = 8 @@ -34485,10 +34509,6 @@ /obj/structure/flora/bush/flowers_br/style_random, /turf/open/floor/grass, /area/station/science/research) -"mwt" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/turf/open/floor/iron/white, -/area/station/science/research) "mww" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -35388,17 +35408,12 @@ /turf/open/floor/grass, /area/station/science/research) "mLm" = ( -/obj/structure/table, -/obj/item/multitool/circuit{ - pixel_x = 7 - }, -/obj/item/multitool/circuit, -/obj/item/multitool/circuit{ - pixel_x = -8 - }, /obj/machinery/light_switch/directional/north, +/obj/effect/turf_decal/tile/purple/half{ + dir = 1 + }, /turf/open/floor/iron/white, -/area/station/science/research) +/area/station/science/circuits) "mLu" = ( /obj/machinery/camera/directional/south{ c_tag = "Science Hallway - RD Office"; @@ -36164,9 +36179,8 @@ "mYu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/purple, -/obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, -/area/station/science/research) +/area/station/science/circuits) "mYw" = ( /obj/structure/lattice/catwalk, /obj/structure/cable, @@ -37135,6 +37149,11 @@ }, /turf/open/floor/wood, /area/station/commons/dorms) +"nph" = ( +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/tile/purple/half, +/turf/open/floor/iron/white, +/area/station/science/circuits) "npD" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/rnd/production/circuit_imprinter/department/science, @@ -38739,12 +38758,6 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) -"nSB" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/disposalpipe/segment, -/obj/machinery/nanite_program_hub, -/turf/open/floor/iron/dark, -/area/station/science/robotics/lab) "nSC" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -40182,12 +40195,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/security/prison/work) -"otR" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/computer/nanite_cloud_controller, -/turf/open/floor/iron/dark, -/area/station/science/robotics/lab) "ouc" = ( /obj/structure/closet/crate, /obj/structure/cable, @@ -41039,12 +41046,12 @@ "oIm" = ( /obj/effect/turf_decal/tile/purple/fourcorners, /obj/machinery/door/airlock/research{ - name = "Testing Labs" + name = "Nanites and Circuits Lab" }, /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/access/all/science/research, /turf/open/floor/iron/white, -/area/station/science/research) +/area/station/science/circuits) "oIG" = ( /obj/structure/lattice/catwalk, /turf/open/space/basic, @@ -41423,7 +41430,9 @@ /turf/open/floor/iron, /area/station/cargo/warehouse) "oQH" = ( -/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/airlock/maintenance{ + name = "Artifact Science Lab" + }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/mapping_helpers/airlock/access/any/science/maintenance, /obj/effect/mapping_helpers/airlock/unres{ @@ -43234,9 +43243,8 @@ /obj/machinery/computer/department_orders/science{ dir = 4 }, -/obj/machinery/airalarm/directional/west, /turf/open/floor/iron, -/area/station/science/research) +/area/station/science/circuits) "pzu" = ( /obj/structure/chair/comfy/black{ dir = 4 @@ -43258,6 +43266,11 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/commons/vacant_room/commissary) +"pzN" = ( +/obj/effect/turf_decal/tile/purple/half, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron/white, +/area/station/science/circuits) "pzT" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small/directional/east, @@ -43567,7 +43580,7 @@ "pFC" = ( /obj/machinery/bci_implanter, /turf/open/floor/iron, -/area/station/science/research) +/area/station/science/circuits) "pFG" = ( /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/tile/neutral{ @@ -43723,8 +43736,9 @@ /area/station/engineering/atmos) "pHD" = ( /obj/machinery/component_printer, +/obj/effect/turf_decal/tile/purple/half, /turf/open/floor/iron/white, -/area/station/science/research) +/area/station/science/circuits) "pHS" = ( /obj/structure/light_construct/directional/east, /turf/open/floor/wood, @@ -45408,7 +45422,7 @@ "qnd" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, -/area/station/science/research) +/area/station/science/circuits) "qnj" = ( /obj/structure/window/spawner/directional/west, /turf/open/floor/grass, @@ -45780,8 +45794,9 @@ /obj/effect/turf_decal/trimline/purple/filled/warning{ dir = 4 }, +/obj/effect/landmark/start/scientist, /turf/open/floor/iron, -/area/station/science/research) +/area/station/science/circuits) "qtm" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -45889,6 +45904,12 @@ /obj/effect/turf_decal/tile/brown/half/contrasted, /turf/open/floor/iron, /area/station/cargo/miningoffice) +"qvZ" = ( +/obj/effect/turf_decal/tile/purple/half{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/science/circuits) "qwh" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -46220,13 +46241,6 @@ /obj/machinery/light_switch/directional/east, /turf/open/floor/iron/white, /area/station/science/ordnance/testlab) -"qBP" = ( -/obj/structure/table, -/obj/item/controller, -/obj/item/compact_remote, -/obj/item/compact_remote, -/turf/open/floor/iron/white, -/area/station/science/research) "qCa" = ( /obj/structure/rack, /obj/item/storage/box/shipping, @@ -46326,7 +46340,6 @@ /area/station/engineering/atmos) "qDy" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/nanite_programmer, /turf/open/floor/iron/dark, /area/station/science/robotics/lab) "qDS" = ( @@ -52563,12 +52576,14 @@ /turf/open/floor/plating, /area/station/maintenance/port/aft) "sMV" = ( -/obj/machinery/airalarm/directional/east, -/obj/effect/turf_decal/trimline/purple/filled/warning{ +/obj/machinery/computer/nanite_chamber_control{ dir = 8 }, -/turf/open/floor/iron/dark, -/area/station/science/research) +/obj/effect/turf_decal/tile/purple/half{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/science/circuits) "sNi" = ( /turf/open/floor/wood, /area/station/service/theater) @@ -52595,8 +52610,11 @@ /obj/item/integrated_circuit/loaded/hello_world, /obj/item/storage/toolbox/electrical, /obj/item/integrated_circuit/loaded/speech_relay, +/obj/effect/turf_decal/tile/purple/half{ + dir = 1 + }, /turf/open/floor/iron/white, -/area/station/science/research) +/area/station/science/circuits) "sNw" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -54280,7 +54298,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/station/science/research) +/area/station/science/circuits) "toK" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -55384,14 +55402,12 @@ /turf/open/floor/iron/dark, /area/station/command/heads_quarters/ce) "tKZ" = ( -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/delivery, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, /obj/machinery/light/directional/north, +/obj/effect/turf_decal/tile/purple/half{ + dir = 1 + }, /turf/open/floor/iron/white, -/area/station/science/research) +/area/station/science/circuits) "tLb" = ( /obj/structure/sign/warning/electric_shock/directional/south, /turf/open/space/basic, @@ -57090,12 +57106,10 @@ /turf/open/floor/iron/white, /area/station/science/research) "uqG" = ( -/obj/machinery/light/small/directional/south, -/obj/effect/turf_decal/trimline/purple/filled/warning{ - dir = 10 - }, -/turf/open/floor/iron/dark, -/area/station/science/research) +/obj/machinery/nanite_chamber, +/obj/effect/turf_decal/tile/purple/anticorner, +/turf/open/floor/iron, +/area/station/science/circuits) "uqL" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -57370,6 +57384,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"uvh" = ( +/turf/closed/wall/r_wall, +/area/station/science/circuits) "uvw" = ( /obj/machinery/status_display/supply{ pixel_y = 32 @@ -58752,11 +58769,12 @@ /turf/open/floor/iron, /area/station/construction/storage_wing) "uTN" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/obj/machinery/light/small/directional/north, -/obj/effect/turf_decal/trimline/purple/filled/warning, -/turf/open/floor/iron/dark, -/area/station/science/research) +/obj/machinery/airalarm/directional/north, +/obj/effect/turf_decal/tile/purple/half{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/science/circuits) "uTP" = ( /obj/machinery/light_switch/directional/south, /turf/open/floor/iron, @@ -59851,14 +59869,10 @@ /turf/open/floor/iron, /area/station/command/teleporter) "vns" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/purple/opposingcorners, /turf/open/floor/iron/white, -/area/station/science/research) +/area/station/science/circuits) "vnE" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/brown{ @@ -65179,6 +65193,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) +"xiu" = ( +/obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/structure/chair/stool/directional/south, +/turf/open/floor/iron/white, +/area/station/science/circuits) "xiv" = ( /obj/item/kirbyplants{ icon_state = "plant-11" @@ -97071,7 +97090,7 @@ jAt mET liD iAk -nSB +liD fXd xwl sNn @@ -97585,7 +97604,7 @@ eut uBy cCs qDy -otR +reL cRW eut kwy @@ -101443,12 +101462,12 @@ vQb jJR gwf fnh -gFQ -gFQ +uvh +uvh oIm -gFQ -gFQ -gFQ +uvh +uvh +uvh svS oGn nFa @@ -101700,9 +101719,9 @@ iio kjG gwf kiJ -gFQ +uvh aim -cOQ +fzG toD pzg pFC @@ -102215,7 +102234,7 @@ moH gwf pOv fRB -aJd +qvZ mYu fid jbI @@ -102728,11 +102747,11 @@ tAg sWB gwf cQd -gFQ +uvh mLm -qBP +fZm moe -dVa +vns pHD oWk bLd @@ -102985,11 +103004,11 @@ gFQ wGE gwf itC -gFQ +uvh uTN -mwt +mfL fMx -lHP +vns mqZ oWk hgA @@ -103242,12 +103261,12 @@ elJ qNA gwf ucd -gFQ +uvh bcG -cOQ -cOQ +fZm +fZm eEl -cOQ +pzN oWk nYU fPD @@ -103499,12 +103518,12 @@ saf hXd gwf itC -gFQ -cOQ -cOQ -cOQ -cOQ -cOQ +uvh +tKZ +fZm +mfL +xiu +nph oWk luE tZo @@ -103756,9 +103775,9 @@ elJ wGH emh fQo -gFQ +uvh ayz -cOQ +cdL aBH sMV uqG From ff8e0bbaccfd1ab139700ea84e549836379c3fd4 Mon Sep 17 00:00:00 2001 From: DexeeXI <120314509+DexeeXI@users.noreply.github.com> Date: Thu, 30 Nov 2023 08:58:20 -0700 Subject: [PATCH 08/14] icebox: nanites lab removed unneeded abandoned atmos room, added space to experiments lab room. moved all nanites machinery to experiments lab. --- .../map_files/IceBoxStation/IceBoxStation.dmm | 318 +++++++----------- 1 file changed, 123 insertions(+), 195 deletions(-) diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 2d2b877d966a..e94e45f99d4e 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -1940,9 +1940,6 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, /turf/open/floor/iron/white/side{ dir = 9 }, @@ -5185,11 +5182,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/aux_base, /turf/open/floor/iron, /area/station/construction/mining/aux_base) -"bGA" = ( -/obj/effect/spawner/structure/window, -/obj/structure/sign/departments/xenobio/directional/south, -/turf/open/floor/plating, -/area/station/science/xenobiology) "bGL" = ( /obj/item/radio/intercom/directional/south, /obj/structure/chair{ @@ -5420,8 +5412,8 @@ /turf/open/floor/iron/dark, /area/station/maintenance/disposal) "bKm" = ( -/obj/machinery/vending/assist, /obj/structure/sign/poster/random/directional/west, +/obj/item/kirbyplants/random, /turf/open/floor/iron/cafeteria{ dir = 8 }, @@ -6877,10 +6869,6 @@ /obj/machinery/status_display/evac/directional/south, /turf/open/floor/iron, /area/station/science/robotics/mechbay) -"chc" = ( -/obj/machinery/computer/nanite_cloud_controller, -/turf/open/floor/glass/reinforced, -/area/station/science/xenobiology) "che" = ( /obj/structure/table, /obj/item/flashlight/lamp, @@ -7189,13 +7177,6 @@ }, /turf/open/floor/iron, /area/station/science/xenobiology) -"clY" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/general, -/turf/open/floor/plating, -/area/station/maintenance/starboard/aft) "cma" = ( /obj/structure/closet/firecloset, /turf/open/floor/plating, @@ -9365,11 +9346,6 @@ initial_gas_mix = "ICEMOON_ATMOS" }, /area/icemoon/underground/explored) -"cSo" = ( -/obj/machinery/module_duplicator, -/obj/structure/sign/poster/official/random/directional/south, -/turf/open/floor/iron, -/area/station/science/explab) "cSw" = ( /obj/structure/cable, /turf/open/floor/iron, @@ -9462,10 +9438,6 @@ /obj/structure/sign/poster/random/directional/north, /turf/open/floor/iron, /area/station/maintenance/port/fore) -"cTN" = ( -/obj/machinery/nanite_program_hub, -/turf/open/floor/glass/reinforced, -/area/station/science/xenobiology) "cTV" = ( /obj/effect/turf_decal/box/white{ color = "#52B4E9" @@ -12279,14 +12251,16 @@ /turf/open/floor/plating, /area/station/maintenance/port/aft) "dOK" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/turf/open/floor/plating, -/area/station/maintenance/starboard/aft) +/obj/structure/sign/poster/official/random/directional/south, +/obj/structure/table, +/obj/item/storage/box/disks_nanite, +/obj/item/nanite_scanner, +/obj/item/nanite_scanner, +/obj/item/nanite_remote, +/obj/item/nanite_remote, +/obj/item/storage/box/disks_nanite, +/turf/open/floor/iron, +/area/station/science/explab) "dOY" = ( /obj/effect/spawner/random/vending/snackvend, /obj/effect/turf_decal/tile/red/half, @@ -12694,7 +12668,7 @@ /turf/open/floor/iron/dark/textured, /area/station/security/prison) "dWu" = ( -/obj/item/kirbyplants/random, +/obj/machinery/vending/assist, /turf/open/floor/iron/cafeteria{ dir = 8 }, @@ -13590,7 +13564,6 @@ /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, /turf/open/floor/iron/white/side{ dir = 8 }, @@ -16116,6 +16089,12 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/stone, /area/mine/eva/lower) +"faF" = ( +/obj/structure/sign/departments/xenobio/directional/west, +/turf/open/floor/iron/white/side{ + dir = 6 + }, +/area/station/science/research) "faG" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -16249,11 +16228,9 @@ /turf/open/floor/plating/icemoon, /area/station/security/execution/education) "fdH" = ( -/obj/machinery/meter, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/smart/manifold4w/general, -/turf/open/floor/plating, -/area/station/maintenance/starboard/aft) +/obj/machinery/newscaster/directional/south, +/turf/open/floor/iron, +/area/station/science/explab) "fdJ" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt/dust, @@ -20759,9 +20736,20 @@ /area/station/science/server) "gEo" = ( /obj/structure/table, -/obj/item/stock_parts/cell/high, -/obj/machinery/cell_charger{ - pixel_y = 5 +/obj/item/stock_parts/cell/high{ + pixel_x = 8; + pixel_y = 9 + }, +/obj/item/stock_parts/cell/high{ + pixel_x = 8; + pixel_y = -2 + }, +/obj/item/multitool/circuit, +/obj/item/multitool/circuit{ + pixel_x = -4 + }, +/obj/item/multitool/circuit{ + pixel_x = -8 }, /turf/open/floor/iron/white/corner{ dir = 4 @@ -21083,6 +21071,14 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/engineering/atmos/storage) +"gJx" = ( +/obj/machinery/status_display/evac/directional/south, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/science/explab) "gJz" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -23341,6 +23337,10 @@ /obj/structure/stairs/north, /turf/open/floor/iron, /area/station/service/chapel) +"hzg" = ( +/obj/machinery/nanite_programmer, +/turf/open/floor/iron, +/area/station/science/explab) "hzz" = ( /obj/structure/table/glass, /obj/item/clothing/gloves/latex, @@ -23960,10 +23960,6 @@ }, /turf/open/floor/iron/white/corner, /area/station/engineering/atmos) -"hMb" = ( -/obj/machinery/nanite_programmer, -/turf/open/floor/glass/reinforced, -/area/station/science/xenobiology) "hMc" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/catwalk_floor/iron_dark, @@ -24629,7 +24625,6 @@ "hWe" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, -/obj/machinery/nanite_chamber, /turf/open/floor/iron/white, /area/station/science/robotics/lab) "hWh" = ( @@ -24659,15 +24654,6 @@ /obj/machinery/light/directional/east, /turf/open/floor/engine, /area/station/science/xenobiology) -"hWI" = ( -/obj/effect/turf_decal/box, -/obj/structure/closet/crate/maint, -/obj/effect/spawner/random/maintenance/six, -/obj/structure/sign/poster/official/wtf_is_co2{ - pixel_y = 32 - }, -/turf/open/floor/iron/dark, -/area/station/maintenance/starboard/aft) "hWP" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -25411,23 +25397,8 @@ /turf/open/floor/plating, /area/station/medical/virology) "iji" = ( -/obj/structure/table, -/obj/item/multitool/circuit{ - pixel_x = -8 - }, -/obj/item/multitool/circuit{ - pixel_x = -4 - }, -/obj/item/multitool/circuit, -/obj/item/stock_parts/cell/high{ - pixel_x = 8; - pixel_y = 9 - }, -/obj/item/stock_parts/cell/high{ - pixel_x = 8; - pixel_y = -2 - }, /obj/item/radio/intercom/directional/west, +/obj/machinery/module_duplicator, /turf/open/floor/iron/white/side{ dir = 4 }, @@ -31070,13 +31041,10 @@ /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "jZY" = ( -/obj/structure/tank_holder/extinguisher, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/machinery/light/small/directional/east, -/turf/open/floor/plating, -/area/station/maintenance/starboard/aft) +/obj/machinery/light/directional/south, +/obj/machinery/nanite_chamber, +/turf/open/floor/iron, +/area/station/science/explab) "kaw" = ( /obj/machinery/photocopier, /obj/item/radio/intercom/directional/north, @@ -31483,8 +31451,8 @@ /turf/open/floor/iron/white/smooth_large, /area/station/service/kitchen/diner) "kfZ" = ( -/obj/machinery/door/firedoor/heavy, /obj/structure/sign/warning/test_chamber/directional/east, +/obj/machinery/door/firedoor/heavy, /turf/open/floor/iron/white/corner{ dir = 1 }, @@ -32825,20 +32793,6 @@ /obj/machinery/airalarm/directional/east, /turf/open/floor/iron/dark/textured, /area/station/security/execution/transfer) -"kBi" = ( -/obj/effect/mapping_helpers/airlock/abandoned, -/obj/machinery/door/airlock/atmos{ - name = "Atmospherics Maintenance" - }, -/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden{ - dir = 4 - }, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 4 - }, -/obj/effect/mapping_helpers/airlock/access/any/science/maintenance, -/turf/open/floor/plating, -/area/station/maintenance/starboard/aft) "kBl" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/circuit, @@ -33841,6 +33795,7 @@ receive_ore_updates = 1; supplies_requestable = 1 }, +/obj/item/crowbar/red, /turf/open/floor/glass/reinforced, /area/station/science/xenobiology) "kRm" = ( @@ -34848,7 +34803,8 @@ /area/station/maintenance/disposal) "lio" = ( /obj/machinery/light/directional/west, -/obj/structure/table/glass, +/obj/machinery/newscaster/directional/west, +/obj/item/storage/box/lights/tubes, /obj/item/assembly/signaler{ pixel_x = 6; pixel_y = 5 @@ -34863,7 +34819,7 @@ pixel_x = -5; pixel_y = 3 }, -/obj/machinery/newscaster/directional/west, +/obj/structure/rack, /turf/open/floor/iron/cafeteria{ dir = 8 }, @@ -35433,14 +35389,8 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/aft) "lqL" = ( -/obj/structure/closet/crate, -/obj/item/target/alien, -/obj/item/target/alien, -/obj/item/target/clown, -/obj/item/target/clown, -/obj/item/target/syndicate, -/obj/item/target/syndicate, -/obj/machinery/light/directional/south, +/obj/machinery/light/small/directional/east, +/obj/machinery/nanite_program_hub, /turf/open/floor/iron, /area/station/science/explab) "lqU" = ( @@ -37546,7 +37496,9 @@ /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, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/iron/white/corner{ dir = 1 }, @@ -40037,14 +39989,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"mXq" = ( -/obj/structure/table, -/obj/machinery/recharger, -/obj/item/gun/energy/laser/practice, -/obj/item/gun/energy/laser/practice, -/obj/machinery/newscaster/directional/south, -/turf/open/floor/iron, -/area/station/science/explab) "mXu" = ( /obj/machinery/light/directional/south, /obj/effect/landmark/start/hangover, @@ -42128,10 +42072,9 @@ /turf/open/floor/iron, /area/station/engineering/atmos) "nBN" = ( -/obj/machinery/atmospherics/components/tank/air, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron/dark, -/area/station/maintenance/starboard/aft) +/obj/machinery/computer/nanite_cloud_controller, +/turf/open/floor/iron, +/area/station/science/explab) "nBV" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/engine/vacuum, @@ -50656,14 +50599,14 @@ /turf/open/floor/iron/showroomfloor, /area/station/security/warden) "qlG" = ( -/obj/structure/table, -/obj/item/stack/sheet/glass/fifty{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/stack/sheet/iron/fifty, -/obj/item/stack/sheet/mineral/plasma, /obj/machinery/firealarm/directional/north, +/obj/structure/closet/crate, +/obj/item/target/syndicate, +/obj/item/target/syndicate, +/obj/item/target/clown, +/obj/item/target/clown, +/obj/item/target/alien, +/obj/item/target/alien, /turf/open/floor/iron, /area/station/science/explab) "qlU" = ( @@ -51829,15 +51772,6 @@ /area/mine/production) "qFp" = ( /obj/item/radio/intercom/directional/west, -/obj/structure/rack, -/obj/item/storage/box/lights/tubes, -/obj/item/crowbar/red, -/obj/item/nanite_scanner, -/obj/item/nanite_scanner, -/obj/item/nanite_remote, -/obj/item/nanite_remote, -/obj/item/storage/box/disks_nanite, -/obj/item/storage/box/disks_nanite, /turf/open/floor/glass/reinforced, /area/station/science/xenobiology) "qFt" = ( @@ -54088,11 +54022,6 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/upper) "rqa" = ( -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/machinery/disposal/bin, -/obj/machinery/status_display/evac/directional/south, /turf/open/floor/iron/white/corner{ dir = 1 }, @@ -56667,14 +56596,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /turf/open/floor/engine, /area/station/engineering/supermatter/room) -"shG" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/machinery/computer/nanite_chamber_control{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/science/robotics/lab) "shH" = ( /obj/structure/cable, /obj/structure/transit_tube/curved{ @@ -65106,19 +65027,16 @@ /turf/open/floor/iron/dark, /area/station/service/chapel) "uXs" = ( -/obj/structure/table, -/obj/item/storage/box/beakers{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/grenade/chem_grenade, -/obj/item/grenade/chem_grenade, /obj/machinery/requests_console/directional/north{ department = "Circuits Lab"; name = "Circuits Lab Requests Console"; receive_ore_updates = 1; supplies_requestable = 1 }, +/obj/structure/table, +/obj/item/gun/energy/laser/practice, +/obj/item/gun/energy/laser/practice, +/obj/machinery/recharger, /turf/open/floor/iron, /area/station/science/explab) "uXu" = ( @@ -67376,6 +67294,7 @@ /area/station/security/checkpoint/medical) "vHm" = ( /obj/structure/rack, +/obj/effect/spawner/random/maintenance/six, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "vHq" = ( @@ -73187,13 +73106,6 @@ /obj/item/radio/intercom/directional/south, /turf/open/floor/iron/large, /area/station/engineering/atmos) -"xxv" = ( -/obj/effect/turf_decal/arrows, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/turf/open/floor/iron/white, -/area/station/maintenance/starboard/aft) "xxx" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -73410,11 +73322,27 @@ /turf/open/floor/iron/dark/textured, /area/station/security/prison/mess) "xBa" = ( +/obj/machinery/light/small/directional/south, /obj/structure/table, +/obj/item/storage/box/beakers{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/stack/sheet/glass/fifty{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/mineral/plasma, /obj/item/storage/toolbox/electrical{ pixel_y = 5 }, -/obj/machinery/light/small/directional/south, +/obj/item/stock_parts/cell/high, +/obj/machinery/cell_charger{ + pixel_y = 5 + }, /turf/open/floor/iron/white/side{ dir = 1 }, @@ -74278,11 +74206,11 @@ /turf/open/floor/plating/snowed/icemoon, /area/icemoon/surface/outdoors/nospawn) "xPI" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 +/obj/machinery/computer/nanite_chamber_control{ + dir = 8 }, -/turf/open/floor/plating, -/area/station/maintenance/starboard/aft) +/turf/open/floor/iron, +/area/station/science/explab) "xPN" = ( /obj/item/storage/box/lights/mixed, /obj/item/storage/box/lights/mixed, @@ -249216,7 +249144,7 @@ ily qLY pnA qFp -hMb +fvk bfN ily gOM @@ -249473,7 +249401,7 @@ ily qLY kRi fvk -cTN +fvk bfN ily ily @@ -249730,7 +249658,7 @@ ily qLY jKY fvk -chc +fvk rMY tgx tgx @@ -250474,7 +250402,7 @@ mpZ ult wjz tXh -shG +hWe hWe uzK iIe @@ -252298,7 +252226,7 @@ eQQ lKq pMY kLy -bGA +pMY lKq dWu lio @@ -252318,7 +252246,7 @@ mWB tKz dmt jCl -jCl +mwQ vzD mVD vzD @@ -252556,7 +252484,7 @@ aYJ eLr hAm via -via +faF tPz iRN via @@ -253080,11 +253008,11 @@ bYu qkH wCV rqa +yeC +gJx bgx bgx bgx -kBi -vzD vzD lXi vzD @@ -253336,12 +253264,12 @@ hjE vWo fOl cyL -cSo -bgx -hWI -xxv +yeC +yeC +yeC +yeC dOK -vzD +bgx puh lXi tgq @@ -253593,12 +253521,12 @@ bkF cSw cmx yeC -mXq -bgx -nBN -clY +yeC +yeC +yeC +yeC fdH -vzD +bgx tKz lXi jPY @@ -253851,11 +253779,11 @@ cSw pwK yeC lqL -bgx +hzg nBN xPI jZY -vzD +bgx vzD lXi vzD @@ -254108,10 +254036,10 @@ cSw ihu hjp hjE -bgx -bgx -bgx -bgx +hjE +hjE +hjE +hjE bgx uAJ lXi From 3cf2b5ecfb70bf4e1105499cdf3856802181af3b Mon Sep 17 00:00:00 2001 From: DexeeXI <120314509+DexeeXI@users.noreply.github.com> Date: Thu, 30 Nov 2023 16:03:19 -0700 Subject: [PATCH 09/14] tram: door fixes fixes certain doors to have appropriate access requirements. --- _maps/map_files/tramstation/tramstation.dmm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index dae408fb2b01..68ce397d0497 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -8159,6 +8159,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/window/right/directional/west, /obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plating, /area/station/security/office) "bwp" = ( @@ -34625,6 +34626,7 @@ /obj/effect/turf_decal/loading_area{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plating, /area/station/medical/storage) "kcX" = ( @@ -53140,7 +53142,7 @@ /obj/machinery/door/airlock/maintenance_hatch{ name = "Security Maintenance Hatch" }, -/obj/effect/mapping_helpers/airlock/access/any/security/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron/smooth, /area/station/maintenance/department/eva) "qcY" = ( @@ -77780,10 +77782,10 @@ /obj/machinery/door/airlock/maintenance_hatch{ name = "Security Maintenance Hatch" }, -/obj/effect/mapping_helpers/airlock/access/any/security/maintenance, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/catwalk_floor, /area/station/maintenance/department/eva) "xSD" = ( From f8a1abc0f921145385200ef991f7ad2fae9e026b Mon Sep 17 00:00:00 2001 From: DexeeXI <120314509+DexeeXI@users.noreply.github.com> Date: Fri, 1 Dec 2023 00:02:54 -0700 Subject: [PATCH 10/14] icebox: add biohazard suit locker biohazard suit locker for artsci. --- _maps/map_files/IceBoxStation/IceBoxStation.dmm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index e94e45f99d4e..ab0c546b8a83 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -64472,6 +64472,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/textured, /area/station/commons/storage/emergency/port) +"uMn" = ( +/obj/structure/closet/l3closet/scientist, +/turf/open/floor/engine, +/area/station/science/explab) "uMq" = ( /obj/structure/sign/warning/cold_temp{ pixel_x = -29 @@ -256347,7 +256351,7 @@ nsZ ajS rYl pWL -rDZ +uMn pxu gHx bgx From aaa7d70a6a9ccb4fb80f7cccf998ff2d34235d4c Mon Sep 17 00:00:00 2001 From: DexeeXI <120314509+DexeeXI@users.noreply.github.com> Date: Sun, 3 Dec 2023 21:11:33 -0700 Subject: [PATCH 11/14] all: remove mass specs removed mass spectro machine from chem as it is not used in our codebase. it is still available if people wish to have it, but it is otherwise removed. --- _maps/map_files/Deltastation/DeltaStation2.dmm | 1 - _maps/map_files/IceBoxStation/IceBoxStation.dmm | 1 - _maps/map_files/MetaStation/MetaStation.dmm | 9 +-------- _maps/map_files/tramstation/tramstation.dmm | 1 - 4 files changed, 1 insertion(+), 11 deletions(-) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 9f005431263c..db0753fbd202 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -62429,7 +62429,6 @@ name = "Pharmacy Shutters"; pixel_y = 40 }, -/obj/machinery/chem_mass_spec, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/siding/yellow{ dir = 8 diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index ab0c546b8a83..b3c0fc7d9b55 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -57774,7 +57774,6 @@ /turf/closed/wall, /area/station/commons/storage/art) "sAT" = ( -/obj/machinery/chem_mass_spec, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ dir = 8 }, diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 3c3bdfb01373..9c395876174b 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -20010,13 +20010,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/cargo/storage) -"hxq" = ( -/obj/machinery/chem_mass_spec, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/medical/pharmacy) "hxt" = ( /obj/structure/closet/secure_closet/personal, /obj/machinery/light/small/directional/north, @@ -94511,7 +94504,7 @@ oar keK lXA mVE -hxq +lXA nJn nqB mtm diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 68ce397d0497..ded581cf5617 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -30343,7 +30343,6 @@ /turf/open/openspace, /area/station/asteroid) "iLD" = ( -/obj/machinery/chem_mass_spec, /obj/effect/turf_decal/tile/yellow/fourcorners, /turf/open/floor/iron/white, /area/station/medical/pharmacy) From 4fc45d439c6a618caa415d095e2adac547575c33 Mon Sep 17 00:00:00 2001 From: DexeeXI <120314509+DexeeXI@users.noreply.github.com> Date: Mon, 4 Dec 2023 00:15:08 -0700 Subject: [PATCH 12/14] Tram: sign problems lmao i dont know where it came from --- _maps/map_files/tramstation/tramstation.dmm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index ded581cf5617..fcd7b19b85ab 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -72526,10 +72526,6 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, -/obj/structure/sign/directions/vault{ - dir = 1; - pixel_y = 30 - }, /turf/open/floor/iron/dark, /area/station/command/bridge) "wdg" = ( @@ -77836,6 +77832,10 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/airlock/public/glass, +/obj/structure/sign/directions/vault{ + dir = 1; + pixel_y = 30 + }, /turf/open/floor/iron/smooth, /area/station/hallway/primary/tram/left) "xTG" = ( From 9e3b60af8711631b96f123d3e6fa0782b3db2a39 Mon Sep 17 00:00:00 2001 From: DexeeXI <120314509+DexeeXI@users.noreply.github.com> Date: Mon, 4 Dec 2023 00:26:46 -0700 Subject: [PATCH 13/14] tram: stupid intercom stupid intercom --- _maps/map_files/tramstation/tramstation.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index fcd7b19b85ab..414bf3cd4a7f 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -22889,6 +22889,7 @@ /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 1 }, +/obj/item/radio/intercom/directional/north, /turf/open/floor/iron, /area/station/cargo/warehouse) "glP" = ( @@ -52344,7 +52345,6 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/obj/item/radio/intercom/directional/north, /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 1 }, From cedc1d82d0d74c4dab29563f01d29e3d2798c401 Mon Sep 17 00:00:00 2001 From: TacticalTortoise <87680969+TacticalTortoise@users.noreply.github.com> Date: Mon, 4 Dec 2023 15:07:30 -0600 Subject: [PATCH 14/14] Turbine LOOOP added independent fuel Pipenet to Delta IceBox and Meta --- .../map_files/Deltastation/DeltaStation2.dmm | 158 ++++++------- .../map_files/IceBoxStation/IceBoxStation.dmm | 172 +++++++------- _maps/map_files/MetaStation/MetaStation.dmm | 212 ++++++++++-------- 3 files changed, 289 insertions(+), 253 deletions(-) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index db0753fbd202..c62ad2065e42 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -12246,11 +12246,6 @@ /obj/machinery/newscaster/directional/north, /turf/open/floor/iron, /area/station/commons/storage/primary) -"cRs" = ( -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/engineering/atmos) "cRv" = ( /obj/structure/reflector/single, /obj/machinery/light/directional/north, @@ -12305,6 +12300,7 @@ color = "#FFFF00" }, /obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer4, /turf/open/floor/iron, /area/station/engineering/atmos) "cSD" = ( @@ -18213,9 +18209,6 @@ /turf/open/floor/iron/dark, /area/station/science/xenobiology) "eso" = ( -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ - dir = 10 - }, /obj/effect/turf_decal/trimline/yellow/filled/warning, /turf/open/floor/iron, /area/station/engineering/atmos) @@ -23008,15 +23001,13 @@ /area/station/hallway/primary/fore) "fzx" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/components/binary/valve/digital{ - dir = 4 - }, /obj/effect/turf_decal/box/corners{ dir = 4 }, /obj/effect/turf_decal/box/corners{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer4, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "fzD" = ( @@ -23357,10 +23348,6 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ - dir = 4 - }, -/obj/machinery/meter, /turf/open/floor/iron/dark/corner, /area/station/maintenance/disposal/incinerator) "fEu" = ( @@ -24478,7 +24465,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/layer_manifold/dark{ dir = 4 }, /turf/open/floor/iron, @@ -29174,9 +29161,6 @@ /turf/open/floor/iron/sepia, /area/station/service/library/artgallery) "gZV" = ( -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ - dir = 5 - }, /obj/structure/sign/warning/secure_area/directional/south, /obj/machinery/light/directional/south, /obj/effect/turf_decal/trimline/yellow/filled/line, @@ -29407,7 +29391,6 @@ /turf/open/floor/iron/white, /area/station/medical/medbay) "hdL" = ( -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -29644,6 +29627,7 @@ /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/yellow/filled/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer4, /turf/open/floor/iron, /area/station/engineering/atmos) "hgz" = ( @@ -36306,12 +36290,12 @@ /turf/open/floor/iron, /area/station/commons/dorms) "iOj" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/purple/visible, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/meter, /obj/effect/turf_decal/box/corners{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/purple, /turf/open/floor/iron, /area/station/engineering/atmos) "iOu" = ( @@ -36738,6 +36722,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer4, /turf/open/floor/iron, /area/station/engineering/atmos) "iVT" = ( @@ -40115,8 +40100,8 @@ "jIB" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/purple, /turf/open/floor/iron, /area/station/engineering/atmos) "jJc" = ( @@ -40514,6 +40499,13 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/security/checkpoint/customs/fore) +"jNU" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer4, +/turf/open/floor/iron, +/area/station/engineering/atmos) "jOo" = ( /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/stripes/line{ @@ -41326,6 +41318,7 @@ "jXN" = ( /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer4, /turf/open/floor/plating, /area/station/engineering/atmos) "jXQ" = ( @@ -44984,7 +44977,6 @@ /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) "kSt" = ( -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -47112,6 +47104,7 @@ "ltD" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer4, /turf/open/floor/iron, /area/station/engineering/atmos) "ltG" = ( @@ -48431,6 +48424,7 @@ /turf/open/floor/iron, /area/station/engineering/main) "lJc" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer4, /turf/open/floor/iron, /area/station/engineering/atmos) "lJh" = ( @@ -52482,9 +52476,6 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ - dir = 10 - }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark/corner, /area/station/maintenance/disposal/incinerator) @@ -53352,10 +53343,9 @@ /area/station/security/checkpoint/customs/aft) "mTe" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ - dir = 10 - }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer4, +/obj/machinery/meter/layer4, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "mTn" = ( @@ -53778,6 +53768,7 @@ name = "plasma mixer" }, /obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer4, /turf/open/floor/iron, /area/station/engineering/atmos) "mZk" = ( @@ -54184,7 +54175,7 @@ /area/station/science/research) "nfn" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/purple, /turf/open/floor/iron, /area/station/engineering/atmos) "nfq" = ( @@ -54975,12 +54966,6 @@ }, /turf/open/floor/iron/dark, /area/station/command/corporate_showroom) -"nqj" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/station/engineering/atmos) "nqk" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -57217,6 +57202,10 @@ }, /turf/open/floor/iron, /area/station/engineering/main) +"nRD" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer4, +/turf/closed/wall, +/area/station/maintenance/disposal/incinerator) "nRF" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/structure/disposalpipe/segment{ @@ -57571,10 +57560,6 @@ /turf/open/floor/iron, /area/station/commons/lounge) "nWL" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1; - name = "Port to Fuel Pipe" - }, /obj/effect/turf_decal/trimline/yellow/filled/warning{ dir = 1 }, @@ -57633,9 +57618,7 @@ }, /obj/machinery/power/apc/auto_name/directional/south, /obj/machinery/light/directional/south, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ - dir = 5 - }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer4, /turf/open/floor/iron/dark/corner, /area/station/maintenance/disposal/incinerator) "nXH" = ( @@ -57887,6 +57870,10 @@ /obj/effect/turf_decal/tile/purple/anticorner/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/components/binary/pump/layer4{ + dir = 4; + name = "Plasma to Turbine" + }, /turf/open/floor/iron, /area/station/engineering/atmos) "oaO" = ( @@ -72054,6 +72041,10 @@ /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/components/binary/pump/layer4{ + dir = 4; + name = "O2 to Turbine" + }, /turf/open/floor/iron, /area/station/engineering/atmos) "rAC" = ( @@ -77032,6 +77023,9 @@ /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 10 }, +/obj/machinery/atmospherics/components/trinary/mixer/flipped/layer4{ + name = "Turbine Mixer'" + }, /turf/open/floor/iron, /area/station/engineering/atmos) "sLY" = ( @@ -77941,6 +77935,7 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer4, /turf/open/floor/iron, /area/station/engineering/atmos) "sXd" = ( @@ -80979,6 +80974,12 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/maintenance/port) +"tLh" = ( +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer4, +/turf/open/floor/iron, +/area/station/engineering/atmos) "tLm" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -83911,7 +83912,6 @@ /obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/bridge_pipe/dark/visible, /obj/effect/turf_decal/trimline/yellow/filled/warning{ dir = 1 }, @@ -85895,6 +85895,17 @@ /obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron/dark, /area/station/medical/chemistry) +"uUd" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer4, +/turf/open/floor/iron, +/area/station/engineering/atmos) "uUg" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -87925,12 +87936,6 @@ }, /turf/open/floor/iron, /area/station/commons/vacant_room/commissary) -"vuh" = ( -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/station/engineering/atmos) "vur" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/dirt, @@ -90653,6 +90658,11 @@ /obj/machinery/power/apc/auto_name/directional/south, /turf/open/floor/plating, /area/station/maintenance/solars/starboard/aft) +"wdu" = ( +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer4, +/turf/open/floor/iron, +/area/station/engineering/atmos) "wdv" = ( /obj/structure/closet, /obj/effect/spawner/random/maintenance/three, @@ -90995,7 +91005,6 @@ /turf/open/floor/iron, /area/station/security/checkpoint/escape) "wgO" = ( -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -92136,11 +92145,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central/aft) -"wsy" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, -/turf/open/floor/iron, -/area/station/engineering/atmos) "wsz" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -122072,27 +122076,27 @@ gFb qUE mTe nXw -wSR -aqc +nRD +uUd lJc sLV iVz -iMf -iMf +wdu +wdu cSr iVz -iMf -iMf +wdu +wdu iVz -iMf -lcA +wdu +jNU hgs jXN sXb -lcA +jNU ltD -iMf -qJb +wdu +tLh mZj iMf qJb @@ -122589,17 +122593,17 @@ mIO cGz uvb hdL -cRs -cRs -cRs +sID +sID +sID wgO -vuh -cRs -cRs -vuh -cRs -wsy -nqj +nmP +sID +sID +nmP +sID +sID +nmP gZV fXF ijC diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index b3c0fc7d9b55..f32a676e2931 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -20125,9 +20125,7 @@ /turf/open/floor/iron/white/smooth_large, /area/station/service/kitchen/diner) "gtg" = ( -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer1{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer4, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/surface/outdoors/nospawn) "gti" = ( @@ -20939,9 +20937,6 @@ /turf/open/floor/iron, /area/station/commons/dorms) "gHl" = ( -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer1{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, @@ -23141,6 +23136,13 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/fore) +"huZ" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer4, +/turf/open/floor/iron, +/area/station/engineering/atmos) "hvl" = ( /obj/effect/turf_decal/siding/white, /obj/effect/spawner/random/entertainment/arcade, @@ -28264,6 +28266,13 @@ /obj/item/flashlight/lamp, /turf/open/floor/iron/grimy, /area/station/commons/vacant_room/office) +"jdA" = ( +/obj/machinery/atmospherics/components/trinary/mixer/flipped/layer4{ + dir = 8; + name = "Turbine Mixer'" + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "jdB" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ @@ -29867,9 +29876,6 @@ /obj/machinery/atmospherics/components/trinary/filter/atmos/co2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer1{ - dir = 8 - }, /turf/open/floor/iron, /area/station/engineering/atmos) "jIg" = ( @@ -30008,6 +30014,13 @@ /obj/machinery/door/firedoor/heavy, /turf/open/floor/iron/dark, /area/station/science/ordnance) +"jJH" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer4, +/turf/open/floor/iron, +/area/station/engineering/atmos) "jJM" = ( /turf/open/floor/glass, /area/station/security/lockers) @@ -30947,6 +30960,7 @@ dir = 9 }, /obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer4, /turf/open/floor/plating, /area/station/engineering/atmos) "jYL" = ( @@ -31543,6 +31557,11 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +"khf" = ( +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer4, +/turf/open/floor/iron, +/area/station/engineering/atmos) "kho" = ( /obj/item/radio/intercom/directional/south, /obj/structure/table/wood, @@ -31806,6 +31825,13 @@ dir = 1 }, /area/station/medical/chemistry) +"klr" = ( +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer4, +/turf/open/floor/iron, +/area/station/engineering/atmos) "klv" = ( /obj/structure/chair/sofa/corp/corner{ dir = 8 @@ -32130,6 +32156,10 @@ name = "O2 To Pure" }, /obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/obj/machinery/atmospherics/components/binary/pump/layer4{ + dir = 1; + name = "O2 to Turbine" + }, /turf/open/floor/iron, /area/station/engineering/atmos) "kqV" = ( @@ -34199,12 +34229,6 @@ /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron/dark, /area/station/security/checkpoint/engineering) -"kYi" = ( -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ - dir = 5 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "kYq" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -36690,10 +36714,8 @@ /turf/open/floor/wood, /area/station/commons/dorms) "lOI" = ( -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer1{ - dir = 5 - }, /obj/machinery/atmospherics/pipe/smart/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer4, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/surface/outdoors/nospawn) "lOU" = ( @@ -38464,6 +38486,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer4, /turf/open/floor/iron, /area/station/engineering/atmos) "mvU" = ( @@ -42066,9 +42089,7 @@ /area/icemoon/surface/outdoors/nospawn) "nBG" = ( /obj/item/cigbutt, -/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /turf/open/floor/iron, /area/station/engineering/atmos) "nBN" = ( @@ -43306,11 +43327,6 @@ /obj/effect/spawner/random/structure/crate, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) -"nST" = ( -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer1, -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, -/turf/open/floor/plating/snowed/icemoon, -/area/icemoon/surface/outdoors/nospawn) "nSX" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -54271,6 +54287,7 @@ dir = 1; name = "plasma mixer" }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer4, /turf/open/floor/iron, /area/station/engineering/atmos) "ruC" = ( @@ -54406,11 +54423,16 @@ }, /obj/machinery/atmospherics/components/binary/pump{ dir = 8; - name = "Plasma to Pure" + name = "Plasma to Pure"; + piping_layer = 4 }, /obj/effect/turf_decal/tile/purple/anticorner/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/components/binary/pump/layer4{ + dir = 8; + name = "Plasma to Turbine" + }, /turf/open/floor/iron, /area/station/engineering/atmos) "rxz" = ( @@ -54715,17 +54737,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/commons/dorms) -"rBo" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer1{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, -/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ - dir = 4 - }, -/turf/open/floor/plating, -/area/station/engineering/atmos) "rBt" = ( /obj/machinery/light/directional/east, /obj/effect/turf_decal/siding/white{ @@ -56577,6 +56588,7 @@ /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 9 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer4, /turf/open/floor/iron, /area/station/engineering/atmos) "sht" = ( @@ -57232,6 +57244,7 @@ /obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer4, /turf/open/floor/iron, /area/station/engineering/atmos) "ssq" = ( @@ -59186,6 +59199,14 @@ /obj/effect/spawner/random/trash/moisture_trap, /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) +"sYZ" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer4, +/turf/open/floor/iron, +/area/station/engineering/atmos) "sZa" = ( /obj/effect/turf_decal/box/white{ color = "#9FED58" @@ -62004,6 +62025,16 @@ /obj/structure/table, /turf/open/floor/plating/snowed/coldroom, /area/station/service/kitchen/coldroom) +"tWI" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "tWK" = ( /obj/structure/cable, /turf/open/floor/plating/snowed/icemoon, @@ -63438,12 +63469,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) -"uub" = ( -/obj/machinery/atmospherics/components/binary/pump{ - name = "Port to Fuel Pipe" - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "uud" = ( /obj/structure/rack, /obj/effect/spawner/random/techstorage/tcomms_all, @@ -64125,9 +64150,7 @@ /turf/open/openspace, /area/station/security/brig/upper) "uGy" = ( -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer1{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer4, /turf/open/floor/iron, /area/station/engineering/atmos) "uGz" = ( @@ -64874,12 +64897,6 @@ /obj/effect/decal/cleanable/blood/old, /turf/open/floor/engine, /area/station/science/xenobiology) -"uUH" = ( -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer1{ - dir = 10 - }, -/turf/open/floor/plating/snowed/icemoon, -/area/icemoon/surface/outdoors/nospawn) "uUT" = ( /turf/closed/wall, /area/mine/mechbay) @@ -65116,13 +65133,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) -"uYH" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/dark/visible{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible, -/turf/open/floor/iron, -/area/station/engineering/atmos) "uYO" = ( /obj/structure/closet/firecloset, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -68588,16 +68598,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/catwalk_floor/iron_dark, /area/station/ai_monitored/turret_protected/ai_upload) -"wfm" = ( -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer1{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/bridge_pipe/orange/visible, -/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ - dir = 4 - }, -/turf/open/floor/plating/snowed/icemoon, -/area/icemoon/surface/outdoors/nospawn) "wfn" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -240419,11 +240419,11 @@ lxU fcN fcN nBG -uub -kYi -rBQ +hHN +hHN +jJH ssh -skx +sYZ kqS mIk wMe @@ -240677,7 +240677,7 @@ jBR fnA hHN lRR -uYH +bpR shj qnO lxu @@ -240929,13 +240929,13 @@ fQc fQc noY ruw -fQc -fQc -fQc +klr +klr +klr mvG shj uGy -hHN +jdA cqO cfC fsQ @@ -241185,14 +241185,14 @@ oyX xfB khe oSX -oyX +tWI xfB cHm xfB oyX xfB jHQ -xfB +khf gBx rkm sEX @@ -241449,7 +241449,7 @@ hHN meT xGM gHl -flH +huZ bOY rPn kqq @@ -241705,7 +241705,7 @@ nVe cnq eMr cnq -rBo +nVe jYH kfs kfs @@ -241962,8 +241962,8 @@ rwB swu mkG swu -wfm -nST +rwB +lOI lOI pGQ wgG @@ -242735,7 +242735,7 @@ aOX aRj aOX qwF -uUH +gtg vuu xvj rCW diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 9c395876174b..f4842840b5f4 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -2455,6 +2455,10 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/station/hallway/secondary/entry) +"aSB" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer4, +/turf/open/floor/iron, +/area/station/engineering/atmos) "aSD" = ( /obj/structure/window/reinforced/spawner/directional/south, /obj/structure/window/reinforced/spawner/directional/east, @@ -5193,6 +5197,13 @@ /obj/effect/turf_decal/bot_white, /turf/open/floor/iron, /area/station/science/xenobiology) +"bQY" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer4, +/turf/open/floor/iron, +/area/station/engineering/atmos) "bRG" = ( /obj/machinery/shower/directional/west, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -5610,6 +5621,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/security/courtroom) +"cay" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/station/engineering/atmos) "caC" = ( /obj/machinery/portable_atmospherics/canister/anesthetic_mix, /obj/effect/turf_decal/box/white{ @@ -5651,6 +5670,7 @@ /obj/machinery/atmospherics/components/trinary/mixer{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer4, /turf/open/floor/iron, /area/station/engineering/atmos) "ccV" = ( @@ -6928,15 +6948,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/station/maintenance/port/aft) -"cBd" = ( -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "cBf" = ( /turf/closed/wall, /area/station/commons/locker) @@ -7104,16 +7115,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) -"cFa" = ( -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ - dir = 4 - }, -/obj/machinery/meter, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "cFe" = ( /obj/machinery/oven, /turf/open/floor/iron/cafeteria, @@ -7173,7 +7174,6 @@ dir = 8 }, /obj/machinery/light/no_nightlight/directional/west, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/iron/dark/corner{ dir = 1 }, @@ -8607,6 +8607,12 @@ }, /turf/closed/wall/r_wall, /area/station/engineering/atmos) +"dkK" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer5, +/obj/machinery/door/firedoor/heavy, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer4, +/turf/open/floor/iron/dark/textured, +/area/station/engineering/atmos) "dkL" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/event_spawn, @@ -9155,6 +9161,7 @@ /area/station/hallway/primary/central) "dwf" = ( /obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer4, /turf/open/floor/iron, /area/station/engineering/atmos) "dwl" = ( @@ -10387,15 +10394,6 @@ /obj/machinery/vending/wardrobe/curator_wardrobe, /turf/open/floor/iron/vaporwave, /area/station/service/library) -"dVT" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "Pure to Fuel Pipe" - }, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer5, -/obj/machinery/door/firedoor/heavy, -/turf/open/floor/iron/dark/textured, -/area/station/engineering/atmos) "dWd" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -14752,12 +14750,10 @@ dir = 1 }, /obj/effect/turf_decal/tile/red/fourcorners, -/obj/machinery/atmospherics/pipe/bridge_pipe/dark/visible{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /turf/open/floor/iron, /area/station/engineering/atmos) "fEK" = ( @@ -19039,10 +19035,6 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "Fuel Pipe to Filter" - }, /turf/open/floor/iron, /area/station/engineering/atmos) "hfa" = ( @@ -20508,10 +20500,10 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "hHt" = ( -/obj/machinery/atmospherics/pipe/bridge_pipe/dark/visible{ +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "hHK" = ( @@ -24478,6 +24470,7 @@ /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 10 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer4, /turf/open/floor/iron, /area/station/engineering/atmos) "iTH" = ( @@ -26416,12 +26409,6 @@ }, /turf/open/floor/iron/grimy, /area/station/security/detectives_office) -"jAV" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/dark/visible{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "jBb" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/structure/cable, @@ -28281,9 +28268,6 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 5 - }, /turf/open/floor/iron/dark/corner{ dir = 1 }, @@ -28332,6 +28316,13 @@ /obj/item/tape, /turf/open/floor/wood, /area/station/service/library) +"klg" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer4, +/turf/open/floor/iron, +/area/station/engineering/atmos) "klj" = ( /obj/machinery/light/small/directional/north, /obj/structure/table, @@ -30211,6 +30202,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer4, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "kUm" = ( @@ -31543,6 +31535,10 @@ dir = 1; name = "Plasma to Pure" }, +/obj/machinery/atmospherics/components/binary/pump/layer4{ + dir = 1; + name = "Plasma to Turbine" + }, /turf/open/floor/iron, /area/station/engineering/atmos) "lqT" = ( @@ -31923,6 +31919,7 @@ /obj/machinery/atmospherics/components/trinary/mixer/airmix{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer4, /turf/open/floor/iron, /area/station/engineering/atmos) "lxp" = ( @@ -32194,6 +32191,12 @@ /obj/effect/landmark/start/hangover/closet, /turf/open/floor/iron/dark, /area/station/commons/locker) +"lDR" = ( +/obj/machinery/atmospherics/components/binary/pump/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "lEr" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/cable, @@ -35867,9 +35870,6 @@ /area/station/maintenance/starboard/greater) "mTI" = ( /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ - dir = 4 - }, /turf/open/floor/iron, /area/station/engineering/atmos) "mTR" = ( @@ -36368,6 +36368,14 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) +"nbv" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer4, +/obj/machinery/meter/layer4, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) "nbx" = ( /obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 @@ -43137,12 +43145,12 @@ /turf/closed/wall/r_wall, /area/station/science/ordnance/storage) "pxC" = ( -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ - dir = 4 - }, /obj/machinery/atmospherics/components/binary/valve/digital{ name = "Waste Release" }, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "pxN" = ( @@ -46967,6 +46975,7 @@ /obj/machinery/atmospherics/components/unary/thermomachine/heater{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer4, /turf/open/floor/iron, /area/station/engineering/atmos) "qOZ" = ( @@ -47114,9 +47123,6 @@ /turf/open/floor/plating, /area/station/maintenance/fore) "qRM" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 6 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -50723,8 +50729,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/iron, /area/station/engineering/atmos) "scY" = ( @@ -51996,6 +52002,7 @@ /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 6 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer4, /turf/open/floor/iron, /area/station/engineering/atmos) "sCh" = ( @@ -52400,6 +52407,16 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) +"sJj" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/components/trinary/mixer/flipped/layer4{ + dir = 4; + name = "Turbine Mixer'" + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "sKf" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -60240,12 +60257,6 @@ /obj/effect/spawner/random/engineering/tracking_beacon, /turf/open/floor/iron, /area/station/security/range) -"vuU" = ( -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "vvp" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -62618,7 +62629,9 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "wmz" = ( -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/obj/machinery/atmospherics/pipe/layer_manifold/dark{ + dir = 1 + }, /turf/open/floor/iron, /area/station/engineering/atmos) "wmB" = ( @@ -65553,6 +65566,10 @@ dir = 1; name = "O2 To Pure" }, +/obj/machinery/atmospherics/components/binary/pump/layer4{ + dir = 1; + name = "O2 to Turbine" + }, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "xoK" = ( @@ -66587,6 +66604,17 @@ }, /turf/open/floor/plating, /area/station/maintenance/aft/greater) +"xHw" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/canister, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer4, +/turf/open/floor/iron, +/area/station/engineering/atmos) "xIx" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, @@ -67192,6 +67220,10 @@ /obj/structure/sign/poster/contraband/missing_gloves, /turf/closed/wall, /area/station/commons/storage/primary) +"xUV" = ( +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers, +/turf/open/floor/iron, +/area/station/engineering/atmos) "xUX" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -109142,8 +109174,8 @@ fWA fWA axx scL -fhG -xRc +cay +xUV aSK pxC gAT @@ -109399,7 +109431,7 @@ gnT lgL lrK heV -cyW +lDR cyW ffk hHt @@ -109655,8 +109687,8 @@ bLg prT prT fVA -jAV -wmz +cyW +aSB wmz fEA gyg @@ -109912,7 +109944,7 @@ ftd cAt gxb apg -vuU +cyW sBV mei awt @@ -110169,8 +110201,8 @@ dKE mHT tJF nau -vuU -jvj +cyW +klg vmx mGl hGk @@ -110426,8 +110458,8 @@ aGS mHT gXW nau -cBd -jvj +qwi +klg nnD hfZ sbl @@ -110683,8 +110715,8 @@ hQB mHT egP gMt -vuU -jvj +cyW +klg nnD jea aTN @@ -110940,7 +110972,7 @@ cyW iQB tds nzo -vuU +cyW lxm smt tDt @@ -111198,8 +111230,8 @@ cyW cyW nzo mTI -jvj -qua +sJj +bQY xoB hGk tfs @@ -111454,7 +111486,7 @@ cyW cyW lxt nzo -vuU +cyW iTC smt eNi @@ -111711,7 +111743,7 @@ cyW cyW cyW nzo -vuU +cyW dwf nnD elW @@ -111968,8 +112000,8 @@ cyW cyW dfS nzo -vuU cyW +aSB kEe fPg jie @@ -112225,8 +112257,8 @@ kLi kLi kLi swy -cFa kLi +nbv sEI tuf oLV @@ -112482,8 +112514,8 @@ tBM jhn jaO hXn -dVT jhn +dkK svj rhx tuo @@ -113254,7 +113286,7 @@ nzo cQQ sCW lNY -sCW +xHw nnD uBg oIM @@ -113511,7 +113543,7 @@ nzo jms rVJ fzM -sCW +xHw qua rZV kBh @@ -113768,7 +113800,7 @@ nzo cQQ sCW fzM -sCW +xHw nnD nbx oIM @@ -114025,7 +114057,7 @@ nzo fiE hur uel -cyW +aSB nnD lRA xXG @@ -114282,7 +114314,7 @@ mDA jZz vlq gTC -cyW +aSB qzK vdf eSZ @@ -114539,7 +114571,7 @@ nzo fzM rZt jZz -cyW +aSB ccK lqS kBh