From 4bdec9aa7cddfeb005be682014ef4dabd04cc504 Mon Sep 17 00:00:00 2001
From: Oblisk234 <61151679+Oblisk234@users.noreply.github.com>
Date: Sat, 30 Nov 2024 21:04:26 +0000
Subject: [PATCH 1/3] Mentor fixes

---
 yogstation/code/modules/mentor/mentor_verbs.dm | 3 +--
 yogstation/code/modules/mentor/mentorpm.dm     | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/yogstation/code/modules/mentor/mentor_verbs.dm b/yogstation/code/modules/mentor/mentor_verbs.dm
index 91aff1e4d67de..5f98858219642 100644
--- a/yogstation/code/modules/mentor/mentor_verbs.dm
+++ b/yogstation/code/modules/mentor/mentor_verbs.dm
@@ -64,9 +64,8 @@ GLOBAL_PROTECT(mentor_verbs)
 
 			if(C.is_afk())
 				msg += " (AFK)"
-		else
-			msg += span_info("Mentorhelps are also sent to Discord. If no mentors are available in game mentorhelp anyways and a mentor on Discord may see it and respond.")
 		msg += "\n"
+	msg += span_info("Mentorhelps are also sent to Discord. If no mentors are available in game mentorhelp anyways and a mentor on Discord may see it and respond.")
 
 	to_chat(src, msg, confidential=TRUE)
 
diff --git a/yogstation/code/modules/mentor/mentorpm.dm b/yogstation/code/modules/mentor/mentorpm.dm
index 826c6bb5f82c4..629bf07eaaf14 100644
--- a/yogstation/code/modules/mentor/mentorpm.dm
+++ b/yogstation/code/modules/mentor/mentorpm.dm
@@ -90,7 +90,7 @@
 		
 	var/datum/DBQuery/add_mhelp_query = SSdbcore.NewQuery(
 		"INSERT INTO `[format_table_name("mentor_interactions")]` (round_id, ckey, ckey_mentor, target_ckey, target_mentor, message) VALUES (:round, :send, :smentor, :receive, :rmentor, :msg);",
-		list("round" = GLOB.round_id, "send" = ckey, "smentor" = is_mentor(), "receive" = C.ckey, "rmentor" = C.is_mentor(), "msg" = msg)
+		list("round" = GLOB.round_id, "send" = ckey, "smentor" = is_mentor(), "receive" = discord_id ? discord_id : C.ckey, "rmentor" = C.is_mentor(), "msg" = msg)
 	)
 	if(!add_mhelp_query.Execute())
 		message_admins("Failed insert mhelp into mhelp DB. Check the SQL error logs for more details.")

From b6d196c18eca8fcb277529ae999d47db51258e72 Mon Sep 17 00:00:00 2001
From: Oblisk234 <61151679+Oblisk234@users.noreply.github.com>
Date: Sat, 30 Nov 2024 21:22:29 +0000
Subject: [PATCH 2/3] That may have been the actual ID and not their alias

---
 yogstation/code/modules/mentor/mentorpm.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yogstation/code/modules/mentor/mentorpm.dm b/yogstation/code/modules/mentor/mentorpm.dm
index 629bf07eaaf14..56a69ccd38943 100644
--- a/yogstation/code/modules/mentor/mentorpm.dm
+++ b/yogstation/code/modules/mentor/mentorpm.dm
@@ -90,7 +90,7 @@
 		
 	var/datum/DBQuery/add_mhelp_query = SSdbcore.NewQuery(
 		"INSERT INTO `[format_table_name("mentor_interactions")]` (round_id, ckey, ckey_mentor, target_ckey, target_mentor, message) VALUES (:round, :send, :smentor, :receive, :rmentor, :msg);",
-		list("round" = GLOB.round_id, "send" = ckey, "smentor" = is_mentor(), "receive" = discord_id ? discord_id : C.ckey, "rmentor" = C.is_mentor(), "msg" = msg)
+		list("round" = GLOB.round_id, "send" = ckey, "smentor" = is_mentor(), "receive" = discord_id ? whom : C.ckey, "rmentor" = C.is_mentor(), "msg" = msg)
 	)
 	if(!add_mhelp_query.Execute())
 		message_admins("Failed insert mhelp into mhelp DB. Check the SQL error logs for more details.")

From ada49958038f215344059cce9d6729b775b60679 Mon Sep 17 00:00:00 2001
From: Oblisk234 <61151679+Oblisk234@users.noreply.github.com>
Date: Sun, 1 Dec 2024 10:56:58 +0000
Subject: [PATCH 3/3] OOC tag fix

---
 code/modules/admin/holder2.dm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/modules/admin/holder2.dm b/code/modules/admin/holder2.dm
index b7acb10ee9456..b5efb03c25bff 100644
--- a/code/modules/admin/holder2.dm
+++ b/code/modules/admin/holder2.dm
@@ -122,6 +122,8 @@ GLOBAL_PROTECT(href_token)
 
 		if (deadmined)
 			activate()
+		if(C.mentor_datum)
+			C.mentor_position = C.mentor_datum.position
 		owner = C
 		ip_cache = C.address
 		cid_cache = C.computer_id