Fixes some runtimes with soapstone messages

I'm not sure why they're not loading on main anymore, possibly some bad
JSON data? This stopped the warning locally, anyway.
This commit is contained in:
Jack Edge
2017-03-22 20:06:09 +00:00
parent ec721fe672
commit 4e8badad73
2 changed files with 22 additions and 3 deletions
+14 -1
View File
@@ -86,12 +86,25 @@ var/datum/controller/subsystem/persistence/SSpersistence
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