From a6d333ab5eda149fbeb840bb36773e4a334fb370 Mon Sep 17 00:00:00 2001
From: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date: Wed, 21 Oct 2020 20:16:03 +0100
Subject: [PATCH] Adds user logging for emitter deletions + Fixes lobby tab
 (#14685)

* Adds user logging for emitter deletions

* Fixes something I broke with lobby too
---
 code/modules/mob/new_player/new_player.dm | 8 ++++----
 code/modules/power/singularity/emitter.dm | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index 6b57cc44cb7..71d3abd5e2c 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -114,6 +114,10 @@
 
 /mob/new_player/Stat()
 	statpanel("Status")
+
+	..()
+
+	statpanel("Lobby")
 	if(client.statpanel=="Lobby" && SSticker)
 		if(SSticker.hide_mode)
 			stat("Game Mode:", "Secret")
@@ -141,10 +145,6 @@
 				if(player.ready)
 					totalPlayersReady++
 
-	..()
-
-	statpanel("Lobby")
-
 
 /mob/new_player/Topic(href, href_list[])
 	if(!client)
diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm
index ceb3b578588..859a97bc7fb 100644
--- a/code/modules/power/singularity/emitter.dm
+++ b/code/modules/power/singularity/emitter.dm
@@ -74,9 +74,9 @@
 	rotate()
 
 /obj/machinery/power/emitter/Destroy()
-	msg_admin_attack("Emitter deleted at ([x],[y],[z] - [ADMIN_JMP(src)])", ATKLOG_FEW)
+	msg_admin_attack("Emitter deleted at ([x],[y],[z] - [ADMIN_JMP(src)]) [usr ? "Broken by [key_name_admin(usr)]" : ""]", ATKLOG_FEW)
 	log_game("Emitter deleted at ([x],[y],[z])")
-	investigate_log("<font color='red'>deleted</font> at ([x],[y],[z])","singulo")
+	investigate_log("<font color='red'>deleted</font> at ([x],[y],[z]) [usr ? "Broken by [key_name(usr)]" : ""]","singulo")
 	QDEL_NULL(sparks)
 	return ..()