Merge branch 'master' into upstream-merge-29940

code/game/turfs/simulated/floor/plating/asteroid.dm

@@ -104,7 +104,18 @@
 	return
 
 /turf/open/floor/plating/asteroid/singularity_pull(S, current_size)
-	return
+	if(dug)
+		return
+	switch(current_size)
+		if(STAGE_THREE)
+			if(!prob(30))
+				gets_dug()
+		if(STAGE_FOUR)
+			if(prob(50))
+				gets_dug()
+		else 
+			if(current_size >= STAGE_FIVE && prob(70))
+				gets_dug()
 
 
 /turf/open/floor/plating/asteroid/basalt

code/game/turfs/turf.dm

@@ -163,6 +163,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)
 	..()

code/game/turfs/turf.dm.rej

@@ -1,10 +1 @@
-diff a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm	(rejected hunks)
-@@ -323,7 +323,7 @@
- 		M.take_damage(damage*2, BRUTE, "melee", 1)
- 
- /turf/proc/Bless()
--	flags |= NOJAUNT
-+	flags_1 |= NOJAUNT_1
- 
- /turf/storage_contents_dump_act(obj/item/storage/src_object, mob/user)
- 	if(src_object.contents.len)
+garbage