Skip to content

Commit

Permalink
Kills weather site overlays
Browse files Browse the repository at this point in the history
This kills the welder-like overlay placed on the screen during weather instances
  • Loading branch information
AmoryBlaine committed Jul 3, 2024
1 parent 188bea4 commit 3d30e51
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 20 deletions.
8 changes: 4 additions & 4 deletions code/_onclick/hud/fullscreen.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/datums/weather/weather_event.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Check warning on line 14 in code/datums/weather/weather_event.dm

View workflow job for this annotation

GitHub Actions / Run Linters

`var;` item has no effect
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

Expand Down
6 changes: 3 additions & 3 deletions code/datums/weather/weather_events/big_red.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand All @@ -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!"
Expand All @@ -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!"
Expand Down
2 changes: 1 addition & 1 deletion code/datums/weather/weather_events/faction_clash.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions code/datums/weather/weather_events/lv624.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions code/datums/weather/weather_events/new_varadero.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions code/datums/weather/weather_events/sorokyne.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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!"
Expand All @@ -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!"
Expand All @@ -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!"
Expand Down
5 changes: 1 addition & 4 deletions code/modules/mob/living/living_defense.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
. = ..()
Expand Down

0 comments on commit 3d30e51

Please sign in to comment.