From 3d30e512138893a208ce90a9a8374cdd914c4563 Mon Sep 17 00:00:00 2001 From: AmoryBlaine Date: Wed, 3 Jul 2024 13:54:36 -0400 Subject: [PATCH] Kills weather site overlays This kills the welder-like overlay placed on the screen during weather instances --- code/_onclick/hud/fullscreen.dm | 8 ++++---- code/datums/weather/weather_event.dm | 2 +- code/datums/weather/weather_events/big_red.dm | 6 +++--- code/datums/weather/weather_events/faction_clash.dm | 2 +- code/datums/weather/weather_events/lv624.dm | 4 ++-- code/datums/weather/weather_events/new_varadero.dm | 4 ++-- code/datums/weather/weather_events/sorokyne.dm | 6 +++--- code/modules/mob/living/living_defense.dm | 5 +---- 8 files changed, 17 insertions(+), 20 deletions(-) diff --git a/code/_onclick/hud/fullscreen.dm b/code/_onclick/hud/fullscreen.dm index b0e2d2b57e..1f440d62b0 100644 --- a/code/_onclick/hud/fullscreen.dm +++ b/code/_onclick/hud/fullscreen.dm @@ -187,20 +187,20 @@ //Weather overlays// -/atom/movable/screen/fullscreen/weather +///atom/movable/screen/fullscreen/weather icon_state = "initialize this" layer = FULLSCREEN_WEATHER_LAYER appearance_flags = NONE show_when_dead = TRUE -/atom/movable/screen/fullscreen/weather/low +///atom/movable/screen/fullscreen/weather/low icon_state = "impairedoverlay1" -/atom/movable/screen/fullscreen/weather/medium +///atom/movable/screen/fullscreen/weather/medium icon_state = "impairedoverlay2" -/atom/movable/screen/fullscreen/weather/high +///atom/movable/screen/fullscreen/weather/high icon_state = "impairedoverlay3" /atom/movable/screen/fullscreen/lighting_backdrop diff --git a/code/datums/weather/weather_event.dm b/code/datums/weather/weather_event.dm index 3d80b54a0e..e7cb98f22a 100644 --- a/code/datums/weather/weather_event.dm +++ b/code/datums/weather/weather_event.dm @@ -11,7 +11,7 @@ var/length = 0 // Length of the event //// Optional vars - var/fullscreen_type = null // If this is set, display a fullscreen type to mobs + 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..b955b673b1 100644 --- a/code/datums/weather/weather_events/big_red.dm +++ b/code/datums/weather/weather_events/big_red.dm @@ -2,7 +2,7 @@ name = "Duststorm" display_name = "Duststorm" length = 10 MINUTES - fullscreen_type = /atom/movable/screen/fullscreen/weather/low + ////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 +17,7 @@ name = "Sandstorm" display_name = "Sandstorm" length = 6 MINUTES - fullscreen_type = /atom/movable/screen/fullscreen/weather/medium + ////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 +32,7 @@ name = "Rockstorm" display_name = "Rockstorm" length = 4 MINUTES - fullscreen_type = /atom/movable/screen/fullscreen/weather/high + ////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..f523341d14 100644 --- a/code/datums/weather/weather_events/faction_clash.dm +++ b/code/datums/weather/weather_events/faction_clash.dm @@ -2,7 +2,7 @@ name = "Rainstorm" display_name = "Rainstorm" length = INFINITY - fullscreen_type = /atom/movable/screen/fullscreen/weather/low + //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..0b68a66006 100644 --- a/code/datums/weather/weather_events/lv624.dm +++ b/code/datums/weather/weather_events/lv624.dm @@ -2,7 +2,7 @@ name = "Light Rain" display_name = "Light Rain" length = 8 MINUTES - fullscreen_type = /atom/movable/screen/fullscreen/weather/low + //fullscreen_type = /atom/movable/screen/fullscreen/weather/low turf_overlay_icon_state = "strata_storm" turf_overlay_alpha = 50 @@ -18,7 +18,7 @@ name = "Heavy Rain" display_name = "Heavy Rain" length = 12 MINUTES - fullscreen_type = /atom/movable/screen/fullscreen/weather/medium + //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 f2af23c3f1..7b15e69139 100644 --- a/code/datums/weather/weather_events/new_varadero.dm +++ b/code/datums/weather/weather_events/new_varadero.dm @@ -2,7 +2,7 @@ name = "Tropical Storm" display_name = "Tropical Storm" length = 4 MINUTES - fullscreen_type = /atom/movable/screen/fullscreen/weather/low + //fullscreen_type = /atom/movable/screen/fullscreen/weather/low turf_overlay_icon_state = "strata_storm" turf_overlay_alpha = 40 @@ -21,7 +21,7 @@ name = "Monsoon Warning" display_name = "Monsoon Warning" length = 6 MINUTES - fullscreen_type = /atom/movable/screen/fullscreen/weather/high + //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..72627b9f01 100644 --- a/code/datums/weather/weather_events/sorokyne.dm +++ b/code/datums/weather/weather_events/sorokyne.dm @@ -3,7 +3,7 @@ name = "Snow" display_name = "Snow" length = 10 MINUTES - fullscreen_type = /atom/movable/screen/fullscreen/weather/low + //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 +17,7 @@ name = "Snowstorm" display_name = "Snowstorm" length = 6 MINUTES - fullscreen_type = /atom/movable/screen/fullscreen/weather/medium + //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 +31,7 @@ name = "Blizzard" display_name = "Blizzard" length = 4 MINUTES - fullscreen_type = /atom/movable/screen/fullscreen/weather/high + //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 375594574a..9d0636bf84 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -213,10 +213,7 @@ 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") + clear_fullscreen("weather") /mob/living/handle_flamer_fire(obj/flamer_fire/fire, damage, delta_time) . = ..()