Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Kills weather site overlays #320

Merged
merged 17 commits into from
Oct 7, 2024
Merged

Kills weather site overlays #320

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
3d30e51
Kills weather site overlays
AmoryBlaine Jul 3, 2024
5f72c36
Comments out a thing
AmoryBlaine Jul 5, 2024
2bf550b
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13 int…
AmoryBlaine Aug 28, 2024
8999533
Merge branch 'master' into weather-not-annoying
AmoryBlaine Sep 14, 2024
5bf27ba
fixed
AmoryBlaine Sep 14, 2024
afc7cc8
Merge branch 'weather-not-annoying' of https://github.com/AmoryBlaine…
AmoryBlaine Sep 14, 2024
34c9594
Update code/modules/mob/living/living_defense.dm
AmoryBlaine Sep 23, 2024
f07e386
Update code/modules/mob/living/living_defense.dm
AmoryBlaine Sep 23, 2024
e998d94
Update code/datums/weather/weather_event.dm
AmoryBlaine Sep 23, 2024
d782339
Update code/datums/weather/weather_events/sorokyne.dm
AmoryBlaine Sep 23, 2024
04fab65
Update code/datums/weather/weather_events/sorokyne.dm
AmoryBlaine Sep 23, 2024
529a32b
Update code/datums/weather/weather_events/sorokyne.dm
AmoryBlaine Sep 23, 2024
06a096f
Update code/datums/weather/weather_events/new_varadero.dm
AmoryBlaine Sep 23, 2024
fc4221c
Update code/datums/weather/weather_events/lv624.dm
AmoryBlaine Sep 23, 2024
48b4e3b
Update code/datums/weather/weather_events/lv624.dm
AmoryBlaine Sep 23, 2024
05aa517
Update code/datums/weather/weather_events/faction_clash.dm
AmoryBlaine Sep 23, 2024
4bea29f
Merge branch 'master' into weather-not-annoying
AmoryBlaine Sep 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions code/_onclick/hud/fullscreen.dm
View file
Open in desktop
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
AmoryBlaine marked this conversation as resolved.
Show resolved Hide resolved
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
View file
Open in desktop
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
AmoryBlaine marked this conversation as resolved.
Show resolved Hide resolved
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
View file
Open in desktop
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
View file
Open in desktop
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
AmoryBlaine marked this conversation as resolved.
Show resolved Hide resolved

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
View file
Open in desktop
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
AmoryBlaine marked this conversation as resolved.
Show resolved Hide resolved

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
AmoryBlaine marked this conversation as resolved.
Show resolved Hide resolved

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
View file
Open in desktop
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
AmoryBlaine marked this conversation as resolved.
Show resolved Hide resolved

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
View file
Open in desktop
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
AmoryBlaine marked this conversation as resolved.
Show resolved Hide resolved
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
AmoryBlaine marked this conversation as resolved.
Show resolved Hide resolved
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
AmoryBlaine marked this conversation as resolved.
Show resolved Hide resolved
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
View file
Open in desktop
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)
AmoryBlaine marked this conversation as resolved.
Show resolved Hide resolved
if(current_weather_effect_type)
overlay_fullscreen("weather", SSweather.weather_event_instance.fullscreen_type)
else
clear_fullscreen("weather")
clear_fullscreen("weather")
AmoryBlaine marked this conversation as resolved.
Show resolved Hide resolved

/mob/living/handle_flamer_fire(obj/flamer_fire/fire, damage, delta_time)
. = ..()
Expand Down
Loading