Conflicts!!!

code/modules/awaymissions/mission_code/Cabin.dm

@@ -1,20 +1,39 @@
 
 /*Cabin areas*/
-/area/awaymission/snowforest
-	name = "Snow Forest"
-	icon_state = "away"
-	requires_power = FALSE
-	dynamic_lighting = DYNAMIC_LIGHTING_ENABLED
-
 /area/awaymission/cabin
 	name = "Cabin"
 	icon_state = "away2"
 	requires_power = TRUE
 	dynamic_lighting = DYNAMIC_LIGHTING_ENABLED
 
-/area/awaymission/snowforest/lumbermill
+/area/awaymission/cabin/snowforest
+	name = "Snow Forest"
+	icon_state = "away"
+	dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
+
+/area/awaymission/cabin/snowforest/sovietsurface
+	name = "Snow Forest"
+	icon_state = "awaycontent29"
+	requires_power = FALSE
+
+/area/awaymission/cabin/lumbermill
 	name = "Lumbermill"
 	icon_state = "away3"
+	requires_power = FALSE
+	dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
+
+/area/awaymission/cabin/caves/sovietcave
+	name = "Soviet Bunker"
+	icon_state = "awaycontent4"
+
+/area/awaymission/cabin/caves
+	name = "North Snowdin Caves"
+	icon_state = "awaycontent15"
+	dynamic_lighting = DYNAMIC_LIGHTING_FORCED
+
+/area/awaymission/cabin/caves/mountain
+	name = "North Snowdin Mountains"
+	icon_state = "awaycontent24"
 
 /obj/structure/firepit
 	name = "firepit"
@@ -92,7 +111,7 @@
 	egg_type = null
 	speak = list()
 
-/*Cabin's forest*/
+/*Cabin's forest. Removed in the new cabin map since it was buggy and I prefer manual placement.*/
 /datum/mapGenerator/snowy
 	modules = list(/datum/mapGeneratorModule/bottomlayer/snow, \
 	/datum/mapGeneratorModule/snow/pineTrees, \
@@ -136,4 +155,4 @@
 	endTurfX = 159
 	endTurfY = 157
 	startTurfX = 37
-	startTurfY = 35
+	startTurfY = 35