From dc7d9a81a1296d7710fec55f8489a51b0b14a72f Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sun, 25 Oct 2020 11:11:00 +0100 Subject: [PATCH] [MIRROR] Fix Map JSON loading errors (#1460) * Fix Map JSON loading errors (#54563) Also fixes that one runtime everyone runs into when they first load in * Fix Map JSON loading errors Co-authored-by: Jordan Brown --- code/datums/map_config.dm | 8 +++++--- code/modules/admin/verbs/maprotation.dm | 1 + code/modules/keybindings/setup.dm | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/code/datums/map_config.dm b/code/datums/map_config.dm index 9de486e08cf..c0df89b1576 100644 --- a/code/datums/map_config.dm +++ b/code/datums/map_config.dm @@ -139,9 +139,11 @@ allow_custom_shuttles = json["allow_custom_shuttles"] != FALSE - if (!islist(json["jobs_changes"])) - log_world("map_config \"job_changes\" field is missing or invalid!") - return + if ("jobs_changes" in json) + if(!islist(json["jobs_changes"])) + log_world("map_config \"job_changes\" field is missing or invalid!") + return + job_changes = json["job_changes"] defaulted = FALSE return TRUE diff --git a/code/modules/admin/verbs/maprotation.dm b/code/modules/admin/verbs/maprotation.dm index 71fd233fa5a..428bbdce59e 100644 --- a/code/modules/admin/verbs/maprotation.dm +++ b/code/modules/admin/verbs/maprotation.dm @@ -84,6 +84,7 @@ VM.map_file = "[map_file]" VM.config_filename = "data/next_map.json" var/json_value = list( + "version" = MAP_CURRENT_VERSION, "map_name" = VM.map_name, "map_path" = VM.map_path, "map_file" = VM.map_file, diff --git a/code/modules/keybindings/setup.dm b/code/modules/keybindings/setup.dm index 83f286754be..d020e9e030a 100644 --- a/code/modules/keybindings/setup.dm +++ b/code/modules/keybindings/setup.dm @@ -32,7 +32,7 @@ var/command = macro_set[key] winset(src, "default-[REF(key)]", "parent=default;name=[key];command=[command]") - if(prefs.hotkeys) + if(prefs?.hotkeys) winset(src, null, "input.focus=true input.background-color=[COLOR_INPUT_ENABLED]") else winset(src, null, "input.focus=true input.background-color=[COLOR_INPUT_DISABLED]")