Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit226

code/controllers/configuration/config_entry.dm

@@ -1,6 +1,7 @@
 #define VALUE_MODE_NUM 0
 #define VALUE_MODE_TEXT 1
 #define VALUE_MODE_FLAG 2
+#define VALUE_MODE_NUM_LIST 3
 
 #define KEY_MODE_TEXT 0
 #define KEY_MODE_TYPE 1
@@ -191,6 +192,18 @@
 			if(VALUE_MODE_TEXT)
 				new_value = key_value
 				continue_check_value = new_value
+			if(VALUE_MODE_NUM_LIST)
+				// this is all copy+pasted from number list up there, but it's super basic so I don't see it being changed soon
+				var/list/new_list = list()
+				var/list/values = splittext(key_value," ")
+				for(var/I in values)
+					var/temp = text2num(I)
+					if(isnull(temp))
+						log_admin("invalid number list entry in [key_name]: [I]")
+						continue_check_value = FALSE
+					new_list += temp
+				new_value = new_list
+				continue_check_value = new_list.len
 		if(continue_check_value && continue_check_key && ValidateListEntry(new_key, new_value))
 			config_entry_value[new_key] = new_value
 			return TRUE

code/controllers/configuration/entries/game_options.dm

@@ -66,10 +66,17 @@
 
 /datum/config_entry/flag/disable_human_mood
 
+/datum/config_entry/flag/disable_borg_flash_knockdown //Should borg flashes be capable of knocking humanoid entities down?
+
+/datum/config_entry/flag/weaken_secborg //Brings secborgs and k9s back in-line with the other borg modules
+
 /datum/config_entry/flag/disable_secborg	// disallow secborg module to be chosen.
 
 /datum/config_entry/flag/disable_peaceborg
 
+/datum/config_entry/number/minimum_secborg_alert	//Minimum alert level for secborgs to be chosen.
+	config_entry_value = 3
+
 /datum/config_entry/number/traitor_scaling_coeff	//how much does the amount of players get divided by to determine traitors
 	config_entry_value = 6
 	min_val = 1
@@ -372,3 +379,43 @@
 /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

code/controllers/configuration/entries/general.dm

@@ -175,6 +175,9 @@
 /datum/config_entry/string/banappeals
 
 /datum/config_entry/string/wikiurl
+	config_entry_value = "https://katlin.dog/citadel-wiki"
+
+/datum/config_entry/string/wikiurltg
 	config_entry_value = "http://www.tgstation13.org/wiki"
 
 /datum/config_entry/string/forumurl