Merge remote-tracking branch 'citadel/master' into nightshift_1

This commit is contained in:
kevinz000
2020-01-10 06:12:59 -08:00
613 changed files with 24088 additions and 18782 deletions

View File

@@ -584,7 +584,16 @@ MONKEYCAP 64
#Replaces standard extended/secret dichotomy with extended and calm/chaotic votes for dynamic.
DYNAMIC_VOTING
## Choose which Engine to start the round with, comment to remove an Engine from the rotation
BOX_RANDOM_ENGINE Engine SM
BOX_RANDOM_ENGINE Engine Tesla
BOX_RANDOM_ENGINE Engine Singulo
## Choose which Engine to start the round with. Weight is after the comma. Setting the weight to 0 removes the engine from rotation.
BOX_RANDOM_ENGINE Box SM,3
BOX_RANDOM_ENGINE Box Tesla,3
BOX_RANDOM_ENGINE Box Singulo,3
BOX_RANDOM_ENGINE Box SM 1x3,1
BOX_RANDOM_ENGINE Box SM 5x5,1
BOX_RANDOM_ENGINE Box SM 3x,0
## Whether or not there's a mode tier list vote after the secret/extended vote.
MODETIER_VOTING
## Number of modes dropped by the modetier vote during mode selection, after vote.
DROPPED_MODES 3