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

Merge pull request #16931 from AffectedArc07/new-rust-g

Browse Source 
Upgrades RUSTG
This commit is contained in:
variableundefined
2021-10-17 13:24:04 -05:00
committed by GitHub
parent e65ce685ca 45e4458eca
commit 1c73b4f005
8 changed files with 128 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/configuration/configuration_core.dm
+1 -2
View File
@@ -85,8 +85,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/list/raw_config_data = json_decode(raw_json)
var/raw_config_data = rustg_read_toml_file(config_file)
// Now pass through all our stuff
admin.load_data(raw_config_data["admin_configuration"])