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

[MIRROR] Merges the two turf/Entereds

code/game/turfs/turf.dm

@@ -164,6 +164,12 @@
 	if(explosion_level && AM.ex_check(explosion_id))
 		AM.ex_act(explosion_level)
 		
+	// If an opaque movable atom moves around we need to potentially update visibility.
+	if (AM.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/open/Entered(atom/movable/AM)
 	..()
 	//slipping

code/game/turfs/turf.dm.rej

@@ -0,0 +1,13 @@
+diff a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm	(rejected hunks)
+@@ -163,6 +163,11 @@
+ 	if(explosion_level && AM.ex_check(explosion_id))
+ 		AM.ex_act(explosion_level)
+ 
++	// If an opaque movable atom moves around we need to potentially update visibility.
++	if (AM.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/open/Entered(atom/movable/AM)
+ 	..()
+ 	//melting

code/modules/lighting/lighting_turf.dm

@@ -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)
 	. = ..()