Panel (#22951)

yogstation/code/modules/mentor/mentor_verbs.dm

@@ -3,6 +3,7 @@ GLOBAL_LIST_INIT(mentor_verbs, list(
 	/client/proc/show_mentor_memo,
 	/client/proc/show_mentor_tickets,
 	/client/proc/cmd_mentor_pm_context,
+	/client/proc/cmd_mentor_pm_panel,
 	/client/proc/dementor
 	))
 GLOBAL_PROTECT(mentor_verbs)

yogstation/code/modules/mentor/mentorpm.dm

@@ -1,18 +1,21 @@
 //shows a list of clients we could send PMs to, then forwards our choice to cmd_Mentor_pm
 /client/proc/cmd_mentor_pm_panel()
 	set category = "Mentor"
-	set name = "Mentor PM"
+	set name = "Mentor PM Panel"
 
 	if(!is_mentor())
 		to_chat(src, "<font color='red'>Error: Mentor-PM-Panel: Only Mentors and Admins may use this command.</font>", confidential=TRUE)
 		return
 
 	var/list/client/targets[0]
 	for(var/client/T)
-		targets["[T]"] = T
+		if(T.mob)
+			targets["[T.mob.name]"] = T
+		else
+			targets["[T]"] = T
 
 	var/list/sorted = sortList(targets)
-	var/target = input(src,"To whom shall we send a message?","Mentor PM",null) in sorted|null
+	var/target = input(src,"To whom shall we send a message?","Mentor PM",null) as null|anything in sorted|null
 	cmd_mentor_pm(targets[target],null)
 	SSblackbox.record_feedback("tally", "Mentor_verb", 1, "APM") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!