Fixes the mentorwho verb (#22650)

* clean and fix * fixes * Update topic.dm * Update admin_verbs.dm
yogstation13 · Oct 28, 2024 · de78fe0 · de78fe0
1 parent bf9f643
commit de78fe0
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 83 deletions.
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
@@ -718,7 +718,7 @@ GLOBAL_PROTECT(admin_verbs_hideable)
 	to_chat(src, span_interface("You are now a normal player."), confidential=TRUE)
 
 	remove_mentor_verbs()
-	mentor_datum = null
+	QDEL_NULL(mentor_datum)
 	GLOB.mentors -= src
 	add_verb(src, /client/proc/rementor)
 

diff --git a/yogstation/code/modules/admin/topic.dm b/yogstation/code/modules/admin/topic.dm
@@ -76,7 +76,7 @@
 			return
 
 		C.remove_mentor_verbs()
-		C.mentor_datum = null
+		QDEL_NULL(C.mentor_datum)
 		GLOB.mentors -= C
 
 	if(SSdbcore.Connect())

diff --git a/yogstation/code/modules/client/client_procs.dm b/yogstation/code/modules/client/client_procs.dm
@@ -60,7 +60,7 @@
 		new /datum/mentors(ckey)
 
 	if(mentor_datum)
-		if(admin)
+		if(!admin)
 			GLOB.mentors |= src // don't add admins to this list too.
 
 		mentor_datum.owner = src

diff --git a/yogstation/code/modules/client/verbs/who.dm b/yogstation/code/modules/client/verbs/who.dm
diff --git a/yogstation/code/modules/mentor/mentor_verbs.dm b/yogstation/code/modules/mentor/mentor_verbs.dm
@@ -43,14 +43,16 @@ GLOBAL_PROTECT(mentor_verbs)
 	set category = "Mentor"
 	var/position = "Mentor"
 	var/msg = "<b>Current Mentors & Wiki:</b>\n"
-	if(holder)
-		for(var/client/C in GLOB.mentors)
-			if(C.holder) continue
-			if(C.mentor_datum.position)
-				position = C.mentor_datum.position
-			msg += "\t[C] is a [position]"
-
-			if(C.holder && C.holder.fakekey)
+
+	for(var/client/C in GLOB.mentors)
+		if(C.holder) 
+			continue
+		if(C.mentor_datum.position)
+			position = C.mentor_datum.position
+		msg += "\t[C] is a [position]"
+
+		if(holder) //admins get extra info about the mentors
+			if(C?.holder?.fakekey)
 				msg += " <i>(as [C.holder.fakekey])</i>"
 
 			if(isobserver(C.mob))
@@ -62,18 +64,10 @@ GLOBAL_PROTECT(mentor_verbs)
 
 			if(C.is_afk())
 				msg += " (AFK)"
-			msg += "\n"
-	else
-		for(var/client/C in GLOB.mentors)
-			if(C.holder) continue
-			if(C.mentor_datum.position)	
-				position = C.mentor_datum.position
-			if(C.holder && C.holder.fakekey)
-				msg += "\t[C.holder.fakekey] is a [position]"
-			else
-				msg += "\t[C] is a [position]"
-			msg += "\n"
-		msg += span_info("Mentorhelps are also seen by admins. If no mentors are available in game adminhelp instead and an admin will see it and respond.")
+		else
+			msg += span_info("Mentorhelps are also seen by admins. If no mentors are available in game adminhelp instead and an admin will see it and respond.")
+		msg += "\n"
+
 	to_chat(src, msg, confidential=TRUE)
 
 /client/verb/mrat()
@@ -110,7 +104,7 @@ GLOBAL_PROTECT(mentor_verbs)
 			return
 	mentor_position = mentor_datum.position
 	remove_mentor_verbs()
-	mentor_datum = null
+	QDEL_NULL(mentor_datum)
 	GLOB.mentors -= src
 	add_verb(src, /client/proc/rementor)
 	to_chat(src, span_interface("You are now a normal player."), confidential=TRUE)