Merge branch 'master' into random-engine

This commit is contained in:
Putnam3145
2020-01-08 21:08:20 -08:00
committed by GitHub
106 changed files with 1224 additions and 483 deletions
@@ -394,3 +394,9 @@
/datum/config_entry/flag/allow_clockwork_marauder_on_station
config_entry_value = TRUE
/datum/config_entry/flag/modetier_voting
config_entry_value = TRUE
/datum/config_entry/number/dropped_modes
config_entry_value = 3