Merge pull request #3708 from Citadel-Station-13/upstream-merge-32213

[MIRROR] New ambience for ash storms
This commit is contained in:
LetterJay
2017-10-31 03:03:37 -04:00
committed by GitHub
28 changed files with 113 additions and 4 deletions
+16
View File
@@ -132,6 +132,22 @@ GLOBAL_LIST_EMPTY(teleportlocs)
if(!IS_DYNAMIC_LIGHTING(src))
add_overlay(/obj/effect/fullbright)
if(contents.len)
var/list/areas_in_z = SSmapping.areas_in_z
var/z
for(var/i in 1 to contents.len)
var/atom/thing = contents[i]
if(!thing)
continue
z = thing.z
break
if(!z)
WARNING("No z found for [src]")
return
if(!areas_in_z["[z]"])
areas_in_z["[z]"] = list()
areas_in_z["[z]"] += src
/area/Destroy()
STOP_PROCESSING(SSobj, src)
return ..()