Merge branch 'master' of https://github.com/tgstation/tgstation into TiredOfTheInconsistency

code/controllers/subsystem/persistence.dm

@@ -81,12 +81,25 @@ SUBSYSTEM_DEF(persistence)
 	var/saved_messages = json_decode(saved_json)
 
 	for(var/item in saved_messages)
-		var/turf/T = locate(item["x"], item["y"], ZLEVEL_STATION)
+		if(!islist(item))
+			continue
+
+		var/xvar = item["x"]
+		var/yvar = item["y"]
+		var/zvar = item["z"]
+
+		if(!xvar || !yvar || !zvar)
+			continue
+
+		var/turf/T = locate(xvar, yvar, zvar)
 		if(!isturf(T))
 			continue
+
 		if(locate(/obj/structure/chisel_message) in T)
 			continue
+
 		var/obj/structure/chisel_message/M = new(T)
+
 		M.unpack(item)
 		if(!M.loc)
 			M.persists = FALSE