From 4e40353cfa9375bcf2ebd1182e4591663d36fedc Mon Sep 17 00:00:00 2001
From: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date: Sun, 17 Oct 2021 21:06:02 +0100
Subject: [PATCH] Check your conflict resolution people

---
 code/controllers/configuration/configuration_core.dm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/code/controllers/configuration/configuration_core.dm b/code/controllers/configuration/configuration_core.dm
index 0550280527b..c96e96016e8 100644
--- a/code/controllers/configuration/configuration_core.dm
+++ b/code/controllers/configuration/configuration_core.dm
@@ -97,8 +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_read_toml_file(config_file)
-	raw_data = json_decode(raw_json)
+	raw_data = rustg_read_toml_file(config_file)
 
 	// Now pass through all our stuff
 	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.")
 	var/start = start_watch() // Time tracking
 
-	var/raw_json = rustg_read_toml_file(override_file)
-	raw_data = json_decode(raw_json)
+	raw_data = rustg_read_toml_file(override_file)
 
 	// 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.