From 3d30e512138893a208ce90a9a8374cdd914c4563 Mon Sep 17 00:00:00 2001 From: AmoryBlaine Date: Wed, 3 Jul 2024 13:54:36 -0400 Subject: [PATCH 01/13] 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) . = ..() From 5f72c36dc90181dd9f0a0dd910c56bfbd3b3d694 Mon Sep 17 00:00:00 2001 From: AmoryBlaine Date: Thu, 4 Jul 2024 22:31:38 -0400 Subject: [PATCH 02/13] Comments out a thing --- code/datums/weather/weather_event.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/weather/weather_event.dm b/code/datums/weather/weather_event.dm index e7cb98f22a..3672824126 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 From 5bf27ba321de7eafefe8dc4af29a7c727ef6d12e Mon Sep 17 00:00:00 2001 From: AmoryBlaine Date: Fri, 13 Sep 2024 23:28:54 -0400 Subject: [PATCH 03/13] fixed --- code/_onclick/hud/fullscreen.dm | 8 ++++---- code/datums/weather/weather_events/big_red.dm | 3 --- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/code/_onclick/hud/fullscreen.dm b/code/_onclick/hud/fullscreen.dm index 1f440d62b0..b0e2d2b57e 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_events/big_red.dm b/code/datums/weather/weather_events/big_red.dm index b955b673b1..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!" From 34c9594f9653a1484c8127f70f51386e2304ae24 Mon Sep 17 00:00:00 2001 From: AmoryBlaine <32080743+AmoryBlaine@users.noreply.github.com> Date: Mon, 23 Sep 2024 00:58:19 -0400 Subject: [PATCH 04/13] Update code/modules/mob/living/living_defense.dm Co-authored-by: Doubleumc --- code/modules/mob/living/living_defense.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index 46a9f49df5..099a097b5f 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -213,7 +213,6 @@ SSweather.weather_event_instance.process_mob_effect(src, delta_time) if(current_weather_effect_type != starting_weather_type) - clear_fullscreen("weather") /mob/living/handle_flamer_fire(obj/flamer_fire/fire, damage, delta_time) . = ..() From f07e386825be12307699eb0dc15a9e8a1dad11d2 Mon Sep 17 00:00:00 2001 From: AmoryBlaine <32080743+AmoryBlaine@users.noreply.github.com> Date: Mon, 23 Sep 2024 00:58:32 -0400 Subject: [PATCH 05/13] Update code/modules/mob/living/living_defense.dm Co-authored-by: Doubleumc --- code/modules/mob/living/living_defense.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index 099a097b5f..f7c5ba2c75 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -212,8 +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) - /mob/living/handle_flamer_fire(obj/flamer_fire/fire, damage, delta_time) . = ..() fire.set_on_fire(src) From e998d94e49f1d29e77a6fede0526a96684300c1f Mon Sep 17 00:00:00 2001 From: AmoryBlaine <32080743+AmoryBlaine@users.noreply.github.com> Date: Mon, 23 Sep 2024 00:58:40 -0400 Subject: [PATCH 06/13] Update code/datums/weather/weather_event.dm Co-authored-by: Doubleumc --- code/datums/weather/weather_event.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/datums/weather/weather_event.dm b/code/datums/weather/weather_event.dm index 3672824126..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 From d782339484ba848bb7ea5e2dc010a9c12ddb9fd7 Mon Sep 17 00:00:00 2001 From: AmoryBlaine <32080743+AmoryBlaine@users.noreply.github.com> Date: Mon, 23 Sep 2024 00:58:45 -0400 Subject: [PATCH 07/13] Update code/datums/weather/weather_events/sorokyne.dm Co-authored-by: Doubleumc --- code/datums/weather/weather_events/sorokyne.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/datums/weather/weather_events/sorokyne.dm b/code/datums/weather/weather_events/sorokyne.dm index 72627b9f01..b97fdfe641 100644 --- a/code/datums/weather/weather_events/sorokyne.dm +++ b/code/datums/weather/weather_events/sorokyne.dm @@ -31,7 +31,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!" From 04fab6500ddd39c9f5f0634997173979b1b4db56 Mon Sep 17 00:00:00 2001 From: AmoryBlaine <32080743+AmoryBlaine@users.noreply.github.com> Date: Mon, 23 Sep 2024 00:58:51 -0400 Subject: [PATCH 08/13] Update code/datums/weather/weather_events/sorokyne.dm Co-authored-by: Doubleumc --- code/datums/weather/weather_events/sorokyne.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/datums/weather/weather_events/sorokyne.dm b/code/datums/weather/weather_events/sorokyne.dm index b97fdfe641..5182d3f79c 100644 --- a/code/datums/weather/weather_events/sorokyne.dm +++ b/code/datums/weather/weather_events/sorokyne.dm @@ -17,7 +17,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!" From 529a32bfe476238ae890ccc6250b4d25284f7ec8 Mon Sep 17 00:00:00 2001 From: AmoryBlaine <32080743+AmoryBlaine@users.noreply.github.com> Date: Mon, 23 Sep 2024 00:58:56 -0400 Subject: [PATCH 09/13] Update code/datums/weather/weather_events/sorokyne.dm Co-authored-by: Doubleumc --- code/datums/weather/weather_events/sorokyne.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/datums/weather/weather_events/sorokyne.dm b/code/datums/weather/weather_events/sorokyne.dm index 5182d3f79c..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!" From 06a096faf9acdf8dc1f0a74f280ed91577fa6e49 Mon Sep 17 00:00:00 2001 From: AmoryBlaine <32080743+AmoryBlaine@users.noreply.github.com> Date: Mon, 23 Sep 2024 00:59:01 -0400 Subject: [PATCH 10/13] Update code/datums/weather/weather_events/new_varadero.dm Co-authored-by: Doubleumc --- code/datums/weather/weather_events/new_varadero.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/datums/weather/weather_events/new_varadero.dm b/code/datums/weather/weather_events/new_varadero.dm index 5ac0f0de00..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 From fc4221c074569deb31d8f43e3d12e9d6bdb447ad Mon Sep 17 00:00:00 2001 From: AmoryBlaine <32080743+AmoryBlaine@users.noreply.github.com> Date: Mon, 23 Sep 2024 00:59:06 -0400 Subject: [PATCH 11/13] Update code/datums/weather/weather_events/lv624.dm Co-authored-by: Doubleumc --- code/datums/weather/weather_events/lv624.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/datums/weather/weather_events/lv624.dm b/code/datums/weather/weather_events/lv624.dm index 0b68a66006..e505d886de 100644 --- a/code/datums/weather/weather_events/lv624.dm +++ b/code/datums/weather/weather_events/lv624.dm @@ -18,7 +18,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 From 48b4e3b3a75291a66011fa6c5fd1959e302d172c Mon Sep 17 00:00:00 2001 From: AmoryBlaine <32080743+AmoryBlaine@users.noreply.github.com> Date: Mon, 23 Sep 2024 00:59:11 -0400 Subject: [PATCH 12/13] Update code/datums/weather/weather_events/lv624.dm Co-authored-by: Doubleumc --- code/datums/weather/weather_events/lv624.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/datums/weather/weather_events/lv624.dm b/code/datums/weather/weather_events/lv624.dm index e505d886de..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 From 05aa517ac769aeab09fc1cf7d26bd27221a72481 Mon Sep 17 00:00:00 2001 From: AmoryBlaine <32080743+AmoryBlaine@users.noreply.github.com> Date: Mon, 23 Sep 2024 00:59:18 -0400 Subject: [PATCH 13/13] Update code/datums/weather/weather_events/faction_clash.dm Co-authored-by: Doubleumc --- code/datums/weather/weather_events/faction_clash.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/datums/weather/weather_events/faction_clash.dm b/code/datums/weather/weather_events/faction_clash.dm index f523341d14..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