Merge branch 'master' into SpaceRuins

This commit is contained in:
BlackMajor
2020-02-25 16:51:39 +13:00
94 changed files with 2078 additions and 1705 deletions
@@ -408,10 +408,6 @@
lowercase = FALSE
splitter = ","
/datum/config_entry/number/auto_transfer_delay
config_entry_value = 72000
min_val = 0
/datum/config_entry/flag/pai_custom_holoforms
/datum/config_entry/number/marauder_delay_non_reebe