From d6d3cbef162b1fbbd7050eb5e7b10f9133905db9 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 22 Feb 2023 04:05:43 +0100 Subject: [PATCH] [MIRROR] Don't error on dupe configs in other files. [MDB IGNORE] (#19372) * Don't error on dupe configs in other files. * Update configuration.dm --------- Co-authored-by: Kyle Spier-Swenson Co-authored-by: lessthnthree Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com> --- code/controllers/configuration/configuration.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/controllers/configuration/configuration.dm b/code/controllers/configuration/configuration.dm index af88fe86840..5f9e9c51178 100644 --- a/code/controllers/configuration/configuration.dm +++ b/code/controllers/configuration/configuration.dm @@ -244,7 +244,7 @@ log_config(log_message) stack_trace(log_message) else - if(E.modified && !E.dupes_allowed) + if(E.modified && !E.dupes_allowed && E.resident_file == filename) log_config_error("Duplicate setting for [entry] ([value], [E.resident_file]) detected! Using latest.") E.resident_file = filename