From 810ed060cf5a38d395fadb0687e26df3252b81b5 Mon Sep 17 00:00:00 2001 From: Byemoh Date: Wed, 22 Jun 2022 22:43:43 -0500 Subject: [PATCH 1/2] fix --- _maps/map_files/YogStation/YogStation.dmm | 56 +++++++++++------------ 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index 1a63f6e988f0..4229ff1c2135 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -28929,6 +28929,16 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel, /area/security/prison) +"eKR" = ( +/obj/structure/table, +/obj/item/stack/sheet/glass/fifty, +/obj/item/stack/sheet/metal/fifty, +/obj/effect/turf_decal/tile/yellow, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/engine/foyer) "eKU" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 @@ -32661,21 +32671,6 @@ "gLo" = ( /turf/open/floor/circuit/telecomms, /area/science/xenobiology) -"gNd" = ( -/obj/machinery/light, -/obj/structure/table, -/obj/item/stack/sheet/glass/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/effect/turf_decal/tile/yellow, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/structure/noticeboard{ - dir = 8; - pixel_x = 27 - }, -/turf/open/floor/plasteel, -/area/engine/foyer) "gNS" = ( /obj/effect/turf_decal/loading_area{ dir = 4 @@ -41799,6 +41794,22 @@ }, /turf/open/floor/plasteel, /area/medical/morgue) +"ldx" = ( +/obj/effect/turf_decal/tile/yellow, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/item/twohanded/required/kirbyplants/random, +/obj/machinery/light, +/obj/structure/noticeboard{ + dir = 8; + pixel_x = 27 + }, +/turf/open/floor/plasteel, +/area/engine/foyer) "ldC" = ( /obj/structure/table, /obj/item/stack/cable_coil{ @@ -64649,17 +64660,6 @@ }, /turf/open/floor/circuit/green/telecomms/mainframe, /area/tcommsat/server) -"wIL" = ( -/obj/effect/turf_decal/tile/yellow, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/item/twohanded/required/kirbyplants/random, -/turf/open/floor/plasteel, -/area/engine/foyer) "wIS" = ( /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -100061,8 +100061,8 @@ akB hNl cMv uQS -gNd -wIL +eKR +ldx cbp ykH dWR From 91d65f614f40ac7d0e1e41a518d210339891b495 Mon Sep 17 00:00:00 2001 From: Byemoh Date: Wed, 22 Jun 2022 22:44:39 -0500 Subject: [PATCH 2/2] wires --- _maps/map_files/YogStation/YogStation.dmm | 169 +++++++++++----------- 1 file changed, 83 insertions(+), 86 deletions(-) diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index 4229ff1c2135..f4309e413a22 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -28929,16 +28929,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel, /area/security/prison) -"eKR" = ( -/obj/structure/table, -/obj/item/stack/sheet/glass/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/effect/turf_decal/tile/yellow, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engine/foyer) "eKU" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 @@ -29468,23 +29458,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) -"eYp" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/open/floor/plasteel, -/area/engine/foyer) "eYt" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/simple/cyan/visible{ @@ -31875,23 +31848,6 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) -"gsF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel, -/area/engine/engineering) "gsH" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 @@ -39062,27 +39018,6 @@ }, /turf/open/floor/plating, /area/maintenance/fore) -"jHV" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/open/floor/plasteel, -/area/engine/foyer) "jHY" = ( /obj/machinery/camera{ c_tag = "Central Hallway East"; @@ -39208,6 +39143,23 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/plating, /area/storage/tech) +"jOc" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel, +/area/engine/foyer) "jOV" = ( /obj/machinery/atmospherics/components/unary/vent_pump/layer2{ dir = 8 @@ -41651,6 +41603,16 @@ /obj/structure/closet/l3closet, /turf/open/floor/plating, /area/maintenance/aft) +"kZP" = ( +/obj/structure/table, +/obj/item/stack/sheet/glass/fifty, +/obj/item/stack/sheet/metal/fifty, +/obj/effect/turf_decal/tile/yellow, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/engine/foyer) "kZX" = ( /obj/structure/window/reinforced{ dir = 8 @@ -41794,22 +41756,6 @@ }, /turf/open/floor/plasteel, /area/medical/morgue) -"ldx" = ( -/obj/effect/turf_decal/tile/yellow, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/item/twohanded/required/kirbyplants/random, -/obj/machinery/light, -/obj/structure/noticeboard{ - dir = 8; - pixel_x = 27 - }, -/turf/open/floor/plasteel, -/area/engine/foyer) "ldC" = ( /obj/structure/table, /obj/item/stack/cable_coil{ @@ -45245,6 +45191,22 @@ /obj/structure/rack, /turf/open/floor/plating, /area/maintenance/port/aft) +"mQz" = ( +/obj/effect/turf_decal/tile/yellow, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/item/twohanded/required/kirbyplants/random, +/obj/machinery/light, +/obj/structure/noticeboard{ + dir = 8; + pixel_x = 27 + }, +/turf/open/floor/plasteel, +/area/engine/foyer) "mQB" = ( /obj/machinery/light{ dir = 1 @@ -48495,6 +48457,27 @@ }, /turf/open/floor/plasteel/dark, /area/engine/atmos) +"osQ" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel, +/area/engine/foyer) "ota" = ( /obj/structure/toilet{ dir = 1 @@ -65399,6 +65382,20 @@ /obj/structure/closet/radiation, /turf/open/floor/plasteel/dark, /area/engine/atmos_distro) +"xgv" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/engine/engineering) "xgD" = ( /obj/structure/table, /obj/item/hand_labeler, @@ -98518,7 +98515,7 @@ aiv aiv xaW aAq -jHV +osQ kbN ixa nQZ @@ -99032,7 +99029,7 @@ jxp lFb jxp jxp -eYp +jOc hOf cfF rhn @@ -99042,7 +99039,7 @@ kfj naG clM qpB -gsF +xgv mhO qQV qQV @@ -100061,8 +100058,8 @@ akB hNl cMv uQS -eKR -ldx +kZP +mQz cbp ykH dWR