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

2020-03-11 17:32:15 -07:00
parent 39a949f223 b311b62919
commit 14b22f0b67
789 changed files with 217724 additions and 211404 deletions
@@ -335,6 +335,10 @@
 	config_entry_value = 16
 	min_val = 0

+/datum/config_entry/number/station_space_budget
+	config_entry_value = 10
+	min_val = 0
+
 /datum/config_entry/flag/allow_random_events	// Enables random events mid-round when set

 /datum/config_entry/number/events_min_time_mul	// Multipliers for random events minimal starting time and minimal players amounts