From dde4690cb4463c026ce27a765cc68398919bacc7 Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Fri, 1 Jan 2016 05:43:17 -0600 Subject: [PATCH 1/2] Fixes floor is lava and advanced darkness --- code/modules/events/wizard/advanced_darkness.dm | 5 +++-- code/modules/events/wizard/lava.dm | 5 +++-- code/modules/mining/lavaland/weather_types.dm | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/code/modules/events/wizard/advanced_darkness.dm b/code/modules/events/wizard/advanced_darkness.dm index 8e60fce2208..3a2f5b92b16 100644 --- a/code/modules/events/wizard/advanced_darkness.dm +++ b/code/modules/events/wizard/advanced_darkness.dm @@ -9,6 +9,7 @@ endWhen = 0 /datum/round_event/wizard/darkness/start() - var/datum/weather/advanced_darkness/darkness = new - darkness.weather_start_up() + spawn() + var/datum/weather/advanced_darkness/darkness = new + darkness.weather_start_up() return diff --git a/code/modules/events/wizard/lava.dm b/code/modules/events/wizard/lava.dm index fe6044182dd..24184026a97 100644 --- a/code/modules/events/wizard/lava.dm +++ b/code/modules/events/wizard/lava.dm @@ -9,6 +9,7 @@ endWhen = 0 /datum/round_event/wizard/lava/start() - var/datum/weather/floor_is_lava/LAVA = new /datum/weather/floor_is_lava - LAVA.weather_start_up() + spawn() + var/datum/weather/floor_is_lava/LAVA = new /datum/weather/floor_is_lava + LAVA.weather_start_up() return diff --git a/code/modules/mining/lavaland/weather_types.dm b/code/modules/mining/lavaland/weather_types.dm index e32fbf4dc7a..89308d4437c 100644 --- a/code/modules/mining/lavaland/weather_types.dm +++ b/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 From 28a0c48403f10352a6e3c47c6655582b162e39d2 Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Sat, 2 Jan 2016 23:21:46 -0600 Subject: [PATCH 2/2] Moves spawn to weather --- code/modules/events/wizard/advanced_darkness.dm | 5 ++--- code/modules/events/wizard/lava.dm | 5 ++--- code/modules/mining/lavaland/weather.dm | 6 +++--- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/code/modules/events/wizard/advanced_darkness.dm b/code/modules/events/wizard/advanced_darkness.dm index 3a2f5b92b16..8e60fce2208 100644 --- a/code/modules/events/wizard/advanced_darkness.dm +++ b/code/modules/events/wizard/advanced_darkness.dm @@ -9,7 +9,6 @@ endWhen = 0 /datum/round_event/wizard/darkness/start() - spawn() - var/datum/weather/advanced_darkness/darkness = new - darkness.weather_start_up() + var/datum/weather/advanced_darkness/darkness = new + darkness.weather_start_up() return diff --git a/code/modules/events/wizard/lava.dm b/code/modules/events/wizard/lava.dm index 24184026a97..fe6044182dd 100644 --- a/code/modules/events/wizard/lava.dm +++ b/code/modules/events/wizard/lava.dm @@ -9,7 +9,6 @@ endWhen = 0 /datum/round_event/wizard/lava/start() - spawn() - var/datum/weather/floor_is_lava/LAVA = new /datum/weather/floor_is_lava - LAVA.weather_start_up() + var/datum/weather/floor_is_lava/LAVA = new /datum/weather/floor_is_lava + LAVA.weather_start_up() return diff --git a/code/modules/mining/lavaland/weather.dm b/code/modules/mining/lavaland/weather.dm index 35eb9a821ff..2d24616df50 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 - sleep(start_up_time) - stage = MAIN_STAGE - weather_main() + spawn(start_up_time) + stage = MAIN_STAGE + weather_main() /datum/weather/proc/weather_main()