From 8fa8b2163ffcaa0de8932352940fe166a0ce0b7e Mon Sep 17 00:00:00 2001 From: SunoFang Date: Wed, 7 Aug 2024 23:37:19 +0200 Subject: [PATCH 01/18] adds infinite weather! --- code/datums/weather/weather_events/long.dm | 48 +++++++++++++++++++ .../weather_events/lv522_chances_claim.dm | 2 + .../weather/weather_events/new_varadero.dm | 2 +- 3 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 code/datums/weather/weather_events/long.dm diff --git a/code/datums/weather/weather_events/long.dm b/code/datums/weather/weather_events/long.dm new file mode 100644 index 0000000000..428da31273 --- /dev/null +++ b/code/datums/weather/weather_events/long.dm @@ -0,0 +1,48 @@ +// Weather events for Big Red +/datum/weather_event/dust/infinite + name = "Duststorm (Infinite)" + length = 600 MINUTES + +/datum/weather_event/sand/infinite + name = "Sandstorm (Infinite)" + length = 600 MINUTES + +/datum/weather_event/rock/infinite + name = "Rockstorm (Infinite)" + length = 600 MINUTES + +// Weather events for Chances Claim +/datum/weather_event/light_rain/lv522/infinite + name = "LV522 Light Rain (Infinite)" + length = 600 MINUTES + +// Weather events for LV624 +/datum/weather_event/light_rain/infinite + name = "Light Rain (Infinite)" + length = 600 MINUTES + +/datum/weather_event/heavy_rain/infinite + name = "Heavy Rain (Infinite)" + length = 600 MINUTES + +// Weather events for New Varadero +/datum/weather_event/light_rain/varadero/infinite + name = "Tropical Storm (Infinite)" + length = 600 MINUTES + +/datum/weather_event/monsoon/infinite + name = "Monsoon Warning (Infinite)" + length = 600 MINUTES + +// Weather events for Sorokyne +/datum/weather_event/snow/infinite + name = "Snow (Infinite)" + length = 600 MINUTES + +/datum/weather_event/snowstorm/infinite + name = "Snowstorm (Infinite)" + length = 600 MINUTES + +/datum/weather_event/blizzard/infinite + name = "Blizzard (Infinite)" + length = 600 MINUTES diff --git a/code/datums/weather/weather_events/lv522_chances_claim.dm b/code/datums/weather/weather_events/lv522_chances_claim.dm index 6b7b296b8c..9d1ec84d71 100644 --- a/code/datums/weather/weather_events/lv522_chances_claim.dm +++ b/code/datums/weather/weather_events/lv522_chances_claim.dm @@ -1,4 +1,6 @@ /datum/weather_event/light_rain/lv522 + name = "LV522 Light Rain" + display_name = "Light Rain" length = 3 MINUTES lightning_chance = 4 diff --git a/code/datums/weather/weather_events/new_varadero.dm b/code/datums/weather/weather_events/new_varadero.dm index f2af23c3f1..311c90b05f 100644 --- a/code/datums/weather/weather_events/new_varadero.dm +++ b/code/datums/weather/weather_events/new_varadero.dm @@ -1,4 +1,4 @@ -/datum/weather_event/light_rain +/datum/weather_event/light_rain/varadero name = "Tropical Storm" display_name = "Tropical Storm" length = 4 MINUTES From b9205b8007db32b5d3cd9e8dd98094e201a8f4e9 Mon Sep 17 00:00:00 2001 From: sunofang <38206283+sunofang@users.noreply.github.com> Date: Wed, 7 Aug 2024 23:42:56 +0200 Subject: [PATCH 02/18] Oops, forgot include! --- colonialmarines.dme | 1 + 1 file changed, 1 insertion(+) diff --git a/colonialmarines.dme b/colonialmarines.dme index d75338ecfe..894acc9560 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -660,6 +660,7 @@ #include "code\datums\supply_packs\weapons.dm" #include "code\datums\weather\weather_event.dm" #include "code\datums\weather\weather_map_holder.dm" +#include "code\datums\weather\weather_events\long.dm" #include "code\datums\weather\weather_events\big_red.dm" #include "code\datums\weather\weather_events\faction_clash.dm" #include "code\datums\weather\weather_events\lv522_chances_claim.dm" From d2757d51355a910e53d06d12a689b15100bbb31d Mon Sep 17 00:00:00 2001 From: SunoFang Date: Wed, 7 Aug 2024 23:51:20 +0200 Subject: [PATCH 03/18] Oops, forgot include! --- colonialmarines.dme | 1 + 1 file changed, 1 insertion(+) diff --git a/colonialmarines.dme b/colonialmarines.dme index d75338ecfe..894acc9560 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -660,6 +660,7 @@ #include "code\datums\supply_packs\weapons.dm" #include "code\datums\weather\weather_event.dm" #include "code\datums\weather\weather_map_holder.dm" +#include "code\datums\weather\weather_events\long.dm" #include "code\datums\weather\weather_events\big_red.dm" #include "code\datums\weather\weather_events\faction_clash.dm" #include "code\datums\weather\weather_events\lv522_chances_claim.dm" From 3def452cf1eec44068f41a89fd4b04eb8ded52f4 Mon Sep 17 00:00:00 2001 From: SunoFang Date: Wed, 7 Aug 2024 23:52:21 +0200 Subject: [PATCH 04/18] Revert "Oops, forgot include!" This reverts commit d2757d51355a910e53d06d12a689b15100bbb31d. --- colonialmarines.dme | 1 - 1 file changed, 1 deletion(-) diff --git a/colonialmarines.dme b/colonialmarines.dme index 894acc9560..d75338ecfe 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -660,7 +660,6 @@ #include "code\datums\supply_packs\weapons.dm" #include "code\datums\weather\weather_event.dm" #include "code\datums\weather\weather_map_holder.dm" -#include "code\datums\weather\weather_events\long.dm" #include "code\datums\weather\weather_events\big_red.dm" #include "code\datums\weather\weather_events\faction_clash.dm" #include "code\datums\weather\weather_events\lv522_chances_claim.dm" From 46d16fdff28919faca32c189646d6ca3b83a9993 Mon Sep 17 00:00:00 2001 From: SunoFang Date: Wed, 7 Aug 2024 23:56:45 +0200 Subject: [PATCH 05/18] I fucked this up hard. Commit gore go BRRRR --- colonialmarines.dme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/colonialmarines.dme b/colonialmarines.dme index 894acc9560..dfc6e4ce6b 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -660,9 +660,9 @@ #include "code\datums\supply_packs\weapons.dm" #include "code\datums\weather\weather_event.dm" #include "code\datums\weather\weather_map_holder.dm" -#include "code\datums\weather\weather_events\long.dm" #include "code\datums\weather\weather_events\big_red.dm" #include "code\datums\weather\weather_events\faction_clash.dm" +#include "code\datums\weather\weather_events\long.dm" #include "code\datums\weather\weather_events\lv522_chances_claim.dm" #include "code\datums\weather\weather_events\lv624.dm" #include "code\datums\weather\weather_events\new_varadero.dm" From ba714666cc8a8275593aa20f6a33c2b290ee3bb7 Mon Sep 17 00:00:00 2001 From: sunofang <38206283+sunofang@users.noreply.github.com> Date: Thu, 15 Aug 2024 09:25:45 +0200 Subject: [PATCH 06/18] True infinity Yippie! --- code/datums/weather/weather_events/long.dm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/code/datums/weather/weather_events/long.dm b/code/datums/weather/weather_events/long.dm index 428da31273..1dc8c95652 100644 --- a/code/datums/weather/weather_events/long.dm +++ b/code/datums/weather/weather_events/long.dm @@ -1,48 +1,48 @@ // Weather events for Big Red /datum/weather_event/dust/infinite name = "Duststorm (Infinite)" - length = 600 MINUTES + length = INFINITE /datum/weather_event/sand/infinite name = "Sandstorm (Infinite)" - length = 600 MINUTES + length = INFINITE /datum/weather_event/rock/infinite name = "Rockstorm (Infinite)" - length = 600 MINUTES + length = INFINITE // Weather events for Chances Claim /datum/weather_event/light_rain/lv522/infinite name = "LV522 Light Rain (Infinite)" - length = 600 MINUTES + length = INFINITE // Weather events for LV624 /datum/weather_event/light_rain/infinite name = "Light Rain (Infinite)" - length = 600 MINUTES + length = INFINITE /datum/weather_event/heavy_rain/infinite name = "Heavy Rain (Infinite)" - length = 600 MINUTES + length = INFINITE // Weather events for New Varadero /datum/weather_event/light_rain/varadero/infinite name = "Tropical Storm (Infinite)" - length = 600 MINUTES + length = INFINITE /datum/weather_event/monsoon/infinite name = "Monsoon Warning (Infinite)" - length = 600 MINUTES + length = INFINITE // Weather events for Sorokyne /datum/weather_event/snow/infinite name = "Snow (Infinite)" - length = 600 MINUTES + length = INFINITE /datum/weather_event/snowstorm/infinite name = "Snowstorm (Infinite)" - length = 600 MINUTES + length = INFINITE /datum/weather_event/blizzard/infinite name = "Blizzard (Infinite)" - length = 600 MINUTES + length = INFINITE From 533ab89cd5cbffc92f6328acfce564d1bb79781f Mon Sep 17 00:00:00 2001 From: sunofang <38206283+sunofang@users.noreply.github.com> Date: Thu, 22 Aug 2024 13:29:35 +0200 Subject: [PATCH 07/18] Update code/datums/weather/weather_events/long.dm Co-authored-by: Doubleumc --- code/datums/weather/weather_events/long.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/weather/weather_events/long.dm b/code/datums/weather/weather_events/long.dm index 1dc8c95652..c8fa06c753 100644 --- a/code/datums/weather/weather_events/long.dm +++ b/code/datums/weather/weather_events/long.dm @@ -45,4 +45,4 @@ /datum/weather_event/blizzard/infinite name = "Blizzard (Infinite)" - length = INFINITE + length = INFINITY From 16c4d00d756234f566e46f30b7b27d8e03d621b2 Mon Sep 17 00:00:00 2001 From: sunofang <38206283+sunofang@users.noreply.github.com> Date: Thu, 22 Aug 2024 13:29:42 +0200 Subject: [PATCH 08/18] Update code/datums/weather/weather_events/long.dm Co-authored-by: Doubleumc --- code/datums/weather/weather_events/long.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/weather/weather_events/long.dm b/code/datums/weather/weather_events/long.dm index c8fa06c753..98a360bb99 100644 --- a/code/datums/weather/weather_events/long.dm +++ b/code/datums/weather/weather_events/long.dm @@ -1,7 +1,7 @@ // Weather events for Big Red /datum/weather_event/dust/infinite name = "Duststorm (Infinite)" - length = INFINITE + length = INFINITY /datum/weather_event/sand/infinite name = "Sandstorm (Infinite)" From 82cf18b4467f5c49a1d2b7f256ca86ed0d38e1e2 Mon Sep 17 00:00:00 2001 From: sunofang <38206283+sunofang@users.noreply.github.com> Date: Thu, 22 Aug 2024 13:29:49 +0200 Subject: [PATCH 09/18] Update code/datums/weather/weather_events/long.dm Co-authored-by: Doubleumc --- code/datums/weather/weather_events/long.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/weather/weather_events/long.dm b/code/datums/weather/weather_events/long.dm index 98a360bb99..c313e4bb9e 100644 --- a/code/datums/weather/weather_events/long.dm +++ b/code/datums/weather/weather_events/long.dm @@ -5,7 +5,7 @@ /datum/weather_event/sand/infinite name = "Sandstorm (Infinite)" - length = INFINITE + length = INFINITY /datum/weather_event/rock/infinite name = "Rockstorm (Infinite)" From 0d47a514eba5f2d9f03c2d3dee3af244562c3bb1 Mon Sep 17 00:00:00 2001 From: sunofang <38206283+sunofang@users.noreply.github.com> Date: Thu, 22 Aug 2024 13:29:55 +0200 Subject: [PATCH 10/18] Update code/datums/weather/weather_events/long.dm Co-authored-by: Doubleumc --- code/datums/weather/weather_events/long.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/weather/weather_events/long.dm b/code/datums/weather/weather_events/long.dm index c313e4bb9e..c9d5133ed8 100644 --- a/code/datums/weather/weather_events/long.dm +++ b/code/datums/weather/weather_events/long.dm @@ -9,7 +9,7 @@ /datum/weather_event/rock/infinite name = "Rockstorm (Infinite)" - length = INFINITE + length = INFINITY // Weather events for Chances Claim /datum/weather_event/light_rain/lv522/infinite From c485961a93ae94299b05f2016ad200ed25201ccc Mon Sep 17 00:00:00 2001 From: sunofang <38206283+sunofang@users.noreply.github.com> Date: Thu, 22 Aug 2024 13:30:03 +0200 Subject: [PATCH 11/18] Update code/datums/weather/weather_events/long.dm Co-authored-by: Doubleumc --- code/datums/weather/weather_events/long.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/weather/weather_events/long.dm b/code/datums/weather/weather_events/long.dm index c9d5133ed8..f98e996d70 100644 --- a/code/datums/weather/weather_events/long.dm +++ b/code/datums/weather/weather_events/long.dm @@ -19,7 +19,7 @@ // Weather events for LV624 /datum/weather_event/light_rain/infinite name = "Light Rain (Infinite)" - length = INFINITE + length = INFINITY /datum/weather_event/heavy_rain/infinite name = "Heavy Rain (Infinite)" From f43b47a567e3fed72d464a7967de56ab52e5e9ed Mon Sep 17 00:00:00 2001 From: sunofang <38206283+sunofang@users.noreply.github.com> Date: Thu, 22 Aug 2024 13:30:10 +0200 Subject: [PATCH 12/18] Update code/datums/weather/weather_events/long.dm Co-authored-by: Doubleumc --- code/datums/weather/weather_events/long.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/weather/weather_events/long.dm b/code/datums/weather/weather_events/long.dm index f98e996d70..4dec70ae92 100644 --- a/code/datums/weather/weather_events/long.dm +++ b/code/datums/weather/weather_events/long.dm @@ -14,7 +14,7 @@ // Weather events for Chances Claim /datum/weather_event/light_rain/lv522/infinite name = "LV522 Light Rain (Infinite)" - length = INFINITE + length = INFINITY // Weather events for LV624 /datum/weather_event/light_rain/infinite From a3a60d6f49e9f6d2a5af898df239406c672d35d6 Mon Sep 17 00:00:00 2001 From: sunofang <38206283+sunofang@users.noreply.github.com> Date: Thu, 22 Aug 2024 13:30:17 +0200 Subject: [PATCH 13/18] Update code/datums/weather/weather_events/long.dm Co-authored-by: Doubleumc --- code/datums/weather/weather_events/long.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/weather/weather_events/long.dm b/code/datums/weather/weather_events/long.dm index 4dec70ae92..d0cd1318c6 100644 --- a/code/datums/weather/weather_events/long.dm +++ b/code/datums/weather/weather_events/long.dm @@ -41,7 +41,7 @@ /datum/weather_event/snowstorm/infinite name = "Snowstorm (Infinite)" - length = INFINITE + length = INFINITY /datum/weather_event/blizzard/infinite name = "Blizzard (Infinite)" From 60ecf9ee52b5ac295a0392d01d3a464ad4bd103e Mon Sep 17 00:00:00 2001 From: sunofang <38206283+sunofang@users.noreply.github.com> Date: Thu, 22 Aug 2024 13:30:31 +0200 Subject: [PATCH 14/18] Update code/datums/weather/weather_events/long.dm Co-authored-by: Doubleumc --- code/datums/weather/weather_events/long.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/weather/weather_events/long.dm b/code/datums/weather/weather_events/long.dm index d0cd1318c6..0b24f4f457 100644 --- a/code/datums/weather/weather_events/long.dm +++ b/code/datums/weather/weather_events/long.dm @@ -37,7 +37,7 @@ // Weather events for Sorokyne /datum/weather_event/snow/infinite name = "Snow (Infinite)" - length = INFINITE + length = INFINITY /datum/weather_event/snowstorm/infinite name = "Snowstorm (Infinite)" From 98ba6d0f34a0af086fda5a3d540e32e60780c406 Mon Sep 17 00:00:00 2001 From: sunofang <38206283+sunofang@users.noreply.github.com> Date: Thu, 22 Aug 2024 13:30:37 +0200 Subject: [PATCH 15/18] Update code/datums/weather/weather_events/long.dm Co-authored-by: Doubleumc --- code/datums/weather/weather_events/long.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/weather/weather_events/long.dm b/code/datums/weather/weather_events/long.dm index 0b24f4f457..7d792d3b84 100644 --- a/code/datums/weather/weather_events/long.dm +++ b/code/datums/weather/weather_events/long.dm @@ -28,7 +28,7 @@ // Weather events for New Varadero /datum/weather_event/light_rain/varadero/infinite name = "Tropical Storm (Infinite)" - length = INFINITE + length = INFINITY /datum/weather_event/monsoon/infinite name = "Monsoon Warning (Infinite)" From 3f2b7bf95f3eeed28f5f07af07c26409d735fd14 Mon Sep 17 00:00:00 2001 From: sunofang <38206283+sunofang@users.noreply.github.com> Date: Thu, 22 Aug 2024 13:30:43 +0200 Subject: [PATCH 16/18] Update code/datums/weather/weather_events/long.dm Co-authored-by: Doubleumc --- code/datums/weather/weather_events/long.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/weather/weather_events/long.dm b/code/datums/weather/weather_events/long.dm index 7d792d3b84..d2a20b40be 100644 --- a/code/datums/weather/weather_events/long.dm +++ b/code/datums/weather/weather_events/long.dm @@ -32,7 +32,7 @@ /datum/weather_event/monsoon/infinite name = "Monsoon Warning (Infinite)" - length = INFINITE + length = INFINITY // Weather events for Sorokyne /datum/weather_event/snow/infinite From 0e8463515a37acb2223e86bed0b7e467a5ad77c2 Mon Sep 17 00:00:00 2001 From: sunofang <38206283+sunofang@users.noreply.github.com> Date: Thu, 22 Aug 2024 13:30:59 +0200 Subject: [PATCH 17/18] Update code/datums/weather/weather_events/long.dm Co-authored-by: Doubleumc --- code/datums/weather/weather_events/long.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/weather/weather_events/long.dm b/code/datums/weather/weather_events/long.dm index d2a20b40be..9e569dd172 100644 --- a/code/datums/weather/weather_events/long.dm +++ b/code/datums/weather/weather_events/long.dm @@ -23,7 +23,7 @@ /datum/weather_event/heavy_rain/infinite name = "Heavy Rain (Infinite)" - length = INFINITE + length = INFINITY // Weather events for New Varadero /datum/weather_event/light_rain/varadero/infinite From 1736fd4ec18fa955e7901ad929df12989108e59b Mon Sep 17 00:00:00 2001 From: SunoFang Date: Sun, 25 Aug 2024 18:08:41 +0200 Subject: [PATCH 18/18] Varadero Weather Stuff --- code/datums/weather/weather_events/new_varadero.dm | 9 --------- code/datums/weather/weather_map_holders/new_varadero.dm | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/code/datums/weather/weather_events/new_varadero.dm b/code/datums/weather/weather_events/new_varadero.dm index 311c90b05f..36845a2940 100644 --- a/code/datums/weather/weather_events/new_varadero.dm +++ b/code/datums/weather/weather_events/new_varadero.dm @@ -2,21 +2,12 @@ name = "Tropical Storm" display_name = "Tropical Storm" length = 4 MINUTES - fullscreen_type = /atom/movable/screen/fullscreen/weather/low - turf_overlay_icon_state = "strata_storm" turf_overlay_alpha = 40 - effect_message = null - damage_per_tick = 0 - has_process = TRUE lightning_chance = 1 - ambience = 'sound/ambience/rainforest.ogg' - - fire_smothering_strength = 1 - /datum/weather_event/monsoon name = "Monsoon Warning" display_name = "Monsoon Warning" diff --git a/code/datums/weather/weather_map_holders/new_varadero.dm b/code/datums/weather/weather_map_holders/new_varadero.dm index 8222001f47..1edb2c42c8 100644 --- a/code/datums/weather/weather_map_holders/new_varadero.dm +++ b/code/datums/weather/weather_map_holders/new_varadero.dm @@ -5,7 +5,7 @@ no_weather_turf_icon_state = "strata_clearsky" potential_weather_events = list( - /datum/weather_event/light_rain, + /datum/weather_event/light_rain/varadero, /datum/weather_event/monsoon, )