Merge branch 'master' into upstream-merge-26760

code/modules/power/singularity/emitter.dm

@@ -97,11 +97,10 @@
 	sparks.set_up(5, TRUE, src)
 
 /obj/machinery/power/emitter/Destroy()
-	if(SSticker && SSticker.current_state == GAME_STATE_PLAYING)
-		var/turf/T = get_turf(src)
-		message_admins("Emitter deleted at [ADMIN_COORDJMP(T)]",0,1)
-		log_game("Emitter deleted at [COORD(T)]")
-		investigate_log("<font color='red'>deleted</font> at [get_area(src)] [COORD(T)]","singulo")
+	if(SSticker && SSticker.IsRoundInProgress())
+		message_admins("Emitter deleted at ([x],[y],[z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)",0,1)
+		log_game("Emitter deleted at ([x],[y],[z])")
+		investigate_log("<font color='red'>deleted</font> at ([x],[y],[z]) at [get_area(src)]","singulo")
 	QDEL_NULL(sparks)
 	return ..()