Merge pull request #4392 from Citadel-Station-13/upstream-merge-33562

[MIRROR] Fixes LoadEntries return value

code/controllers/configuration/configuration.dm

@@ -22,7 +22,7 @@ GLOBAL_PROTECT(config_dir)
 	config = src
 	InitEntries()
 	LoadModes()
-	if(!LoadEntries("config.txt"))
+	if(LoadEntries("config.txt") <= 1)
 		log_config("No $include directives found in config.txt! Loading legacy game_options/dbconfig/comms files...")
 		LoadEntries("game_options.txt")
 		LoadEntries("dbconfig.txt")
@@ -97,6 +97,13 @@ GLOBAL_PROTECT(config_dir)
 
 		if(!entry)
 			continue
+		if(entry == "$include")
+			if(!value)
+				log_config("Warning: Invalid $include directive: [value]")
+			else
+				LoadEntries(value, stack)
+				++.
+			continue
 		
 		if(entry == "$include")
 			if(!value)
@@ -123,8 +130,8 @@ GLOBAL_PROTECT(config_dir)
 		
 		if(validated)
 			E.modified = TRUE
-		
-		. = TRUE
+	
+	++.
 
 /datum/controller/configuration/can_vv_get(var_name)
 	return (var_name != "entries_by_type" || !hiding_entries_by_type) && ..()