From 098699c488a0568dfb77f894796345d09384cdd1 Mon Sep 17 00:00:00 2001 From: Aquizit Date: Mon, 30 Aug 2021 07:38:27 -0500 Subject: [PATCH 1/2] Add TEG Heater --- .../StationRuins/BoxStation/engine_teg.dmm | 44 ++++++++++++------- 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/_maps/RandomRuins/StationRuins/BoxStation/engine_teg.dmm b/_maps/RandomRuins/StationRuins/BoxStation/engine_teg.dmm index e494466b0131..c638e7de4265 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/engine_teg.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/engine_teg.dmm @@ -324,6 +324,13 @@ /obj/machinery/meter, /turf/open/floor/engine, /area/engine/engineering) +"hW" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/thermomachine/heater, +/turf/open/floor/engine, +/area/engine/engineering) "ia" = ( /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ @@ -331,12 +338,6 @@ }, /turf/open/floor/engine, /area/engine/engineering) -"is" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/engine, -/area/engine/engineering) "iD" = ( /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -408,6 +409,21 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/engine, /area/engine/engineering) +"kE" = ( +/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) "la" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ @@ -446,12 +462,6 @@ }, /turf/template_noop, /area/space/nearstation) -"mW" = ( -/obj/machinery/atmospherics/pipe/manifold/orange/visible{ - dir = 1 - }, -/turf/open/floor/engine, -/area/engine/engineering) "nh" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/green/visible, @@ -1637,6 +1647,10 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/engine/engineering) +"VN" = ( +/obj/machinery/atmospherics/pipe/manifold4w/orange/visible, +/turf/open/floor/engine, +/area/engine/engineering) "VS" = ( /obj/machinery/atmospherics/components/binary/valve/digital{ dir = 4 @@ -2269,9 +2283,9 @@ dG "} (18,1,1) = {" ac -is -bC -mW +hW +kE +VN kD kB kp From 9686b93dc2db15d7bae5e26e6c4003f28124b680 Mon Sep 17 00:00:00 2001 From: Aquizit Date: Mon, 30 Aug 2021 13:09:01 -0500 Subject: [PATCH 2/2] TEG Heater Tweak Move --- .../StationRuins/BoxStation/engine_teg.dmm | 148 +++++++++--------- 1 file changed, 77 insertions(+), 71 deletions(-) diff --git a/_maps/RandomRuins/StationRuins/BoxStation/engine_teg.dmm b/_maps/RandomRuins/StationRuins/BoxStation/engine_teg.dmm index c638e7de4265..3f7698c9aeb5 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, @@ -324,13 +320,6 @@ /obj/machinery/meter, /turf/open/floor/engine, /area/engine/engineering) -"hW" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/thermomachine/heater, -/turf/open/floor/engine, -/area/engine/engineering) "ia" = ( /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ @@ -532,6 +521,26 @@ /obj/machinery/atmospherics/pipe/manifold/cyan/visible, /turf/open/floor/engine, /area/engine/engineering) +"oT" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/airalarm{ + pixel_y = 24 + }, +/obj/item/pipe_dispenser{ + pixel_y = -9 + }, +/obj/item/pipe_dispenser, +/obj/item/pipe_dispenser{ + pixel_y = 8 + }, +/obj/structure/table/reinforced, +/turf/open/floor/engine, +/area/engine/engineering) "pq" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 4 @@ -552,6 +561,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/engine, /area/engine/engineering) +"qd" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/manifold4w/orange/visible, +/turf/open/floor/engine, +/area/engine/engineering) "qt" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos{ dir = 1; @@ -972,25 +986,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 @@ -1005,13 +1000,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 @@ -1054,6 +1042,13 @@ dir = 8 }, /area/engine/engineering) +"CZ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/machinery/portable_atmospherics/scrubber, +/turf/open/floor/engine, +/area/engine/engineering) "Db" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 1 @@ -1141,6 +1136,12 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/engine, /area/engine/engineering) +"HF" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/engine, +/area/engine/engineering) "Ic" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/orange/visible{ @@ -1190,25 +1191,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" @@ -1581,11 +1563,20 @@ }, /turf/open/floor/engine, /area/engine/engineering) -"TP" = ( +"TO" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/plasteel, +/area/engine/engineering) +"TV" = ( /obj/effect/turf_decal/stripes/line{ - dir = 5 + dir = 1 }, -/obj/structure/closet/firecloset, +/obj/machinery/camera{ + c_tag = "Engineering TEG Fore"; + network = list("ss13","engine"); + pixel_x = 23 + }, +/obj/machinery/atmospherics/components/unary/thermomachine/heater, /turf/open/floor/engine, /area/engine/engineering) "Um" = ( @@ -1647,8 +1638,10 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/engine/engineering) -"VN" = ( -/obj/machinery/atmospherics/pipe/manifold4w/orange/visible, +"Vk" = ( +/obj/machinery/atmospherics/pipe/manifold/orange/visible{ + dir = 1 + }, /turf/open/floor/engine, /area/engine/engineering) "VS" = ( @@ -1749,6 +1742,19 @@ }, /turf/open/floor/engine, /area/engine/engineering) +"Xl" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/item/clothing/glasses/meson/engine, +/obj/structure/table/reinforced, +/obj/item/clothing/gloves/color/black, +/obj/item/tank/internals/emergency_oxygen/engi{ + pixel_x = 5 + }, +/obj/item/holosign_creator/atmos, +/turf/open/floor/engine, +/area/engine/engineering) "XF" = ( /obj/effect/spawner/structure/window/plasma/reinforced/shutter, /obj/machinery/atmospherics/pipe/simple/purple/visible{ @@ -2283,9 +2289,9 @@ dG "} (18,1,1) = {" ac -hW -kE -VN +HF +bC +Vk kD kB kp @@ -2339,9 +2345,9 @@ dG "} (20,1,1) = {" ad -Ar -bC -Bh +TV +kE +qd EE PV pP @@ -2367,7 +2373,7 @@ dG "} (21,1,1) = {" ad -IV +oT bC ZP pw @@ -2395,7 +2401,7 @@ dG "} (22,1,1) = {" ac -Ci +Xl bp zv xP @@ -2451,7 +2457,7 @@ dG "} (24,1,1) = {" ad -TP +CZ bJ Mi tJ @@ -2506,7 +2512,7 @@ IF dG "} (26,1,1) = {" -af +TO ac tl aX