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

Merge remote-tracking branch 'ParadiseSS13/master' into multi-instance-support

Browse Source
This commit is contained in:
AffectedArc07
2021-10-17 20:49:07 +01:00
parent 1d750acf78 9470fd0387
commit e843d297bf
55 changed files with 699 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/configuration/configuration_core.dm
+2 -2
View File
@@ -97,7 +97,7 @@ GLOBAL_DATUM_INIT(configuration, /datum/server_configuration, new())
var/config_file = "config/config.toml"
if(!fexists(config_file))
config_file = "config/example/config.toml" // Fallback to example if user hasnt setup config properly
var/raw_json = rustg_toml2json(config_file)
var/raw_json = rustg_read_toml_file(config_file)
raw_data = json_decode(raw_json)
// Now pass through all our stuff
@@ -141,7 +141,7 @@ GLOBAL_DATUM_INIT(configuration, /datum/server_configuration, new())
DIRECT_OUTPUT(world.log, "Overrides found for this instance. Loading them.")
var/start = start_watch() // Time tracking
var/raw_json = rustg_toml2json(override_file)
var/raw_json = rustg_read_toml_file(override_file)
raw_data = json_decode(raw_json)
// Now safely load our overrides.