From b9bf6ef5474c94bc41cb176e7ed8f99e8fd57a45 Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Thu, 31 Dec 2015 19:32:02 -0600 Subject: [PATCH] Advanced Darkness --- code/modules/events/wizard/advanced_darkness.dm | 6 +++--- code/modules/events/wizard/lava.dm | 4 ++-- code/modules/mining/lavaland/weather_types.dm | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/code/modules/events/wizard/advanced_darkness.dm b/code/modules/events/wizard/advanced_darkness.dm index e5ed8d93a1c..8e60fce2208 100644 --- a/code/modules/events/wizard/advanced_darkness.dm +++ b/code/modules/events/wizard/advanced_darkness.dm @@ -6,9 +6,9 @@ earliest_start = 0 /datum/round_event/wizard/darkness - - endWhen = 10 + endWhen = 0 /datum/round_event/wizard/darkness/start() - var/datum/weather/advanced_darkness/darkness = new /datum/weather/advanced_darkness + 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 f6cfff8dfe6..fe6044182dd 100644 --- a/code/modules/events/wizard/lava.dm +++ b/code/modules/events/wizard/lava.dm @@ -6,9 +6,9 @@ earliest_start = 0 /datum/round_event/wizard/lava/ - - endWhen = 30 //half a minutes + 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() + return diff --git a/code/modules/mining/lavaland/weather_types.dm b/code/modules/mining/lavaland/weather_types.dm index 1415b596b77..e32fbf4dc7a 100644 --- a/code/modules/mining/lavaland/weather_types.dm +++ b/code/modules/mining/lavaland/weather_types.dm @@ -31,10 +31,10 @@ /datum/weather/advanced_darkness name = "advanced darkness" start_up_time = 100 //10 seconds - start_up_message = "The lights begin to dim...is power going out?" + start_up_message = "The lights begin to dim... is power going out?" duration_lower = 45 duration_upper = 60 //1 minute - duration_message = "This isn't average everyday darkness...this is advanced darkness!" + duration_message = "This isn't average everyday darkness... this is advanced darkness!" wind_down = 100 // 10 seconds wind_down_message = "The darkness is receding. Thank god." purely_aesthetic = TRUE @@ -43,8 +43,8 @@ exclude_walls = TRUE area_type = /area - start_up_overlay = "darkness" - duration_overlay = "darkness" + start_up_overlay = "" + duration_overlay = "" overlay_layer = 10 /datum/weather/advanced_darkness/advanced_darkness/update_areas()