Merge conflic fix

code/modules/mining/lavaland/weather.dm

@@ -36,9 +36,9 @@
 		if(M.z == target_z)
 			M << start_up_message
 
-	sleep(start_up_time)
-	stage = MAIN_STAGE
-	weather_main()
+	spawn(start_up_time)
+		stage = MAIN_STAGE
+		weather_main()
 
 
 /datum/weather/proc/weather_main()

code/modules/mining/lavaland/weather_types.dm

@@ -47,12 +47,13 @@
 	duration_overlay = ""
 	overlay_layer = 10
 
-/datum/weather/advanced_darkness/advanced_darkness/update_areas()
-	..()
+/datum/weather/advanced_darkness/update_areas()
 	for(var/area/A in impacted_areas)
 		if(stage == MAIN_STAGE)
+			A.invisibility = 0
 			A.opacity = 1
 		else
+			A.invisibility = 100
 			A.opacity = 0
 //Ash storms