Merge branch 'master' into void-but-for-real

This commit is contained in:
kiwedespars
2021-03-12 23:10:19 -08:00
67 changed files with 424 additions and 210 deletions
@@ -22,7 +22,7 @@
target_trait = ZTRAIT_STATION
immunity_type = "rad"
var/radiation_intensity = 100
/datum/weather/rad_storm/telegraph()