Merge upstream

This commit is contained in:
Cyberboss
2017-04-01 23:33:23 -04:00
121 changed files with 2258 additions and 4320 deletions
@@ -168,7 +168,7 @@ PROCESSING_SUBSYSTEM_DEF(overlays)
var/list/cached_other = other.our_overlays
if(cached_other)
if(cut_old)
if(cut_old || !LAZYLEN(our_overlays))
our_overlays = cached_other.Copy()
else
our_overlays |= cached_other