Various Map Things (#11375)

modular_chomp/maps/common_submaps/overmap/planets/tyr/tyr.dm

@@ -191,7 +191,8 @@
 	outdoors = OUTDOORS_NO
 
 /area/surface/tyr/precursorruins/finale
-	name = "Training Final Assesment Chamber"
+	name = "Advanced Mass Production"
+	flags = RAD_SHIELDED | AREA_FLAG_IS_NOT_PERSISTENT | AREA_SECRET_NAME | AREA_FORBID_EVENTS | PHASE_SHIELDED
 
 /area/surface/tyr/precursorruins/southeast
 	name = "Relax Training Chamber"

modular_chomp/maps/common_submaps/overmap/planets/tyr/tyr.dmm

@@ -452,7 +452,6 @@
 /area/surface/tyr/wrecked_shipA)
 "bR" = (
 /mob/living/simple_mob/mechanical/mecha/eclipse/hivebot/tyr,
-/obj/effect/map_helper/no_phaseshift/area,
 /turf/simulated/shuttle/floor/alien,
 /area/surface/tyr/precursorruins/finale)
 "bS" = (

modular_chomp/maps/submaps/surface_submaps/wilderness/AbandonedLab.dmm

@@ -128,9 +128,9 @@
 /area/submap/AbandonedLab)
 "gP" = (
 /mob/living/simple_mob/mechanical/hivebot/ranged_damage/strong{
-	size_multiplier = 1.2;
 	health = 240;
-	loot_list = list(/obj/item/gun/energy/laser = 5, /obj/item/gun/energy/laser/sleek = 5, /obj/item/gun/energy/gun = 5, /obj/item/gun/energy/sniperrifle = 5)
+	loot_list = list(/obj/item/gun/energy/laser = 5, /obj/item/gun/energy/laser/sleek = 5, /obj/item/gun/energy/gun = 5, /obj/item/gun/energy/sniperrifle = 5);
+	size_multiplier = 1.2
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/submap/AbandonedLab)
@@ -956,10 +956,6 @@
 /obj/effect/decal/cleanable/generic,
 /turf/simulated/floor/tiled/asteroid_steel,
 /area/submap/AbandonedLab)
-"Sd" = (
-/obj/effect/map_helper/no_phaseshift/area,
-/turf/simulated/mineral/ignore_mapgen,
-/area/submap/AbandonedLab)
 "Sx" = (
 /obj/effect/wingrille_spawn,
 /turf/simulated/floor/plating,
@@ -1157,7 +1153,7 @@ Dh
 ku
 ku
 ku
-Sd
+ku
 ku
 Dh
 "}

modular_chomp/maps/submaps/surface_submaps/wilderness/AmbushBase.dmm

@@ -8,9 +8,9 @@
 	faction = "syndicate"
 	},
 /turf/simulated/floor/plating{
+	nitrogen = 93.7835;
 	oxygen = 20.7263;
-	temperature = 243.15;
-	nitrogen = 93.7835
+	temperature = 243.15
 	},
 /area/submap/DugOutMercs)
 "bg" = (
@@ -61,8 +61,8 @@
 /obj/item/oar,
 /obj/item/oar,
 /turf/simulated/floor/wood{
-	oxygen = 20.7263;
 	nitrogen = 93.7835;
+	oxygen = 20.7263;
 	temperature = 243.15
 	},
 /area/submap/DugOutMercs)
@@ -78,8 +78,8 @@
 "cj" = (
 /obj/machinery/light,
 /turf/simulated/floor/wood{
-	oxygen = 20.7263;
 	nitrogen = 93.7835;
+	oxygen = 20.7263;
 	temperature = 243.15
 	},
 /area/submap/DugOutMercs)
@@ -88,9 +88,9 @@
 /obj/structure/table/woodentable,
 /obj/item/storage/toolbox/lunchbox/syndicate/filled,
 /turf/simulated/floor/tiled/hydro{
-	temperature = 243.15;
+	nitrogen = 93.7835;
 	oxygen = 20.7263;
-	nitrogen = 93.7835
+	temperature = 243.15
 	},
 /area/submap/DugOutMercs)
 "dh" = (
@@ -151,9 +151,9 @@
 /obj/item/reagent_containers/food/snacks/monkfishfillet,
 /obj/item/reagent_containers/food/snacks/monkfishfillet,
 /turf/simulated/floor/tiled/hydro{
-	temperature = 243.15;
+	nitrogen = 93.7835;
 	oxygen = 20.7263;
-	nitrogen = 93.7835
+	temperature = 243.15
 	},
 /area/submap/DugOutMercs)
 "fL" = (
@@ -196,8 +196,8 @@
 "iq" = (
 /obj/random/mob/merc/armored,
 /turf/simulated/floor/wood{
-	oxygen = 20.7263;
 	nitrogen = 93.7835;
+	oxygen = 20.7263;
 	temperature = 243.15
 	},
 /area/submap/DugOutMercs)
@@ -291,9 +291,9 @@
 /obj/effect/floor_decal/corner/lightgrey/diagonal,
 /obj/random/mob/merc/all,
 /turf/simulated/floor/tiled/hydro{
-	temperature = 243.15;
+	nitrogen = 93.7835;
 	oxygen = 20.7263;
-	nitrogen = 93.7835
+	temperature = 243.15
 	},
 /area/submap/DugOutMercs)
 "my" = (
@@ -383,9 +383,9 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled/hydro{
-	temperature = 243.15;
+	nitrogen = 93.7835;
 	oxygen = 20.7263;
-	nitrogen = 93.7835
+	temperature = 243.15
 	},
 /area/submap/DugOutMercs)
 "qR" = (
@@ -457,9 +457,9 @@
 "sc" = (
 /obj/effect/floor_decal/corner/lightgrey/diagonal,
 /turf/simulated/floor/tiled/hydro{
-	temperature = 243.15;
+	nitrogen = 93.7835;
 	oxygen = 20.7263;
-	nitrogen = 93.7835
+	temperature = 243.15
 	},
 /area/submap/DugOutMercs)
 "so" = (
@@ -469,9 +469,9 @@
 /obj/item/material/fishing_net,
 /obj/item/material/fishing_net,
 /turf/simulated/floor/tiled/hydro{
-	temperature = 243.15;
+	nitrogen = 93.7835;
 	oxygen = 20.7263;
-	nitrogen = 93.7835
+	temperature = 243.15
 	},
 /area/submap/DugOutMercs)
 "sO" = (
@@ -485,8 +485,8 @@
 /obj/structure/table/sifwooden_reinforced,
 /obj/item/oar,
 /turf/simulated/floor/wood{
-	oxygen = 20.7263;
 	nitrogen = 93.7835;
+	oxygen = 20.7263;
 	temperature = 243.15
 	},
 /area/submap/DugOutMercs)
@@ -524,9 +524,9 @@
 /obj/item/material/fishing_rod/modern/built,
 /obj/item/material/fishing_rod/modern/built,
 /turf/simulated/floor/tiled/hydro{
-	temperature = 243.15;
+	nitrogen = 93.7835;
 	oxygen = 20.7263;
-	nitrogen = 93.7835
+	temperature = 243.15
 	},
 /area/submap/DugOutMercs)
 "uv" = (
@@ -535,8 +535,8 @@
 "uF" = (
 /obj/structure/barricade,
 /turf/simulated/floor/wood{
-	oxygen = 20.7263;
 	nitrogen = 93.7835;
+	oxygen = 20.7263;
 	temperature = 243.15
 	},
 /area/submap/DugOutMercs)
@@ -713,8 +713,8 @@
 /obj/structure/table/sifwooden_reinforced,
 /obj/item/material/fishing_rod/modern/built,
 /turf/simulated/floor/wood{
-	oxygen = 20.7263;
 	nitrogen = 93.7835;
+	oxygen = 20.7263;
 	temperature = 243.15
 	},
 /area/submap/DugOutMercs)
@@ -729,8 +729,8 @@
 /obj/structure/table/sifwooden_reinforced,
 /obj/item/material/fishing_net,
 /turf/simulated/floor/wood{
-	oxygen = 20.7263;
 	nitrogen = 93.7835;
+	oxygen = 20.7263;
 	temperature = 243.15
 	},
 /area/submap/DugOutMercs)
@@ -832,9 +832,9 @@
 /obj/item/reagent_containers/food/snacks/carpmeat/sif/murkfish,
 /obj/item/reagent_containers/food/snacks/carpmeat/sif/murkfish,
 /turf/simulated/floor/tiled/hydro{
-	temperature = 243.15;
+	nitrogen = 93.7835;
 	oxygen = 20.7263;
-	nitrogen = 93.7835
+	temperature = 243.15
 	},
 /area/submap/DugOutMercs)
 "Ia" = (
@@ -918,9 +918,9 @@
 /mob/living/simple_mob/humanoid/merc/ranged/grenadier/poi,
 /obj/effect/floor_decal/corner/lightgrey/diagonal,
 /turf/simulated/floor/tiled/hydro{
-	temperature = 243.15;
+	nitrogen = 93.7835;
 	oxygen = 20.7263;
-	nitrogen = 93.7835
+	temperature = 243.15
 	},
 /area/submap/DugOutMercs)
 "Mi" = (
@@ -944,9 +944,9 @@
 /obj/machinery/light,
 /obj/effect/floor_decal/corner/lightgrey/diagonal,
 /turf/simulated/floor/tiled/hydro{
-	temperature = 243.15;
+	nitrogen = 93.7835;
 	oxygen = 20.7263;
-	nitrogen = 93.7835
+	temperature = 243.15
 	},
 /area/submap/DugOutMercs)
 "Nr" = (
@@ -1132,8 +1132,8 @@
 /obj/item/storage/mre/random,
 /obj/item/binoculars,
 /turf/simulated/floor/wood{
-	oxygen = 20.7263;
 	nitrogen = 93.7835;
+	oxygen = 20.7263;
 	temperature = 243.15
 	},
 /area/submap/DugOutMercs)
@@ -1172,9 +1172,9 @@
 /obj/item/reagent_containers/food/snacks/carpmeat/fish/sharkmeat,
 /obj/item/reagent_containers/food/snacks/carpmeat/fish/sharkmeat,
 /turf/simulated/floor/tiled/hydro{
-	temperature = 243.15;
+	nitrogen = 93.7835;
 	oxygen = 20.7263;
-	nitrogen = 93.7835
+	temperature = 243.15
 	},
 /area/submap/DugOutMercs)
 "WY" = (
@@ -1183,8 +1183,8 @@
 /area/submap/DugOutMercs)
 "Yg" = (
 /turf/simulated/floor/wood{
-	oxygen = 20.7263;
 	nitrogen = 93.7835;
+	oxygen = 20.7263;
 	temperature = 243.15
 	},
 /area/submap/DugOutMercs)
@@ -1210,8 +1210,8 @@
 	},
 /mob/living/simple_mob/humanoid/merc/ranged/sniper,
 /turf/simulated/floor/wood{
-	oxygen = 20.7263;
 	nitrogen = 93.7835;
+	oxygen = 20.7263;
 	temperature = 243.15
 	},
 /area/submap/DugOutMercs)
@@ -1232,16 +1232,11 @@
 	dir = 1
 	},
 /turf/simulated/floor/wood{
-	oxygen = 20.7263;
 	nitrogen = 93.7835;
+	oxygen = 20.7263;
 	temperature = 243.15
 	},
 /area/submap/DugOutMercs)
-"Zs" = (
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/map_helper/no_phaseshift/area,
-/turf/simulated/floor/tiled,
-/area/submap/DugOutMercs)
 "Zt" = (
 /obj/effect/floor_decal/corner/blue/border{
 	dir = 8
@@ -1836,7 +1831,7 @@ sc
 sc
 uv
 nZ
-Zs
+yG
 pg
 Eh
 Eh

modular_chomp/maps/submaps/surface_submaps/wilderness/AmbushBaseAlt.dmm

@@ -24,23 +24,18 @@
 /obj/item/oar,
 /obj/item/oar,
 /turf/simulated/floor/wood{
-	oxygen = 20.7263;
 	nitrogen = 93.7835;
+	oxygen = 20.7263;
 	temperature = 243.15
 	},
 /area/submap/DugOutMercs)
-"aS" = (
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/map_helper/no_phaseshift/area,
-/turf/simulated/floor/tiled,
-/area/submap/DugOutMercs)
 "bm" = (
 /obj/machinery/light,
 /obj/effect/floor_decal/corner/lightgrey/diagonal,
 /turf/simulated/floor/tiled/hydro{
-	temperature = 243.15;
+	nitrogen = 93.7835;
 	oxygen = 20.7263;
-	nitrogen = 93.7835
+	temperature = 243.15
 	},
 /area/submap/DugOutMercs)
 "bp" = (
@@ -211,8 +206,8 @@
 /obj/structure/table/sifwooden_reinforced,
 /obj/item/material/fishing_net,
 /turf/simulated/floor/wood{
-	oxygen = 20.7263;
 	nitrogen = 93.7835;
+	oxygen = 20.7263;
 	temperature = 243.15
 	},
 /area/submap/DugOutMercs)
@@ -354,8 +349,8 @@
 /obj/item/storage/mre/random,
 /obj/item/binoculars,
 /turf/simulated/floor/wood{
-	oxygen = 20.7263;
 	nitrogen = 93.7835;
+	oxygen = 20.7263;
 	temperature = 243.15
 	},
 /area/submap/DugOutMercs)
@@ -384,9 +379,9 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled/hydro{
-	temperature = 243.15;
+	nitrogen = 93.7835;
 	oxygen = 20.7263;
-	nitrogen = 93.7835
+	temperature = 243.15
 	},
 /area/submap/DugOutMercs)
 "nC" = (
@@ -428,9 +423,9 @@
 /obj/item/reagent_containers/food/snacks/carpmeat/sif/murkfish,
 /obj/item/reagent_containers/food/snacks/carpmeat/sif/murkfish,
 /turf/simulated/floor/tiled/hydro{
-	temperature = 243.15;
+	nitrogen = 93.7835;
 	oxygen = 20.7263;
-	nitrogen = 93.7835
+	temperature = 243.15
 	},
 /area/submap/DugOutMercs)
 "pj" = (
@@ -457,9 +452,9 @@
 "rg" = (
 /obj/effect/floor_decal/corner/lightgrey/diagonal,
 /turf/simulated/floor/tiled/hydro{
-	temperature = 243.15;
+	nitrogen = 93.7835;
 	oxygen = 20.7263;
-	nitrogen = 93.7835
+	temperature = 243.15
 	},
 /area/submap/DugOutMercs)
 "rp" = (
@@ -469,9 +464,9 @@
 /obj/item/material/fishing_rod/modern/built,
 /obj/item/material/fishing_rod/modern/built,
 /turf/simulated/floor/tiled/hydro{
-	temperature = 243.15;
+	nitrogen = 93.7835;
 	oxygen = 20.7263;
-	nitrogen = 93.7835
+	temperature = 243.15
 	},
 /area/submap/DugOutMercs)
 "rE" = (
@@ -540,9 +535,9 @@
 	faction = "syndicate"
 	},
 /turf/simulated/floor/plating{
+	nitrogen = 93.7835;
 	oxygen = 20.7263;
-	temperature = 243.15;
-	nitrogen = 93.7835
+	temperature = 243.15
 	},
 /area/submap/DugOutMercs)
 "ve" = (
@@ -591,8 +586,8 @@
 "yI" = (
 /obj/structure/barricade,
 /turf/simulated/floor/wood{
-	oxygen = 20.7263;
 	nitrogen = 93.7835;
+	oxygen = 20.7263;
 	temperature = 243.15
 	},
 /area/submap/DugOutMercs)
@@ -638,8 +633,8 @@
 	dir = 1
 	},
 /turf/simulated/floor/wood{
-	oxygen = 20.7263;
 	nitrogen = 93.7835;
+	oxygen = 20.7263;
 	temperature = 243.15
 	},
 /area/submap/DugOutMercs)
@@ -655,9 +650,9 @@
 /obj/effect/floor_decal/corner/lightgrey/diagonal,
 /mob/living/simple_mob/humanoid/merc/ranged/sniper,
 /turf/simulated/floor/tiled/hydro{
-	temperature = 243.15;
+	nitrogen = 93.7835;
 	oxygen = 20.7263;
-	nitrogen = 93.7835
+	temperature = 243.15
 	},
 /area/submap/DugOutMercs)
 "Ct" = (
@@ -669,8 +664,8 @@
 /obj/structure/table/sifwooden_reinforced,
 /obj/item/oar,
 /turf/simulated/floor/wood{
-	oxygen = 20.7263;
 	nitrogen = 93.7835;
+	oxygen = 20.7263;
 	temperature = 243.15
 	},
 /area/submap/DugOutMercs)
@@ -734,8 +729,8 @@
 	},
 /mob/living/simple_mob/humanoid/merc/ranged/grenadier/poi,
 /turf/simulated/floor/wood{
-	oxygen = 20.7263;
 	nitrogen = 93.7835;
+	oxygen = 20.7263;
 	temperature = 243.15
 	},
 /area/submap/DugOutMercs)
@@ -879,17 +874,17 @@
 /mob/living/simple_mob/humanoid/merc/ranged/sniper,
 /obj/effect/floor_decal/corner/lightgrey/diagonal,
 /turf/simulated/floor/tiled/hydro{
-	temperature = 243.15;
+	nitrogen = 93.7835;
 	oxygen = 20.7263;
-	nitrogen = 93.7835
+	temperature = 243.15
 	},
 /area/submap/DugOutMercs)
 "LY" = (
 /obj/structure/table/sifwooden_reinforced,
 /obj/item/material/fishing_rod/modern/built,
 /turf/simulated/floor/wood{
-	oxygen = 20.7263;
 	nitrogen = 93.7835;
+	oxygen = 20.7263;
 	temperature = 243.15
 	},
 /area/submap/DugOutMercs)
@@ -921,8 +916,8 @@
 "NB" = (
 /obj/machinery/light,
 /turf/simulated/floor/wood{
-	oxygen = 20.7263;
 	nitrogen = 93.7835;
+	oxygen = 20.7263;
 	temperature = 243.15
 	},
 /area/submap/DugOutMercs)
@@ -962,9 +957,9 @@
 /obj/item/material/fishing_net,
 /obj/item/material/fishing_net,
 /turf/simulated/floor/tiled/hydro{
-	temperature = 243.15;
+	nitrogen = 93.7835;
 	oxygen = 20.7263;
-	nitrogen = 93.7835
+	temperature = 243.15
 	},
 /area/submap/DugOutMercs)
 "PE" = (
@@ -1000,8 +995,8 @@
 /area/submap/DugOutMercs)
 "Rd" = (
 /turf/simulated/floor/wood{
-	oxygen = 20.7263;
 	nitrogen = 93.7835;
+	oxygen = 20.7263;
 	temperature = 243.15
 	},
 /area/submap/DugOutMercs)
@@ -1027,9 +1022,9 @@
 /obj/item/reagent_containers/food/snacks/carpmeat/fish/sharkmeat,
 /obj/item/reagent_containers/food/snacks/carpmeat/fish/sharkmeat,
 /turf/simulated/floor/tiled/hydro{
-	temperature = 243.15;
+	nitrogen = 93.7835;
 	oxygen = 20.7263;
-	nitrogen = 93.7835
+	temperature = 243.15
 	},
 /area/submap/DugOutMercs)
 "Su" = (
@@ -1101,9 +1096,9 @@
 /obj/structure/table/woodentable,
 /obj/item/storage/toolbox/lunchbox/syndicate/filled,
 /turf/simulated/floor/tiled/hydro{
-	temperature = 243.15;
+	nitrogen = 93.7835;
 	oxygen = 20.7263;
-	nitrogen = 93.7835
+	temperature = 243.15
 	},
 /area/submap/DugOutMercs)
 "WV" = (
@@ -1168,9 +1163,9 @@
 /obj/item/reagent_containers/food/snacks/monkfishfillet,
 /obj/item/reagent_containers/food/snacks/monkfishfillet,
 /turf/simulated/floor/tiled/hydro{
-	temperature = 243.15;
+	nitrogen = 93.7835;
 	oxygen = 20.7263;
-	nitrogen = 93.7835
+	temperature = 243.15
 	},
 /area/submap/DugOutMercs)
 "Zj" = (
@@ -1715,7 +1710,7 @@ Cp
 rg
 bu
 nJ
-aS
+aM
 bu
 XW
 XW

modular_chomp/maps/submaps/surface_submaps/wilderness/Blackshuttledown.dmm

@@ -762,10 +762,6 @@
 /obj/effect/floor_decal/borderfloor/full,
 /turf/simulated/floor/tiled/steel,
 /area/submap/Blackshuttledown)
-"Zy" = (
-/obj/effect/map_helper/no_phaseshift/area,
-/turf/simulated/floor/tiled/steel,
-/area/submap/Blackshuttledown)
 
 (1,1,1) = {"
 aa
@@ -1303,7 +1299,7 @@ ay
 bh
 bl
 bl
-Zy
+bl
 bl
 bF
 ay

modular_chomp/maps/submaps/surface_submaps/wilderness/Blueshuttledown.dmm

@@ -865,11 +865,6 @@
 	},
 /turf/simulated/floor/tiled/red,
 /area/submap/Blackshuttledown)
-"oi" = (
-/obj/effect/alien/weeds,
-/obj/effect/map_helper/no_phaseshift/area,
-/turf/simulated/floor/tiled/steel,
-/area/submap/Blackshuttledown)
 "so" = (
 /obj/structure/table/steel,
 /obj/random/toolbox,
@@ -1521,7 +1516,7 @@ aR
 bh
 bI
 ct
-oi
+ct
 bI
 bF
 aR

modular_chomp/maps/submaps/surface_submaps/wilderness/Manor1.dmm

@@ -1098,10 +1098,6 @@
 /obj/item/bone/ribs,
 /turf/simulated/floor/holofloor/wood,
 /area/submap/Manor1)
-"yn" = (
-/obj/effect/map_helper/no_phaseshift,
-/turf/simulated/wall/wood,
-/area/submap/Manor1)
 "yI" = (
 /obj/effect/decal/cleanable/dirt,
 /mob/living/simple_mob/animal/giant_spider/carrier,
@@ -2384,7 +2380,7 @@ ab
 ab
 ab
 ab
-yn
+ab
 ab
 ab
 ab

modular_chomp/maps/submaps/surface_submaps/wilderness/Manor1Alt.dmm

@@ -538,11 +538,6 @@
 /obj/effect/spider/stickyweb,
 /turf/simulated/floor/holofloor/wood,
 /area/submap/Manor1)
-"si" = (
-/obj/effect/map_helper/no_phaseshift,
-/obj/effect/map_helper/no_phaseshift,
-/turf/simulated/floor/holofloor/wood,
-/area/submap/Manor1)
 "sl" = (
 /obj/random/humanoidremains,
 /turf/simulated/floor/holofloor/wood,
@@ -2118,7 +2113,7 @@ CY
 CY
 CY
 CY
-si
+rh
 rh
 CY
 CY

modular_chomp/maps/submaps/surface_submaps/wilderness/Rockybase.dmm

@@ -597,7 +597,6 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/obj/effect/map_helper/no_phaseshift/area,
 /turf/simulated/floor/tiled,
 /area/submap/Rockybase)
 "cf" = (

modular_chomp/maps/submaps/surface_submaps/wilderness/RockybaseAlt.dmm

@@ -685,10 +685,6 @@
 /mob/living/simple_mob/mechanical/mining_drone,
 /turf/simulated/floor/tiled,
 /area/submap/Rockybase)
-"Jh" = (
-/obj/effect/map_helper/no_phaseshift/area,
-/turf/simulated/floor/tiled,
-/area/submap/Rockybase)
 "Jm" = (
 /obj/structure/bed,
 /obj/item/bedsheet,
@@ -1612,7 +1608,7 @@ eO
 eO
 Vz
 Vf
-Jh
+MW
 Hf
 pk
 gZ

modular_chomp/maps/submaps/surface_submaps/wilderness/borglab.dmm

@@ -1124,14 +1124,6 @@
 "RP" = (
 /turf/simulated/floor/outdoors/dirt,
 /area/submap/BorgLab)
-"RZ" = (
-/obj/effect/floor_decal/industrial/warning{
-	dir = 1
-	},
-/obj/effect/floor_decal/rust,
-/obj/effect/map_helper/no_phaseshift/area,
-/turf/simulated/floor/plating,
-/area/submap/BorgLab)
 "Su" = (
 /obj/effect/floor_decal/techfloor/orange,
 /obj/item/stack/material/uranium{
@@ -1687,7 +1679,7 @@ KX
 jf
 Vc
 bI
-RZ
+RL
 Nj
 lZ
 YD

modular_chomp/maps/submaps/surface_submaps/wilderness/borglabAlt.dmm

@@ -699,11 +699,11 @@
 /area/submap/BorgLab)
 "Ds" = (
 /mob/living/simple_mob/vore/aggressive/corrupthound/prettyboi{
+	faction = "synthtide";
 	health = 300;
 	maxHealth = 300;
 	melee_damage_lower = 15;
-	melee_damage_upper = 25;
-	faction = "synthtide"
+	melee_damage_upper = 25
 	},
 /turf/simulated/floor/reinforced,
 /area/submap/BorgLab)
@@ -1099,7 +1099,6 @@
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
 	},
-/obj/effect/map_helper/no_phaseshift/area,
 /turf/simulated/floor/tiled,
 /area/submap/BorgLab)
 "Oy" = (

modular_chomp/maps/submaps/surface_submaps/wilderness/bountyhunters.dmm

@@ -3,6 +3,13 @@
 /obj/effect/floor_decal/corner/grey/diagonal,
 /turf/simulated/floor/concrete/turfpack/sif,
 /area/submap/BountyHunters)
+"ab" = (
+/obj/structure/cable/green{
+	icon_state = "0-8"
+	},
+/obj/effect/floor_decal/corner/grey/diagonal,
+/turf/simulated/floor/concrete/turfpack/sif,
+/area/submap/BountyHunters)
 "aH" = (
 /obj/machinery/button/remote/blast_door{
 	id = "bountycellA"
@@ -71,11 +78,6 @@
 /obj/effect/floor_decal/corner/grey/diagonal,
 /turf/simulated/floor/concrete,
 /area/submap/BountyHunters)
-"hU" = (
-/obj/effect/floor_decal/corner/grey/diagonal,
-/obj/effect/map_helper/no_phaseshift/area,
-/turf/simulated/floor/concrete,
-/area/submap/BountyHunters)
 "jO" = (
 /obj/structure/cable{
 	icon_state = "1-8"
@@ -826,7 +828,7 @@ qG
 qG
 qG
 qG
-hU
+qG
 oV
 qG
 Yd
@@ -964,7 +966,7 @@ qQ
 qG
 RC
 zl
-PP
+ab
 Gi
 aa
 NE

modular_chomp/maps/submaps/surface_submaps/wilderness/bountyhunters2.dmm

@@ -3,6 +3,13 @@
 /obj/effect/floor_decal/corner/grey/diagonal,
 /turf/simulated/floor/concrete/turfpack/sif,
 /area/submap/BountyHunters)
+"ab" = (
+/obj/structure/cable/green{
+	icon_state = "0-8"
+	},
+/obj/effect/floor_decal/corner/grey/diagonal,
+/turf/simulated/floor/concrete/turfpack/sif,
+/area/submap/BountyHunters)
 "aB" = (
 /obj/structure/table/steel,
 /obj/machinery/recharger,
@@ -10,11 +17,6 @@
 /obj/random/material/precious,
 /turf/simulated/floor/concrete,
 /area/submap/BountyHunters)
-"aF" = (
-/obj/effect/floor_decal/corner/grey/diagonal,
-/obj/effect/map_helper/no_phaseshift/area,
-/turf/simulated/floor/concrete,
-/area/submap/BountyHunters)
 "be" = (
 /mob/living/simple_mob/humanoid/merc/ranged/space/suppressor/elite{
 	name = "elite bounty hunter"
@@ -705,7 +707,7 @@ VQ
 rC
 WC
 mf
-zu
+ab
 WF
 aa
 xt
@@ -837,7 +839,7 @@ rC
 rC
 rC
 be
-aF
+rC
 rC
 rC
 eY

modular_chomp/maps/submaps/surface_submaps/wilderness/deathden.dmm

@@ -751,11 +751,6 @@
 /obj/item/storage/box/donut,
 /turf/simulated/floor/wood/sif/turfpack/sif,
 /area/submap/DeathDen)
-"Rd" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/map_helper/no_phaseshift/area,
-/turf/simulated/floor/wood/sif/turfpack/sif,
-/area/submap/DeathDen)
 "Rs" = (
 /obj/structure/table/bench/wooden,
 /obj/effect/floor_decal/carpet,
@@ -784,7 +779,6 @@
 "Up" = (
 /obj/structure/windoor_assembly,
 /obj/random/trash,
-/obj/effect/map_helper/no_phaseshift,
 /turf/simulated/floor/tiled/freezer,
 /area/submap/DeathDen)
 "UR" = (
@@ -964,7 +958,7 @@ Th
 Th
 Th
 HZ
-Rd
+ph
 ph
 HZ
 Th

modular_chomp/maps/submaps/surface_submaps/wilderness/deathdenAlt.dmm

@@ -159,15 +159,6 @@
 	oxygen = 0
 	},
 /area/submap/DeathDen)
-"mR" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/food/snacks/candy_corn{
-	pixel_x = 6;
-	pixel_y = 4
-	},
-/obj/effect/map_helper/no_phaseshift/area,
-/turf/simulated/floor/wood/sif/turfpack/sif,
-/area/submap/DeathDen)
 "nl" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/wood/sif/broken/turfpack/sif,
@@ -641,11 +632,6 @@
 	},
 /turf/simulated/floor/wood/sif/turfpack/sif,
 /area/submap/DeathDen)
-"Yr" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/map_helper/no_phaseshift,
-/turf/simulated/floor/wood/sif/turfpack/sif,
-/area/submap/DeathDen)
 "YA" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/wood/sif/turfpack/sif,
@@ -829,7 +815,7 @@ Sf
 Ps
 JE
 ex
-mR
+Ps
 GU
 YA
 MV
@@ -845,7 +831,7 @@ Is
 (10,1,1) = {"
 Is
 aa
-Yr
+YA
 Ps
 Xy
 Ps

modular_chomp/maps/submaps/surface_submaps/wilderness/demonpool.dmm

@@ -14,15 +14,15 @@
 /obj/fire,
 /obj/fire,
 /obj/fire,
-/turf/simulated/floor/cult,
+/turf/simulated/floor/cult/turfpack/sif,
 /area/submap/DemonPool)
 "ay" = (
 /obj/structure/girder/cult,
-/turf/simulated/floor/cult,
+/turf/simulated/floor/cult/turfpack/sif,
 /area/submap/DemonPool)
 "bb" = (
 /obj/item/melee/cultblade,
-/turf/simulated/floor/cult,
+/turf/simulated/floor/cult/turfpack/sif,
 /area/submap/DemonPool)
 "bh" = (
 /obj/structure/simple_door,
@@ -54,7 +54,7 @@
 "es" = (
 /obj/effect/decal/cleanable/blood/gibs/body,
 /obj/structure/loot_pile/surface/bones,
-/turf/simulated/floor/cult,
+/turf/simulated/floor/cult/turfpack/sif,
 /area/submap/DemonPool)
 "eM" = (
 /obj/structure/table/woodentable,
@@ -67,7 +67,7 @@
 "eV" = (
 /obj/structure/bonfire/permanent,
 /obj/structure/grille/cult,
-/turf/simulated/floor/cult,
+/turf/simulated/floor/cult/turfpack/sif,
 /area/submap/DemonPool)
 "eW" = (
 /turf/template_noop,
@@ -104,7 +104,7 @@
 /area/submap/DemonPool)
 "hO" = (
 /obj/effect/gibspawner/human/xenochimera,
-/turf/simulated/floor/cult,
+/turf/simulated/floor/cult/turfpack/sif,
 /area/submap/DemonPool)
 "hW" = (
 /obj/effect/decal/cleanable/dirt,
@@ -122,7 +122,7 @@
 /obj/item/stack/material/silver{
 	amount = 15
 	},
-/turf/simulated/floor/cult,
+/turf/simulated/floor/cult/turfpack/sif,
 /area/submap/DemonPool)
 "jv" = (
 /turf/simulated/floor/outdoors/dirt,
@@ -130,12 +130,12 @@
 "jG" = (
 /obj/effect/gibspawner/human,
 /obj/effect/rune,
-/turf/simulated/floor/cult,
+/turf/simulated/floor/cult/turfpack/sif,
 /area/submap/DemonPool)
 "jK" = (
 /obj/fire,
 /obj/fire,
-/turf/simulated/floor/cult,
+/turf/simulated/floor/cult/turfpack/sif,
 /area/submap/DemonPool)
 "jS" = (
 /obj/structure/grille/cult,
@@ -151,7 +151,7 @@
 /area/submap/DemonPool)
 "lo" = (
 /obj/item/clothing/suit/cultrobes/alt,
-/turf/simulated/floor/cult,
+/turf/simulated/floor/cult/turfpack/sif,
 /area/submap/DemonPool)
 "lr" = (
 /obj/effect/decal/cleanable/dirt,
@@ -179,7 +179,7 @@
 "mO" = (
 /obj/effect/gibspawner/human,
 /obj/item/clothing/head/culthood/alt,
-/turf/simulated/floor/cult,
+/turf/simulated/floor/cult/turfpack/sif,
 /area/submap/DemonPool)
 "mU" = (
 /mob/living/simple_mob/animal/space/bats/cult/strong{
@@ -191,11 +191,11 @@
 	},
 /area/submap/DemonPool)
 "oi" = (
-/turf/simulated/floor/cult,
+/turf/simulated/floor/cult/turfpack/sif,
 /area/submap/DemonPool)
 "on" = (
 /obj/effect/decal/cleanable/blood/gibs/body,
-/turf/simulated/floor/cult,
+/turf/simulated/floor/cult/turfpack/sif,
 /area/submap/DemonPool)
 "pb" = (
 /obj/fire,
@@ -205,11 +205,11 @@
 "pi" = (
 /obj/effect/decal/cleanable/blood/gibs/body,
 /obj/item/spellbook/oneuse/forcewall,
-/turf/simulated/floor/cult,
+/turf/simulated/floor/cult/turfpack/sif,
 /area/submap/DemonPool)
 "pH" = (
 /obj/structure/grille/cult,
-/turf/simulated/floor/cult,
+/turf/simulated/floor/cult/turfpack/sif,
 /area/submap/DemonPool)
 "qa" = (
 /mob/living/simple_mob/animal/space/bats/cult/strong{
@@ -226,28 +226,28 @@
 	melee_damage_lower = 15;
 	melee_damage_upper = 25
 	},
-/turf/simulated/floor/cult,
+/turf/simulated/floor/cult/turfpack/sif,
 /area/submap/DemonPool)
 "qc" = (
 /mob/living/simple_mob/vore/demonAI/wendigo,
-/turf/simulated/floor/cult,
+/turf/simulated/floor/cult/turfpack/sif,
 /area/submap/DemonPool)
 "qQ" = (
 /obj/fire,
-/turf/simulated/floor/cult,
+/turf/simulated/floor/cult/turfpack/sif,
 /area/submap/DemonPool)
 "sb" = (
 /obj/item/clothing/shoes/cult,
 /obj/item/melee/energy/sword/red,
-/turf/simulated/floor/cult,
+/turf/simulated/floor/cult/turfpack/sif,
 /area/submap/DemonPool)
 "si" = (
 /obj/effect/decal/cleanable/blood/gibs/limb,
-/turf/simulated/floor/cult,
+/turf/simulated/floor/cult/turfpack/sif,
 /area/submap/DemonPool)
 "sM" = (
 /obj/effect/gateway,
-/turf/simulated/floor/cult,
+/turf/simulated/floor/cult/turfpack/sif,
 /area/submap/DemonPool)
 "tC" = (
 /mob/living/simple_mob/vore/demonAI/ira,
@@ -258,7 +258,7 @@
 "vv" = (
 /obj/effect/gibspawner/human/xenochimera,
 /obj/fire,
-/turf/simulated/floor/cult,
+/turf/simulated/floor/cult/turfpack/sif,
 /area/submap/DemonPool)
 "vw" = (
 /turf/simulated/floor,
@@ -283,20 +283,20 @@
 /area/submap/DemonPool)
 "yW" = (
 /obj/structure/cult/pylon,
-/turf/simulated/floor/cult,
+/turf/simulated/floor/cult/turfpack/sif,
 /area/submap/DemonPool)
 "zi" = (
 /mob/living/simple_mob/animal/space/bats/cult/strong{
 	faction = "demon"
 	},
-/turf/simulated/floor/cult,
+/turf/simulated/floor/cult/turfpack/sif,
 /area/submap/DemonPool)
 "zj" = (
 /obj/effect/decal/cleanable/blood/gibs/limb,
 /mob/living/simple_mob/animal/space/bats/cult/strong{
 	faction = "demon"
 	},
-/turf/simulated/floor/cult,
+/turf/simulated/floor/cult/turfpack/sif,
 /area/submap/DemonPool)
 "zI" = (
 /obj/structure/grille/broken/cult,
@@ -325,7 +325,7 @@
 /area/submap/DemonPool)
 "AH" = (
 /obj/structure/cult/tome,
-/turf/simulated/floor/cult,
+/turf/simulated/floor/cult/turfpack/sif,
 /area/submap/DemonPool)
 "Bb" = (
 /obj/fire,
@@ -406,7 +406,7 @@
 "JP" = (
 /obj/effect/decal/cleanable/blood/gibs/limb,
 /obj/fire,
-/turf/simulated/floor/cult,
+/turf/simulated/floor/cult/turfpack/sif,
 /area/submap/DemonPool)
 "JV" = (
 /obj/structure/loot_pile/maint/trash,
@@ -421,7 +421,7 @@
 /area/submap/DemonPool)
 "KR" = (
 /obj/effect/gibspawner/human,
-/turf/simulated/floor/cult,
+/turf/simulated/floor/cult/turfpack/sif,
 /area/submap/DemonPool)
 "Lu" = (
 /obj/fire,
@@ -450,7 +450,7 @@
 /obj/effect/gibspawner/human,
 /obj/fire,
 /obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/cult,
+/turf/simulated/floor/cult/turfpack/sif,
 /area/submap/DemonPool)
 "Oo" = (
 /obj/structure/grille/broken/cult,
@@ -485,16 +485,16 @@
 /area/submap/DemonPool)
 "Qr" = (
 /obj/structure/closet/crate/secure/loot,
-/turf/simulated/floor/cult,
+/turf/simulated/floor/cult/turfpack/sif,
 /area/submap/DemonPool)
 "Qv" = (
 /obj/effect/landmark/loot_spawn,
 /obj/effect/rune,
-/turf/simulated/floor/cult,
+/turf/simulated/floor/cult/turfpack/sif,
 /area/submap/DemonPool)
 "Qz" = (
 /obj/effect/spawner/lootdrop,
-/turf/simulated/floor/cult,
+/turf/simulated/floor/cult/turfpack/sif,
 /area/submap/DemonPool)
 "RP" = (
 /obj/effect/decal/cleanable/dirt,
@@ -527,7 +527,7 @@
 /area/submap/DemonPool)
 "WV" = (
 /obj/structure/loot_pile/surface/bones,
-/turf/simulated/floor/cult,
+/turf/simulated/floor/cult/turfpack/sif,
 /area/submap/DemonPool)
 "Xe" = (
 /obj/structure/grille/broken/cult,
@@ -538,7 +538,7 @@
 "XB" = (
 /obj/effect/decal/cleanable/blood/gibs/body,
 /obj/fire,
-/turf/simulated/floor/cult,
+/turf/simulated/floor/cult/turfpack/sif,
 /area/submap/DemonPool)
 "XJ" = (
 /obj/effect/decal/cleanable/blood/gibs/limb,
@@ -550,11 +550,11 @@
 /area/submap/DemonPool)
 "XP" = (
 /obj/structure/constructshell/cult,
-/turf/simulated/floor/cult,
+/turf/simulated/floor/cult/turfpack/sif,
 /area/submap/DemonPool)
 "Yk" = (
 /obj/item/clothing/shoes/cult,
-/turf/simulated/floor/cult,
+/turf/simulated/floor/cult/turfpack/sif,
 /area/submap/DemonPool)
 "YF" = (
 /turf/simulated/floor/outdoors/dirt{
@@ -586,7 +586,7 @@
 "ZU" = (
 /obj/effect/decal/cleanable/blood/gibs/limb,
 /obj/effect/spawner/lootdrop,
-/turf/simulated/floor/cult,
+/turf/simulated/floor/cult/turfpack/sif,
 /area/submap/DemonPool)
 
 (1,1,1) = {"

modular_chomp/maps/submaps/surface_submaps/wilderness/dogbase.dmm

@@ -658,13 +658,6 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/submap/DogBase)
-"Pm" = (
-/obj/structure/bed/chair{
-	dir = 1
-	},
-/obj/effect/map_helper/no_phaseshift/area,
-/turf/simulated/floor/tiled/dark,
-/area/submap/DogBase)
 "PB" = (
 /obj/effect/floor_decal/borderfloor/corner{
 	dir = 1
@@ -1302,7 +1295,7 @@ LP
 Yr
 VG
 Ok
-Pm
+wI
 re
 lX
 Bk

modular_chomp/maps/submaps/surface_submaps/wilderness/wilderness_areas.dm

@@ -2,7 +2,7 @@
 /area/submap
 	name = "Submap Area"
 	icon_state = "submap"
-	flags = RAD_SHIELDED | AREA_FLAG_IS_NOT_PERSISTENT | AREA_SECRET_NAME | AREA_FORBID_EVENTS
+	flags = RAD_SHIELDED | AREA_FLAG_IS_NOT_PERSISTENT | AREA_SECRET_NAME | AREA_FORBID_EVENTS | PHASE_SHIELDED
 	ambience = AMBIENCE_RUINS
 
 /area/submap/event //To be used for Events not for regular PoIs

modular_chomp/maps/submaps/surface_submaps/wilderness/xenohive.dmm

@@ -65,14 +65,6 @@
 	outdoors = 0
 	},
 /area/submap/XenoHive)
-"co" = (
-/obj/effect/alien/weeds,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/map_helper/no_phaseshift,
-/turf/simulated/floor/outdoors/rocks{
-	outdoors = 0
-	},
-/area/submap/XenoHive)
 "dm" = (
 /obj/effect/alien/weeds,
 /obj/machinery/portable_atmospherics/powered/reagent_distillery/industrial,
@@ -140,12 +132,6 @@
 	},
 /turf/simulated/floor/plating/turfpack/sif,
 /area/submap/XenoHive)
-"iX" = (
-/obj/effect/alien/weeds,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/map_helper/no_phaseshift/area,
-/turf/simulated/floor/tiled/steel_dirty/turfpack/sif,
-/area/submap/XenoHive)
 "jY" = (
 /obj/effect/alien/weeds,
 /mob/living/simple_mob/animal/space/alien/queen/empress{
@@ -715,7 +701,7 @@ zm
 Gw
 tA
 Vg
-iX
+Tb
 LB
 zU
 LB
@@ -818,7 +804,7 @@ Et
 Et
 Et
 AB
-co
+HJ
 Or
 va
 AB

modular_chomp/maps/~turfpacks/packs_sim/turfpacks_sim_outdoors.dm

@@ -330,3 +330,9 @@
 	nitrogen = TURFPACK_N2
 	phoron = TURFPACK_PHORON
 	carbon_dioxide = TURFPACK_CO2
+/turf/simulated/floor/cult/turfpack/TURFPACK_PACKNAME
+	temperature = TURFPACK_TEMP
+	oxygen = TURFPACK_O2
+	nitrogen = TURFPACK_N2
+	phoron = TURFPACK_PHORON
+	carbon_dioxide = TURFPACK_CO2