From 95809d9ff7c1eac612eeae1e4cd3fe3c006c942d Mon Sep 17 00:00:00 2001 From: Casey Date: Sat, 3 Sep 2022 12:34:49 -0400 Subject: [PATCH] Fixes edges of 3c wilds having wrong atmos in mineral walls --- code/modules/planet/virgo3c_vr.dm | 1 + maps/groundbase/eastwilds/eastwilds1.dmm | 11 +++++++++++ maps/groundbase/eastwilds/eastwilds2.dmm | 5 +++++ maps/groundbase/northwilds/northwilds1.dmm | 5 +++++ maps/groundbase/northwilds/northwilds2.dmm | 5 +++++ maps/groundbase/southwilds/southwilds1.dmm | 5 +++++ maps/groundbase/southwilds/southwilds2.dmm | 5 +++++ maps/groundbase/southwilds/southwilds3.dmm | 2 +- maps/groundbase/westwilds/westwilds1.dmm | 5 +++++ maps/groundbase/westwilds/westwilds2.dmm | 5 +++++ 10 files changed, 48 insertions(+), 1 deletion(-) diff --git a/code/modules/planet/virgo3c_vr.dm b/code/modules/planet/virgo3c_vr.dm index 45c64daee2..191a7e06e5 100644 --- a/code/modules/planet/virgo3c_vr.dm +++ b/code/modules/planet/virgo3c_vr.dm @@ -545,6 +545,7 @@ VIRGO3C_TURF_CREATE(/turf/simulated/floor/glass/reinforced) VIRGO3C_TURF_CREATE(/turf/simulated/open) VIRGO3C_TURF_CREATE(/turf/simulated/floor/tiled/dark) VIRGO3C_TURF_CREATE(/turf/simulated/mineral) +VIRGO3C_TURF_CREATE(/turf/simulated/mineral/ignore_cavegen) VIRGO3C_TURF_CREATE(/turf/simulated/floor) VIRGO3C_TURF_CREATE(/turf/simulated/floor/wood) VIRGO3C_TURF_CREATE(/turf/simulated/floor/wood/sif) diff --git a/maps/groundbase/eastwilds/eastwilds1.dmm b/maps/groundbase/eastwilds/eastwilds1.dmm index 083efd24e9..4992ae4453 100644 --- a/maps/groundbase/eastwilds/eastwilds1.dmm +++ b/maps/groundbase/eastwilds/eastwilds1.dmm @@ -36,8 +36,19 @@ /turf/simulated/floor/outdoors/grass/forest/virgo3c, /area/groundbase/wilderness/east) "y" = ( +<<<<<<< HEAD /turf/simulated/mineral/ignore_cavegen, /area/groundbase/wilderness/east) +======= +/turf/simulated/mineral/ignore_cavegen/virgo3c, +/area/submap/groundbase/wilderness/east) +"B" = ( +/obj/effect/landmark{ + name = "carpspawn" + }, +/turf/simulated/floor/water/virgo3c, +/area/submap/groundbase/wilderness/east) +>>>>>>> 3e5775ea6e... Merge pull request #13634 from Heroman3003/3c-turfs "F" = ( /turf/simulated/floor/outdoors/grass/virgo3c, /area/groundbase/wilderness/east/unexplored) diff --git a/maps/groundbase/eastwilds/eastwilds2.dmm b/maps/groundbase/eastwilds/eastwilds2.dmm index 8336bc5029..287d56b34b 100644 --- a/maps/groundbase/eastwilds/eastwilds2.dmm +++ b/maps/groundbase/eastwilds/eastwilds2.dmm @@ -26,8 +26,13 @@ }, /area/groundbase/wilderness/east) "r" = ( +<<<<<<< HEAD /turf/simulated/mineral/ignore_cavegen, /area/groundbase/wilderness/east) +======= +/turf/simulated/mineral/ignore_cavegen/virgo3c, +/area/submap/groundbase/wilderness/east) +>>>>>>> 3e5775ea6e... Merge pull request #13634 from Heroman3003/3c-turfs "t" = ( /turf/simulated/floor/water/deep/virgo3c, /area/groundbase/wilderness/east) diff --git a/maps/groundbase/northwilds/northwilds1.dmm b/maps/groundbase/northwilds/northwilds1.dmm index 0cc00b445b..e586ac7bea 100644 --- a/maps/groundbase/northwilds/northwilds1.dmm +++ b/maps/groundbase/northwilds/northwilds1.dmm @@ -13,8 +13,13 @@ /turf/simulated/floor/outdoors/grass/forest/virgo3c, /area/groundbase/wilderness/north) "m" = ( +<<<<<<< HEAD /turf/simulated/mineral/ignore_cavegen, /area/groundbase/wilderness/north) +======= +/turf/simulated/mineral/ignore_cavegen/virgo3c, +/area/submap/groundbase/wilderness/north) +>>>>>>> 3e5775ea6e... Merge pull request #13634 from Heroman3003/3c-turfs "p" = ( /obj/effect/map_effect/portal/master/side_a/gb_wilds/north_south, /turf/simulated/floor/outdoors/grass/forest/virgo3c, diff --git a/maps/groundbase/northwilds/northwilds2.dmm b/maps/groundbase/northwilds/northwilds2.dmm index 6dc23369cb..18d11228fa 100644 --- a/maps/groundbase/northwilds/northwilds2.dmm +++ b/maps/groundbase/northwilds/northwilds2.dmm @@ -22,8 +22,13 @@ /turf/simulated/floor/outdoors/grass/virgo3c, /area/groundbase/wilderness/north) "m" = ( +<<<<<<< HEAD /turf/simulated/mineral/ignore_cavegen, /area/groundbase/wilderness/north) +======= +/turf/simulated/mineral/ignore_cavegen/virgo3c, +/area/submap/groundbase/wilderness/north) +>>>>>>> 3e5775ea6e... Merge pull request #13634 from Heroman3003/3c-turfs "o" = ( /turf/simulated/mineral/cave/virgo3c, /area/groundbase/wilderness/north/cave) diff --git a/maps/groundbase/southwilds/southwilds1.dmm b/maps/groundbase/southwilds/southwilds1.dmm index 080ddbf0ba..9788032938 100644 --- a/maps/groundbase/southwilds/southwilds1.dmm +++ b/maps/groundbase/southwilds/southwilds1.dmm @@ -42,8 +42,13 @@ /turf/simulated/mineral/cave/virgo3c, /area/groundbase/wilderness/south/cave) "Q" = ( +<<<<<<< HEAD /turf/simulated/mineral/ignore_cavegen, /area/groundbase/wilderness/south) +======= +/turf/simulated/mineral/ignore_cavegen/virgo3c, +/area/submap/groundbase/wilderness/south) +>>>>>>> 3e5775ea6e... Merge pull request #13634 from Heroman3003/3c-turfs "S" = ( /obj/effect/map_effect/portal/master/side_b/gb_wilds/south, /turf/simulated/floor/outdoors/grass/forest/virgo3c, diff --git a/maps/groundbase/southwilds/southwilds2.dmm b/maps/groundbase/southwilds/southwilds2.dmm index 90eefbebdd..b3aeb2e3b7 100644 --- a/maps/groundbase/southwilds/southwilds2.dmm +++ b/maps/groundbase/southwilds/southwilds2.dmm @@ -41,8 +41,13 @@ /turf/simulated/floor/outdoors/grass/virgo3c, /area/groundbase/wilderness/south) "Q" = ( +<<<<<<< HEAD /turf/simulated/mineral/ignore_cavegen, /area/groundbase/wilderness/south) +======= +/turf/simulated/mineral/ignore_cavegen/virgo3c, +/area/submap/groundbase/wilderness/south) +>>>>>>> 3e5775ea6e... Merge pull request #13634 from Heroman3003/3c-turfs "S" = ( /obj/effect/map_effect/portal/master/side_b/gb_wilds/south, /turf/simulated/floor/outdoors/grass/forest/virgo3c, diff --git a/maps/groundbase/southwilds/southwilds3.dmm b/maps/groundbase/southwilds/southwilds3.dmm index 14ee56a717..cfa03d4587 100644 --- a/maps/groundbase/southwilds/southwilds3.dmm +++ b/maps/groundbase/southwilds/southwilds3.dmm @@ -84,7 +84,7 @@ /turf/simulated/floor/outdoors/grass/virgo3c, /area/submap/groundbase/wilderness/south) "Q" = ( -/turf/simulated/mineral/ignore_cavegen, +/turf/simulated/mineral/ignore_cavegen/virgo3c, /area/submap/groundbase/wilderness/south) "S" = ( /obj/effect/map_effect/portal/master/side_b/gb_wilds/south, diff --git a/maps/groundbase/westwilds/westwilds1.dmm b/maps/groundbase/westwilds/westwilds1.dmm index 147fc8f73f..c594711843 100644 --- a/maps/groundbase/westwilds/westwilds1.dmm +++ b/maps/groundbase/westwilds/westwilds1.dmm @@ -2085,8 +2085,13 @@ /turf/simulated/floor, /area/groundbase/science/outpost/atmos) "zM" = ( +<<<<<<< HEAD /turf/simulated/mineral/ignore_cavegen, /area/groundbase/wilderness/west) +======= +/turf/simulated/mineral/ignore_cavegen/virgo3c, +/area/submap/groundbase/wilderness/west) +>>>>>>> 3e5775ea6e... Merge pull request #13634 from Heroman3003/3c-turfs "zP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black, /turf/simulated/floor/tiled/white, diff --git a/maps/groundbase/westwilds/westwilds2.dmm b/maps/groundbase/westwilds/westwilds2.dmm index d16b67dd4f..4a821d801a 100644 --- a/maps/groundbase/westwilds/westwilds2.dmm +++ b/maps/groundbase/westwilds/westwilds2.dmm @@ -446,8 +446,13 @@ }, /area/groundbase/wilderness/west) "fM" = ( +<<<<<<< HEAD /turf/simulated/mineral/ignore_cavegen, /area/groundbase/wilderness/west) +======= +/turf/simulated/mineral/ignore_cavegen/virgo3c, +/area/submap/groundbase/wilderness/west) +>>>>>>> 3e5775ea6e... Merge pull request #13634 from Heroman3003/3c-turfs "fQ" = ( /obj/machinery/chem_master, /obj/machinery/camera/network/research_outpost{