Merge branch 'master' into synctesting

2018-04-09 21:43:26 +00:00
parent d3ba1085bb dab96582bd
commit e0d7630c19
43 changed files with 411 additions and 90 deletions
@@ -226,10 +226,13 @@
 /datum/config_entry/keyed_number_list/law_weight
 	splitter = ","

-/datum/config_entry/number/assistant_cap
+/datum/config_entry/number/overflow_cap
 	config_entry_value = -1
 	min_val = -1

+/datum/config_entry/string/overflow_job
+	config_entry_value = "Assistant"
+
 /datum/config_entry/flag/starlight
 /datum/config_entry/flag/grey_assistants