From 37fdf365a54d5fa6b0b6bbbc378f07e89fcec730 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sun, 29 Oct 2017 11:25:50 -0400 Subject: [PATCH 1/2] Fixes map_config validation --- code/datums/map_config.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/datums/map_config.dm b/code/datums/map_config.dm index 2fb74abfb9..911687684a 100644 --- a/code/datums/map_config.dm +++ b/code/datums/map_config.dm @@ -96,8 +96,14 @@ log_world("Map file ([path]) does not exist!") return +<<<<<<< HEAD if(json["transition_config"] != "default") if(!islist(json["transition_config"])) +======= + var/tc = json["transition_config"] + if(tc != null && tc != "default") + if(!islist(tc)) +>>>>>>> 9375965... Fixes map_config validation (#32206) log_world("transition_config is not a list!") return From b6f0423840ded9420e6d38faf4e23487bf8a0cc1 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 29 Oct 2017 22:23:17 -0500 Subject: [PATCH 2/2] Update map_config.dm --- code/datums/map_config.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/datums/map_config.dm b/code/datums/map_config.dm index 911687684a..a1c76b45d0 100644 --- a/code/datums/map_config.dm +++ b/code/datums/map_config.dm @@ -96,14 +96,9 @@ log_world("Map file ([path]) does not exist!") return -<<<<<<< HEAD - if(json["transition_config"] != "default") - if(!islist(json["transition_config"])) -======= var/tc = json["transition_config"] if(tc != null && tc != "default") if(!islist(tc)) ->>>>>>> 9375965... Fixes map_config validation (#32206) log_world("transition_config is not a list!") return