shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
silicons
2020-12-26 22:20:04 -08:00
parent 753c1389cc
commit 57065d995e
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/controllers/subsystem/mapping.dm
View File

@@ -264,8 +264,12 @@ SUBSYSTEM_DEF(mapping)
/datum/controller/subsystem/mapping/proc/setup_station_z_index()
z_to_station_z_index = list()
var/sz = 1
for(var/i in station_start to (station_start + islist(config.map_file)? (length(config.map_file) - 1) : 0))
z_to_station_z_index["[i]"] = sz++
var/cz = station_start
if(islist(config.map_file))
for(var/map in config.map_file)
z_to_station_z_index["[cz++]"] = sz++
else
z_to_station_z_index["[station_start]"] = 1
/datum/controller/subsystem/mapping/proc/loadWorld()
//if any of these fail, something has gone horribly, HORRIBLY, wrong

15
code/controllers/subsystem/persistence/cleanable_debris.dm
View File

@@ -32,21 +32,16 @@
/// reverse it
for(var/z in SSmapping.z_to_station_z_index)
var/sz = SSmapping.z_to_station_z_index[z]
z_lookup[num2text(sz)] = z
z_lookup[num2text(sz)] = text2num(z)
for(var/z in data)
to_chat(world, "DEBUG: looking at z [z]")
var/actual_z = z_lookup[z]
to_chat(world, "DEBUG: actual z [actual_z]")
var/list/L1 = data[z]
for(var/x in L1)
to_chat(world, "DEBUG: looking at x [x]")
var/list/L2 = data[z][x]
for(var/y in L2)
to_chat(world, "DEBUG: looking at y [y]")
var/turf/tile = locate(x, y, actual_z)
to_chat(world, "DEBUG: finding turf [x] [y] [z]: [tile]")
var/turf/tile = locate(text2num(x), text2num(y), actual_z)
if(!tile)
to_chat(world, "DEBUG: aborting due to no turf")
to_chat(world, "DEBUG: aborting due to no turf ([x] [y] [actual_z])")
continue
var/list/objects = data[z][x][y]
for(var/_L in objects)
@@ -59,10 +54,10 @@
path = text2path(_L)
objdata = objects[_L]
if(!path)
to_chat(world, "DEBUG: Aborting: No path")
to_chat(world, "DEBUG: Aborting: No path ([x] [y] [actual_z])")
continue
if(!IsValidDebrisLocation(tile, allowed_turf_typecache, allowed_z_cache, path, TRUE))
to_chat(world, "DEBUG: Aborting: Invalid location")
to_chat(world, "DEBUG: Aborting: Invalid location ([x] [y] [actual_z])")
continue
var/obj/effect/decal/cleanable/instantiated = new path(tile)
if(objdata)