diff --git a/code/modules/events/wizard/advanced_darkness.dm b/code/modules/events/wizard/advanced_darkness.dm index 8e60fce2208..62603dd9a8a 100644 --- a/code/modules/events/wizard/advanced_darkness.dm +++ b/code/modules/events/wizard/advanced_darkness.dm @@ -7,8 +7,11 @@ /datum/round_event/wizard/darkness endWhen = 0 + var/started = FALSE + /datum/round_event/wizard/darkness/start() - var/datum/weather/advanced_darkness/darkness = new - darkness.weather_start_up() - return + if(!started) + started = TRUE + var/datum/weather/advanced_darkness/darkness = new + darkness.weather_start_up() diff --git a/code/modules/events/wizard/lava.dm b/code/modules/events/wizard/lava.dm index fe6044182dd..231fab230d3 100644 --- a/code/modules/events/wizard/lava.dm +++ b/code/modules/events/wizard/lava.dm @@ -7,8 +7,10 @@ /datum/round_event/wizard/lava/ endWhen = 0 + var/started = FALSE /datum/round_event/wizard/lava/start() - var/datum/weather/floor_is_lava/LAVA = new /datum/weather/floor_is_lava - LAVA.weather_start_up() - return + if(!started) + started = TRUE + var/datum/weather/floor_is_lava/LAVA = new /datum/weather/floor_is_lava + LAVA.weather_start_up() diff --git a/code/modules/mining/lavaland/weather.dm b/code/modules/mining/lavaland/weather.dm index 2d24616df50..35eb9a821ff 100644 --- a/code/modules/mining/lavaland/weather.dm +++ b/code/modules/mining/lavaland/weather.dm @@ -36,9 +36,9 @@ if(M.z == target_z) M << start_up_message - spawn(start_up_time) - stage = MAIN_STAGE - weather_main() + sleep(start_up_time) + stage = MAIN_STAGE + weather_main() /datum/weather/proc/weather_main() diff --git a/code/modules/mining/lavaland/weather_types.dm b/code/modules/mining/lavaland/weather_types.dm index 89308d4437c..32a3ad33253 100644 --- a/code/modules/mining/lavaland/weather_types.dm +++ b/code/modules/mining/lavaland/weather_types.dm @@ -52,6 +52,9 @@ if(stage == MAIN_STAGE) A.invisibility = 0 A.opacity = 1 + A.layer = overlay_layer + A.icon = 'icons/effects/weather_effects.dmi' + A.icon_state = start_up_overlay else A.invisibility = 100 A.opacity = 0