shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes map_config validation

Browse Source
This commit is contained in:
Jordan Brown
2017-10-29 10:26:20 -05:00
committed by CitadelStationBot
parent fd2705b6e6
commit 37fdf365a5
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/map_config.dm
+6
View File
@@ -96,8 +96,14 @@
log_world("Map file ([path]) does not exist!") log_world("Map file ([path]) does not exist!")
return return
<<<<<<< HEAD
if(json["transition_config"] != "default") if(json["transition_config"] != "default")
if(!islist(json["transition_config"])) 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!") log_world("transition_config is not a list!")
return return