From fb0925047ad1bb98b38850f6e0a7c5df60d4271d Mon Sep 17 00:00:00 2001
From: Seris02 <49109742+Seris02@users.noreply.github.com>
Date: Thu, 19 Mar 2020 02:23:19 +0800
Subject: [PATCH] mentor fixes and improvements (#11519)

* one teensy fix but imma go do something else quick

* yee?

* yee?

* yee 3

* ah shit

* uhhhhhh

* oh
---
 .../code/modules/mentor/dementor.dm           | 19 +++++++++++++++++++
 .../code/modules/mentor/mentor_verbs.dm       |  3 ++-
 .../code/modules/mentor/mentorpm.dm           | 11 ++++++-----
 tgstation.dme                                 |  1 +
 4 files changed, 28 insertions(+), 6 deletions(-)
 create mode 100644 modular_citadel/code/modules/mentor/dementor.dm

diff --git a/modular_citadel/code/modules/mentor/dementor.dm b/modular_citadel/code/modules/mentor/dementor.dm
new file mode 100644
index 0000000000..8acd07f9a3
--- /dev/null
+++ b/modular_citadel/code/modules/mentor/dementor.dm
@@ -0,0 +1,19 @@
+/client/proc/cmd_mentor_dementor()
+	set category = "Mentor"
+	set name = "dementor"
+	if(!is_mentor())
+		return
+	remove_mentor_verbs()
+	if (/client/proc/mentor_unfollow in verbs)
+		mentor_unfollow()
+	GLOB.mentors -= src
+	verbs += /client/proc/cmd_mentor_rementor
+	
+/client/proc/cmd_mentor_rementor()
+	set category = "Mentor"
+	set name = "rementor"
+	if(!is_mentor())
+		return
+	add_mentor_verbs()
+	GLOB.mentors += src
+	verbs -= /client/proc/cmd_mentor_rementor
diff --git a/modular_citadel/code/modules/mentor/mentor_verbs.dm b/modular_citadel/code/modules/mentor/mentor_verbs.dm
index 716a484ee2..534b877399 100644
--- a/modular_citadel/code/modules/mentor/mentor_verbs.dm
+++ b/modular_citadel/code/modules/mentor/mentor_verbs.dm
@@ -1,6 +1,7 @@
 GLOBAL_LIST_INIT(mentor_verbs, list(
 	/client/proc/cmd_mentor_say,
-	/client/proc/show_mentor_memo
+	/client/proc/show_mentor_memo,
+	/client/proc/cmd_mentor_dementor
 	))
 GLOBAL_PROTECT(mentor_verbs)
 
diff --git a/modular_citadel/code/modules/mentor/mentorpm.dm b/modular_citadel/code/modules/mentor/mentorpm.dm
index cb39f02092..d2d04495d4 100644
--- a/modular_citadel/code/modules/mentor/mentorpm.dm
+++ b/modular_citadel/code/modules/mentor/mentorpm.dm
@@ -38,8 +38,9 @@
 	if(!msg)
 		msg = input(src,"Message:", "Private message") as text|null
 
-		if(!msg && is_mentor(whom))
-			to_chat(GLOB.admins | GLOB.mentors, "<span class='purple'>[src] has stopped their reply to [whom]'s mhelp.</span>")
+		if(!msg)
+			if (is_mentor(whom))
+				to_chat(GLOB.admins | GLOB.mentors, "<span class='purple'>[src] has stopped their reply to [whom]'s mhelp.</span>")
 			return
 
 		if(!C)
@@ -54,10 +55,10 @@
 			return
 
 	msg = sanitize(copytext_char(msg, 1, MAX_MESSAGE_LEN))
-	if(!msg && is_mentor(whom))
-		to_chat(GLOB.admins | GLOB.mentors, "<span class='purple'>[src] has stopped their reply to [whom]'s mhelp.</span>")
+	if(!msg)
+		if (is_mentor(whom))
+			to_chat(GLOB.admins | GLOB.mentors, "<span class='purple'>[src] has stopped their reply to [whom]'s mhelp.</span>")
 		return
-
 	log_mentor("Mentor PM: [key_name(src)]->[key_name(C)]: [msg]")
 
 	msg = emoji_parse(msg)
diff --git a/tgstation.dme b/tgstation.dme
index 8b04b3deac..bdc536c037 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -3252,6 +3252,7 @@
 #include "modular_citadel\code\modules\custom_loadout\custom_items.dm"
 #include "modular_citadel\code\modules\custom_loadout\load_to_mob.dm"
 #include "modular_citadel\code\modules\custom_loadout\read_from_file.dm"
+#include "modular_citadel\code\modules\mentor\dementor.dm"
 #include "modular_citadel\code\modules\mentor\follow.dm"
 #include "modular_citadel\code\modules\mentor\mentor.dm"
 #include "modular_citadel\code\modules\mentor\mentor_memo.dm"