cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-25 21:19:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Check your conflict resolution people

Browse Source
This commit is contained in:
AffectedArc07
2021-10-17 21:06:02 +01:00
parent e843d297bf
commit 4e40353cfa
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/configuration/configuration_core.dm
+2 -4
View File
@@ -97,8 +97,7 @@ GLOBAL_DATUM_INIT(configuration, /datum/server_configuration, new())
var/config_file = "config/config.toml" var/config_file = "config/config.toml"
if(!fexists(config_file)) if(!fexists(config_file))
config_file = "config/example/config.toml" // Fallback to example if user hasnt setup config properly config_file = "config/example/config.toml" // Fallback to example if user hasnt setup config properly
var/raw_json = rustg_read_toml_file(config_file) raw_data = rustg_read_toml_file(config_file)
raw_data = json_decode(raw_json)
// Now pass through all our stuff // Now pass through all our stuff
load_all_sections() load_all_sections()
@@ -141,8 +140,7 @@ GLOBAL_DATUM_INIT(configuration, /datum/server_configuration, new())
DIRECT_OUTPUT(world.log, "Overrides found for this instance. Loading them.") DIRECT_OUTPUT(world.log, "Overrides found for this instance. Loading them.")
var/start = start_watch() // Time tracking var/start = start_watch() // Time tracking
var/raw_json = rustg_read_toml_file(override_file) raw_data = rustg_read_toml_file(override_file)
raw_data = json_decode(raw_json)
// Now safely load our overrides. // Now safely load our overrides.
// Due to the nature of config wrappers, only vars that exist in the config file are applied to the config datums. // Due to the nature of config wrappers, only vars that exist in the config file are applied to the config datums.