Merge upstream

This commit is contained in:
Cyberboss
2017-03-30 19:18:59 -04:00
102 changed files with 8157 additions and 382 deletions
+1 -1
View File
@@ -77,7 +77,7 @@
defaulted = FALSE
#define CHECK_EXISTS(X) if(!istext(json[X])) log_world(X + "missing from json!")
#define CHECK_EXISTS(X) if(!istext(json[X])) { log_world(X + "missing from json!"); return; }
/datum/map_config/proc/ValidateJSON(list/json)
CHECK_EXISTS("map_name")
CHECK_EXISTS("map_path")