Merge remote-tracking branch 'Upstream/master' into TGUI-3.0

code/controllers/configuration/config_entry.dm

@@ -209,6 +209,8 @@
 				new_value = new_list
 				continue_check_value = new_list.len
 		if(continue_check_value && continue_check_key && ValidateListEntry(new_key, new_value))
+			new_key = preprocess_key(new_key)
+			new_value = preprocess_value(new_value)
 			config_entry_value[new_key] = new_value
 			return TRUE
 	return FALSE
@@ -216,6 +218,12 @@
 /datum/config_entry/keyed_list/vv_edit_var(var_name, var_value)
 	return var_name != "splitter" && ..()
 
+/datum/config_entry/keyed_list/proc/preprocess_key(key)
+	return key
+
+/datum/config_entry/keyed_list/proc/preprocess_value(value)
+	return value
+
 //snowflake for donator things being on one line smh
 /datum/config_entry/multi_keyed_flag
 	vv_VAS = FALSE

code/controllers/configuration/configuration.dm

@@ -14,6 +14,7 @@
 	var/list/modes			// allowed modes
 	var/list/gamemode_cache
 	var/list/votable_modes		// votable modes
+	// var/list/ic_filter_regex
 	var/list/storyteller_cache
 	var/list/mode_names
 	var/list/mode_reports
@@ -414,3 +415,21 @@
 				continue
 			runnable_modes[M] = probabilities[M.config_tag]
 	return runnable_modes
+/*
+/datum/controller/configuration/proc/LoadChatFilter()
+	var/list/in_character_filter = list()
+
+	if(!fexists("[directory]/in_character_filter.txt"))
+		return
+	log_config("Loading config file in_character_filter.txt...")
+	for(var/line in world.file2list("[directory]/in_character_filter.txt"))
+		if(!line)
+			continue
+		if(findtextEx(line,"#",1,2))
+			continue
+		in_character_filter += REGEX_QUOTE(line)
+
+	ic_filter_regex = in_character_filter.len ? regex("\\b([jointext(in_character_filter, "|")])\\b", "i") : null
+
+	syncChatRegexes()
+*/

code/controllers/configuration/entries/policy.dm

@@ -0,0 +1,11 @@
+/// Seconds for CMD on defib-with-memory-loss policy config to display instead of defib-intact config
+/datum/config_entry/number/defib_cmd_time_limit
+	config_entry_value = 300
+	integer = TRUE
+
+/datum/config_entry/keyed_list/policyconfig
+	key_mode = KEY_MODE_TEXT
+	value_mode = VALUE_MODE_TEXT
+
+/datum/config_entry/keyed_list/policyconfig/preprocess_key(key)
+	return uppertext(..())