Merge remote-tracking branch 'upstream/master' into snaxi2

This commit is contained in:
Detective Google
2020-05-11 20:56:42 -05:00
213 changed files with 3373 additions and 2828 deletions
+14
View File
@@ -139,6 +139,20 @@ MIDROUND_ANTAG CHANGELING
MIDROUND_ANTAG WIZARD
#MIDROUND_ANTAG MONKEY
## Toggles for whether this mode should force antags even if not enough players have it enabled.
## If it's off, it just won't roll as many antags.
#FORCE_ANTAG_COUNT TRAITOR
#FORCE_ANTAG_COUNT TRAITORBRO
#FORCE_ANTAG_COUNT TRAITORCHAN
#FORCE_ANTAG_COUNT INTERNAL_AFFAIRS
FORCE_ANTAG_COUNT NUCLEAR
FORCE_ANTAG_COUNT REVOLUTION
FORCE_ANTAG_COUNT CULT
FORCE_ANTAG_COUNT CLOCKWORK_CULT
#FORCE_ANTAG_COUNT CHANGELING
#FORCE_ANTAG_COUNT WIZARD
#FORCE_ANTAG_COUNT MONKEY
## Uncomment these for overrides of the minimum / maximum number of players in a round type.
## If you set any of these occasionally check to see if you still need them as the modes
## will still be actively rebalanced around the SUGGESTED populations, not your overrides.