Cumullative fix fow CoutAlex away mission maps.

maps/away/marooned/marooned.dm

@@ -2,6 +2,11 @@
 #include "marooned.dmm"
 #include "../mining/mining_areas.dm"
 
+/turf/simulated/floor/marooned/snow
+	name = "snow"
+	icon = 'icons/turf/snow.dmi'
+	icon_state = "snow"
+	temperature = T20C - 40
 
 /obj/effect/overmap/sector/marooned
 	name = "Glacier planet with power signature in polar region"
@@ -12,7 +17,7 @@
 	generic_waypoints = list(
 		"nav_marooned_1",
 		"nav_marooned_2",
-		"nav_lmarooned_antag"
+		"nav_marooned_antag"
 	)
 
 /obj/effect/shuttle_landmark/nav_marooned/nav1

maps/away/marooned/marooned_areas.dm

@@ -2,6 +2,7 @@
 	name = "\improper Snow-covered mountain area"
 	icon_state = "marooned_snow"
 	icon = 'marooned_sprites.dmi'
+	sound_env = FOREST
 
 /area/marooned/marooned_hut
 	name = "\improper Little wooden hut"

maps/away/smugglers/smugglers.dmm

@@ -1,8 +1,8 @@
 "aa" = (/turf/space,/area/space)
-"ab" = (/turf/space,/area/overmap)
-"ac" = (/turf/simulated/floor/asteroid,/area/mine/explored)
-"ad" = (/turf/unsimulated/mask,/area/mine/unexplored)
-"ae" = (/obj/random/shoes,/turf/space,/area/space)
+"ab" = (/turf/simulated/floor/asteroid,/area/mine/explored)
+"ac" = (/turf/unsimulated/mask,/area/mine/unexplored)
+"ad" = (/obj/random/shoes,/turf/space,/area/space)
+"ae" = (/obj/effect/overmap/sector/smugglers,/turf/space,/area/space)
 "af" = (/turf/simulated/wall/r_wall,/area/smugglers/base)
 "ag" = (/obj/machinery/door/airlock/external{frequency = 1503; icon_state = "door_closed"; locked = 0},/turf/simulated/floor/airless/ceiling,/area/smugglers/base)
 "ah" = (/obj/effect/landmark/corpse,/obj/effect/decal/cleanable/blood,/turf/simulated/floor/asteroid,/area/mine/explored)
@@ -134,52 +134,52 @@
 (1,1,1) = {"
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaaaaacaaacacadaaaaaaaaaaadaaacacadaaaaaaadadaaadaaaaaaaaaaaaaaaaaaaa
-aaaaaaacadadaaaaaaaaaaaaaaaaaaaaaaaaacacacacacadadaaaaaaadadadacadaaaeaaadadaaadadaaaaaaaaaaaaaaaaaa
-aaaaaaacacadaaaaaaaaaaaaaaaaaaaaaaaaaaacadadacacacacaaaaaaadadadacaaaaaaaaadadadadaaaaaaaaaaaaaaaaaa
-aaaaaaadacacaaaaafagafaaaaaaacaaaaaaaaacadadacacaaacaaaaaaadadahaiajajaaaaadadadadadadadaaaaaaaaaaaa
-aaaaaaaaadacacacakalafaaaaacadamaaaaaaadadadacacacadadadadadadacadadacacacacacadadacacadacacaaaaaaaa
-aaaaaaaaadacacadafanafafafafafaoapaqafafafafafarafasadadadadacadadadacacacacacadacacadadadacaaaaaaaa
-aaaaaaaaacacacacafatauavawaxayazaAaBaCaDaAaEaFaGaHaIacacadadacadacacaJacacacacacacacadadadacaaaaaaaa
-aaaaaaaaacacadadafaKaLaMaNaNaLaLaOaPaQaRaSaTafafafadacacacacacacacacacadacacacacacadadadadaaaaaaaaaa
-aaaaaaaaacadadadafaUaVaWaXaYaZaVaVbaaQaZaZbbafadadadadadadadbcacacadadacacacacadadadadadadaaaaaaaaaa
-aaaaaaaaadadadadafbdaZbebfbgaVaVaVbaaQbhbibjafadadadadadadadbkblacadadacadadadacadadadadadacaaaaaaaa
-aaaaaaacadadadadafbmbnbobpbqaZaVaVbrbsbsbsbsbtadadadadadadadadadadadadacacacacacacacacaaaaaaaaaaaaaa
-aaaaaaacacadadadafbdbubvbwbxaVaZaVbybzbAbBbCbtadadadadadadadadadadadadadadadaJacacadacaaaaaaaaaaaaaa
-aaaaaaadacadadadafbdaZbDbEbFaZaZaZbGbsbHbIbJbtacadadadadadadadadadadadadadadadacadacacaaaaaaaaaaaaaa
-aaaaaaadacacadadafbKaZaZaZaZbLbMaZbNbsbHbObObtadadadadadadadadadadacacadadadadacadacadaaaaaaaaaaaaaa
-aaaaaaaaaaadadacafbdbPbQbRbSbTbUaZbVbsbWbXbYbtadacacacacacadadadadacadadadadadadacacacaaaaacaaaaaaaa
-aaaaaaaaaaadadacbZcacbcbcbcbcbcbcbcbbZbtbtbtbtadacacacacacadadadadacacadadadadacadadacaaaaacaaaaaaaa
-aaaaaaaaaaaaadadbZcccdcecfcgchcbcicjbZadadadadadadadacadadadadadadacacacadadadaJacacacadadadaaaaaaaa
-aaaaaaaaacadadadbZckclclclclcmcncocpbZacacacacacacadcqadadadadadadadacacacadadacadadadadadaaaaaaaaaa
-aaaaaaaaacacadadbZclcrcsctcucvcbbZbZbZadadadacacacadacacadadadadacadadadadadadacadadadadadaaaaaaaaaa
-aaaaaaaaaaacadadbZcwcbcbcbcbcbcbbZacadadadadacacacacacaJacadadacacadadadadadacacadadacacacacadaaaaaa
-aaaaaaaaaaacadadbZclcxcycxcycxcybZacadadadadadadacacadadacacacacadadadacacacacadadadacacacadadaaaaaa
-aaaaaaadaaacacadbZclczclclclczclbZadadadacacacacacadadadacacadacacadadaJadadadadadadacacacadadaaaaaa
-aaaaaaacacacacadbZbZbZbZbZbZbZbZbZadacacacacacadadadadadacadadadacacacacadadadaaaaaaaaaaaaaaadaaaaaa
-aaaaaaaaaaaaacadadacacadadadadadacacacaJadadadacadadadadadadadadadadadadadaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaadadadacadadadadadadadadadaJacadacadadadaaaaadadadadadadadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaacadacadadadadacacacacaJacacacacacadadadaaaaadadadadacadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaacacadacadadacacacacacacacacacacacacacacadaaaaadadadadacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaacacacadacacacacacacacacacacacacacacacadadadadadadadadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaacacacadacacacacacacacacacacacacacacacacadadacacadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaacacadadadacacacacacacacacacacacacacacacadadacacacacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaacacadadacacacacacacacacacacacacacacacacadadadadacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaacacaaaaacacacacacacacacacacacacacacacacacacacacacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaacacacacacacacacacacacacacacacacacadadadadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaacacacacacacacaccAacacacacacacacacacadadadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaacacacacacacacacacacacacacacacacacadadaaaaaaaaaaaaaaaaaaaaaaaacBaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaacacacacacacacacacacacacacacacacacacadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaadadacacacacacacacacacacacacacacacacacacacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaadadacacacacacacacacacacacacacacacadadacadadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaadadadadadacacacacacacacacacacacacacacadadacacacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaadadadadadadacacacacacacacacacacacacacacacadadadacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaadadacadadadacacacacacacacacacacacacacacacacacacacacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaadadadadadadadadadacacacacacacacacacadacacacadadadadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaadadadadaaaaaaaaadadadadacacadadacacacadadadadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaadadadadadadaaaaaaaaaaaaadacacacacacadadadadadadadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaadadadadacaaaaaaaaaaaaaaaaaaaaaaaaadadadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaadadadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaababacaaaaaaaaaaacaaababacaaaaaaacacaaacaaaaaaaaaaaaaaaaaaaa
+aaaaaaabacacaaaaaaaaaaaaaaaaaaaaaaaaabababababacacaaaaaaacacacabacaaadaaacacaaacacaaaaaaaaaaaaaaaaaa
+aaaaaaababacaaaaaaaeaaaaaaaaaaaaaaaaaaabacacababababaaaaaaacacacabaaaaaaaaacacacacaaaaaaaaaaaaaaaaaa
+aaaaaaacababaaaaafagafaaaaaaabaaaaaaaaabacacababaaabaaaaaaacacahaiajajaaaaacacacacacacacaaaaaaaaaaaa
+aaaaaaaaacabababakalafaaaaabacamaaaaaaacacacabababacacacacacacabacacabababababacacababacababaaaaaaaa
+aaaaaaaaacababacafanafafafafafaoapaqafafafafafarafasacacacacabacacacabababababacababacacacabaaaaaaaa
+aaaaaaaaababababafatauavawaxayazaAaBaCaDaAaEaFaGaHaIababacacabacababaJabababababababacacacabaaaaaaaa
+aaaaaaaaababacacafaKaLaMaNaNaLaLaOaPaQaRaSaTafafafacabababababababababacabababababacacacacaaaaaaaaaa
+aaaaaaaaabacacacafaUaVaWaXaYaZaVaVbaaQaZaZbbafacacacacacacacbcababacacababababacacacacacacaaaaaaaaaa
+aaaaaaaaacacacacafbdaZbebfbgaVaVaVbaaQbhbibjafacacacacacacacbkblabacacabacacacabacacacacacabaaaaaaaa
+aaaaaaabacacacacafbmbnbobpbqaZaVaVbrbsbsbsbsbtacacacacacacacacacacacacababababababababaaaaaaaaaaaaaa
+aaaaaaababacacacafbdbubvbwbxaVaZaVbybzbAbBbCbtacacacacacacacacacacacacacacacaJababacabaaaaaaaaaaaaaa
+aaaaaaacabacacacafbdaZbDbEbFaZaZaZbGbsbHbIbJbtabacacacacacacacacacacacacacacacabacababaaaaaaaaaaaaaa
+aaaaaaacababacacafbKaZaZaZaZbLbMaZbNbsbHbObObtacacacacacacacacacacababacacacacabacabacaaaaaaaaaaaaaa
+aaaaaaaaaaacacabafbdbPbQbRbSbTbUaZbVbsbWbXbYbtacabababababacacacacabacacacacacacabababaaaaabaaaaaaaa
+aaaaaaaaaaacacabbZcacbcbcbcbcbcbcbcbbZbtbtbtbtacabababababacacacacababacacacacabacacabaaaaabaaaaaaaa
+aaaaaaaaaaaaacacbZcccdcecfcgchcbcicjbZacacacacacacacabacacacacacacabababacacacaJabababacacacaaaaaaaa
+aaaaaaaaabacacacbZckclclclclcmcncocpbZababababababaccqacacacacacacacabababacacabacacacacacaaaaaaaaaa
+aaaaaaaaababacacbZclcrcsctcucvcbbZbZbZacacacabababacababacacacacabacacacacacacabacacacacacaaaaaaaaaa
+aaaaaaaaaaabacacbZcwcbcbcbcbcbcbbZabacacacacabababababaJabacacababacacacacacababacacababababacaaaaaa
+aaaaaaaaaaabacacbZclcxcycxcycxcybZabacacacacacacababacacababababacacacababababacacacabababacacaaaaaa
+aaaaaaacaaababacbZclczclclclczclbZacacacabababababacacacababacababacacaJacacacacacacabababacacaaaaaa
+aaaaaaababababacbZbZbZbZbZbZbZbZbZacabababababacacacacacabacacacababababacacacaaaaaaaaaaaaaaacaaaaaa
+aaaaaaaaaaaaabacacababacacacacacabababaJacacacabacacacacacacacacacacacacacaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaacacacabacacacacacacacacacaJabacabacacacaaaaacacacacacacacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaabacabacacacacababababaJabababababacacacaaaaacacacacabacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaababacabacacababababababababababababababacaaaaacacacacabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaabababacabababababababababababababababacacacacacacacacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaabababacababababababababababababababababacacababacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaababacacacabababababababababababababababacacababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaababacacababababababababababababababababacacacacabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaababaaaaabababababababababababababababababababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaabababababababababababababababababacacacacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaababababababababcAabababababababababacacacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaabababababababababababababababababacacaaaaaaaaaaaaaaaaaaaaaaaacBaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaababababababababababababababababababacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaacacabababababababababababababababababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaacacabababababababababababababababacacabacacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaacacacacacababababababababababababababacacabababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaacacacacacacabababababababababababababababacacacabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaacacabacacacababababababababababababababababababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaacacacacacacacacacabababababababababacabababacacacacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaacacacacaaaaaaaaacacacacababacacabababacacacacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaacacacacacacaaaaaaaaaaaaacabababababacacacacacacacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaacacacacabaaaaaaaaaaaaaaaaaaaaaaaaacacacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaacacacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-"}
+"}

maps/torch/torch_define.dm

@@ -82,6 +82,12 @@
 	new /datum/random_map/noise/ore(null,1,1,7,64, 64)             // Create the mining ore distribution map.
 	new /datum/random_map/automata/cave_system(null,1,1,10,world.maxx,world.maxy) // Create the mining Z-level.
 	new /datum/random_map/noise/ore(null,1,1,9,64, 64)             // Create the mining ore distribution map.
+	new /datum/random_map/automata/cave_system(null,1,1,12,world.maxx,world.maxy) // lost_supply_base
+	new /datum/random_map/noise/ore(null,1,1,12,64, 64)             // Create the mining ore distribution map.
+	new /datum/random_map/automata/cave_system(null,1,1,13,world.maxx,world.maxy) // marooned
+	new /datum/random_map/noise/ore(null,1,1,13,64, 64)             // Create the mining ore distribution map.
+	new /datum/random_map/automata/cave_system(null,1,1,14,world.maxx,world.maxy) // smugglers.
+	new /datum/random_map/noise/ore(null,1,1,14,64, 64)             // Create the mining ore distribution map.
 	return 1
 
 //Overriding event containers to remove random versions of overmap events - electrical storm, dust and meteor

maps/torch/torch_unit_testing.dm

@@ -80,7 +80,11 @@
 		/area/ship/scrap/shuttle/lift = NO_SCRUBBER|NO_VENT|NO_APC,
 		/area/ship/scrap/command/hallway = NO_SCRUBBER|NO_VENT,
 		/area/marooned/marooned_snow = NO_SCRUBBER|NO_VENT|NO_APC,
-		/area/marooned/marooned_hut = NO_SCRUBBER|NO_VENT|NO_APC
+		/area/marooned/marooned_hut = NO_SCRUBBER|NO_VENT|NO_APC,
+		/area/lost_supply_base_solar = NO_SCRUBBER,
+		/area/smugglers/base = NO_SCRUBBER,
+		/area/smugglers/dorms = NO_SCRUBBER|NO_VENT,
+		/area/smugglers/office = NO_SCRUBBER|NO_VENT
 	)
 
 	area_coherency_test_exempt_areas = list(