Sync with master (#3)

Alot of stuff, honk
2019-11-16 16:03:25 +01:00
parent 3d8c41e143
commit 350dd6ed3a
1635 changed files with 40068 additions and 142864 deletions
@@ -34,7 +34,7 @@
 	if(_directory)
 		directory = _directory
 	if(entries)
-		CRASH("[THIS_PROC_TYPE_WEIRD] called more than once!")
+		CRASH("/datum/controller/configuration/Load() called more than once!")
 	InitEntries()
 	LoadModes()
 	if(fexists("[directory]/config.txt") && LoadEntries("config.txt") <= 1)
@@ -0,0 +1,126 @@
+/datum/config_entry/flag/dynamic_voting
+
+/datum/config_entry/number/dynamic_high_pop_limit
+	config_entry_value = 55
+	min_val = 1
+
+/datum/config_entry/number/dynamic_pop_per_requirement
+	config_entry_value = 6
+	min_val = 1
+
+/datum/config_entry/number/dynamic_midround_delay_min
+	config_entry_value = 15
+	min_val = 1
+
+/datum/config_entry/number/dynamic_midround_delay_max
+	config_entry_value = 35
+	min_val = 1
+
+/datum/config_entry/number/dynamic_latejoin_delay_min
+	config_entry_value = 5
+	min_val = 1
+
+/datum/config_entry/number/dynamic_latejoin_delay_max
+	config_entry_value = 25
+	min_val = 1
+
+/datum/config_entry/number/dynamic_first_midround_delay_min
+	config_entry_value = 20
+	min_val = 1
+
+/datum/config_entry/number/dynamic_first_midround_delay_max
+	config_entry_value = 40
+	min_val = 1
+
+/datum/config_entry/number/dynamic_first_latejoin_delay_min
+	config_entry_value = 10
+	min_val = 1
+
+/datum/config_entry/number/dynamic_first_latejoin_delay_max
+	config_entry_value = 30
+	min_val = 1
+
+
+/datum/config_entry/keyed_list/dynamic_cost
+	key_mode = KEY_MODE_TEXT
+	value_mode = VALUE_MODE_NUM
+
+/datum/config_entry/keyed_list/dynamic_weight
+	key_mode = KEY_MODE_TEXT
+	value_mode = VALUE_MODE_NUM
+
+/datum/config_entry/keyed_list/dynamic_requirements
+	key_mode = KEY_MODE_TEXT
+	value_mode = VALUE_MODE_NUM_LIST
+
+/datum/config_entry/keyed_list/dynamic_high_population_requirement
+	key_mode = KEY_MODE_TEXT
+	value_mode = VALUE_MODE_NUM
+
+/datum/config_entry/number_list/dynamic_second_rule_requirements
+
+/datum/config_entry/number_list/dynamic_third_rule_requirements
+
+/datum/config_entry/number/dynamic_second_rule_high_pop_requirement
+	config_entry_value = 50
+
+/datum/config_entry/number/dynamic_third_rule_high_pop_requirement
+	config_entry_value = 70
+
+/datum/config_entry/number_list/dynamic_hijack_requirements
+
+/datum/config_entry/number/dynamic_hijack_high_population_requirement
+	config_entry_value = 25
+
+/datum/config_entry/number/dynamic_hijack_cost
+	config_entry_value = 5
+	
+/datum/config_entry/number/dynamic_glorious_death_cost
+	config_entry_value = 5
+
+/datum/config_entry/number/dynamic_assassinate_cost
+	config_entry_value = 2
+
+/datum/config_entry/number/dynamic_summon_guns_requirement
+	config_entry_value = 10
+	min_val = 0
+
+/datum/config_entry/number/dynamic_summon_guns_cost
+	config_entry_value = 5
+	min_val = 0
+
+/datum/config_entry/number/dynamic_summon_magic_requirement
+	config_entry_value = 10
+	min_val = 0
+
+/datum/config_entry/number/dynamic_summon_magic_cost
+	config_entry_value = 5
+	min_val = 0
+
+/datum/config_entry/number/dynamic_summon_events_requirement
+	config_entry_value = 20
+	min_val = 0
+
+/datum/config_entry/number/dynamic_summon_events_cost
+	config_entry_value = 10
+	min_val = 0
+
+/datum/config_entry/number/dynamic_staff_of_change_requirement
+	config_entry_value = 20
+	min_val = 0
+
+/datum/config_entry/number/dynamic_staff_of_change_cost
+	config_entry_value = 10
+	min_val = 0
+
+/datum/config_entry/number/dynamic_apprentice_cost
+	config_entry_value = 10
+	min_val = 0
+
+/datum/config_entry/number/dynamic_warops_requirement
+	config_entry_value = 60
+	min_val = 0
+
+/datum/config_entry/number/dynamic_warops_cost
+	config_entry_value = 10
+	min_val = 0
@@ -139,6 +139,14 @@
 	min_val = 0
 	max_val = 1

+/datum/config_entry/number/suicide_reenter_round_timer
+	config_entry_value = 30
+	min_val = 0
+
+/datum/config_entry/number/roundstart_suicide_time_limit
+	config_entry_value = 30
+	min_val = 0
+
 /datum/config_entry/number/shuttle_refuel_delay
 	config_entry_value = 12000
 	min_val = 0
@@ -371,43 +379,3 @@
 /datum/config_entry/number/auto_transfer_delay
 	config_entry_value = 72000
 	min_val = 0
-
-/datum/config_entry/number/dynamic_high_pop_limit
-	config_entry_value = 55
-	min_val = 1
-
-/datum/config_entry/number/dynamic_pop_per_requirement
-	config_entry_value = 6
-	min_val = 1
-
-/datum/config_entry/number/dynamic_midround_delay_min
-	config_entry_value = 15
-	min_val = 1
-
-/datum/config_entry/number/dynamic_midround_delay_max
-	config_entry_value = 35
-	min_val = 1
-
-/datum/config_entry/number/dynamic_latejoin_delay_min
-	config_entry_value = 5
-	min_val = 1
-
-/datum/config_entry/number/dynamic_latejoin_delay_max
-	config_entry_value = 25
-	min_val = 1
-
-/datum/config_entry/keyed_list/dynamic_cost
-	key_mode = KEY_MODE_TEXT
-	value_mode = VALUE_MODE_NUM
-
-/datum/config_entry/keyed_list/dynamic_weight
-	key_mode = KEY_MODE_TEXT
-	value_mode = VALUE_MODE_NUM
-
-/datum/config_entry/keyed_list/dynamic_requirements
-	key_mode = KEY_MODE_TEXT
-	value_mode = VALUE_MODE_NUM_LIST
-
-/datum/config_entry/keyed_list/dynamic_high_population_requirement
-	key_mode = KEY_MODE_TEXT
-	value_mode = VALUE_MODE_NUM
@@ -141,6 +141,11 @@
 /datum/config_entry/flag/load_legacy_ranks_only	//Loads admin ranks only from legacy admin_ranks.txt, while enabled ranks are mirrored to the database
 	protection = CONFIG_ENTRY_LOCKED

+/datum/config_entry/flag/mentors_mobname_only
+
+/datum/config_entry/flag/mentor_legacy_system	//Defines whether the server uses the legacy mentor system with mentors.txt or the SQL system
+	protection = CONFIG_ENTRY_LOCKED
+
 /datum/config_entry/string/hostedby

 /datum/config_entry/flag/norespawn