Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT

2020-08-18 10:33:21 +08:00
parent 55bd3ecc26 20648fc1bb
commit 90cb13f6af
276 changed files with 6068 additions and 1533 deletions
@@ -98,6 +98,11 @@
 	config_entry_value = 6
 	min_val = 1

+/datum/config_entry/number/ecult_scaling_coeff		//how much does the amount of players get divided by to determine e_cult
+	config_entry_value = 6
+	integer = FALSE
+	min_val = 1
+
 /datum/config_entry/number/security_scaling_coeff	//how much does the amount of players get divided by to determine open security officer positions
 	config_entry_value = 8
 	min_val = 1