TG: - Redesigned the options panel (show player panel verb) to be less terrible.

Screenshot: http://www.kamletos.si/options%20panel.PNG - Made some changes to admin verbs: - Rejuvenate verb removed from mobs, is now in the options panel above (heal). - Drop everything verb moved into view variables, added a confirmation message. - Mute verb removed from mobs, use the options panel. - Warn verb removed from mobs, use the options panel. - Grant full access moved to debug verbs. - Rejuvanate as a verb also still exists in debug verbs. These changes were made to make right clicking a mob not show a million unneeded verbs. They were moved based on the statistics gathered via feedback logging: http://www.kamletos.si/tgdb/latest_stats.html#adminverbs Please post any additional feedback on the admin forum. Renaming mobs by clicking the big name at the top of the view-variables screen now updates real_name too. Additionally, if the mob is human, the first ID and PDA found in the mob's contents which is associated with the original name, will have their details updated. Nomore having to edit like, 6 variables everytime somebody names themself "dicks", "sanic" or "captain" ... etc. Revision: r3532, r3533 Author: baloh.matevz, elly1...@rocketmail.com
2025-12-20 23:21:20 +00:00 · 2012-05-06 20:01:18 +01:00
parent 7b3bfada34
commit 097b08fa25
7 changed files with 241 additions and 111 deletions
--- a/code/datums/datumvars.dm
+++ b/code/datums/datumvars.dm
@@ -167,10 +167,10 @@ client

 		if(istype(D,/atom))
 			var/atom/A = D
-			body += "<a href='byond://?src=\ref[src];datumedit=\ref[D];varnameedit=name'><b>[D]</b></a>"
+			if(ismob(A))
+				body += "<a href='byond://?src=\ref[src];rename=\ref[D]'><b>[D]</b></a>"
 				if(A.dir)
 					body += "<br><font size='1'><a href='byond://?src=\ref[src];rotatedatum=\ref[D];rotatedir=left'><<</a> <a href='byond://?src=\ref[src];datumedit=\ref[D];varnameedit=dir'>[dir2text(A.dir)]</a> <a href='byond://?src=\ref[src];rotatedatum=\ref[D];rotatedir=right'>>></a></font>"
-			if(istype(A,/mob))
 				var/mob/M = A
 				body += "<br><font size='1'><a href='byond://?src=\ref[src];datumedit=\ref[D];varnameedit=ckey'>[M.ckey ? M.ckey : "No ckey"]</a> / <a href='byond://?src=\ref[src];datumedit=\ref[D];varnameedit=real_name'>[M.real_name ? M.real_name : "No real name"]</a></font>"
 				body += {"
@@ -185,6 +185,10 @@ client


 				"}
+			else
+				body += "<a href='byond://?src=\ref[src];datumedit=\ref[D];varnameedit=name'><b>[D]</b></a>"
+				if(A.dir)
+					body += "<br><font size='1'><a href='byond://?src=\ref[src];rotatedatum=\ref[D];rotatedir=left'><<</a> <a href='byond://?src=\ref[src];datumedit=\ref[D];varnameedit=dir'>[dir2text(A.dir)]</a> <a href='byond://?src=\ref[src];rotatedatum=\ref[D];rotatedir=right'>>></a></font>"
 		else
 			body += "<b>[D]</b>"

@@ -239,7 +243,8 @@ client
 			body += "<option value='byond://?src=\ref[src];ninja=\ref[D]'>Make Space Ninja</option>"
 			body += "<option value='byond://?src=\ref[src];godmode=\ref[D]'>Toggle Godmode</option>"
 			body += "<option value='byond://?src=\ref[src];build_mode=\ref[D]'>Toggle Build Mode</option>"
-//			body += "<option value='byond://?src=\ref[src];direct_control=\ref[D]'>Assume Direct Control</option>"
+			body += "<option value='byond://?src=\ref[src];direct_control=\ref[D]'>Assume Direct Control</option>"
+			body += "<option value='byond://?src=\ref[src];drop_everything=\ref[D]'>Drop Everything</option>"
 			if(ishuman(D))
 				body += "<option value>---</option>"
 				body += "<option value='byond://?src=\ref[src];makeai=\ref[D]'>Make AI</option>"
@@ -389,6 +394,31 @@ client

 		if (href_list["Vars"])
 			debug_variables(locate(href_list["Vars"]))
+
+		//~CARN: for renaming mobs (updates their real_name and their ID/PDA if applicable).
+		else if (href_list["rename"])
+			var/new_name = input(usr,"What would you like to name this mob?","Input a name") as text|null
+			if(!new_name)	return
+			var/mob/M = locate(href_list["rename"])
+			if(!istype(M))	return
+
+			message_admins("Admin [key_name_admin(usr)] renamed [key_name_admin(M)] to [new_name].", 1)
+			if(istype(M, /mob/living/carbon/human))
+				for(var/obj/item/weapon/card/id/ID in M.contents)
+					if(ID.registered_name == M.real_name)
+						ID.name = "[new_name]'s ID Card ([ID.assignment])"
+						ID.registered_name = new_name
+						break
+				for(var/obj/item/device/pda/PDA in M.contents)
+					if(PDA.owner == M.real_name)
+						PDA.name = "PDA-[new_name] ([PDA.ownjob])"
+						PDA.owner = new_name
+						break
+			M.real_name = new_name
+			M.name = new_name
+			M.original_name = new_name
+			href_list["datumrefresh"] = href_list["rename"]
+
 		else if (href_list["varnameedit"])
 			if(!href_list["datumedit"] || !href_list["varnameedit"])
 				usr << "Varedit error: Not all information has been sent Contact a coder."
@@ -498,6 +528,20 @@ client
 			togglebuildmode(MOB)
 			href_list["datumrefresh"] = href_list["build_mode"]

+		else if (href_list["drop_everything"])
+			if(!href_list["drop_everything"])
+				return
+			var/mob/MOB = locate(href_list["drop_everything"])
+			if(!MOB)
+				return
+			if(!ismob(MOB))
+				return
+			if(!src.holder)
+				return
+
+			if(usr.client)
+				usr.client.cmd_admin_drop_everything(MOB)
+
 		else if (href_list["direct_control"])
 			if(!href_list["direct_control"])
 				return
--- a/code/defines/procs/helpers.dm
+++ b/code/defines/procs/helpers.dm
@@ -1829,6 +1829,13 @@ proc/get_opposite(var/checkdir)
 			count++
 	return count

+proc/get_mob_with_client_list()
+	var/list/mobs = list()
+	for(var/mob/M in world)
+		if (M.client)
+			mobs += M
+	return mobs
+
 /proc/reverse_direction(var/dir)
 	switch(dir)
 		if(NORTH)
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -2231,6 +2231,7 @@ var/global/BSACooldown = 0
 	set category = "Admin"
 	set name = "Show Player Panel"
 	set desc="Edit player (respawn, ban, heal, etc)"
+
 	if(!M)
 		usr << "You seem to be selecting a mob that doesn't exist anymore."
 		return
@@ -2239,60 +2240,123 @@ var/global/BSACooldown = 0
 	if (!istype(src,/obj/admins))
 		usr << "Error: you are not an admin!"
 		return
-	var/dat = "<html><head><title>Options for [M.key]</title></head>"
-	var/foo = " "
-	if (ismob(M) && M.client)
-//		if(!M.client.authenticated && !M.client.authenticating)
-//			foo += text("<A HREF='?src=\ref[src];adminauth=\ref[M]'>Authorize</A> | ")
-//		else
-//			foo += text("<B>Authorized</B> | ")
-		foo += text("<A HREF='?src=\ref[src];prom_demot=\ref[M.client]'>Promote/Demote</A> | ")
-		if(!istype(M, /mob/new_player))
-			if(!ismonkey(M))
-				foo += text("<A HREF='?src=\ref[src];monkeyone=\ref[M]'>Monkeyize</A> | ")
-			else
-				foo += text("<B>Monkeyized</B> | ")
-			if(!iscorgi(M))
-				foo += text("<A HREF='?src=\ref[src];corgione=\ref[M]'>Corgize</A> | ")
-			else
-				foo += text("<B>Corgized</B> | ")
-			if(isAI(M))
-				foo += text("<B>Is an AI</B> | ")
-			else if(ishuman(M))
-				foo += text("<A HREF='?src=\ref[src];makeai=\ref[M]'>Make AI</A> | ")
-				foo += text("<A HREF='?src=\ref[src];makeaisilent=\ref[M]'>Make AI Silently</A> | ")
-				foo += text("<A HREF='?src=\ref[src];makerobot=\ref[M]'>Make Robot</A> | ")
-				foo += text("<A HREF='?src=\ref[src];makealien=\ref[M]'>Make Alien</A> | ")
-				foo += text("<A HREF='?src=\ref[src];makemetroid=\ref[M]'>Make Metroid</A> | ")
-			foo += text("<A HREF='?src=\ref[src];tdome1=\ref[M]'>Thunderdome 1</A> | ")
-			foo += text("<A HREF='?src=\ref[src];tdome2=\ref[M]'>Thunderdome 2</A> | ")
-			foo += text("<A HREF='?src=\ref[src];tdomeadmin=\ref[M]'>Thunderdome Admin</A> | ")
-			foo += text("<A HREF='?src=\ref[src];tdomeobserve=\ref[M]'>Thunderdome Observer</A> | ")
-			foo += text("<A HREF='?src=\ref[src];sendtoprison=\ref[M]'>Prison</A> | ")
-		//	foo += text("<A HREF='?src=\ref[src];sendtomaze=\ref[M]'>Maze</A> | ")
-			foo += text("<A HREF='?src=\ref[src];revive=\ref[M]'>Heal/Revive</A> | ")
-		else
-			foo += text("<B>Hasn't Entered Game</B> | ")
-		foo += text("<A href='?src=\ref[src];forcespeech=\ref[M]'>Forcesay</A> | ")
+
+	var/body = "<html><head><title>Options for [M.key]</title></head>"
+	body += "<body>Options panel for <b>[M]</b>"
 	if(M.client)
-			foo += text("<A href='?src=\ref[src];mute2=\ref[M]'>Mute: [(M.client.muted ? "Muted" : "Voiced")]</A> | ")
-			foo += text("<A href='?src=\ref[src];mute_complete=\ref[M]'>Complete mute: [(M.client.muted ? "Completely Muted" : "Voiced")]</A> | ")
+		body += " played by <b>[M.client]</b> "
+		if(M.client.holder)
+			body += "\[<A href='?src=\ref[src];prom_demot=\ref[M.client]'>[M.client.holder.rank]</A>\]"
 		else
-			foo += "Mute unavailable - no client"
-		foo += text("<A href='?src=\ref[src];boot2=\ref[M]'>Boot</A>")
-	foo += text("<br>")
-	foo += text("<A href='?src=\ref[src];jumpto=\ref[M]'>Jump to</A> | ")
-	foo += text("<A href='?src=\ref[src];getmob=\ref[M]'>Get</A> | ")
-	foo += text("<A href='?src=\ref[src];sendmob=\ref[M]'>Send</A>")
-	foo += text("<br>")
-	foo += text("<A href='?src=\ref[src];traitor=\ref[M]'>Edit mind</A> | ")
-	foo += text("<A href='?src=\ref[src];narrateto=\ref[M]'>Narrate to</A> | ")
-	foo += text("<A href='?src=\ref[src];subtlemessage=\ref[M]'>Subtle message</A>")
-	foo += text("<br>")
-	foo += text("<A href='?src=\ref[src];newban=\ref[M]'>Ban</A> | ")
-	foo += text("<A href='?src=\ref[src];jobban2=\ref[M]'>Jobban</A>")
-	dat += text("<body>[foo]</body></html>")
-	usr << browse(dat, "window=adminplayeropts;size=480x150")
+			body += "\[<A href='?src=\ref[src];prom_demot=\ref[M.client]'>Player</A>\]"
+
+	if(istype(M, /mob/new_player))
+		body += " <B>Hasn't Entered Game</B> "
+	else
+		body += " \[<A href='?src=\ref[src];revive=\ref[M]'>Heal</A>\] "
+
+	body += "<br><br>\[ "
+	body += "<a href='?src=\ref[src];adminplayervars=\ref[M]'>VV</a> - "
+	body += "<a href='?src=\ref[src];traitor_panel_pp=\ref[M]'>TP</a> - "
+	body += "<a href='?src=\ref[usr];priv_msg=\ref[M]'>PM</a> - "
+	body += "<a href='?src=\ref[src];adminplayersubtlemessage=\ref[M]'>SM</a> - "
+	body += "<a href='?src=\ref[src];adminplayerobservejump=\ref[M]'>JMP</a>\] </b><br>"
+
+	body += "<b>Mob type</b> = [M.type]<br><br>"
+
+	body += "<A href='?src=\ref[src];boot2=\ref[M]'>Kick</A> | "
+	body += "<A href='?src=\ref[src];newban=\ref[M]'>Ban</A> | "
+	body += "<A href='?src=\ref[src];jobban2=\ref[M]'>Jobban</A> "
+
+	if(M.client)
+		body += "| <A HREF='?src=\ref[src];sendtoprison=\ref[M]'>Prison</A> | "
+		body += "<b>Mute:</b> "
+		if(M.client.muted_complete)
+			body += "<b>Completely Muted:</b> (<A href='?src=\ref[src];mute_complete=\ref[M]'>Allow adminhelp</A>)"
+		else
+			if(M.client.muted)
+				body += "<b>Soft Mute:</b> (<A href='?src=\ref[src];mute2=\ref[M]'>Unmute</A>) (<A href='?src=\ref[src];mute_complete=\ref[M]'>Mute adminhelps</A>)"
+			else
+				body += "Voiced: (<A href='?src=\ref[src];mute2=\ref[M]'>Mute</A>)"
+
+	body += "<br><br>"
+	body += "<A href='?src=\ref[src];jumpto=\ref[M]'><b>Jump to</b></A> | "
+	body += "<A href='?src=\ref[src];getmob=\ref[M]'>Get</A>"
+
+	body += "<br><br>"
+	body += "<A href='?src=\ref[src];traitor=\ref[M]'>Traitor panel</A> | "
+	body += "<A href='?src=\ref[src];narrateto=\ref[M]'>Narrate to</A> | "
+	body += "<A href='?src=\ref[src];subtlemessage=\ref[M]'>Subtle message</A>"
+
+	if (M.client)
+		if(!istype(M, /mob/new_player))
+			body += "<br><br>"
+			body += "<b>Transformation:</b>"
+			body += "<br>"
+
+			//Monkey
+			if(ismonkey(M))
+				body += "<B>Monkeyized</B> | "
+			else
+				body += "<A href='?src=\ref[src];monkeyone=\ref[M]'>Monkeyize</A> | "
+
+			//Corgi
+			if(iscorgi(M))
+				body += "<B>Corgized</B> | "
+			else
+				body += "<A href='?src=\ref[src];corgione=\ref[M]'>Corgize</A> | "
+
+			//AI / Cyborg
+			if(isAI(M))
+				body += "<B>Is an AI</B> "
+			else if(ishuman(M))
+				body += "<A href='?src=\ref[src];makeai=\ref[M]'>Make AI</A> | "
+				body += "<A href='?src=\ref[src];makeaisilent=\ref[M]'>Make AI Silently</A> | "
+				body += "<A href='?src=\ref[src];makerobot=\ref[M]'>Make Robot</A> | "
+				body += "<A href='?src=\ref[src];makealien=\ref[M]'>Make Alien</A> | "
+				body += "<A href='?src=\ref[src];makemetroid=\ref[M]'>Make Metroid</A> "
+
+			body += "<br><br>"
+			body += "<b>Rudimentary transformation:</b><font size=2><br>These transformations only create a new mob type and copy stuff over. They do not take into account MMIs and similar mob-specific things. The buttons in 'Transformations' are preferred, when possible.</font><br>"
+			body += "<A href='?src=\ref[src];simplemake=observer;mob=\ref[M]'>Observer</A> | "
+			body += "\[ Alien: <A href='?src=\ref[src];simplemake=drone;mob=\ref[M]'>Drone</A>, "
+			body += "<A href='?src=\ref[src];simplemake=hunter;mob=\ref[M]'>Hunter</A>, "
+			body += "<A href='?src=\ref[src];simplemake=queen;mob=\ref[M]'>Queen</A>, "
+			body += "<A href='?src=\ref[src];simplemake=sentinel;mob=\ref[M]'>Sentinel</A>, "
+			body += "<A href='?src=\ref[src];simplemake=larva;mob=\ref[M]'>Larva</A> \] "
+			body += "<A href='?src=\ref[src];simplemake=human;mob=\ref[M]'>Human</A> "
+			body += "\[ Metroid: <A href='?src=\ref[src];simplemake=metroid;mob=\ref[M]'>Baby</A>, "
+			body += "<A href='?src=\ref[src];simplemake=adultmetroid;mob=\ref[M]'>Adult</A> \] "
+			body += "<A href='?src=\ref[src];simplemake=monkey;mob=\ref[M]'>Monkey</A> | "
+			body += "<A href='?src=\ref[src];simplemake=robot;mob=\ref[M]'>Cyborg</A> | "
+			body += "<A href='?src=\ref[src];simplemake=cat;mob=\ref[M]'>Cat</A> | "
+			body += "<A href='?src=\ref[src];simplemake=runtime;mob=\ref[M]'>Runtime</A> | "
+			body += "<A href='?src=\ref[src];simplemake=corgi;mob=\ref[M]'>Corgi</A> | "
+			body += "<A href='?src=\ref[src];simplemake=ian;mob=\ref[M]'>Ian</A> | "
+			body += "<A href='?src=\ref[src];simplemake=crab;mob=\ref[M]'>Crab</A> | "
+			body += "<A href='?src=\ref[src];simplemake=coffee;mob=\ref[M]'>Coffee</A> | "
+			//body += "<A href='?src=\ref[src];simplemake=parrot;mob=\ref[M]'>Parrot</A> | "
+			//body += "<A href='?src=\ref[src];simplemake=drprofessor;mob=\ref[M]'>DrProfessor</A> | "
+			body += "\[ Construct: <A href='?src=\ref[src];simplemake=constructarmoured;mob=\ref[M]'>Armoured</A> , "
+			body += "<A href='?src=\ref[src];simplemake=constructbuilder;mob=\ref[M]'>Builder</A> , "
+			body += "<A href='?src=\ref[src];simplemake=constructwraith;mob=\ref[M]'>Wraith</A> \] "
+			body += "<A href='?src=\ref[src];simplemake=shade;mob=\ref[M]'>Shade</A>"
+			body += "<br>"
+
+	if (M.client)
+		body += "<br><br>"
+		body += "<b>Other actions:</b>"
+		body += "<br>"
+		body += "<A href='?src=\ref[src];forcespeech=\ref[M]'>Forcesay</A> | "
+		body += "<A href='?src=\ref[src];tdome1=\ref[M]'>Thunderdome 1</A> | "
+		body += "<A href='?src=\ref[src];tdome2=\ref[M]'>Thunderdome 2</A> | "
+		body += "<A href='?src=\ref[src];tdomeadmin=\ref[M]'>Thunderdome Admin</A> | "
+		body += "<A href='?src=\ref[src];tdomeobserve=\ref[M]'>Thunderdome Observer</A> | "
+
+	body += "<br>"
+	body += "</body></html>"
+
+	usr << browse(body, "window=adminplayeropts;size=550x515")
 	//feedback_add_details("admin_verb","SPP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!


--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -64,7 +64,7 @@
 				verbs += /client/proc/cmd_admin_delete
 				verbs += /client/proc/cmd_admin_add_freeform_ai_law
 				verbs += /client/proc/cmd_admin_rejuvenate
-				verbs += /client/proc/cmd_admin_drop_everything
+				//verbs += /client/proc/cmd_admin_drop_everything		--Merged with view variables
 				//verbs += /client/proc/cmd_modify_object_variables 	--Merged with view variables

 		if ("Admin Candidate")
@@ -127,11 +127,11 @@
 			verbs += /obj/admins/proc/votekill
 			verbs += /obj/admins/proc/show_player_panel
 			verbs += /client/proc/deadchat								//toggles deadchat
-			verbs += /client/proc/cmd_admin_mute
+			//verbs += /client/proc/cmd_admin_mute	--was never used (according to stats trackind) - use show player panel --erro
 			verbs += /client/proc/cmd_admin_pm_context
 			verbs += /client/proc/cmd_admin_pm_panel
 			verbs += /client/proc/cmd_admin_subtle_message
-			verbs += /client/proc/warn
+			//verbs += /client/proc/warn	- was never used
 			verbs += /client/proc/dsay
 			verbs += /client/proc/admin_play
 			verbs += /client/proc/admin_observe
@@ -140,7 +140,7 @@
 			verbs += /client/proc/player_panel_new
 			verbs += /client/proc/unban_panel
 			verbs += /client/proc/jobbans
-			verbs += /client/proc/playernotes
+
 			verbs += /client/proc/voting
 			verbs += /client/proc/hide_verbs
 			verbs += /client/proc/general_report
@@ -148,6 +148,7 @@
 			verbs += /client/proc/deadmin_self
 			//verbs += /client/proc/cmd_admin_prison 					--Merged with player panel
 			//verbs += /obj/admins/proc/unprison  						--Merged with player panel
+			verbs += /client/proc/playernotes
 			verbs += /obj/admins/proc/show_skills
 		else	return

@@ -244,9 +245,8 @@
 			verbs += /client/proc/mapload
 			verbs += /client/proc/check_words
 			verbs += /client/proc/drop_bomb
-			verbs += /client/proc/cmd_admin_grantfullaccess
 			verbs += /client/proc/kill_airgroup
-			verbs += /client/proc/cmd_admin_drop_everything
+			//verbs += /client/proc/cmd_admin_drop_everything			--Merged with view variables
 			verbs += /client/proc/make_sound
 			verbs += /client/proc/play_local_sound
 			verbs += /client/proc/send_space_ninja
@@ -350,8 +350,7 @@
 	verbs -= /client/proc/mapload
 	verbs -= /client/proc/check_words
 	verbs -= /client/proc/drop_bomb
-	verbs -= /client/proc/cmd_admin_grantfullaccess
-	verbs -= /client/proc/cmd_admin_drop_everything
+	//verbs -= /client/proc/cmd_admin_drop_everything					--merged with view variables
 	verbs -= /client/proc/make_sound
 	verbs -= /client/proc/only_one
 	verbs -= /client/proc/send_space_ninja
@@ -379,17 +378,18 @@
 	verbs -= /client/proc/spawn_xeno
 	verbs -= /client/proc/cmd_admin_add_random_ai_law
 	verbs -= /client/proc/secrets
+	verbs -= /client/proc/check_antagonists
 	verbs -= /client/proc/play_sound
 	verbs -= /client/proc/stealth
 	verbs -= /client/proc/cmd_admin_check_contents
 	verbs -= /client/proc/cmd_admin_create_centcom_report
 	verbs -= /client/proc/deadchat										//toggles deadchat
-	verbs -= /client/proc/cmd_admin_mute
+	//verbs -= /client/proc/cmd_admin_mute	--was never used (according to stats trackind) - use show player panel --erro
 	verbs -= /client/proc/cmd_admin_pm_context
 	verbs -= /client/proc/cmd_admin_pm_panel
 	verbs -= /client/proc/cmd_admin_say
 	verbs -= /client/proc/cmd_admin_subtle_message
-	verbs -= /client/proc/warn
+	//verbs -= /client/proc/warn
 	verbs -= /client/proc/dsay
 	verbs -= /client/proc/admin_play
 	verbs -= /client/proc/admin_observe
--- a/code/modules/admin/verbs/mapping.dm
+++ b/code/modules/admin/verbs/mapping.dm
@@ -140,6 +140,9 @@ var/intercom_range_display_status = 0
 		src.verbs += /client/proc/jump_to_dead_group
 		src.verbs += /client/proc/startSinglo
 		src.verbs += /client/proc/ticklag	//allows you to set the ticklag.
+		src.verbs += /client/proc/cmd_admin_grantfullaccess
+		//src.verbs += /client/proc/cmd_admin_rejuvenate
+
 		//feedback_add_details("admin_verb","mDV") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

 	count_objects_on_z_level()
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -4,6 +4,11 @@
 	if(!holder)
 		src << "Only administrators may use this command."
 		return
+
+	var/confirm = alert(src, "Make [M] drop everything?", "Message", "Yes", "No")
+	if(confirm != "Yes")
+		return
+
 	for(var/obj/item/W in M)
 		M.drop_from_slot(W)

@@ -77,14 +82,25 @@
 	message_admins("\blue \bold GlobalNarrate: [key_name_admin(usr)] : [msg]<BR>", 1)
 	//feedback_add_details("admin_verb","GLN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

-/client/proc/cmd_admin_direct_narrate(mob/M as mob in world)	// Targetted narrate -- TLE
+/client/proc/cmd_admin_direct_narrate(var/mob/M)	// Targetted narrate -- TLE
 	set category = "Special Verbs"
 	set name = "Direct Narrate"

 	if(!holder)
 		src << "Only administrators may use this command."
 		return
+
+	if(!M)
+		M = input("Direct narrate to who?", "Active Players") as null|anything in get_mob_with_client_list()
+
+	if(!M)
+		return
+
 	var/msg = input("Message:", text("Enter the text you wish to appear to your target:")) as text
+
+	if( !msg )
+		return
+
 	M << msg
 	log_admin("DirectNarrate: [key_name(usr)] to ([M.name]/[M.key]): [msg]")
 	message_admins("\blue \bold DirectNarrate: [key_name(usr)] to ([M.name]/[M.key]): [msg]<BR>", 1)
@@ -457,51 +473,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 		alert("Cannot revive a ghost")
 		return
 	if(config.allow_admin_rev)
-		//M.fireloss = 0
-		M.setToxLoss(0)
-		//M.bruteloss = 0
-		M.setOxyLoss(0)
-		M.SetParalysis(0)
-		M.SetStunned(0)
-		M.SetWeakened(0)
-		M.radiation = 0
-		//M.health = 100
-		M.nutrition = 400
-		M.bodytemperature = initial(M.bodytemperature)
-		M.heal_overall_damage(1000, 1000)
-		//M.updatehealth()
-		M.buckled = initial(M.buckled)
-		M.handcuffed = initial(M.handcuffed)
-		if(istype(M,/mob/living/carbon/human))
-			var/mob/living/carbon/human/H = M
-			for(var/name in H.organs)
-				var/datum/organ/external/e = H.organs[name]
-				e.brute_dam = 0.0
-				e.burn_dam = 0.0
-				e.bandaged = 0.0
-				e.max_damage = initial(e.max_damage)
-				e.bleeding = 0
-				e.open = 0
-				e.broken = 0
-				e.destroyed = 0
-				e.perma_injury = 0
-				e.update_icon()
-				for(var/datum/organ/wound/W in e.wounds)
-					if(W.bleeding || !W.is_healing)
-						W.stopbleeding()
-			del(H.vessel)
-			H.vessel = new/datum/reagents(560)
-			H.vessel.my_atom = H
-			H.vessel.add_reagent("blood",560)
-			spawn(1)
-				H.fixblood()
-			H.pale = 0
-			H.update_body()
-			H.update_face()
-			H.UpdateDamageIcon()
-		if (M.stat > 1)
-			M.stat=0
-		..()
+		M.revive()

 		log_admin("[key_name(usr)] healed / revived [key_name(M)]")
 		message_admins("\red Admin [key_name_admin(usr)] healed / revived [key_name_admin(M)]!", 1)
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -218,10 +218,50 @@
 	SetStunned(0)
 	SetWeakened(0)
 	//src.health = 100
+	if(ishuman(src))
+		src.radiation = 0
+		//M.health = 100
+		src.nutrition = 400
+		src.bodytemperature = initial(src.bodytemperature)
+		src.heal_overall_damage(1000, 1000)
+		//M.updatehealth()
+		src.buckled = initial(src.buckled)
+		src.handcuffed = initial(src.handcuffed)
+		if(istype(src,/mob/living/carbon/human))
+			var/mob/living/carbon/human/H = src
+			for(var/name in H.organs)
+				var/datum/organ/external/e = H.organs[name]
+				e.brute_dam = 0.0
+				e.burn_dam = 0.0
+				e.bandaged = 0.0
+				e.max_damage = initial(e.max_damage)
+				e.bleeding = 0
+				e.open = 0
+				e.broken = 0
+				e.destroyed = 0
+				e.perma_injury = 0
+				e.update_icon()
+				for(var/datum/organ/wound/W in e.wounds)
+					if(W.bleeding || !W.is_healing)
+						W.stopbleeding()
+			del(H.vessel)
+			H.vessel = new/datum/reagents(560)
+			H.vessel.my_atom = H
+			H.vessel.add_reagent("blood",560)
+			spawn(1)
+				H.fixblood()
+			H.pale = 0
+			H.update_body()
+			H.update_face()
+			H.UpdateDamageIcon()
+		if (src.stat > 1)
+			src.stat=0
+		..()
 	src.heal_overall_damage(1000, 1000)
 	src.buckled = initial(src.buckled)
 	src.handcuffed = initial(src.handcuffed)
-	if(src.stat > 1) src.stat = CONSCIOUS
+	if(src.stat > 1)
+		src.stat = CONSCIOUS
 	..()
 	return