Merge pull request #2361 from Citadel-Station-13/upstream-merge-29829

[MIRROR] Merges the two turf/Entereds
This commit is contained in:
LetterJay
2017-08-18 13:41:23 -05:00
committed by GitHub
3 changed files with 19 additions and 8 deletions

View File

@@ -95,14 +95,6 @@
has_opaque_atom = TRUE
break
// If an opaque movable atom moves around we need to potentially update visibility.
/turf/Entered(var/atom/movable/Obj, var/atom/OldLoc)
. = ..()
if (Obj && Obj.opacity)
has_opaque_atom = TRUE // Make sure to do this before reconsider_lights(), incase we're on instant updates. Guaranteed to be on in this case.
reconsider_lights()
/turf/Exited(var/atom/movable/Obj, var/atom/newloc)
. = ..()