Merge branch 'master' into upstream-merge-26131

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

@@ -63,7 +63,7 @@
 			if(istype(src, /turf/open/floor/plating/asteroid))
 				to_chat(user, "<span class='notice'>You dig a hole.</span>")
 				gets_dug()
-				feedback_add_details("pick_used_mining","[W.type]")
+				SSblackbox.add_details("pick_used_mining","[W.type]")
 
 	if(istype(W,/obj/item/weapon/storage/bag/ore))
 		var/obj/item/weapon/storage/bag/ore/S = W

code/game/turfs/simulated/minerals.dm

@@ -63,7 +63,7 @@
 			if(ismineralturf(src))
 				to_chat(user, "<span class='notice'>You finish cutting into the rock.</span>")
 				gets_drilled(user)
-				feedback_add_details("pick_used_mining","[P.type]")
+				SSblackbox.add_details("pick_used_mining","[P.type]")
 	else
 		return attack_hand(user)
 
@@ -72,7 +72,7 @@
 		var/i
 		for(i in 1 to mineralAmt)
 			new mineralType(src)
-			feedback_add_details("ore_mined",mineralType)
+			SSblackbox.add_details("ore_mined",mineralType)
 	ChangeTurf(turf_type, defer_change)
 	addtimer(CALLBACK(src, .proc/AfterChange), 1, TIMER_UNIQUE)
 	playsound(src, 'sound/effects/break_stone.ogg', 50, 1) //beautiful destruction

code/game/turfs/simulated/minerals.dm.rej

@@ -0,0 +1,19 @@
+diff a/code/game/turfs/simulated/minerals.dm b/code/game/turfs/simulated/minerals.dm	(rejected hunks)
+@@ -64,7 +64,7 @@
+ 			if(ismineralturf(src))
+ 				to_chat(user, "<span class='notice'>You finish cutting into the rock.</span>")
+ 				gets_drilled(user)
+-				feedback_add_details("pick_used_mining","[P.type]")
++				SSblackbox.add_details("pick_used_mining","[P.type]")
+ 	else
+ 		return attack_hand(user)
+ 	return
+@@ -74,7 +74,7 @@
+ 		var/i
+ 		for (i=0;i<mineralAmt;i++)
+ 			new mineralType(src)
+-		feedback_add_details("ore_mined","[mineralType]|[mineralAmt]")
++		SSblackbox.add_details("ore_mined","[mineralType]|[mineralAmt]")
+ 	ChangeTurf(turf_type, defer_change)
+ 	addtimer(CALLBACK(src, .proc/AfterChange), 1, TIMER_UNIQUE)
+ 	playsound(src, 'sound/effects/break_stone.ogg', 50, 1) //beautiful destruction

code/game/turfs/space/space.dm

@@ -42,6 +42,8 @@
 
 	if (opacity)
 		has_opaque_atom = TRUE
+	
+	return INITIALIZE_HINT_NORMAL
 
 /turf/open/space/attack_ghost(mob/dead/observer/user)
 	if(destination_z)

code/game/turfs/turf.dm

@@ -56,6 +56,7 @@
 
 	if (opacity)
 		has_opaque_atom = TRUE
+	return INITIALIZE_HINT_NORMAL
 
 /turf/proc/Initalize_Atmos(times_fired)
 	CalculateAdjacentTurfs()