From 3a763afc750310f7e4d21bc2c64a077b4d6983a3 Mon Sep 17 00:00:00 2001
From: Chaplain Maximum <nngg223524@gmail.com>
Date: Sun, 21 Jul 2024 03:03:48 +0300
Subject: [PATCH] Fix

---
 code/modules/admin/admin_verbs.dm |  1 +
 colonialmarines.dme               |  1 +
 void-marines/code/admin_tools.dm  | 35 ++++++++++++++++++++++---------
 3 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 6e47391fc1..314bc75972 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -14,6 +14,7 @@ var/list/admin_verbs_default = list(
 	/client/proc/create_custom_paper,
 	/client/proc/cmd_admin_change_their_name,
 	/client/proc/cmd_admin_changekey,
+	/client/proc/editappearplayer,
 	/client/proc/cmd_admin_subtle_message,
 	/client/proc/cmd_admin_atom_narrate,
 	/client/proc/cmd_admin_xeno_report,  //Allows creation of IC reports by the Queen Mother
diff --git a/colonialmarines.dme b/colonialmarines.dme
index fe9860e217..300f01a677 100644
--- a/colonialmarines.dme
+++ b/colonialmarines.dme
@@ -2476,4 +2476,5 @@
 #include "void-marines\code\rasputin.dm"
 #include "void-marines\code\reserve_role.dm"
 #include "void-marines\code\vendors.dm"
+#include "void-marines\code\admin_tools.dm"
 // END_INCLUDE
diff --git a/void-marines/code/admin_tools.dm b/void-marines/code/admin_tools.dm
index b0a970222d..f0a7472cc3 100644
--- a/void-marines/code/admin_tools.dm
+++ b/void-marines/code/admin_tools.dm
@@ -10,6 +10,31 @@
 	switch(alert("Are you sure you wish to edit this mob's appearance?",,"Yes","No"))
 		if("No")
 			return
+
+	// Changing name \\
+
+	var/newname = input(M, "What do you want to name them?", "Name:") as null|text
+	if(!newname)
+		return
+
+	if(!M)
+		to_chat(usr, "This mob no longer exists")
+		return
+
+	var/old_name = M.name
+	M.change_real_name(M, newname)
+	if(istype(M, /mob/living/carbon/human))
+		var/mob/living/carbon/human/H = M
+		if(H.wear_id)
+			H.wear_id.name = "[H.real_name]'s ID Card"
+			H.wear_id.registered_name = "[H.real_name]"
+			if(H.wear_id.assignment)
+				H.wear_id.name += " ([H.wear_id.assignment])"
+
+	message_admins("[key_name(src)] changed name of [old_name] to [newname].")
+
+	// Changing appear \\
+
 	var/new_facial = input(M, "Please select facial hair color.", "Character Generation") as color
 	if(new_facial)
 		M.r_facial = hex2num(copytext(new_facial, 2, 4))
@@ -47,13 +72,3 @@
 			M.gender = FEMALE
 	M.update_hair()
 	M.update_body()
-
-	var/old_name = M.name
-	M.change_real_name(M, newname)
-	if(M.wear_id)
-		M.wear_id.name = "[M.real_name]'s ID Card"
-		M.wear_id.registered_name = "[M.real_name]"
-		if(M.wear_id.assignment)
-			M.wear_id.name += " ([M.wear_id.assignment])"
-
-	message_admins("[key_name(src)] changed name of [old_name] to [newname].")