From bdaade14bc022de9c9b3457f5d5cbf1caa843f3d Mon Sep 17 00:00:00 2001 From: 1080pCat <96908085+1080pCat@users.noreply.github.com> Date: Tue, 20 Feb 2024 02:21:07 +1000 Subject: [PATCH] Changes how the external portable pumps/scrubbers deals with their gas on cyberiad (#24144) * Update cyberiad.dmm * woops * oops 2 --- _maps/map_files/cyberiad/cyberiad.dmm | 264 ++++++++++++++------------ 1 file changed, 145 insertions(+), 119 deletions(-) diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index 0492e6de051..f63bd4e0a91 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -28227,6 +28227,7 @@ id_tag = "Engineering"; name = "Engineering Security Doors" }, +/obj/machinery/atmospherics/pipe/simple/hidden/purple, /turf/simulated/floor/plating, /area/station/engineering/equipmentstorage) "bHZ" = ( @@ -30747,6 +30748,7 @@ id_tag = "Engineering"; name = "Engineering Security Doors" }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plasteel, /area/station/engineering/equipmentstorage) "bRj" = ( @@ -36812,12 +36814,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/science/storage) -"cmG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) "cmH" = ( /obj/structure/closet/emcloset, /obj/effect/spawner/lootdrop/maintenance, @@ -41036,9 +41032,6 @@ pixel_x = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/universal{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) @@ -41376,12 +41369,6 @@ icon_state = "cautioncorner" }, /area/station/hallway/primary/aft/south) -"cBF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 6 - }, -/turf/simulated/wall, -/area/station/engineering/controlroom) "cBG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 @@ -41431,13 +41418,6 @@ icon_state = "purple" }, /area/station/maintenance/asmaint2) -"cBJ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) "cBL" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -41847,18 +41827,13 @@ name = "west bump"; pixel_x = -28 }, -/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ - dir = 6 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "cDA" = ( /obj/machinery/drone_fabricator, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /obj/item/radio/intercom{ name = "south bump"; pixel_y = -28 @@ -41905,9 +41880,6 @@ name = "Emergency NanoMed"; pixel_y = -28 }, -/obj/machinery/atmospherics/pipe/simple/hidden/universal{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "cDF" = ( @@ -42131,6 +42103,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 10 + }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "cEk" = ( @@ -42622,10 +42597,17 @@ "cGr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, +/obj/machinery/atmospherics/pipe/simple/hidden/purple{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/station/engineering/break_room) "cGs" = ( /obj/machinery/recharge_station, +/obj/machinery/atmospherics/pipe/simple/hidden/purple{ + dir = 10 + }, /turf/simulated/floor/plasteel, /area/station/engineering/break_room) "cGt" = ( @@ -42748,8 +42730,8 @@ /area/station/medical/storage) "cGN" = ( /obj/machinery/atmospherics/meter, -/obj/machinery/atmospherics/pipe/manifold/hidden/yellow{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/purple{ + dir = 10 }, /turf/simulated/wall, /area/station/engineering/controlroom) @@ -42916,10 +42898,11 @@ /area/station/hallway/primary/aft/south) "cHm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/station/engineering/break_room) "cHo" = ( @@ -42980,6 +42963,7 @@ /obj/structure/disposalpipe/trunk{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/purple, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "caution" @@ -43138,6 +43122,7 @@ d2 = 8; icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plasteel, /area/station/engineering/break_room) "cHQ" = ( @@ -43150,9 +43135,7 @@ /area/station/engineering/break_room) "cHU" = ( /obj/structure/sign/securearea, -/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ - dir = 9 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/purple, /turf/simulated/wall, /area/station/engineering/break_room) "cHV" = ( @@ -43458,6 +43441,7 @@ dir = 2; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plasteel, /area/station/engineering/break_room) "cIV" = ( @@ -43546,6 +43530,7 @@ /obj/machinery/light{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plasteel, /area/station/engineering/break_room) "cJp" = ( @@ -44015,6 +44000,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plasteel, /area/station/engineering/break_room) "cKV" = ( @@ -44582,6 +44568,7 @@ icon_state = "2-8" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plasteel, /area/station/engineering/break_room) "cMX" = ( @@ -45200,6 +45187,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plasteel, /area/station/engineering/equipmentstorage) "cPo" = ( @@ -45353,6 +45341,7 @@ d2 = 8; icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plasteel, /area/station/engineering/equipmentstorage) "cPN" = ( @@ -45362,7 +45351,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/equipmentstorage) "cPO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, /turf/simulated/floor/plasteel, @@ -45608,6 +45597,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/landmark/lightsout, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plasteel, /area/station/engineering/equipmentstorage) "cQL" = ( @@ -46006,6 +45996,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plasteel, /area/station/engineering/equipmentstorage) "cRP" = ( @@ -46071,8 +46062,8 @@ /turf/simulated/floor/plasteel, /area/station/engineering/equipmentstorage) "cRV" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, /turf/simulated/floor/plasteel, /area/station/engineering/equipmentstorage) @@ -46279,6 +46270,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plasteel, /area/station/engineering/equipmentstorage) "cSK" = ( @@ -46335,6 +46327,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/purple{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/station/engineering/equipmentstorage) "cSP" = ( @@ -46344,7 +46339,7 @@ /obj/structure/sign/poster/official/random{ pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/purple{ dir = 4 }, /turf/simulated/floor/plasteel, @@ -46406,26 +46401,26 @@ /turf/simulated/floor/carpet, /area/station/public/mrchangs) "cSY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/structure/cable{ d1 = 2; d2 = 8; icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/purple{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/station/engineering/equipmentstorage) "cSZ" = ( -/obj/machinery/atmospherics/pipe/simple/visible/universal{ - dir = 4 - }, /obj/machinery/computer/atmos_alert{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "cTa" = ( @@ -46487,7 +46482,7 @@ }, /area/station/command/office/ce) "cTj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/purple{ dir = 4 }, /turf/simulated/wall/r_wall, @@ -46655,21 +46650,22 @@ /area/station/command/office/ce) "cTN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 5 }, /turf/simulated/floor/plasteel, /area/station/engineering/equipmentstorage) "cTO" = ( /obj/structure/table, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/item/painter, /obj/item/painter{ pixel_x = -4; pixel_y = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/station/engineering/equipmentstorage) "cTP" = ( @@ -46688,15 +46684,15 @@ /obj/item/clothing/gloves/color/black, /obj/item/clothing/gloves/color/black, /obj/item/storage/box/lights/mixed, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/newscaster{ dir = 1; name = "south bump"; pixel_y = -28 }, /obj/item/crowbar/engineering, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/station/engineering/equipmentstorage) "cTU" = ( @@ -46827,7 +46823,7 @@ /area/station/engineering/control) "cUm" = ( /obj/structure/reagent_dispensers/fueltank, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, /turf/simulated/floor/plasteel, @@ -46861,14 +46857,14 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft) "cUs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/station/engineering/equipmentstorage) "cUt" = ( @@ -46897,7 +46893,7 @@ /turf/simulated/floor/plasteel, /area/station/command/office/ce) "cUx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, /turf/simulated/wall/r_wall, @@ -47483,6 +47479,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/purple{ + dir = 5 + }, /turf/simulated/floor/plasteel, /area/station/engineering/equipmentstorage) "cWL" = ( @@ -47500,6 +47499,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/purple{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/station/engineering/equipmentstorage) "cWM" = ( @@ -47752,7 +47754,7 @@ "cXQ" = ( /obj/machinery/atmospherics/binary/volume_pump/on{ dir = 8; - name = "Filter to External" + name = "Air to External" }, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) @@ -51434,9 +51436,6 @@ dir = 6 }, /obj/machinery/ai_slipper, -/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ - dir = 4 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -51536,9 +51535,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ - dir = 4 - }, /obj/effect/turf_decal/stripes/corner{ dir = 1 }, @@ -52564,8 +52560,9 @@ /area/station/maintenance/storage) "dot" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ - dir = 4 + dir = 1 }, +/obj/machinery/atmospherics/meter, /turf/simulated/wall, /area/station/engineering/controlroom) "dou" = ( @@ -53614,13 +53611,13 @@ /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) "dtc" = ( -/obj/machinery/atmospherics/pipe/simple/visible/universal{ - dir = 4 - }, /obj/machinery/light{ dir = 8 }, /obj/machinery/economy/vending/atmosdrobe, +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "dtk" = ( @@ -56189,11 +56186,9 @@ }, /obj/effect/mapping_helpers/airlock/access/any/engineering/atmos, /obj/effect/mapping_helpers/airlock/access/any/engineering/equipment, -/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ - dir = 9 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "exh" = ( @@ -56910,6 +56905,19 @@ /obj/effect/spawner/lootdrop/maintenance/three, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) +"eOZ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/purple, +/turf/simulated/floor/plasteel, +/area/station/engineering/break_room) "ePp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 @@ -65461,6 +65469,10 @@ }, /turf/simulated/floor/plating, /area/station/command/office/ce) +"iWr" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/purple, +/turf/simulated/floor/plasteel, +/area/station/engineering/break_room) "iWs" = ( /obj/structure/cable, /obj/effect/spawner/window/reinforced/grilled, @@ -75969,6 +75981,13 @@ icon_state = "whitegreenfull" }, /area/station/public/sleep) +"oiK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/purple, +/turf/simulated/floor/plasteel, +/area/station/engineering/equipmentstorage) "oiL" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, @@ -78313,25 +78332,6 @@ icon_state = "dark" }, /area/station/medical/morgue) -"pjq" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/station/turret_protected/aisat/interior) "pko" = ( /obj/structure/chair/stool{ dir = 8 @@ -82341,6 +82341,17 @@ icon_state = "dark" }, /area/station/security/execution) +"rcq" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/purple{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/equipmentstorage) "rcs" = ( /obj/machinery/hologram/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -82885,16 +82896,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 5; - level = 2 - }, /obj/structure/cable{ d1 = 1; d2 = 4; icon_state = "1-4" }, /obj/effect/decal/cleanable/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 5 + }, /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "rqs" = ( @@ -83879,6 +83889,15 @@ icon_state = "freezerfloor" }, /area/station/security/permabrig) +"rRy" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "rSd" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -90797,9 +90816,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -93130,8 +93146,7 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 10; - level = 2 + dir = 10 }, /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) @@ -93284,6 +93299,13 @@ }, /turf/simulated/floor/plating/airless, /area/station/maintenance/asmaint) +"wHK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/purple, +/turf/simulated/floor/plasteel, +/area/station/engineering/equipmentstorage) "wHN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -94757,6 +94779,10 @@ icon_state = "dark" }, /area/station/engineering/control) +"xve" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/purple, +/turf/simulated/floor/plasteel, +/area/station/engineering/equipmentstorage) "xvg" = ( /obj/structure/cable{ d1 = 1; @@ -126392,7 +126418,7 @@ cxd cyx csD csD -cBF +csD dot cFj cGN @@ -126906,23 +126932,23 @@ cxf cxv czC csD -cmG -cBL +ctY +rRy cDE csD cGs cHu -cHX -dcj -dcj -dcj -dcj -dcj +eOZ +iWr +iWr +iWr +iWr +iWr bHY -cRX -cPO -cRX -cRS +xve +wHK +xve +oiK cWJ cPO gLG @@ -127164,7 +127190,7 @@ cxr cGI cvB cAR -cBJ +cBL cDA csD cHQ @@ -127694,7 +127720,7 @@ cRX cRX cRX cRS -cWJ +rcq cPO cYM cNV @@ -133128,7 +133154,7 @@ dpw dpf dkb dkg -pjq +dlb dqx dqm wny