Merge branch 'Citadel-Station-13:master' into wingport

2021-12-11 12:53:03 -07:00
parent 3b52782ae5 eb8af2f94b
commit 0e3d30e59f
23 changed files with 386 additions and 209 deletions
@@ -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"