From 4fb560ea9854d1c0347aff8c162a85e3262569a3 Mon Sep 17 00:00:00 2001 From: Putnam Date: Fri, 12 Mar 2021 14:46:58 -0800 Subject: [PATCH 1/2] makes the chaos thing actually work (whoops) --- .../subsystem/persistence/recent_votes_etc.dm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/code/controllers/subsystem/persistence/recent_votes_etc.dm b/code/controllers/subsystem/persistence/recent_votes_etc.dm index 3c36c7581e..f9cccbbf14 100644 --- a/code/controllers/subsystem/persistence/recent_votes_etc.dm +++ b/code/controllers/subsystem/persistence/recent_votes_etc.dm @@ -21,6 +21,7 @@ /datum/controller/subsystem/persistence/LoadServerPersistence() . = ..() LoadRecentModes() + LoadRecentChaos() LoadRecentStorytellers() LoadRecentRulesets() LoadRecentMaps() @@ -85,6 +86,15 @@ return saved_modes = json["data"] +/datum/controller/subsystem/persistence/proc/LoadRecentChaos() + json_file = file("data/RecentChaos.json") + if(!fexists(json_file)) + return + json = json_decode(file2text(json_file)) + if(!json) + return + saved_chaos = json["data"] + /datum/controller/subsystem/persistence/proc/LoadRecentRulesets() var/json_file = file("data/RecentRulesets.json") if(!fexists(json_file)) From 49e1673047e121d1b1f5fdd5c8aa88289a92351a Mon Sep 17 00:00:00 2001 From: Putnam Date: Fri, 12 Mar 2021 15:44:15 -0800 Subject: [PATCH 2/2] how did i mess up a copypasta like this --- code/controllers/subsystem/persistence/recent_votes_etc.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/controllers/subsystem/persistence/recent_votes_etc.dm b/code/controllers/subsystem/persistence/recent_votes_etc.dm index f9cccbbf14..87f1ec0d4f 100644 --- a/code/controllers/subsystem/persistence/recent_votes_etc.dm +++ b/code/controllers/subsystem/persistence/recent_votes_etc.dm @@ -87,10 +87,10 @@ saved_modes = json["data"] /datum/controller/subsystem/persistence/proc/LoadRecentChaos() - json_file = file("data/RecentChaos.json") + var/json_file = file("data/RecentChaos.json") if(!fexists(json_file)) return - json = json_decode(file2text(json_file)) + var/list/json = json_decode(file2text(json_file)) if(!json) return saved_chaos = json["data"]