Merge branch 'master' into upstream-merge-26813

2017-05-07 22:31:16 -07:00
parent a87cee8a05 066c8e8de8
commit 335b6cde56
2 changed files with 4 additions and 1 deletions
@@ -114,6 +114,9 @@ SUBSYSTEM_DEF(persistence)
 	var/saved_json
 	trophy_sav >> saved_json

+	if(!saved_json)
+		return
+
 	var/decoded_json = json_decode(saved_json)

 	if(!islist(decoded_json))
@@ -82,7 +82,7 @@
 		getFlatIcon(A,defdir=4)
 	catch
 		return 0
-	return 1
+	return TRUE

 /obj/structure/displaycase/proc/get_flat_icon_directional(atom/A)
 	//Get flatIcon even if dir is mismatched for directionless icons