Merge branch 'master' into upstream-merge-26131

code/modules/power/cell.dm

@@ -69,7 +69,7 @@
 		return 0
 	charge = (charge - amount)
 	if(!istype(loc, /obj/machinery/power/apc))
-		feedback_add_details("cell_used","[src.type]")
+		SSblackbox.add_details("cell_used","[src.type]")
 	return 1
 
 // recharge the cell

code/modules/power/singularity/emitter.dm

@@ -93,6 +93,7 @@
 		connect_to_network()
 
 	sparks = new
+	sparks.attach(src)
 	sparks.set_up(5, TRUE, src)
 
 /obj/machinery/power/emitter/Destroy()

code/modules/power/singularity/generator.dm

@@ -32,7 +32,7 @@
 	if(energy > 0)
 		if(energy >= 200)
 			var/turf/T = get_turf(src)
-			feedback_add_details("engine_started","[src.type]")
+			SSblackbox.add_details("engine_started","[src.type]")
 			var/obj/singularity/S = new creation_type(T, 50)
 			transfer_fingerprints_to(S)
 			qdel(src)

code/modules/power/singularity/narsie.dm

@@ -39,7 +39,7 @@
 	narsie_spawn_animation()
 
 	sleep(70)
-	SSshuttle.emergency.request(null, 0.1) // Cannot recall
+	SSshuttle.emergency.request(null, set_coefficient = 0.1) // Cannot recall
 
 
 /obj/singularity/narsie/large/attack_ghost(mob/dead/observer/user as mob)

code/modules/power/supermatter/supermatter.dm

@@ -127,7 +127,7 @@
 /obj/machinery/power/supermatter_shard/make_frozen_visual()
 	return
 
-/obj/machinery/power/supermatter_shard/New()
+/obj/machinery/power/supermatter_shard/Initialize()
 	. = ..()
 	countdown = new(src)
 	countdown.start()