Merge pull request #6210 from Citadel-Station-13/upstream-merge-36834

[MIRROR] Removes advanced darkness
This commit is contained in:
LetterJay
2018-04-02 06:58:18 -05:00
committed by GitHub
3 changed files with 0 additions and 48 deletions
@@ -1,30 +0,0 @@
//Restricts the vision of affected mobs to a single tile in the cardinal directions.
/datum/weather/advanced_darkness
name = "advanced darkness"
desc = "Everything in the area is effectively blinded, unable to see more than a foot or so around itself."
telegraph_message = "<span class='warning'>Your eyes hurt... a vignette settles in your vision and closes in.</span>"
telegraph_duration = 150
weather_message = "<span class='userdanger'>This isn't your average everday darkness... this is <i>advanced</i> darkness!</span>"
weather_duration_lower = 300
weather_duration_upper = 300
end_message = "<span class='danger'>At last, the darkness recedes.</span>"
end_duration = 0
area_type = /area
target_trait = ZTRAIT_STATION
/datum/weather/advanced_darkness/update_areas()
for(var/V in impacted_areas)
var/area/A = V
if(stage == MAIN_STAGE)
A.invisibility = 0
A.set_opacity(TRUE)
A.layer = overlay_layer
A.icon = 'icons/effects/weather_effects.dmi'
A.icon_state = "darkness"
else
A.invisibility = INVISIBILITY_MAXIMUM
A.set_opacity(FALSE)
@@ -1,16 +0,0 @@
/datum/round_event_control/wizard/darkness
name = "Advanced Darkness"
weight = 2
typepath = /datum/round_event/wizard/darkness
max_occurrences = 2
earliest_start = 0 MINUTES
/datum/round_event/wizard/darkness
endWhen = 0
var/started = FALSE
/datum/round_event/wizard/darkness/start()
if(!started)
started = TRUE
SSweather.run_weather(/datum/weather/advanced_darkness)
-2
View File
@@ -436,7 +436,6 @@
#include "code\datums\traits\neutral.dm"
#include "code\datums\weather\weather.dm"
#include "code\datums\weather\weather_types\acid_rain.dm"
#include "code\datums\weather\weather_types\advanced_darkness.dm"
#include "code\datums\weather\weather_types\ash_storm.dm"
#include "code\datums\weather\weather_types\floor_is_lava.dm"
#include "code\datums\weather\weather_types\radiation_storm.dm"
@@ -1492,7 +1491,6 @@
#include "code\modules\events\holiday\halloween.dm"
#include "code\modules\events\holiday\vday.dm"
#include "code\modules\events\holiday\xmas.dm"
#include "code\modules\events\wizard\advanced_darkness.dm"
#include "code\modules\events\wizard\aid.dm"
#include "code\modules\events\wizard\blobies.dm"
#include "code\modules\events\wizard\curseditems.dm"