cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-11 18:22:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't error on dupe configs in other files. (#73399)

Browse Source 
It ruins my whole every server defaults -> per server overrides model
for config management

🆑
config: Repeated configs in other files (from $include) will no longer
trigger a config error. Repeated configs in the same file still will.
config: In all cases the new value will still be used
/🆑
This commit is contained in:
Kyle Spier-Swenson
2023-02-15 17:42:25 -08:00
committed by GitHub
parent 54328721bf
commit faf96a9ad0
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/controllers/configuration/configuration.dm
View File

@@ -239,7 +239,7 @@
log_config(log_message) log_config(log_message)
stack_trace(log_message) stack_trace(log_message)
else 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.") log_config_error("Duplicate setting for [entry] ([value], [E.resident_file]) detected! Using latest.")
E.resident_file = filename E.resident_file = filename