From ef1ea7f7cc24faa653d80fc912abf727840d5cb4 Mon Sep 17 00:00:00 2001 From: CallmeHouston Date: Wed, 15 Jan 2025 23:47:07 +0800 Subject: [PATCH 01/10] Cyberiad: fix turbine, curator access MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Перестройка турбины, фикс доступов в библиотеке --- _maps/map_files/Cyberiad/Cyberiad.dmm | 341 ++++++++++++++------------ 1 file changed, 186 insertions(+), 155 deletions(-) diff --git a/_maps/map_files/Cyberiad/Cyberiad.dmm b/_maps/map_files/Cyberiad/Cyberiad.dmm index ab9de3079294a..05f28aeab9e0c 100644 --- a/_maps/map_files/Cyberiad/Cyberiad.dmm +++ b/_maps/map_files/Cyberiad/Cyberiad.dmm @@ -5875,7 +5875,9 @@ "bxz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small/directional/south, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 4 + }, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "bxI" = ( @@ -12501,8 +12503,9 @@ /turf/open/floor/iron, /area/station/maintenance/ghetto/central) "dcS" = ( -/obj/machinery/power/turbine/core_rotor, -/obj/structure/cable, +/obj/machinery/power/turbine/inlet_compressor{ + dir = 4 + }, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) "dcV" = ( @@ -26834,6 +26837,12 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) +"gMR" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ + dir = 8 + }, +/turf/open/floor/plating/airless, +/area/space/nearstation) "gMS" = ( /obj/machinery/status_display/ai/directional/east, /obj/structure/cable, @@ -29882,6 +29891,9 @@ "hAN" = ( /obj/structure/closet/secure_closet/atmospherics, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 6 + }, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "hBh" = ( @@ -30599,8 +30611,10 @@ /turf/open/floor/iron/white, /area/station/medical/storage) "hIY" = ( -/obj/machinery/power/turbine/inlet_compressor, -/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, +/obj/machinery/igniter/incinerator_atmos{ + id = "waste_incinerator_igniter" + }, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) "hJh" = ( @@ -31371,19 +31385,10 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) "hTP" = ( -/obj/machinery/door/airlock/public/glass/incinerator/atmos_exterior, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/obj/effect/mapping_helpers/airlock/locked, -/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, -/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, /obj/structure/cable, -/obj/machinery/airlock_controller/incinerator_atmos{ - pixel_x = -24 - }, -/turf/open/floor/engine, +/obj/effect/turf_decal/stripes/line, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "hTZ" = ( /obj/structure/rack, @@ -34688,17 +34693,13 @@ /turf/open/floor/plating, /area/station/maintenance/ghetto/fore/starboard) "iMY" = ( -/obj/machinery/light/small/directional/west, /obj/machinery/airlock_sensor/incinerator_atmos{ pixel_y = 24 }, -/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible{ - dir = 8 - }, -/obj/machinery/atmospherics/components/binary/pump{ - name = "Fuel Pipe to Incinerator" +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden{ + dir = 4 }, -/turf/open/floor/engine, +/turf/closed/wall/r_wall, /area/station/maintenance/disposal/incinerator) "iMZ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -35728,9 +35729,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /obj/structure/disposalpipe/segment, -/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/autoname, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/service/library, /turf/open/floor/plating, /area/station/service/library/ghetto) "jbg" = ( @@ -36186,6 +36188,7 @@ /obj/machinery/door/airlock/public/glass, /obj/effect/mapping_helpers/airlock/autoname, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/any/service/library, /turf/open/floor/iron/dark, /area/station/service/library/artgallery) "jha" = ( @@ -36685,12 +36688,11 @@ /turf/closed/wall/r_wall, /area/station/engineering/supermatter/room) "joL" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 5 +/obj/machinery/atmospherics/components/unary/vent_scrubber/layer2{ + dir = 1 }, -/obj/structure/lattice, -/turf/open/space/openspace, -/area/space/nearstation) +/turf/open/floor/engine, +/area/station/maintenance/disposal/incinerator) "joZ" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -39741,15 +39743,16 @@ /turf/open/space/openspace, /area/space/nearstation) "kcS" = ( -/obj/machinery/door/airlock/public/glass/incinerator/atmos_interior, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/machinery/airlock_controller/incinerator_atmos{ + pixel_x = -24 + }, /obj/effect/mapping_helpers/airlock/locked, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/obj/machinery/door/airlock/public/glass/incinerator/atmos_exterior, /obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, -/obj/structure/cable, -/obj/machinery/airlock_controller/incinerator_atmos{ - pixel_x = -24 +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 }, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) @@ -44210,9 +44213,21 @@ /turf/open/floor/iron, /area/station/engineering/atmos/storage/gas) "lgC" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /obj/effect/decal/cleanable/dirt, +/obj/machinery/button/door/incinerator_vent_atmos_main{ + pixel_x = -8; + pixel_y = -24 + }, +/obj/machinery/button/door/incinerator_vent_atmos_aux{ + pixel_x = 8; + pixel_y = -24 + }, +/obj/machinery/button/ignition/incinerator/atmos{ + pixel_y = -32 + }, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 9 + }, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "lgF" = ( @@ -45594,7 +45609,10 @@ /turf/open/floor/iron/large, /area/station/maintenance/ghetto/central) "lxI" = ( -/obj/machinery/power/turbine/turbine_outlet, +/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_atmos{ + dir = 8 + }, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) "lxO" = ( @@ -48926,6 +48944,10 @@ /obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron, /area/station/command/bridge) +"mpD" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/turf/closed/wall/r_wall, +/area/station/maintenance/disposal/incinerator) "mpE" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -50301,11 +50323,13 @@ /turf/open/floor/plating, /area/station/maintenance/port/aft) "mGT" = ( -/obj/machinery/light/small/directional/east, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_atmos{ - dir = 8 +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/computer/turbine_computer{ + dir = 8; + mapping_id = "main_turbine" }, -/turf/open/floor/engine, +/turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "mHf" = ( /obj/machinery/air_sensor/oxygen_tank, @@ -52990,6 +53014,7 @@ /obj/effect/mapping_helpers/airlock/autoname, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/any/service/library, /turf/open/floor/wood, /area/station/service/library/ghetto) "npE" = ( @@ -53344,6 +53369,17 @@ }, /turf/open/floor/iron/white, /area/station/science/explab) +"nuc" = ( +/obj/machinery/airlock_controller/incinerator_atmos{ + pixel_x = -24 + }, +/obj/effect/mapping_helpers/airlock/locked, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/obj/machinery/door/airlock/public/glass/incinerator/atmos_interior, +/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, +/turf/open/floor/engine, +/area/station/maintenance/disposal/incinerator) "nuf" = ( /obj/structure/disposalpipe/trunk{ dir = 4 @@ -58535,8 +58571,11 @@ /turf/open/floor/iron/white, /area/station/maintenance/aft) "oJi" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/south, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 9 + }, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "oJo" = ( @@ -60136,22 +60175,15 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/station/engineering/atmos) "pfd" = ( -/obj/machinery/button/door/incinerator_vent_atmos_aux{ - pixel_x = 8; - pixel_y = -24 - }, -/obj/machinery/button/door/incinerator_vent_atmos_main{ - pixel_x = -8; - pixel_y = -24 - }, -/obj/machinery/computer/turbine_computer{ - dir = 8; - mapping_id = "main_turbine" +/obj/effect/decal/cleanable/dirt, +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -2; + pixel_y = 5 }, -/obj/machinery/button/ignition/incinerator/atmos{ - pixel_y = -32 +/obj/item/pen{ + pixel_y = 8 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "pfh" = ( @@ -65492,10 +65524,10 @@ /turf/open/floor/iron, /area/station/service/hydroponics/garden) "qxx" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/layer2{ - dir = 8 +/obj/machinery/power/turbine/turbine_outlet{ + dir = 4 }, -/turf/open/floor/engine, +/turf/open/space/basic, /area/station/maintenance/disposal/incinerator) "qxy" = ( /obj/structure/table/wood, @@ -67722,15 +67754,10 @@ /turf/open/floor/iron/white, /area/station/science/research) "qZC" = ( -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = -2; - pixel_y = 5 - }, -/obj/item/pen{ - pixel_y = 8 - }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 6 + }, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "qZJ" = ( @@ -71488,10 +71515,11 @@ /turf/open/floor/plating, /area/station/maintenance/ghetto/port/aft) "rXD" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/east, /obj/machinery/computer/atmos_control/nocontrol/incinerator{ dir = 8 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "rXH" = ( @@ -79545,11 +79573,18 @@ /turf/open/floor/plating, /area/station/maintenance/port) "tZG" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 4 }, -/turf/open/floor/plating/airless, -/area/space/nearstation) +/obj/machinery/atmospherics/components/binary/pump{ + name = "Fuel Pipe to Incinerator" + }, +/obj/machinery/light/small/directional/west, +/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible{ + dir = 8 + }, +/turf/open/floor/engine, +/area/station/maintenance/disposal/incinerator) "tZM" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -79876,12 +79911,10 @@ /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) "udX" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, /obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 4 - }, -/turf/open/floor/engine, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "uea" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -84269,10 +84302,9 @@ /turf/open/water, /area/station/maintenance/ghetto/garden) "vnQ" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden{ - dir = 4 - }, -/turf/closed/wall/r_wall, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating/airless, /area/station/maintenance/disposal/incinerator) "vnR" = ( /obj/structure/chair/office/light{ @@ -86091,13 +86123,13 @@ /turf/open/floor/iron, /area/station/commons/fitness) "vJV" = ( -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ - dir = 6 - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 6 + }, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "vJY" = ( @@ -91140,6 +91172,7 @@ /obj/effect/mapping_helpers/airlock/autoname, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/any/service/library, /turf/open/floor/iron/dark, /area/station/service/library/artgallery) "wZp" = ( @@ -93425,9 +93458,9 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) "xEN" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, +/obj/machinery/air_sensor/incinerator_tank, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) "xEO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -94144,10 +94177,9 @@ /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hos) "xNE" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, -/obj/structure/cable, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/turf/open/floor/plating, /area/station/maintenance/disposal/incinerator) "xNK" = ( /obj/effect/turf_decal/trimline/green/filled/line{ @@ -95200,11 +95232,10 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "ybj" = ( -/obj/machinery/igniter/incinerator_atmos{ - id = "waste_incinerator_igniter" +/obj/machinery/power/turbine/core_rotor{ + dir = 4; + mapping_id = "main_turbine" }, -/obj/machinery/air_sensor/incinerator_tank, -/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, /obj/structure/cable, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) @@ -184902,10 +184933,10 @@ wNB cZJ cZJ cZJ -tYD -tYD -tYD -tYD +kJd +kJd +kJd +kJd tYD tYD tYD @@ -185158,14 +185189,14 @@ jHU baa uva hAN -cZJ -tYD -tYD -tYD -tYD -tYD -tYD -tYD +xNE +gMR +eAR +kJd +kJd +kJd +kJd +kJd tYD tYD tYD @@ -185415,15 +185446,15 @@ vJj bxU xfP oJi -xEN -joL -kJd -kJd -tYD -tYD -tYD -tYD -tYD +cZJ +rgb +cZJ +cZJ +cZJ +cZJ +trM +trM +gOj tYD tYD tYD @@ -185672,15 +185703,15 @@ mBk pzh hZK qZC -wNB +hpp tZG -eAR -kJd -kJd -kJd -kJd -kJd -kJd +hpp +xEN +hSi +euX +trM +vbK +gOj tYD tYD tYD @@ -185929,15 +185960,15 @@ vaF eIw hID bxz +nuc +lxI +kcS +hIY +joL cZJ -rgb -cZJ -cZJ -cZJ -trM -trM -trM +fNa trM +gOj tYD tYD tYD @@ -186186,16 +186217,16 @@ vJV nuv nuv lgC -hpp +mpD iMY -hpp -hSi -cZJ cZJ +dcS cZJ cZJ -fNa -gOj +vbK +ceC +tYD +tYD tYD tYD tYD @@ -186442,17 +186473,17 @@ hZK fjb nkA uuF -xNE -kcS +uuF +uuF udX hTP ybj -hIY -dcS -lxI -euX -trM -gOj +cZJ +vbK +vbK +ceC +tYD +tYD tYD tYD tYD @@ -186698,18 +186729,18 @@ jTS jjz ouO mFb -rXD +hZK pfd -cZJ +rXD mGT cZJ qxx cZJ -cZJ -cZJ -cZJ -fNa -gOj +vbK +vbK +ceC +tYD +tYD tYD tYD tYD @@ -186965,7 +186996,7 @@ cZJ rEy trM trM -trM +kJd kJd kJd kJd From cb5cbfe74282035692deb70957c8e135d698ede9 Mon Sep 17 00:00:00 2001 From: CallmeHouston Date: Thu, 16 Jan 2025 00:07:00 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=D0=9A=D0=BE=D1=81=D0=BC=D0=BE=D1=81=20?= =?UTF-8?q?=D0=BB=D0=B8=D0=BA=D0=B2=D0=B8=D0=B4=D0=B8=D1=80=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0=D0=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _maps/map_files/Cyberiad/Cyberiad.dmm | 116 +++++++++++++------------- 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/_maps/map_files/Cyberiad/Cyberiad.dmm b/_maps/map_files/Cyberiad/Cyberiad.dmm index 05f28aeab9e0c..d521ae2727b1a 100644 --- a/_maps/map_files/Cyberiad/Cyberiad.dmm +++ b/_maps/map_files/Cyberiad/Cyberiad.dmm @@ -3990,6 +3990,20 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/maintenance/ghetto/port/aft) +"aYp" = ( +/obj/machinery/airlock_controller/incinerator_atmos{ + pixel_x = -24 + }, +/obj/effect/mapping_helpers/airlock/locked, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/obj/machinery/door/airlock/public/glass/incinerator/atmos_exterior, +/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/maintenance/disposal/incinerator) "aYy" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan, @@ -12503,8 +12517,8 @@ /turf/open/floor/iron, /area/station/maintenance/ghetto/central) "dcS" = ( -/obj/machinery/power/turbine/inlet_compressor{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_scrubber/layer2{ + dir = 1 }, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) @@ -26837,12 +26851,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) -"gMR" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ - dir = 8 - }, -/turf/open/floor/plating/airless, -/area/space/nearstation) "gMS" = ( /obj/machinery/status_display/ai/directional/east, /obj/structure/cable, @@ -36688,9 +36696,14 @@ /turf/closed/wall/r_wall, /area/station/engineering/supermatter/room) "joL" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/layer2{ - dir = 1 +/obj/machinery/airlock_controller/incinerator_atmos{ + pixel_x = -24 }, +/obj/effect/mapping_helpers/airlock/locked, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/obj/machinery/door/airlock/public/glass/incinerator/atmos_interior, +/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) "joZ" = ( @@ -39743,19 +39756,11 @@ /turf/open/space/openspace, /area/space/nearstation) "kcS" = ( -/obj/machinery/airlock_controller/incinerator_atmos{ - pixel_x = -24 - }, -/obj/effect/mapping_helpers/airlock/locked, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, -/obj/machinery/door/airlock/public/glass/incinerator/atmos_exterior, -/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ + dir = 8 }, -/turf/open/floor/engine, -/area/station/maintenance/disposal/incinerator) +/turf/open/floor/plating/airless, +/area/space/nearstation) "kcZ" = ( /turf/closed/wall/r_wall, /area/station/ai_monitored/command/nuke_storage) @@ -45609,11 +45614,12 @@ /turf/open/floor/iron/large, /area/station/maintenance/ghetto/central) "lxI" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_atmos{ +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/east, +/obj/machinery/computer/atmos_control/nocontrol/incinerator{ dir = 8 }, -/turf/open/floor/engine, +/turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "lxO" = ( /obj/effect/decal/cleanable/dirt, @@ -48944,10 +48950,6 @@ /obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron, /area/station/command/bridge) -"mpD" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/turf/closed/wall/r_wall, -/area/station/maintenance/disposal/incinerator) "mpE" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -52161,6 +52163,10 @@ /obj/item/cultivator, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"neT" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/turf/closed/wall/r_wall, +/area/station/maintenance/disposal/incinerator) "neY" = ( /obj/machinery/light/small/directional/west, /turf/open/floor/plating, @@ -53369,17 +53375,6 @@ }, /turf/open/floor/iron/white, /area/station/science/explab) -"nuc" = ( -/obj/machinery/airlock_controller/incinerator_atmos{ - pixel_x = -24 - }, -/obj/effect/mapping_helpers/airlock/locked, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, -/obj/machinery/door/airlock/public/glass/incinerator/atmos_interior, -/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, -/turf/open/floor/engine, -/area/station/maintenance/disposal/incinerator) "nuf" = ( /obj/structure/disposalpipe/trunk{ dir = 4 @@ -65527,7 +65522,7 @@ /obj/machinery/power/turbine/turbine_outlet{ dir = 4 }, -/turf/open/space/basic, +/turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) "qxy" = ( /obj/structure/table/wood, @@ -71515,12 +71510,10 @@ /turf/open/floor/plating, /area/station/maintenance/ghetto/port/aft) "rXD" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small/directional/east, -/obj/machinery/computer/atmos_control/nocontrol/incinerator{ - dir = 8 +/obj/machinery/power/turbine/inlet_compressor{ + dir = 4 }, -/turf/open/floor/iron, +/turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) "rXH" = ( /obj/structure/cable, @@ -76873,6 +76866,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/maintenance/starboard/upper) +"tqG" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) "tqI" = ( /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 1 @@ -94177,9 +94175,11 @@ /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hos) "xNE" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, -/turf/open/floor/plating, +/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_atmos{ + dir = 8 + }, +/turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) "xNK" = ( /obj/effect/turf_decal/trimline/green/filled/line{ @@ -185189,8 +185189,8 @@ jHU baa uva hAN -xNE -gMR +tqG +kcS eAR kJd kJd @@ -185960,11 +185960,11 @@ vaF eIw hID bxz -nuc -lxI -kcS -hIY joL +xNE +aYp +hIY +dcS cZJ fNa trM @@ -186217,10 +186217,10 @@ vJV nuv nuv lgC -mpD +neT iMY cZJ -dcS +rXD cZJ cZJ vbK @@ -186731,7 +186731,7 @@ ouO mFb hZK pfd -rXD +lxI mGT cZJ qxx From 77c719600f33a4b82be284adf1f18cc4ad4c8446 Mon Sep 17 00:00:00 2001 From: CallmeHouston Date: Thu, 16 Jan 2025 00:08:03 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=D1=85=D0=B5=D0=BB=D0=BF=D0=B5=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _maps/map_files/Cyberiad/Cyberiad.dmm | 125 +++++++++++++------------- 1 file changed, 61 insertions(+), 64 deletions(-) diff --git a/_maps/map_files/Cyberiad/Cyberiad.dmm b/_maps/map_files/Cyberiad/Cyberiad.dmm index d521ae2727b1a..a849d8a55a543 100644 --- a/_maps/map_files/Cyberiad/Cyberiad.dmm +++ b/_maps/map_files/Cyberiad/Cyberiad.dmm @@ -3990,20 +3990,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/maintenance/ghetto/port/aft) -"aYp" = ( -/obj/machinery/airlock_controller/incinerator_atmos{ - pixel_x = -24 - }, -/obj/effect/mapping_helpers/airlock/locked, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, -/obj/machinery/door/airlock/public/glass/incinerator/atmos_exterior, -/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/turf/open/floor/engine, -/area/station/maintenance/disposal/incinerator) "aYy" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan, @@ -12517,7 +12503,15 @@ /turf/open/floor/iron, /area/station/maintenance/ghetto/central) "dcS" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/layer2{ +/obj/machinery/airlock_controller/incinerator_atmos{ + pixel_x = -24 + }, +/obj/effect/mapping_helpers/airlock/locked, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/obj/machinery/door/airlock/public/glass/incinerator/atmos_exterior, +/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, /turf/open/floor/engine, @@ -30619,9 +30613,8 @@ /turf/open/floor/iron/white, /area/station/medical/storage) "hIY" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, -/obj/machinery/igniter/incinerator_atmos{ - id = "waste_incinerator_igniter" +/obj/machinery/power/turbine/inlet_compressor{ + dir = 4 }, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) @@ -36696,14 +36689,9 @@ /turf/closed/wall/r_wall, /area/station/engineering/supermatter/room) "joL" = ( -/obj/machinery/airlock_controller/incinerator_atmos{ - pixel_x = -24 +/obj/machinery/atmospherics/components/unary/vent_scrubber/layer2{ + dir = 1 }, -/obj/effect/mapping_helpers/airlock/locked, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, -/obj/machinery/door/airlock/public/glass/incinerator/atmos_interior, -/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) "joZ" = ( @@ -39756,11 +39744,12 @@ /turf/open/space/openspace, /area/space/nearstation) "kcS" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_atmos{ dir = 8 }, -/turf/open/floor/plating/airless, -/area/space/nearstation) +/turf/open/floor/engine, +/area/station/maintenance/disposal/incinerator) "kcZ" = ( /turf/closed/wall/r_wall, /area/station/ai_monitored/command/nuke_storage) @@ -45614,12 +45603,11 @@ /turf/open/floor/iron/large, /area/station/maintenance/ghetto/central) "lxI" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small/directional/east, -/obj/machinery/computer/atmos_control/nocontrol/incinerator{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, +/obj/machinery/igniter/incinerator_atmos{ + id = "waste_incinerator_igniter" }, -/turf/open/floor/iron, +/turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) "lxO" = ( /obj/effect/decal/cleanable/dirt, @@ -52163,10 +52151,6 @@ /obj/item/cultivator, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"neT" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/turf/closed/wall/r_wall, -/area/station/maintenance/disposal/incinerator) "neY" = ( /obj/machinery/light/small/directional/west, /turf/open/floor/plating, @@ -71510,9 +71494,8 @@ /turf/open/floor/plating, /area/station/maintenance/ghetto/port/aft) "rXD" = ( -/obj/machinery/power/turbine/inlet_compressor{ - dir = 4 - }, +/obj/machinery/air_sensor/incinerator_tank, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) "rXH" = ( @@ -74281,6 +74264,14 @@ /obj/machinery/light/directional/north, /turf/open/floor/iron, /area/station/commons/locker) +"sGJ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/east, +/obj/machinery/computer/atmos_control/nocontrol/incinerator{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "sGN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan, /obj/structure/cable, @@ -76866,11 +76857,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/maintenance/starboard/upper) -"tqG" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, -/turf/open/floor/plating, -/area/station/maintenance/disposal/incinerator) "tqI" = ( /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 1 @@ -76984,6 +76970,18 @@ }, /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/ai) +"tsm" = ( +/obj/machinery/airlock_controller/incinerator_atmos{ + pixel_x = -24 + }, +/obj/effect/mapping_helpers/airlock/locked, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/obj/machinery/door/airlock/public/glass/incinerator/atmos_interior, +/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/turf/open/floor/engine, +/area/station/maintenance/disposal/incinerator) "tsn" = ( /obj/structure/disposalpipe/trunk{ dir = 1 @@ -93456,10 +93454,11 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) "xEN" = ( -/obj/machinery/air_sensor/incinerator_tank, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, -/turf/open/floor/engine, -/area/station/maintenance/disposal/incinerator) +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ + dir = 8 + }, +/turf/open/floor/plating/airless, +/area/space/nearstation) "xEO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -94175,11 +94174,9 @@ /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hos) "xNE" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_atmos{ - dir = 8 - }, -/turf/open/floor/engine, +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/turf/open/floor/plating, /area/station/maintenance/disposal/incinerator) "xNK" = ( /obj/effect/turf_decal/trimline/green/filled/line{ @@ -185189,8 +185186,8 @@ jHU baa uva hAN -tqG -kcS +xNE +xEN eAR kJd kJd @@ -185706,7 +185703,7 @@ qZC hpp tZG hpp -xEN +rXD hSi euX trM @@ -185960,11 +185957,11 @@ vaF eIw hID bxz -joL -xNE -aYp -hIY +tsm +kcS dcS +lxI +joL cZJ fNa trM @@ -186217,10 +186214,10 @@ vJV nuv nuv lgC -neT +cZJ iMY cZJ -rXD +hIY cZJ cZJ vbK @@ -186731,7 +186728,7 @@ ouO mFb hZK pfd -lxI +sGJ mGT cZJ qxx From f69dad94b21517aeca783b9ac3a5b08fbd2166f8 Mon Sep 17 00:00:00 2001 From: CallmeHouston Date: Thu, 16 Jan 2025 00:09:00 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=D1=81=D0=B5=D0=BD=D1=81=D0=BE=D1=80=20?= =?UTF-8?q?=D0=B0=D0=B0=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _maps/map_files/Cyberiad/Cyberiad.dmm | 138 +++++++++++++------------- 1 file changed, 69 insertions(+), 69 deletions(-) diff --git a/_maps/map_files/Cyberiad/Cyberiad.dmm b/_maps/map_files/Cyberiad/Cyberiad.dmm index a849d8a55a543..80f934dffe694 100644 --- a/_maps/map_files/Cyberiad/Cyberiad.dmm +++ b/_maps/map_files/Cyberiad/Cyberiad.dmm @@ -12503,16 +12503,9 @@ /turf/open/floor/iron, /area/station/maintenance/ghetto/central) "dcS" = ( -/obj/machinery/airlock_controller/incinerator_atmos{ - pixel_x = -24 - }, -/obj/effect/mapping_helpers/airlock/locked, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, -/obj/machinery/door/airlock/public/glass/incinerator/atmos_exterior, /obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 +/obj/machinery/igniter/incinerator_atmos{ + id = "waste_incinerator_igniter" }, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) @@ -26608,6 +26601,12 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/dark, /area/station/maintenance/department/security/ghetto) +"gKt" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/layer2{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/maintenance/disposal/incinerator) "gKv" = ( /obj/machinery/button/door/directional/west{ id = "Toilet1"; @@ -30613,9 +30612,8 @@ /turf/open/floor/iron/white, /area/station/medical/storage) "hIY" = ( -/obj/machinery/power/turbine/inlet_compressor{ - dir = 4 - }, +/obj/machinery/air_sensor/incinerator_tank, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) "hJh" = ( @@ -34694,13 +34692,10 @@ /turf/open/floor/plating, /area/station/maintenance/ghetto/fore/starboard) "iMY" = ( -/obj/machinery/airlock_sensor/incinerator_atmos{ - pixel_y = 24 - }, -/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden{ +/obj/machinery/power/turbine/inlet_compressor{ dir = 4 }, -/turf/closed/wall/r_wall, +/turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) "iMZ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -36689,9 +36684,15 @@ /turf/closed/wall/r_wall, /area/station/engineering/supermatter/room) "joL" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/layer2{ - dir = 1 +/obj/machinery/airlock_controller/incinerator_atmos{ + pixel_x = -24 }, +/obj/effect/mapping_helpers/airlock/locked, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/obj/machinery/door/airlock/public/glass/incinerator/atmos_interior, +/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) "joZ" = ( @@ -39744,11 +39745,12 @@ /turf/open/space/openspace, /area/space/nearstation) "kcS" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_atmos{ +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/east, +/obj/machinery/computer/atmos_control/nocontrol/incinerator{ dir = 8 }, -/turf/open/floor/engine, +/turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "kcZ" = ( /turf/closed/wall/r_wall, @@ -45603,9 +45605,16 @@ /turf/open/floor/iron/large, /area/station/maintenance/ghetto/central) "lxI" = ( +/obj/machinery/airlock_controller/incinerator_atmos{ + pixel_x = -24 + }, +/obj/effect/mapping_helpers/airlock/locked, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/obj/machinery/door/airlock/public/glass/incinerator/atmos_exterior, /obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, -/obj/machinery/igniter/incinerator_atmos{ - id = "waste_incinerator_igniter" +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 }, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) @@ -67873,6 +67882,11 @@ /obj/machinery/status_display/ai/directional/north, /turf/open/floor/iron, /area/station/hallway/primary/aft) +"raN" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating/airless, +/area/station/maintenance/disposal/incinerator) "raR" = ( /obj/machinery/conveyor_switch/oneway{ id = "packageSort1"; @@ -71494,10 +71508,11 @@ /turf/open/floor/plating, /area/station/maintenance/ghetto/port/aft) "rXD" = ( -/obj/machinery/air_sensor/incinerator_tank, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, -/turf/open/floor/engine, -/area/station/maintenance/disposal/incinerator) +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ + dir = 8 + }, +/turf/open/floor/plating/airless, +/area/space/nearstation) "rXH" = ( /obj/structure/cable, /obj/machinery/light_switch/directional/south, @@ -74264,14 +74279,6 @@ /obj/machinery/light/directional/north, /turf/open/floor/iron, /area/station/commons/locker) -"sGJ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small/directional/east, -/obj/machinery/computer/atmos_control/nocontrol/incinerator{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/maintenance/disposal/incinerator) "sGN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan, /obj/structure/cable, @@ -76970,18 +76977,6 @@ }, /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/ai) -"tsm" = ( -/obj/machinery/airlock_controller/incinerator_atmos{ - pixel_x = -24 - }, -/obj/effect/mapping_helpers/airlock/locked, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, -/obj/machinery/door/airlock/public/glass/incinerator/atmos_interior, -/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/turf/open/floor/engine, -/area/station/maintenance/disposal/incinerator) "tsn" = ( /obj/structure/disposalpipe/trunk{ dir = 1 @@ -79579,6 +79574,9 @@ /obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible{ dir = 8 }, +/obj/machinery/airlock_sensor/incinerator_atmos{ + pixel_y = 24 + }, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) "tZM" = ( @@ -84298,9 +84296,10 @@ /turf/open/water, /area/station/maintenance/ghetto/garden) "vnQ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating/airless, +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden{ + dir = 4 + }, +/turf/closed/wall/r_wall, /area/station/maintenance/disposal/incinerator) "vnR" = ( /obj/structure/chair/office/light{ @@ -93454,11 +93453,10 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) "xEN" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ - dir = 8 - }, -/turf/open/floor/plating/airless, -/area/space/nearstation) +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) "xEO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -94174,9 +94172,11 @@ /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hos) "xNE" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, -/turf/open/floor/plating, +/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_atmos{ + dir = 8 + }, +/turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) "xNK" = ( /obj/effect/turf_decal/trimline/green/filled/line{ @@ -185186,8 +185186,8 @@ jHU baa uva hAN -xNE xEN +rXD eAR kJd kJd @@ -185703,7 +185703,7 @@ qZC hpp tZG hpp -rXD +hIY hSi euX trM @@ -185957,11 +185957,11 @@ vaF eIw hID bxz -tsm -kcS -dcS -lxI joL +xNE +lxI +dcS +gKt cZJ fNa trM @@ -186215,9 +186215,9 @@ nuv nuv lgC cZJ -iMY +vnQ cZJ -hIY +iMY cZJ cZJ vbK @@ -186728,7 +186728,7 @@ ouO mFb hZK pfd -sGJ +kcS mGT cZJ qxx @@ -186986,7 +186986,7 @@ cZJ lEp lEp cZJ -vnQ +raN cZJ udL cZJ From 8c81081534d01a85f75cdcc64b2f7c98adf65af3 Mon Sep 17 00:00:00 2001 From: CallmeHouston Date: Thu, 16 Jan 2025 00:10:04 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=D1=81=D1=82=D0=B5=D0=BD=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _maps/map_files/Cyberiad/Cyberiad.dmm | 127 +++++++++++++------------- 1 file changed, 64 insertions(+), 63 deletions(-) diff --git a/_maps/map_files/Cyberiad/Cyberiad.dmm b/_maps/map_files/Cyberiad/Cyberiad.dmm index 80f934dffe694..2c3f88118dafc 100644 --- a/_maps/map_files/Cyberiad/Cyberiad.dmm +++ b/_maps/map_files/Cyberiad/Cyberiad.dmm @@ -12503,9 +12503,8 @@ /turf/open/floor/iron, /area/station/maintenance/ghetto/central) "dcS" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, -/obj/machinery/igniter/incinerator_atmos{ - id = "waste_incinerator_igniter" +/obj/machinery/power/turbine/inlet_compressor{ + dir = 4 }, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) @@ -26601,12 +26600,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/dark, /area/station/maintenance/department/security/ghetto) -"gKt" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/layer2{ - dir = 1 - }, -/turf/open/floor/engine, -/area/station/maintenance/disposal/incinerator) "gKv" = ( /obj/machinery/button/door/directional/west{ id = "Toilet1"; @@ -30612,10 +30605,11 @@ /turf/open/floor/iron/white, /area/station/medical/storage) "hIY" = ( -/obj/machinery/air_sensor/incinerator_tank, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, -/turf/open/floor/engine, -/area/station/maintenance/disposal/incinerator) +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ + dir = 8 + }, +/turf/open/floor/plating/airless, +/area/space/nearstation) "hJh" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -34692,10 +34686,11 @@ /turf/open/floor/plating, /area/station/maintenance/ghetto/fore/starboard) "iMY" = ( -/obj/machinery/power/turbine/inlet_compressor{ - dir = 4 +/obj/effect/decal/cleanable/dirt, +/obj/machinery/computer/atmos_control/nocontrol/incinerator{ + dir = 8 }, -/turf/open/floor/engine, +/turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "iMZ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -36148,6 +36143,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/starboard/upper) +"jgC" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, +/obj/machinery/igniter/incinerator_atmos{ + id = "waste_incinerator_igniter" + }, +/turf/open/floor/engine, +/area/station/maintenance/disposal/incinerator) "jgF" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -36684,16 +36686,9 @@ /turf/closed/wall/r_wall, /area/station/engineering/supermatter/room) "joL" = ( -/obj/machinery/airlock_controller/incinerator_atmos{ - pixel_x = -24 - }, -/obj/effect/mapping_helpers/airlock/locked, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, -/obj/machinery/door/airlock/public/glass/incinerator/atmos_interior, -/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/turf/open/floor/engine, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating/airless, /area/station/maintenance/disposal/incinerator) "joZ" = ( /obj/effect/spawner/structure/window, @@ -39745,12 +39740,11 @@ /turf/open/space/openspace, /area/space/nearstation) "kcS" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small/directional/east, -/obj/machinery/computer/atmos_control/nocontrol/incinerator{ +/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_atmos{ dir = 8 }, -/turf/open/floor/iron, +/turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) "kcZ" = ( /turf/closed/wall/r_wall, @@ -45605,15 +45599,7 @@ /turf/open/floor/iron/large, /area/station/maintenance/ghetto/central) "lxI" = ( -/obj/machinery/airlock_controller/incinerator_atmos{ - pixel_x = -24 - }, -/obj/effect/mapping_helpers/airlock/locked, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, -/obj/machinery/door/airlock/public/glass/incinerator/atmos_exterior, -/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/layer2{ dir = 1 }, /turf/open/floor/engine, @@ -46157,7 +46143,9 @@ /turf/open/floor/wood, /area/station/command/heads_quarters/hop) "lEp" = ( -/turf/closed/wall, +/obj/machinery/air_sensor/incinerator_tank, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) "lEq" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan, @@ -65474,6 +65462,18 @@ /obj/item/storage/medkit/regular, /turf/open/floor/iron/white, /area/station/maintenance/department/medical/ghetto/central) +"qxc" = ( +/obj/machinery/airlock_controller/incinerator_atmos{ + pixel_x = -24 + }, +/obj/effect/mapping_helpers/airlock/locked, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/obj/machinery/door/airlock/public/glass/incinerator/atmos_interior, +/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/turf/open/floor/engine, +/area/station/maintenance/disposal/incinerator) "qxg" = ( /obj/machinery/light/directional/east, /obj/effect/turf_decal/stripes/line, @@ -67882,11 +67882,6 @@ /obj/machinery/status_display/ai/directional/north, /turf/open/floor/iron, /area/station/hallway/primary/aft) -"raN" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating/airless, -/area/station/maintenance/disposal/incinerator) "raR" = ( /obj/machinery/conveyor_switch/oneway{ id = "packageSort1"; @@ -71508,11 +71503,10 @@ /turf/open/floor/plating, /area/station/maintenance/ghetto/port/aft) "rXD" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ - dir = 8 - }, -/turf/open/floor/plating/airless, -/area/space/nearstation) +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "rXH" = ( /obj/structure/cable, /obj/machinery/light_switch/directional/south, @@ -94172,9 +94166,16 @@ /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hos) "xNE" = ( +/obj/machinery/airlock_controller/incinerator_atmos{ + pixel_x = -24 + }, +/obj/effect/mapping_helpers/airlock/locked, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/obj/machinery/door/airlock/public/glass/incinerator/atmos_exterior, /obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_atmos{ - dir = 8 +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 }, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) @@ -185187,7 +185188,7 @@ baa uva hAN xEN -rXD +hIY eAR kJd kJd @@ -185703,7 +185704,7 @@ qZC hpp tZG hpp -hIY +lEp hSi euX trM @@ -185957,11 +185958,11 @@ vaF eIw hID bxz -joL +qxc +kcS xNE +jgC lxI -dcS -gKt cZJ fNa trM @@ -186217,7 +186218,7 @@ lgC cZJ vnQ cZJ -iMY +dcS cZJ cZJ vbK @@ -186726,9 +186727,9 @@ jTS jjz ouO mFb -hZK +rXD pfd -kcS +iMY mGT cZJ qxx @@ -186983,10 +186984,10 @@ cZJ cZJ tXg cZJ -lEp -lEp cZJ -raN +cZJ +cZJ +joL cZJ udL cZJ From ec6dee29fff06e4a4b6f54c7fc0da5449adbf717 Mon Sep 17 00:00:00 2001 From: CallmeHouston Date: Thu, 16 Jan 2025 20:34:28 +0800 Subject: [PATCH 06/10] fix pipes --- _maps/map_files/Cyberiad/Cyberiad.dmm | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/_maps/map_files/Cyberiad/Cyberiad.dmm b/_maps/map_files/Cyberiad/Cyberiad.dmm index 2c3f88118dafc..66f638b5cc4eb 100644 --- a/_maps/map_files/Cyberiad/Cyberiad.dmm +++ b/_maps/map_files/Cyberiad/Cyberiad.dmm @@ -68301,7 +68301,8 @@ /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, -/turf/closed/wall/r_wall, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, /area/station/maintenance/disposal/incinerator) "rgo" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -79558,19 +79559,16 @@ /turf/open/floor/plating, /area/station/maintenance/port) "tZG" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/pump{ - name = "Fuel Pipe to Incinerator" - }, -/obj/machinery/light/small/directional/west, /obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible{ dir = 8 }, /obj/machinery/airlock_sensor/incinerator_atmos{ pixel_y = 24 }, +/obj/machinery/atmospherics/components/binary/pump{ + name = "Fuel Pipe to Incinerator" + }, +/obj/machinery/light/small/directional/north, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) "tZM" = ( @@ -93447,8 +93445,8 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) "xEN" = ( -/obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/maintenance/disposal/incinerator) "xEO" = ( From 552e1710b2957ed2923c57ed20e07ee0ca6a9296 Mon Sep 17 00:00:00 2001 From: CallmeHouston Date: Sat, 18 Jan 2025 22:55:40 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D1=81=D1=82?= =?UTF-8?q?=D1=80=D0=BE=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _maps/map_files/Cyberiad/Cyberiad.dmm | 267 ++++++++++++++------------ 1 file changed, 145 insertions(+), 122 deletions(-) diff --git a/_maps/map_files/Cyberiad/Cyberiad.dmm b/_maps/map_files/Cyberiad/Cyberiad.dmm index 66f638b5cc4eb..fb7427a920203 100644 --- a/_maps/map_files/Cyberiad/Cyberiad.dmm +++ b/_maps/map_files/Cyberiad/Cyberiad.dmm @@ -5875,9 +5875,6 @@ "bxz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ - dir = 4 - }, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "bxI" = ( @@ -12503,8 +12500,8 @@ /turf/open/floor/iron, /area/station/maintenance/ghetto/central) "dcS" = ( -/obj/machinery/power/turbine/inlet_compressor{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_scrubber/layer2{ + dir = 8 }, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) @@ -29883,11 +29880,14 @@ /turf/open/floor/iron/showroomfloor, /area/station/service/kitchen/abandoned) "hAN" = ( -/obj/structure/closet/secure_closet/atmospherics, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 6 }, +/obj/machinery/computer/turbine_computer{ + dir = 1; + mapping_id = "main_turbine" + }, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "hBh" = ( @@ -30566,6 +30566,9 @@ "hID" = ( /obj/machinery/atmospherics/pipe/layer_manifold/brown/visible, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 4 + }, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "hIG" = ( @@ -31378,10 +31381,7 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) "hTP" = ( -/obj/structure/cable, -/obj/effect/turf_decal/stripes/line, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, +/turf/closed/wall, /area/station/maintenance/disposal/incinerator) "hTZ" = ( /obj/structure/rack, @@ -34686,10 +34686,13 @@ /turf/open/floor/plating, /area/station/maintenance/ghetto/fore/starboard) "iMY" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /obj/effect/decal/cleanable/dirt, -/obj/machinery/computer/atmos_control/nocontrol/incinerator{ - dir = 8 - }, +/obj/machinery/door/airlock/atmos, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/obj/machinery/door/firedoor, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "iMZ" = ( @@ -36144,10 +36147,11 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/upper) "jgC" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, /obj/machinery/igniter/incinerator_atmos{ id = "waste_incinerator_igniter" }, +/obj/machinery/air_sensor/incinerator_tank, +/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) "jgF" = ( @@ -36686,9 +36690,9 @@ /turf/closed/wall/r_wall, /area/station/engineering/supermatter/room) "joL" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating/airless, +/obj/machinery/power/turbine/core_rotor, +/obj/structure/cable, +/turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) "joZ" = ( /obj/effect/spawner/structure/window, @@ -39741,8 +39745,8 @@ /area/space/nearstation) "kcS" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_atmos{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 4 }, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) @@ -44215,9 +44219,6 @@ /obj/machinery/button/ignition/incinerator/atmos{ pixel_y = -32 }, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ - dir = 9 - }, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "lgF" = ( @@ -45599,9 +45600,7 @@ /turf/open/floor/iron/large, /area/station/maintenance/ghetto/central) "lxI" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/layer2{ - dir = 1 - }, +/obj/machinery/power/turbine/inlet_compressor, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) "lxO" = ( @@ -46143,9 +46142,10 @@ /turf/open/floor/wood, /area/station/command/heads_quarters/hop) "lEp" = ( -/obj/machinery/air_sensor/incinerator_tank, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, -/turf/open/floor/engine, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/secure_closet/atmospherics, +/turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "lEq" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan, @@ -50310,12 +50310,9 @@ /turf/open/floor/plating, /area/station/maintenance/port/aft) "mGT" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/computer/turbine_computer{ - dir = 8; - mapping_id = "main_turbine" - }, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "mHf" = ( @@ -58548,10 +58545,13 @@ /area/station/maintenance/aft) "oJi" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small/directional/south, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 9 }, +/obj/machinery/computer/atmos_control/nocontrol/incinerator{ + dir = 1 + }, +/obj/machinery/light/small/directional/south, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "oJo" = ( @@ -61832,9 +61832,9 @@ /turf/open/floor/plating, /area/station/maintenance/ghetto/port) "pBa" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/lattice/catwalk, -/turf/open/space/openspace, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/space/basic, /area/space/nearstation) "pBh" = ( /obj/machinery/holopad, @@ -65401,6 +65401,7 @@ /obj/structure/cable, /obj/machinery/light/directional/north, /obj/effect/decal/cleanable/dirt, +/obj/structure/closet/radiation, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "qwo" = ( @@ -65463,15 +65464,15 @@ /turf/open/floor/iron/white, /area/station/maintenance/department/medical/ghetto/central) "qxc" = ( -/obj/machinery/airlock_controller/incinerator_atmos{ - pixel_x = -24 - }, -/obj/effect/mapping_helpers/airlock/locked, +/obj/machinery/door/airlock/public/glass/incinerator/atmos_interior, /obj/effect/mapping_helpers/airlock/autoname, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/locked, /obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, -/obj/machinery/door/airlock/public/glass/incinerator/atmos_interior, /obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/machinery/airlock_controller/incinerator_atmos{ + pixel_x = -24 + }, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) "qxg" = ( @@ -65512,10 +65513,12 @@ /turf/open/floor/iron, /area/station/service/hydroponics/garden) "qxx" = ( -/obj/machinery/power/turbine/turbine_outlet{ - dir = 4 +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, -/turf/open/floor/engine, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "qxy" = ( /obj/structure/table/wood, @@ -70349,6 +70352,13 @@ /obj/effect/turf_decal/loading_area, /turf/open/floor/iron, /area/station/cargo/lobby) +"rIL" = ( +/obj/machinery/light/small/directional/east, +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_atmos{ + dir = 8 + }, +/turf/open/floor/engine, +/area/station/maintenance/disposal/incinerator) "rIO" = ( /obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/dirt, @@ -71505,7 +71515,7 @@ /area/station/maintenance/ghetto/port/aft) "rXD" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small/directional/east, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "rXH" = ( @@ -76918,6 +76928,13 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/maintenance/department/engine/ghetto) +"trC" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 9 + }, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "trD" = ( /obj/structure/chair{ dir = 8 @@ -79559,16 +79576,16 @@ /turf/open/floor/plating, /area/station/maintenance/port) "tZG" = ( -/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible{ - dir = 8 - }, +/obj/machinery/light/small/directional/west, /obj/machinery/airlock_sensor/incinerator_atmos{ pixel_y = 24 }, +/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible{ + dir = 8 + }, /obj/machinery/atmospherics/components/binary/pump{ name = "Fuel Pipe to Incinerator" }, -/obj/machinery/light/small/directional/north, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) "tZM" = ( @@ -79897,9 +79914,9 @@ /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) "udX" = ( -/obj/structure/cable, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/light/directional/east, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "uea" = ( @@ -81022,7 +81039,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 }, -/obj/structure/closet/radiation, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) @@ -82704,6 +82720,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/ghetto/bar) +"uSu" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/directional/south, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "uSD" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/autoname, @@ -86110,13 +86132,13 @@ /turf/open/floor/iron, /area/station/commons/fitness) "vJV" = ( +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 6 + }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ - dir = 6 - }, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "vJY" = ( @@ -88552,6 +88574,11 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/engineering/supermatter/room) +"wrM" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) "wrR" = ( /obj/effect/turf_decal/bot, /obj/effect/spawner/random/trash/box, @@ -94164,16 +94191,16 @@ /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hos) "xNE" = ( -/obj/machinery/airlock_controller/incinerator_atmos{ - pixel_x = -24 +/obj/machinery/door/airlock/public/glass/incinerator/atmos_exterior, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 }, /obj/effect/mapping_helpers/airlock/locked, -/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, -/obj/machinery/door/airlock/public/glass/incinerator/atmos_exterior, /obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 +/obj/machinery/airlock_controller/incinerator_atmos{ + pixel_x = -24 }, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) @@ -95228,11 +95255,7 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "ybj" = ( -/obj/machinery/power/turbine/core_rotor{ - dir = 4; - mapping_id = "main_turbine" - }, -/obj/structure/cable, +/obj/machinery/power/turbine/turbine_outlet, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) "ybl" = ( @@ -184929,10 +184952,10 @@ wNB cZJ cZJ cZJ +ceC +ceC kJd -kJd -kJd -kJd +doz tYD tYD tYD @@ -185193,7 +185216,7 @@ kJd kJd kJd kJd -tYD +kJd tYD tYD tYD @@ -185445,12 +185468,12 @@ oJi cZJ rgb cZJ -cZJ -cZJ +udL cZJ trM trM -gOj +trM +trM tYD tYD tYD @@ -185694,19 +185717,20 @@ aWy aWy xca cZJ -uuF +lEp mBk pzh -hZK qZC +rXD hpp tZG hpp -lEp hSi -euX -trM -vbK +cZJ +wNB +cZJ +cZJ +fNa gOj tYD tYD @@ -185745,7 +185769,6 @@ tYD tYD tYD tYD -tYD "} (95,1,2) = {" tYD @@ -185961,8 +185984,9 @@ kcS xNE jgC lxI -cZJ -fNa +joL +ybj +euX trM gOj tYD @@ -186002,7 +186026,6 @@ tYD tYD tYD tYD -tYD "} (96,1,2) = {" tYD @@ -186211,18 +186234,18 @@ llm xIm vJV nuv -nuv +trC lgC cZJ -vnQ +rIL cZJ dcS cZJ +qxx cZJ -vbK -ceC -tYD -tYD +cZJ +fNa +gOj tYD tYD tYD @@ -186467,19 +186490,19 @@ cZJ mEk hZK fjb -nkA -uuF -uuF +hZK +hZK +pfd +cZJ +vnQ +cZJ +cZJ +cZJ uuF -udX -hTP -ybj cZJ -vbK -vbK -ceC -tYD -tYD +rEy +trM +kJd tYD tYD tYD @@ -186725,14 +186748,16 @@ jTS jjz ouO mFb -rXD -pfd +nkA +udX iMY mGT +uuF +uuF +uuF +uSu cZJ -qxx -cZJ -vbK +trM vbK ceC tYD @@ -186772,8 +186797,6 @@ tYD tYD tYD tYD -tYD -tYD "} (99,1,2) = {" tYD @@ -186982,18 +187005,18 @@ cZJ cZJ tXg cZJ +hTP +hTP +wrM cZJ cZJ cZJ -joL cZJ -udL cZJ -rEy -trM -trM -kJd -kJd +cZJ +vbK +vbK +ceC kJd kJd kJd @@ -187242,13 +187265,13 @@ kJd kJd kJd pBa -pBa -trM -trM -trM -trM -trM -trM +vbK +vbK +vbK +vbK +vbK +vbK +vbK trM trM trM From 5a966bdee235e3f1621025c88d47a7a032e95fcc Mon Sep 17 00:00:00 2001 From: CallmeHouston Date: Mon, 20 Jan 2025 04:44:45 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=D1=8D=D1=82=D0=BE=D1=82=20=D0=BA=D0=BE?= =?UTF-8?q?=D1=81=D0=BC=D0=BE=D1=81..?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _maps/map_files/Cyberiad/Cyberiad.dmm | 35 ++++++++++++--------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/_maps/map_files/Cyberiad/Cyberiad.dmm b/_maps/map_files/Cyberiad/Cyberiad.dmm index 10a76bcb3e98b..0ebbda272d0d2 100644 --- a/_maps/map_files/Cyberiad/Cyberiad.dmm +++ b/_maps/map_files/Cyberiad/Cyberiad.dmm @@ -31402,9 +31402,6 @@ /obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) -"hTP" = ( -/turf/closed/wall, -/area/station/maintenance/disposal/incinerator) "hTZ" = ( /obj/structure/rack, /obj/item/wrench, @@ -61951,7 +61948,7 @@ "pBa" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/space/basic, +/turf/open/space/openspace, /area/space/nearstation) "pBh" = ( /obj/machinery/holopad, @@ -185131,10 +185128,10 @@ wNB cZJ cZJ cZJ -ceC -ceC kJd -doz +kJd +kJd +tYD tYD tYD tYD @@ -186938,7 +186935,7 @@ uSu cZJ trM vbK -ceC +kJd tYD tYD tYD @@ -187184,18 +187181,18 @@ cZJ cZJ tXg cZJ -hTP -hTP -wrM cZJ cZJ cZJ +wrM +cZJ +cZJ cZJ cZJ cZJ vbK vbK -ceC +kJd kJd kJd kJd @@ -187444,13 +187441,13 @@ kJd kJd kJd pBa -vbK -vbK -vbK -vbK -vbK -vbK -vbK +pBa +trM +trM +trM +trM +trM +trM trM trM trM From b3c8fb95447ecaeb0a9c1c3ba453927fcb66a13e Mon Sep 17 00:00:00 2001 From: CallmeHouston Date: Mon, 20 Jan 2025 23:28:21 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=D0=B4=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _maps/map_files/Cyberiad/Cyberiad.dmm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_maps/map_files/Cyberiad/Cyberiad.dmm b/_maps/map_files/Cyberiad/Cyberiad.dmm index 095d4867e297e..bc8690aaa3f1b 100644 --- a/_maps/map_files/Cyberiad/Cyberiad.dmm +++ b/_maps/map_files/Cyberiad/Cyberiad.dmm @@ -187143,7 +187143,7 @@ uuF qpY cZJ trM -vbK +trM kJd tYD tYD @@ -187399,8 +187399,8 @@ cZJ cZJ cZJ cZJ -vbK -vbK +trM +trM kJd kJd kJd From e281a754d1a9376243f2ae355d3f5b5b06079cd0 Mon Sep 17 00:00:00 2001 From: CallmeHouston Date: Mon, 20 Jan 2025 23:58:23 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=D1=82=D1=80=D1=83=D0=B1=D1=8B=20=D0=B1?= =?UTF-8?q?=D0=B5=D1=81=D1=8F=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _maps/map_files/Cyberiad/Cyberiad.dmm | 63 ++++++++++----------------- 1 file changed, 24 insertions(+), 39 deletions(-) diff --git a/_maps/map_files/Cyberiad/Cyberiad.dmm b/_maps/map_files/Cyberiad/Cyberiad.dmm index bc8690aaa3f1b..fd939cf3f4e2e 100644 --- a/_maps/map_files/Cyberiad/Cyberiad.dmm +++ b/_maps/map_files/Cyberiad/Cyberiad.dmm @@ -3839,6 +3839,9 @@ "aWW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 4 + }, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "aXb" = ( @@ -18818,8 +18821,8 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "eIw" = ( -/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/co2, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/co2, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "eIA" = ( @@ -20761,13 +20764,6 @@ /obj/effect/turf_decal/trimline/yellow/line, /turf/open/floor/iron, /area/station/engineering/atmos/project) -"fjb" = ( -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/station/maintenance/disposal/incinerator) "fjd" = ( /obj/structure/cable, /obj/machinery/holopad/secure, @@ -30642,6 +30638,9 @@ /obj/item/pen{ pixel_y = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 9 + }, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "hGd" = ( @@ -31708,11 +31707,8 @@ /turf/open/floor/plating, /area/station/maintenance/ghetto/fore/starboard) "hUM" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/brown/visible, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/layer_manifold/brown/visible, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "hUN" = ( @@ -31820,6 +31816,9 @@ /obj/machinery/button/ignition/incinerator/atmos{ pixel_y = -32 }, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 4 + }, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "hVO" = ( @@ -43236,13 +43235,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/aft) -"kPE" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ - dir = 9 - }, -/turf/open/floor/iron, -/area/station/maintenance/disposal/incinerator) "kPF" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -50109,10 +50101,10 @@ /turf/open/floor/carpet/royalblack, /area/station/maintenance/port/aft) "mBk" = ( +/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/simple/brown/visible{ dir = 8 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "mBn" = ( @@ -53754,11 +53746,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/ghetto/port) -"nuv" = ( -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/station/maintenance/disposal/incinerator) "nux" = ( /obj/machinery/camera/directional/west{ c_tag = "Prisoner Lockers" @@ -62264,11 +62251,12 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/upper) "pzh" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/obj/machinery/portable_atmospherics/canister, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 4 }, -/obj/machinery/portable_atmospherics/canister, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "pzi" = ( @@ -83738,13 +83726,13 @@ /turf/open/floor/iron, /area/station/maintenance/ghetto/kitchen) "vaF" = ( -/obj/machinery/atmospherics/pipe/smart/simple/brown/visible{ - dir = 10 - }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/simple/brown/visible{ + dir = 10 + }, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "vaH" = ( @@ -86617,9 +86605,6 @@ /turf/open/floor/iron, /area/station/commons/fitness) "vJV" = ( -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ - dir = 6 - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, @@ -186105,8 +186090,8 @@ cZJ eNi mBk pzh +hZK uZW -lux hpp iMY hpp @@ -186618,8 +186603,8 @@ nQz llm xIm vJV -nuv -kPE +hZK +hZK hVM cZJ mGT @@ -186874,9 +186859,9 @@ idP cZJ msj hZK -fjb -hZK -hZK +uZW +lux +lux hFY cZJ vnQ