From 09d6e9382d607bffb97120f12272bc5f7e64aae7 Mon Sep 17 00:00:00 2001 From: FluffMedic <109300046+FluffMedic@users.noreply.github.com> Date: Sat, 2 Mar 2024 06:21:55 -0500 Subject: [PATCH] Active edge (#7852) Co-authored-by: Changelogs Co-authored-by: Raeschen --- .../surface_submaps/valley/piratefortress.dmm | 82 ++++++----- .../submaps/surface_submaps/valley/vault.dmm | 136 +++++++++--------- 2 files changed, 114 insertions(+), 104 deletions(-) diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/piratefortress.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/piratefortress.dmm index 73fd0d5391..ea1ee20b17 100644 --- a/modular_chomp/maps/submaps/surface_submaps/valley/piratefortress.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/valley/piratefortress.dmm @@ -236,10 +236,7 @@ /turf/simulated/floor/tiled/yellow, /area/submap/piratefortress) "kC" = ( -/obj/machinery/porta_turret/stationary/syndie{ - faction = "pirate" - }, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/external, /area/submap/piratefortress) "lc" = ( /obj/effect/floor_decal/corner/paleblue/border{ @@ -573,6 +570,12 @@ /obj/effect/floor_decal/corner/orange/diagonal, /turf/simulated/floor/tiled/yellow, /area/submap/piratefortress) +"EC" = ( +/obj/machinery/porta_turret/stationary/syndie{ + faction = "pirate" + }, +/turf/simulated/floor/plating/external, +/area/submap/piratefortress) "Fo" = ( /obj/machinery/door/airlock, /turf/simulated/floor/tiled/techfloor/grid, @@ -636,7 +639,11 @@ /obj/structure/railing{ dir = 1 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/wood/sif{ + nitrogen = 93.7835; + oxygen = 20.7263; + temperature = 243.15 + }, /area/submap/piratefortress) "La" = ( /turf/simulated/floor/outdoors/rocks, @@ -657,6 +664,9 @@ }, /turf/simulated/floor/tiled/yellow, /area/submap/piratefortress) +"Mu" = ( +/turf/simulated/floor/plating, +/area/submap/piratefortress) "MC" = ( /obj/effect/floor_decal/corner/green/border{ dir = 6 @@ -888,7 +898,11 @@ /area/submap/piratefortress) "ZQ" = ( /obj/structure/railing, -/turf/simulated/floor/wood, +/turf/simulated/floor/wood/sif{ + nitrogen = 93.7835; + oxygen = 20.7263; + temperature = 243.15 + }, /area/submap/piratefortress) (1,1,1) = {" @@ -1397,7 +1411,7 @@ ms ms La La -vT +EC kC vT vT @@ -1406,8 +1420,8 @@ vT vT vT vT -kC -vT +Mu +EC vT vT vT @@ -1452,17 +1466,17 @@ oX PP Qw oX -kC +Mu +vT vT vT vT -kC vT vT La La kC -La +EC ms ms ms @@ -1622,7 +1636,7 @@ ms ms La vT -kC +vT oX oX St @@ -1645,7 +1659,7 @@ oX vT vT kC -La +EC La ms ms @@ -1757,7 +1771,7 @@ ms ms ms La -kC +vT oX oX XJ @@ -1825,7 +1839,7 @@ Uz QM Pl oX -kC +vT vT La ms @@ -1892,7 +1906,7 @@ or ms La La -vT +kC oX uu uu @@ -1915,7 +1929,7 @@ nl RI wq oX -vT +kC vT La ms @@ -1937,7 +1951,7 @@ ms ms La DN -vT +EC oX uu uu @@ -1960,7 +1974,7 @@ oX oX oX oX -kC +EC vT La ms @@ -1982,7 +1996,7 @@ ms ms La vT -vT +kC oX uu uu @@ -2005,7 +2019,7 @@ Up Xv mU oX -vT +kC vT La ms @@ -2117,7 +2131,7 @@ ms ms La vT -kC +vT oX XJ VJ @@ -2297,7 +2311,16 @@ ms ms ms La -La +EC +kC +vT +vT +vT +vT +vT +vT +kC +EC kC vT vT @@ -2306,21 +2329,12 @@ vT vT vT vT -kC vT vT vT vT kC -vT -vT -vT -vT -vT -vT -vT -kC -vT +EC vT La La diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/vault.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/vault.dmm index fd7e02d972..30b8a75995 100644 --- a/modular_chomp/maps/submaps/surface_submaps/valley/vault.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/valley/vault.dmm @@ -24,11 +24,8 @@ /turf/simulated/shuttle/floor/alienplating/blue, /area/submap/vault) "j" = ( -/turf/simulated/shuttle/floor/alien{ - temperature = 243.15; - oxygen = 20.7263; - nitrogen = 93.7835 - }, +/obj/structure/loot_pile/surface/alien/engineering, +/turf/simulated/shuttle/floor/alienplating/blue, /area/submap/vault) "n" = ( /obj/structure/loot_pile/surface/alien/end, @@ -54,8 +51,7 @@ /turf/simulated/shuttle/floor/alienplating/external, /area/submap/vault) "v" = ( -/obj/structure/table/alien/blue, -/obj/random/janusmodule, +/obj/structure/loot_pile/surface/alien/medical, /turf/simulated/shuttle/floor/alienplating/blue, /area/submap/vault) "x" = ( @@ -232,19 +228,19 @@ c c c c -a -a -a -a -a -a -a -a -a -a -a -a -a +x +x +x +x +x +x +x +x +x +x +x +x +x c c c @@ -273,19 +269,19 @@ c c c c -a -a -j -j -a -a -a -a -a -j -j -a -a +x +x +x +x +x +x +x +x +x +x +x +x +x c c r @@ -315,17 +311,17 @@ a r c c -r -a -a -r +t +x +x +x c c c -r -a -a -r +x +x +x +t c c c @@ -558,7 +554,7 @@ q a z a -n +v c a a @@ -638,7 +634,7 @@ a a c i -n +j c c c @@ -730,7 +726,7 @@ a a a a -v +n a a a @@ -755,7 +751,7 @@ d d x x -r +t c z z @@ -795,8 +791,8 @@ d (16,1,1) = {" d x -j -a +x +x Y a a @@ -829,15 +825,15 @@ a a Y x -j +x x d "} (17,1,1) = {" d x -j -a +x +x Y a a @@ -870,7 +866,7 @@ a a Y x -j +x x d "} @@ -878,7 +874,7 @@ d d x x -r +x c c c @@ -910,7 +906,7 @@ c c c c -t +x x x d @@ -970,7 +966,7 @@ a z a z -v +n D D p @@ -982,7 +978,7 @@ p p D D -v +n z L z @@ -1042,7 +1038,7 @@ d d x x -t +x c c c @@ -1074,7 +1070,7 @@ c c c c -t +x x x d @@ -1082,7 +1078,7 @@ d (23,1,1) = {" d x -j +x x Y a @@ -1116,14 +1112,14 @@ a a Y x -j +x x d "} (24,1,1) = {" d x -j +x x Y a @@ -1157,7 +1153,7 @@ a a Y x -j +x x d "} @@ -1222,7 +1218,7 @@ a a a a -v +n a a a @@ -1314,7 +1310,7 @@ a c c c -n +j i c a @@ -1394,7 +1390,7 @@ a a a c -n +v a z a @@ -1630,11 +1626,11 @@ c t x x -t +x c c c -t +x x x t @@ -1669,15 +1665,15 @@ r c x x -j -j x x x x x -j -j +x +x +x +x x x c