Merge pull request #614 from Citadel-Station-13/upstream-merge-26521

[MIRROR] Fixes templates/ruins not updating area list
This commit is contained in:
LetterJay
2017-04-28 08:18:31 -05:00
committed by GitHub
7 changed files with 21 additions and 8 deletions

View File

@@ -51,7 +51,7 @@
return FALSE
smooth_zlevel(world.maxz)
SortAreas()
repopulate_sorted_areas()
//initialize things that are normally initialized after map load
initTemplateBounds(bounds)
@@ -74,6 +74,9 @@
//initialize things that are normally initialized after map load
initTemplateBounds(bounds)
if(!SSmapping.loading_ruins) //Will be done manually during mapping ss init
repopulate_sorted_areas()
log_game("[name] loaded at at [T.x],[T.y],[T.z]")
return TRUE

View File

@@ -355,9 +355,13 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
if(!isobserver(usr))
to_chat(usr, "Not when you're not dead!")
return
var/A
A = input("Area to jump to", "BOOYEA", A) as null|anything in GLOB.sortedAreas
var/area/thearea = A
var/list/filtered = list()
for(var/V in GLOB.sortedAreas)
var/area/A = V
if(!A.hidden)
filtered += A
var/area/thearea = input("Area to jump to", "BOOYEA") as null|anything in filtered
if(!thearea)
return