Merge pull request #3892 from Citadel-Station-13/upstream-merge-32584

[MIRROR] Fixes some cases where changeturf were called incorrectly
This commit is contained in:
LetterJay
2017-11-11 15:56:45 -06:00
committed by GitHub
2 changed files with 10 additions and 5 deletions
+1 -1
View File
@@ -74,7 +74,7 @@
if(T.y+height > world.maxy)
return
var/list/bounds = maploader.load_map(file(mappath), T.x, T.y, T.z, cropMap=TRUE)
var/list/bounds = maploader.load_map(file(mappath), T.x, T.y, T.z, cropMap=TRUE, no_changeturf=(SSatoms.initialized == INITIALIZATION_INSSATOMS))
if(!bounds)
return