diff --git a/code/datums/weather/weather_types/acid_rain.dm b/code/datums/weather/weather_types/acid_rain.dm deleted file mode 100644 index 5c5809bae81..00000000000 --- a/code/datums/weather/weather_types/acid_rain.dm +++ /dev/null @@ -1,32 +0,0 @@ -//Acid rain is part of the natural weather cycle in the humid forests of Planetstation, and cause acid damage to anyone unprotected. -/datum/weather/acid_rain - name = "acid rain" - desc = "The planet's thunderstorms are by nature acidic, and will incinerate anyone standing beneath them without protection." - - telegraph_duration = 400 - telegraph_message = "Thunder rumbles far above. You hear droplets drumming against the canopy. Seek shelter." - telegraph_sound = 'sound/ambience/acidrain_start.ogg' - - weather_message = "Acidic rain pours down around you! Get inside!" - weather_overlay = "acid_rain" - weather_duration_lower = 600 - weather_duration_upper = 1500 - weather_sound = 'sound/ambience/acidrain_mid.ogg' - - end_duration = 100 - end_message = "The downpour gradually slows to a light shower. It should be safe outside now." - end_sound = 'sound/ambience/acidrain_end.ogg' - - area_type = /area - protect_indoors = TRUE - target_trait = ZTRAIT_ACIDRAIN - - immunity_type = WEATHER_ACID // temp - - barometer_predictable = TRUE - - -/datum/weather/acid_rain/weather_act(mob/living/L) - var/resist = L.getarmor(null, ACID) - if(prob(max(0,100-resist))) - L.acid_act(20,20) diff --git a/code/datums/weather/weather_types/void_storm.dm b/code/datums/weather/weather_types/void_storm.dm index 9091ecb63f6..a502d992054 100644 --- a/code/datums/weather/weather_types/void_storm.dm +++ b/code/datums/weather/weather_types/void_storm.dm @@ -3,10 +3,11 @@ desc = "A rare and highly anomalous event often accompanied by unknown entities shredding spacetime continouum. We'd advise you to start running." telegraph_duration = 2 SECONDS - telegraph_overlay = "void" + telegraph_overlay = "light_snow" weather_message = "You feel air around you getting colder... and void's sweet embrace..." - weather_overlay = "void_storm" + weather_overlay = "snow_storm" + weather_color = COLOR_BLACK weather_duration_lower = 60 SECONDS weather_duration_upper = 120 SECONDS diff --git a/icons/effects/weather_effects.dmi b/icons/effects/weather_effects.dmi index 4ae2387692a..0149245d943 100644 Binary files a/icons/effects/weather_effects.dmi and b/icons/effects/weather_effects.dmi differ diff --git a/tgstation.dme b/tgstation.dme index e19bda9ea86..e752636fede 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -858,7 +858,6 @@ #include "code\datums\status_effects\status_effect.dm" #include "code\datums\status_effects\wound_effects.dm" #include "code\datums\weather\weather.dm" -#include "code\datums\weather\weather_types\acid_rain.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"