Merge branch 'master' into upstream-merge-31371

code/controllers/configuration/configuration.dm

@@ -49,7 +49,6 @@ GLOBAL_PROTECT(config_dir)
 		if(initial(E.abstract_type) == I)
 			continue
 		E = new I
-		_entries_by_type[I] = E
 		var/esname = E.name
 		var/datum/config_entry/test = _entries[esname]
 		if(test)
@@ -57,6 +56,7 @@ GLOBAL_PROTECT(config_dir)
 			qdel(E)
 			continue
 		_entries[esname] = E
+		_entries_by_type[I] = E
 		.[E.resident_file] = TRUE
 
 /datum/controller/configuration/proc/RemoveEntry(datum/config_entry/CE)

code/controllers/configuration/entries/game_options.dm

@@ -268,3 +268,8 @@ CONFIG_DEF(flag/allow_extended_miscreants)
 		GLOB.MAX_EX_LIGHT_RANGE = value
 		GLOB.MAX_EX_FLASH_RANGE = value
 		GLOB.MAX_EX_FLAME_RANGE = value
+
+CONFIG_DEF(number/emergency_shuttle_autocall_threshold)
+	min_val = 0
+	max_val = 1
+	integer = FALSE