From 8d9cef7fcc859bf4cadddcecdf0d9c521057cbc5 Mon Sep 17 00:00:00 2001 From: Aquizit Date: Mon, 30 Aug 2021 13:43:43 -0500 Subject: [PATCH 1/3] TEG Heater final i'm so tired --- .../StationRuins/BoxStation/engine_teg.dmm | 109 +++++++++++------- 1 file changed, 65 insertions(+), 44 deletions(-) diff --git a/_maps/RandomRuins/StationRuins/BoxStation/engine_teg.dmm b/_maps/RandomRuins/StationRuins/BoxStation/engine_teg.dmm index e494466b0131..1206948e0885 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/engine_teg.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/engine_teg.dmm @@ -9,10 +9,6 @@ "ad" = ( /turf/closed/wall/r_wall, /area/engine/engineering) -"af" = ( -/obj/structure/closet/radiation, -/turf/open/floor/plasteel, -/area/engine/engineering) "ag" = ( /obj/structure/table, /obj/item/clothing/gloves/color/yellow, @@ -277,6 +273,13 @@ /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /turf/open/floor/engine, /area/engine/engineering) +"er" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/machinery/portable_atmospherics/scrubber, +/turf/open/floor/engine, +/area/engine/engineering) "eu" = ( /turf/closed/wall/r_wall, /area/space/nearstation) @@ -452,6 +455,10 @@ }, /turf/open/floor/engine, /area/engine/engineering) +"na" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/heater, +/turf/open/floor/engine, +/area/engine/engineering) "nh" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/green/visible, @@ -522,6 +529,21 @@ /obj/machinery/atmospherics/pipe/manifold/cyan/visible, /turf/open/floor/engine, /area/engine/engineering) +"oW" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 1 + }, +/turf/open/floor/engine, +/area/engine/engineering) "pq" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 4 @@ -995,13 +1017,6 @@ }, /turf/template_noop, /area/space/nearstation) -"Bh" = ( -/obj/machinery/atmospherics/pipe/manifold/orange/visible{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/engine, -/area/engine/engineering) "Bi" = ( /obj/machinery/atmospherics/pipe/simple/purple/visible{ dir = 1 @@ -1036,6 +1051,28 @@ /obj/machinery/portable_atmospherics/scrubber, /turf/open/floor/engine, /area/engine/engineering) +"Cw" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/table/reinforced, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/item/clothing/gloves/color/black, +/obj/item/clothing/glasses/meson/engine, +/obj/item/tank/internals/emergency_oxygen/engi{ + pixel_x = 5 + }, +/obj/item/holosign_creator/atmos, +/obj/machinery/airalarm{ + pixel_y = 24 + }, +/turf/open/floor/engine, +/area/engine/engineering) "CM" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -1180,25 +1217,6 @@ }, /turf/open/floor/engine, /area/engine/engineering) -"IV" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/item/clothing/gloves/color/black, -/obj/item/clothing/glasses/meson/engine, -/obj/item/tank/internals/emergency_oxygen/engi{ - pixel_x = 5 - }, -/obj/item/holosign_creator/atmos, -/obj/machinery/airalarm{ - pixel_y = 24 - }, -/turf/open/floor/engine, -/area/engine/engineering) "Jf" = ( /obj/structure/cable{ icon_state = "4-8" @@ -1376,6 +1394,11 @@ dir = 4 }, /area/engine/engineering) +"Ow" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/manifold4w/orange/visible, +/turf/open/floor/engine, +/area/engine/engineering) "OB" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -1401,6 +1424,11 @@ }, /turf/open/floor/plasteel/dark/corner, /area/engine/engineering) +"Pw" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/closet/firecloset, +/turf/open/floor/plasteel, +/area/engine/engineering) "PH" = ( /obj/structure/grille, /turf/template_noop, @@ -1571,13 +1599,6 @@ }, /turf/open/floor/engine, /area/engine/engineering) -"TP" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/structure/closet/firecloset, -/turf/open/floor/engine, -/area/engine/engineering) "Um" = ( /obj/structure/table/reinforced, /obj/structure/cable/yellow{ @@ -2325,9 +2346,9 @@ dG "} (20,1,1) = {" ad -Ar -bC -Bh +na +oW +Ow EE PV pP @@ -2353,7 +2374,7 @@ dG "} (21,1,1) = {" ad -IV +Ar bC ZP pw @@ -2381,7 +2402,7 @@ dG "} (22,1,1) = {" ac -Ci +Cw bp zv xP @@ -2437,7 +2458,7 @@ dG "} (24,1,1) = {" ad -TP +er bJ Mi tJ @@ -2492,7 +2513,7 @@ IF dG "} (26,1,1) = {" -af +Pw ac tl aX From c97e41021cf7b7b394d6112eee85e9d523771ac2 Mon Sep 17 00:00:00 2001 From: Aquizit <70451213+Aquizit@users.noreply.github.com> Date: Mon, 30 Aug 2021 13:54:55 -0500 Subject: [PATCH 2/3] Ok don't just drag and drop entire tiles --- .../StationRuins/BoxStation/engine_teg.dmm | 96 +++++++++---------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/_maps/RandomRuins/StationRuins/BoxStation/engine_teg.dmm b/_maps/RandomRuins/StationRuins/BoxStation/engine_teg.dmm index 1206948e0885..623458aeab7a 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/engine_teg.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/engine_teg.dmm @@ -411,6 +411,23 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/engine, /area/engine/engineering) +"kH" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/item/pipe_dispenser, +/obj/item/pipe_dispenser{ + pixel_y = -9 + }, +/obj/item/pipe_dispenser{ + pixel_y = 8 + }, +/obj/machinery/airalarm{ + pixel_y = 24 + }, +/turf/open/floor/engine, +/area/engine/engineering) "la" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ @@ -449,14 +466,22 @@ }, /turf/template_noop, /area/space/nearstation) -"mW" = ( -/obj/machinery/atmospherics/pipe/manifold/orange/visible{ +"ms" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/heater, +/obj/machinery/camera{ + c_tag = "Engineering TEG Fore"; + network = list("ss13","engine"); + pixel_x = 23 + }, +/obj/effect/turf_decal/stripes/line{ dir = 1 }, /turf/open/floor/engine, /area/engine/engineering) -"na" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/heater, +"mW" = ( +/obj/machinery/atmospherics/pipe/manifold/orange/visible{ + dir = 1 + }, /turf/open/floor/engine, /area/engine/engineering) "nh" = ( @@ -984,25 +1009,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/engine, /area/engine/engineering) -"Ar" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/camera{ - c_tag = "Engineering TEG Fore"; - network = list("ss13","engine"); - pixel_x = 23 - }, -/obj/item/pipe_dispenser, -/obj/item/pipe_dispenser{ - pixel_y = -9 - }, -/obj/item/pipe_dispenser{ - pixel_y = 8 - }, -/turf/open/floor/engine, -/area/engine/engineering) "AD" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 8 @@ -1051,28 +1057,6 @@ /obj/machinery/portable_atmospherics/scrubber, /turf/open/floor/engine, /area/engine/engineering) -"Cw" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/table/reinforced, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/item/clothing/gloves/color/black, -/obj/item/clothing/glasses/meson/engine, -/obj/item/tank/internals/emergency_oxygen/engi{ - pixel_x = 5 - }, -/obj/item/holosign_creator/atmos, -/obj/machinery/airalarm{ - pixel_y = 24 - }, -/turf/open/floor/engine, -/area/engine/engineering) "CM" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -1168,6 +1152,22 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/engine, /area/engine/engineering) +"HX" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/item/clothing/gloves/color/black, +/obj/item/clothing/glasses/meson/engine, +/obj/item/tank/internals/emergency_oxygen/engi{ + pixel_x = 5 + }, +/obj/item/holosign_creator/atmos, +/turf/open/floor/engine, +/area/engine/engineering) "Ic" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/orange/visible{ @@ -2346,7 +2346,7 @@ dG "} (20,1,1) = {" ad -na +ms oW Ow EE @@ -2374,7 +2374,7 @@ dG "} (21,1,1) = {" ad -Ar +kH bC ZP pw @@ -2402,7 +2402,7 @@ dG "} (22,1,1) = {" ac -Cw +HX bp zv xP From e6f71303c801380a9dfe49b10cb05e28968c74e9 Mon Sep 17 00:00:00 2001 From: Aquizit <70451213+Aquizit@users.noreply.github.com> Date: Mon, 30 Aug 2021 14:07:44 -0500 Subject: [PATCH 3/3] ok last one i hope thanks wej --- .../StationRuins/BoxStation/engine_teg.dmm | 70 +++++++++---------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/_maps/RandomRuins/StationRuins/BoxStation/engine_teg.dmm b/_maps/RandomRuins/StationRuins/BoxStation/engine_teg.dmm index 623458aeab7a..f9980a36d5f6 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/engine_teg.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/engine_teg.dmm @@ -320,6 +320,19 @@ }, /turf/open/floor/plasteel/dark, /area/engine/engineering) +"ht" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/item/clothing/gloves/color/black, +/obj/item/clothing/glasses/meson/engine, +/obj/item/tank/internals/emergency_oxygen/engi{ + pixel_x = 5 + }, +/obj/item/holosign_creator/atmos, +/turf/open/floor/engine, +/area/engine/engineering) "hN" = ( /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 4 @@ -411,23 +424,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/engine, /area/engine/engineering) -"kH" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/item/pipe_dispenser, -/obj/item/pipe_dispenser{ - pixel_y = -9 - }, -/obj/item/pipe_dispenser{ - pixel_y = 8 - }, -/obj/machinery/airalarm{ - pixel_y = 24 - }, -/turf/open/floor/engine, -/area/engine/engineering) "la" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ @@ -1152,22 +1148,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/engine, /area/engine/engineering) -"HX" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/item/clothing/gloves/color/black, -/obj/item/clothing/glasses/meson/engine, -/obj/item/tank/internals/emergency_oxygen/engi{ - pixel_x = 5 - }, -/obj/item/holosign_creator/atmos, -/turf/open/floor/engine, -/area/engine/engineering) "Ic" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/orange/visible{ @@ -1265,6 +1245,26 @@ dir = 4 }, /area/engine/engineering) +"KJ" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/item/pipe_dispenser, +/obj/item/pipe_dispenser{ + pixel_y = -9 + }, +/obj/item/pipe_dispenser{ + pixel_y = 8 + }, +/obj/machinery/airalarm{ + pixel_y = 24 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/engine, +/area/engine/engineering) "KV" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 @@ -2374,7 +2374,7 @@ dG "} (21,1,1) = {" ad -kH +KJ bC ZP pw @@ -2402,7 +2402,7 @@ dG "} (22,1,1) = {" ac -HX +ht bp zv xP