effect cleanup (#7502)

yeah, also updates emissive blockers

code/modules/atmospherics/machinery/air_alarm.dm

@@ -27,7 +27,7 @@ CREATE_WALL_MOUNTING_TYPES_SHIFTED(/obj/machinery/air_alarm, 26)
 	req_one_access = list(ACCESS_ENGINEERING_ATMOS, ACCESS_ENGINEERING_ENGINE)
 	clicksound = "button"
 	clickvol = 30
-	//blocks_emissive = NONE
+	//blocks_emissive = EMISSIVE_BLOCK_NONE
 	light_power = 0.25
 
 	/// The area we're registered to

code/modules/power/supermatter/supermatter.dm

@@ -104,17 +104,24 @@
 	/// Cooldown tracker for accent sounds,
 	var/last_accent_sound = 0
 
-	var/datum/looping_sound/supermatter/soundloop
-
 	var/list/history = list()
 	var/record_size = 60
 	var/record_interval = 20
 	var/next_record = 0
 
+	///An effect we show to admins and ghosts the percentage of delam we're at
+	var/obj/effect/countdown/supermatter/countdown
+
+	var/datum/looping_sound/supermatter/soundloop
+
 /obj/machinery/power/supermatter/Initialize(mapload)
 	. = ..()
 	uid = gl_uid++
+
+	countdown = new(src)
+	countdown.start()
 	soundloop = new(list(src), TRUE)
+
 	history["integrity_history"] = list()
 	history["EER_history"] = list()
 	history["temperature_history"] = list()
@@ -123,6 +130,7 @@
 
 /obj/machinery/power/supermatter/Destroy()
 	STOP_PROCESSING(SSobj, src)
+	QDEL_NULL(countdown)
 	QDEL_NULL(soundloop)
 	return ..()
 
@@ -488,21 +496,22 @@
 
 		Consume(bumped_atom)
 
-/obj/machinery/power/supermatter/proc/Consume(var/mob/living/user)
+/obj/machinery/power/supermatter/proc/Consume(atom/movable/nom)
 	// todo: rework the fucking supermatter so we don't need this
 	// todo: also rework shit to not keep references to deleted things; LOOKING AT YOU CYBORGS
 	// tl;dr cyborgs keep refs to shit that's deleted and keep letting you use them
 	// so we add a sanity check here
-	if(QDELETED(user))
+	if(QDELETED(nom))
 		return
-	if(user & (ATOM_ABSTRACT | ATOM_NONWORLD))
+	if(nom & (ATOM_ABSTRACT | ATOM_NONWORLD))
 		return
-	investigate_log("Consumed [user] ([ref(user)]) potentially last touched by [user.fingerprintslast], adding [istype(user)? 400 : 200] energy.", INVESTIGATE_SUPERMATTER)
-	if(istype(user))
-		user.dust()
+	investigate_log("Consumed [nom] ([ref(nom)]) potentially last touched by [nom.fingerprintslast], adding [istype(nom)? 400 : 200] energy.", INVESTIGATE_SUPERMATTER)
+	if(ismob(nom))
+		var/mob/M = nom
+		M.dust()
 		power += 200
 	else
-		qdel(user)
+		qdel(nom)
 
 	power += 200