diff --git a/code/controllers/subsystems/persistence.dm b/code/controllers/subsystems/persistence.dm index f238621b3e1..e20c83e5a59 100644 --- a/code/controllers/subsystems/persistence.dm +++ b/code/controllers/subsystems/persistence.dm @@ -4,7 +4,7 @@ SUBSYSTEM_DEF(persistence) flags = SS_NO_FIRE var/list/tracking_values = list() var/list/persistence_datums = list() - + /// Places our subsystem can spawn paintings (helps with art spawning differently across maps) var/list/obj/structure/sign/painting/painting_frames = list() var/list/all_paintings = list() @@ -36,10 +36,6 @@ SUBSYSTEM_DEF(persistence) if(!A || (A.flags & AREA_FLAG_IS_NOT_PERSISTENT)) return -// if((!T.z in GLOB.using_map.station_levels) || !initialized) - if(!(T.z in using_map.station_levels)) - return - if(!(T.z in using_map.persist_levels)) return diff --git a/code/modules/persistence/datum/persistence_datum.dm b/code/modules/persistence/datum/persistence_datum.dm index 325ff15ceda..14d813406d9 100644 --- a/code/modules/persistence/datum/persistence_datum.dm +++ b/code/modules/persistence/datum/persistence_datum.dm @@ -71,7 +71,7 @@ return var/_z = token["z"] - if(_z in using_map.station_levels) + if(_z in using_map.persist_levels) . = GetValidTurf(locate(token["x"], token["y"], _z), token) if(.) CreateEntryInstance(., token) @@ -82,7 +82,7 @@ if(GetEntryAge(entry) >= entries_expire_at) return FALSE var/turf/T = get_turf(entry) - if(!T || !(T.z in using_map.station_levels) ) + if(!T || !(T.z in using_map.persist_levels) ) return FALSE var/area/A = get_area(T) if(!A || (A.flags & AREA_FLAG_IS_NOT_PERSISTENT)) @@ -104,7 +104,7 @@ /datum/persistent/proc/Shutdown() if(fexists(filename)) fdel(filename) - + var/list/to_store = list() for(var/thing in SSpersistence.tracking_values[type]) if(!IsValidEntry(thing)) @@ -121,10 +121,10 @@ var/list/my_tracks = SSpersistence.tracking_values[type] if(!my_tracks?.len) return - + . = list("[capitalize(name)]") . += "
" - + for(var/thing in my_tracks) . += "[GetAdminDataStringFor(thing, can_modify, user)]" . += "
"