Antag Panel / Check antagonists Refactor

2018-01-19 08:43:49 -06:00
parent c6f227fc18
commit 3dc89ba058
63 changed files with 1224 additions and 1427 deletions
@@ -112,9 +112,12 @@ CONTINUOUS CULT
 CONTINUOUS CLOCKWORK_CULT
 CONTINUOUS CHANGELING
 CONTINUOUS WIZARD
+<<<<<<< HEAD
 CONTINUOUS BLOB
 CONTINUOUS ABDUCTION
 #CONTINUOUS RAGINMAGES
+=======
+>>>>>>> e38e6b8... Antag Panel / Check antagonists Refactor (#34236)
 #CONTINUOUS MONKEY

 ##Note: do not toggle continuous off for these modes, as they have no antagonists and would thus end immediately!
@@ -137,9 +140,12 @@ MIDROUND_ANTAG CULT
 MIDROUND_ANTAG CLOCKWORK_CULT
 MIDROUND_ANTAG CHANGELING
 MIDROUND_ANTAG WIZARD
+<<<<<<< HEAD
 MIDROUND_ANTAG BLOB
 MIDROUND_ANTAG ABDUCTION
 #MIDROUND_ANTAG  RAGINMAGES
+=======
+>>>>>>> e38e6b8... Antag Panel / Check antagonists Refactor (#34236)
 #MIDROUND_ANTAG  MONKEY

 ## Uncomment these for overrides of the minimum / maximum number of players in a round type. 
@@ -178,9 +184,6 @@ MIDROUND_ANTAG ABDUCTION
 #MIN_POP WIZARD 20
 #MAX_POP WIZARD -1

-#MIN_POP BLOB 25
-#MAX_POP BLOB -1
-
 #MIN_POP MONKEY 20
 #MAX_POP MONKEY -1