From 76fbc0994ff465ae3a6588dd38073c3203c527bc Mon Sep 17 00:00:00 2001 From: Lin Date: Wed, 8 Dec 2021 17:49:43 +0000 Subject: [PATCH] ball map weather (#15405) --- _maps/festivestation.json | 5 ++++- _maps/spookystation.json | 5 ++++- code/__DEFINES/maps.dm | 2 ++ code/datums/weather/weather_types/ice_storm.dm | 2 +- .../code/modules/eventmaps/Spookystation/JTGSZwork.dm | 3 ++- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/_maps/festivestation.json b/_maps/festivestation.json index 0803c1b566..b8884371a3 100644 --- a/_maps/festivestation.json +++ b/_maps/festivestation.json @@ -7,5 +7,8 @@ "ferry": "ferry_fancy", "whiteship": "whiteship_box", "emergency": "emergency_box" - } + }, + "traits": [ + { "Weather_Icestorm":true } + ] } diff --git a/_maps/spookystation.json b/_maps/spookystation.json index ec2db6e950..c880aacff7 100644 --- a/_maps/spookystation.json +++ b/_maps/spookystation.json @@ -7,5 +7,8 @@ "whiteship": "whiteship_pubby", "ferry": "ferry_fancy", "cargo": "cargo_box" - } + }, + "traits": [ + { "Weather_Longrain":true } + ] } diff --git a/code/__DEFINES/maps.dm b/code/__DEFINES/maps.dm index 5e3f571cb7..70bb338b7b 100644 --- a/code/__DEFINES/maps.dm +++ b/code/__DEFINES/maps.dm @@ -43,6 +43,8 @@ require only minor tweaks. #define ZTRAIT_ASHSTORM "Weather_Ashstorm" #define ZTRAIT_ACIDRAIN "Weather_Acidrain" #define ZTRAIT_VOIDSTORM "Weather_Voidstorm" +#define ZTRAIT_ICESTORM "Weather_Icestorm" +#define ZTRAIT_LONGRAIN "Weather_Longrain" // number - bombcap is multiplied by this before being applied to bombs #define ZTRAIT_BOMBCAP_MULTIPLIER "Bombcap Multiplier" diff --git a/code/datums/weather/weather_types/ice_storm.dm b/code/datums/weather/weather_types/ice_storm.dm index f7be622770..451b0bdad6 100644 --- a/code/datums/weather/weather_types/ice_storm.dm +++ b/code/datums/weather/weather_types/ice_storm.dm @@ -19,7 +19,7 @@ area_type = /area/edina protected_areas = list(/area/edina/protected) - target_trait = ZTRAIT_STATION + target_trait = ZTRAIT_ICESTORM immunity_type = "rad" diff --git a/modular_citadel/code/modules/eventmaps/Spookystation/JTGSZwork.dm b/modular_citadel/code/modules/eventmaps/Spookystation/JTGSZwork.dm index 98ca2005dc..8143380262 100644 --- a/modular_citadel/code/modules/eventmaps/Spookystation/JTGSZwork.dm +++ b/modular_citadel/code/modules/eventmaps/Spookystation/JTGSZwork.dm @@ -483,7 +483,8 @@ end_message = "The downpour gradually slows until it stops." area_type = /area/eventmap/outside - target_trait = ZTRAIT_STATION + target_trait = ZTRAIT_LONGRAIN + probability = 90 barometer_predictable = TRUE