diff --git a/code/datums/weather/weather_event.dm b/code/datums/weather/weather_event.dm index 3d80b54a0e..cab98e8b2f 100644 --- a/code/datums/weather/weather_event.dm +++ b/code/datums/weather/weather_event.dm @@ -11,7 +11,6 @@ var/length = 0 // Length of the event //// Optional vars - var/fullscreen_type = null // If this is set, display a fullscreen type to mobs var/turf_overlay_icon_state // The icon to set on the VFX holder instanced into every turf at round start var/turf_overlay_alpha = 255 diff --git a/code/datums/weather/weather_events/big_red.dm b/code/datums/weather/weather_events/big_red.dm index 262e731425..73ef175e5c 100644 --- a/code/datums/weather/weather_events/big_red.dm +++ b/code/datums/weather/weather_events/big_red.dm @@ -2,7 +2,6 @@ name = "Duststorm" display_name = "Duststorm" length = 10 MINUTES - fullscreen_type = /atom/movable/screen/fullscreen/weather/low turf_overlay_icon_state = "bigred_dust" effect_message = "You feel dust blow into every crevice of your body, annoying." @@ -17,7 +16,6 @@ name = "Sandstorm" display_name = "Sandstorm" length = 6 MINUTES - fullscreen_type = /atom/movable/screen/fullscreen/weather/medium turf_overlay_icon_state = "bigred_sand" effect_message = "You feel sand scraping the upper layers of your exterior away!" @@ -32,7 +30,6 @@ name = "Rockstorm" display_name = "Rockstorm" length = 4 MINUTES - fullscreen_type = /atom/movable/screen/fullscreen/weather/high turf_overlay_icon_state = "bigred_rocks" effect_message = "You feel multiple small rocks hit all over your body!" diff --git a/code/datums/weather/weather_events/faction_clash.dm b/code/datums/weather/weather_events/faction_clash.dm index 86f8c379dd..a73fa83708 100644 --- a/code/datums/weather/weather_events/faction_clash.dm +++ b/code/datums/weather/weather_events/faction_clash.dm @@ -2,7 +2,6 @@ name = "Rainstorm" display_name = "Rainstorm" length = INFINITY - fullscreen_type = /atom/movable/screen/fullscreen/weather/low turf_overlay_icon_state = "strata_storm" turf_overlay_alpha = 80 diff --git a/code/datums/weather/weather_events/lv624.dm b/code/datums/weather/weather_events/lv624.dm index 9dd2926faf..2c694bbc66 100644 --- a/code/datums/weather/weather_events/lv624.dm +++ b/code/datums/weather/weather_events/lv624.dm @@ -2,7 +2,6 @@ name = "Light Rain" display_name = "Light Rain" length = 8 MINUTES - fullscreen_type = /atom/movable/screen/fullscreen/weather/low turf_overlay_icon_state = "strata_storm" turf_overlay_alpha = 50 @@ -18,7 +17,6 @@ name = "Heavy Rain" display_name = "Heavy Rain" length = 12 MINUTES - fullscreen_type = /atom/movable/screen/fullscreen/weather/medium turf_overlay_icon_state = "strata_storm" turf_overlay_alpha = 125 diff --git a/code/datums/weather/weather_events/new_varadero.dm b/code/datums/weather/weather_events/new_varadero.dm index 36845a2940..2a9ea50c79 100644 --- a/code/datums/weather/weather_events/new_varadero.dm +++ b/code/datums/weather/weather_events/new_varadero.dm @@ -12,7 +12,6 @@ name = "Monsoon Warning" display_name = "Monsoon Warning" length = 6 MINUTES - fullscreen_type = /atom/movable/screen/fullscreen/weather/high turf_overlay_icon_state = "strata_storm" turf_overlay_alpha = 115 diff --git a/code/datums/weather/weather_events/sorokyne.dm b/code/datums/weather/weather_events/sorokyne.dm index 0388903271..6ac20560c8 100644 --- a/code/datums/weather/weather_events/sorokyne.dm +++ b/code/datums/weather/weather_events/sorokyne.dm @@ -3,7 +3,6 @@ name = "Snow" display_name = "Snow" length = 10 MINUTES - fullscreen_type = /atom/movable/screen/fullscreen/weather/low turf_overlay_icon_state = "strata_snowing" effect_message = "You feel the icy winds chill you!" @@ -17,7 +16,6 @@ name = "Snowstorm" display_name = "Snowstorm" length = 6 MINUTES - fullscreen_type = /atom/movable/screen/fullscreen/weather/medium turf_overlay_icon_state = "strata_storm" effect_message = "You feel the icy winds of the snowstorm chill you to the bone!" @@ -31,7 +29,6 @@ name = "Blizzard" display_name = "Blizzard" length = 4 MINUTES - fullscreen_type = /atom/movable/screen/fullscreen/weather/high turf_overlay_icon_state = "strata_blizzard" effect_message = "You feel the winds of the blizzard sap all the warmth from your body!" diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index b19afb0450..f7c5ba2c75 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -212,12 +212,6 @@ current_weather_effect_type = SSweather.weather_event_type SSweather.weather_event_instance.process_mob_effect(src, delta_time) - if(current_weather_effect_type != starting_weather_type) - if(current_weather_effect_type) - overlay_fullscreen("weather", SSweather.weather_event_instance.fullscreen_type) - else - clear_fullscreen("weather") - /mob/living/handle_flamer_fire(obj/flamer_fire/fire, damage, delta_time) . = ..() fire.set_on_fire(src)