Merge pull request #6160 from Citadel-Station-13/upstream-merge-36703

[MIRROR] Restarting the controller no longer resets the config

code/controllers/master.dm

@@ -62,7 +62,8 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 	var/static/current_ticklimit = TICK_LIMIT_RUNNING
 
 /datum/controller/master/New()
-	config = new
+	if(!config)
+		config = new
 	// Highlander-style: there can only be one! Kill off the old and replace it with the new.
 
 	if(!random_seed)