From f4a834901567cec2481f6b12ebe93c9e6740a4c5 Mon Sep 17 00:00:00 2001 From: Wanderer-Of-Worlds <153442955+Wanderer-Of-Worlds@users.noreply.github.com> Date: Tue, 19 Dec 2023 23:41:18 +0300 Subject: [PATCH 1/4] Update nanotrasen_savior.dmm MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Фикс атмоса и положения пожарного ящика --- .../shuttles/nanotrasen/nanotrasen_savior.dmm | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/_maps/shuttles/nanotrasen/nanotrasen_savior.dmm b/_maps/shuttles/nanotrasen/nanotrasen_savior.dmm index 7296f1354ee7..b25a517cf2e2 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_savior.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_savior.dmm @@ -1380,7 +1380,7 @@ }, /obj/structure/closet/firecloset/wall{ dir = 8; - pixel_x = 28 + pixel_x = 36 }, /turf/open/floor/engine, /area/ship/engineering/engine) @@ -1628,9 +1628,6 @@ /obj/machinery/atmospherics/components/binary/pump/layer4{ dir = 1 }, -/obj/structure/closet/firecloset/wall{ - pixel_y = 28 - }, /turf/open/floor/plating, /area/ship/engineering) "vi" = ( @@ -1792,7 +1789,8 @@ /obj/machinery/atmospherics/components/unary/thermomachine/freezer{ dir = 8; heat_capacity = 500; - name = "thermo-electric cooler" + name = "thermo-electric cooler"; + layer = 5 }, /obj/machinery/light/dim/directional/north, /obj/effect/decal/cleanable/dirt, @@ -1888,12 +1886,18 @@ /turf/open/floor/plasteel/white, /area/ship/hallway/starboard) "yU" = ( -/obj/machinery/airalarm/directional/east, +/obj/machinery/airalarm/directional/east{ + pixel_x = 22 + }, /obj/effect/decal/cleanable/oil, /obj/structure/cable{ icon_state = "1-10" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/closet/firecloset/wall{ + dir = 8; + pixel_x = 36 + }, /turf/open/floor/plating, /area/ship/engineering) "zi" = ( @@ -2743,7 +2747,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/waste/trash, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ +/obj/machinery/atmospherics/components/unary/passive_vent/layer4{ dir = 4 }, /turf/open/floor/engine/airless, @@ -2985,6 +2989,12 @@ }, /turf/open/floor/carpet/royalblue, /area/ship/crew/crewtwo) +"ON" = ( +/obj/machinery/airalarm/directional/east{ + pixel_x = 24 + }, +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/engineering) "OU" = ( /obj/effect/turf_decal/corner/opaque/blue{ dir = 4 @@ -4468,7 +4478,7 @@ Vf Vf Pj Vf -Vf +ON Vf GR GR From f13173040e57145b77169758a906d4b41351eeb3 Mon Sep 17 00:00:00 2001 From: Wanderer-Of-Worlds <153442955+Wanderer-Of-Worlds@users.noreply.github.com> Date: Tue, 19 Dec 2023 23:41:48 +0300 Subject: [PATCH 2/4] Revert "Update nanotrasen_savior.dmm" This reverts commit f4a834901567cec2481f6b12ebe93c9e6740a4c5. --- .../shuttles/nanotrasen/nanotrasen_savior.dmm | 26 ++++++------------- 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/_maps/shuttles/nanotrasen/nanotrasen_savior.dmm b/_maps/shuttles/nanotrasen/nanotrasen_savior.dmm index b25a517cf2e2..7296f1354ee7 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_savior.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_savior.dmm @@ -1380,7 +1380,7 @@ }, /obj/structure/closet/firecloset/wall{ dir = 8; - pixel_x = 36 + pixel_x = 28 }, /turf/open/floor/engine, /area/ship/engineering/engine) @@ -1628,6 +1628,9 @@ /obj/machinery/atmospherics/components/binary/pump/layer4{ dir = 1 }, +/obj/structure/closet/firecloset/wall{ + pixel_y = 28 + }, /turf/open/floor/plating, /area/ship/engineering) "vi" = ( @@ -1789,8 +1792,7 @@ /obj/machinery/atmospherics/components/unary/thermomachine/freezer{ dir = 8; heat_capacity = 500; - name = "thermo-electric cooler"; - layer = 5 + name = "thermo-electric cooler" }, /obj/machinery/light/dim/directional/north, /obj/effect/decal/cleanable/dirt, @@ -1886,18 +1888,12 @@ /turf/open/floor/plasteel/white, /area/ship/hallway/starboard) "yU" = ( -/obj/machinery/airalarm/directional/east{ - pixel_x = 22 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/decal/cleanable/oil, /obj/structure/cable{ icon_state = "1-10" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/closet/firecloset/wall{ - dir = 8; - pixel_x = 36 - }, /turf/open/floor/plating, /area/ship/engineering) "zi" = ( @@ -2747,7 +2743,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/waste/trash, -/obj/machinery/atmospherics/components/unary/passive_vent/layer4{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, /turf/open/floor/engine/airless, @@ -2989,12 +2985,6 @@ }, /turf/open/floor/carpet/royalblue, /area/ship/crew/crewtwo) -"ON" = ( -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/ship/engineering) "OU" = ( /obj/effect/turf_decal/corner/opaque/blue{ dir = 4 @@ -4478,7 +4468,7 @@ Vf Vf Pj Vf -ON +Vf Vf GR GR From 2ed31492a8b3987d1788e2d54545e687ae0bb437 Mon Sep 17 00:00:00 2001 From: Wanderer-Of-Worlds <153442955+Wanderer-Of-Worlds@users.noreply.github.com> Date: Tue, 19 Dec 2023 23:44:29 +0300 Subject: [PATCH 3/4] Update nanotrasen_savior.dmm MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Фикс атмоса и положения противо-пожарного ящика. --- .../shuttles/nanotrasen/nanotrasen_savior.dmm | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/_maps/shuttles/nanotrasen/nanotrasen_savior.dmm b/_maps/shuttles/nanotrasen/nanotrasen_savior.dmm index 7296f1354ee7..c10a29bdf32d 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_savior.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_savior.dmm @@ -709,6 +709,12 @@ }, /turf/open/floor/engine/hull/reinforced, /area/ship/engineering) +"jO" = ( +/obj/machinery/airalarm/directional/east{ + pixel_x = 24 + }, +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/engineering) "jW" = ( /turf/open/floor/plasteel/white, /area/ship/cargo) @@ -1380,7 +1386,7 @@ }, /obj/structure/closet/firecloset/wall{ dir = 8; - pixel_x = 28 + pixel_x = 36 }, /turf/open/floor/engine, /area/ship/engineering/engine) @@ -1628,9 +1634,6 @@ /obj/machinery/atmospherics/components/binary/pump/layer4{ dir = 1 }, -/obj/structure/closet/firecloset/wall{ - pixel_y = 28 - }, /turf/open/floor/plating, /area/ship/engineering) "vi" = ( @@ -1792,7 +1795,8 @@ /obj/machinery/atmospherics/components/unary/thermomachine/freezer{ dir = 8; heat_capacity = 500; - name = "thermo-electric cooler" + name = "thermo-electric cooler"; + layer = 5 }, /obj/machinery/light/dim/directional/north, /obj/effect/decal/cleanable/dirt, @@ -1888,12 +1892,18 @@ /turf/open/floor/plasteel/white, /area/ship/hallway/starboard) "yU" = ( -/obj/machinery/airalarm/directional/east, +/obj/machinery/airalarm/directional/east{ + pixel_x = 22 + }, /obj/effect/decal/cleanable/oil, /obj/structure/cable{ icon_state = "1-10" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/closet/firecloset/wall{ + dir = 8; + pixel_x = 36 + }, /turf/open/floor/plating, /area/ship/engineering) "zi" = ( @@ -2743,7 +2753,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/waste/trash, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ +/obj/machinery/atmospherics/components/unary/passive_vent/layer4{ dir = 4 }, /turf/open/floor/engine/airless, @@ -4468,7 +4478,7 @@ Vf Vf Pj Vf -Vf +jO Vf GR GR From 795d4fd367fe3fa84bdf69019afd022fd20b29ec Mon Sep 17 00:00:00 2001 From: Wanderer-Of-Worlds <153442955+Wanderer-Of-Worlds@users.noreply.github.com> Date: Wed, 20 Dec 2023 00:04:52 +0300 Subject: [PATCH 4/4] Update nanotrasen_savior.dmm --- .../shuttles/nanotrasen/nanotrasen_savior.dmm | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/_maps/shuttles/nanotrasen/nanotrasen_savior.dmm b/_maps/shuttles/nanotrasen/nanotrasen_savior.dmm index c10a29bdf32d..89fe7d60ec99 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_savior.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_savior.dmm @@ -709,12 +709,6 @@ }, /turf/open/floor/engine/hull/reinforced, /area/ship/engineering) -"jO" = ( -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/ship/engineering) "jW" = ( /turf/open/floor/plasteel/white, /area/ship/cargo) @@ -1264,6 +1258,10 @@ }, /turf/open/floor/plasteel/white, /area/ship/medical) +"rB" = ( +/obj/machinery/airalarm/directional/east, +/turf/template_noop, +/area/template_noop) "rD" = ( /obj/structure/cable{ icon_state = "4-8" @@ -1796,6 +1794,7 @@ dir = 8; heat_capacity = 500; name = "thermo-electric cooler"; + piping_layer = 5; layer = 5 }, /obj/machinery/light/dim/directional/north, @@ -1969,6 +1968,12 @@ /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, /turf/open/floor/plasteel/white, /area/ship/hallway/starboard) +"zV" = ( +/obj/machinery/airalarm/directional/east{ + pixel_x = 24 + }, +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/engineering) "zX" = ( /obj/item/clothing/shoes/magboots, /obj/item/clothing/mask/breath, @@ -4326,7 +4331,7 @@ Jz (3,1,1) = {" Jz Jz -Jz +rB Jz bY Vf @@ -4478,7 +4483,7 @@ Vf Vf Pj Vf -jO +zV Vf GR GR