From 7f17629404622c222a21d21a049cc27187b0b4d7 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Sun, 19 Jan 2020 23:38:47 -0700
Subject: [PATCH] O K

---
 modular_citadel/code/modules/admin/topic.dm | 59 ---------------------
 tgstation.dme                               |  1 -
 2 files changed, 60 deletions(-)
 delete mode 100644 modular_citadel/code/modules/admin/topic.dm

diff --git a/modular_citadel/code/modules/admin/topic.dm b/modular_citadel/code/modules/admin/topic.dm
deleted file mode 100644
index 26bc902bef..0000000000
--- a/modular_citadel/code/modules/admin/topic.dm
+++ /dev/null
@@ -1,59 +0,0 @@
-/datum/admins/proc/citaTopic(href, href_list)
-	if(href_list["makementor"])
-		makeMentor(href_list["makementor"])
-	else if(href_list["removementor"])
-		removeMentor(href_list["removementor"])
-
-/datum/admins/proc/makeMentor(ckey)
-	if(!usr.client)
-		return
-	if (!check_rights(0))
-		return
-	if(!ckey)
-		return
-	var/client/C = GLOB.directory[ckey]
-	if(C)
-		if(check_rights_for(C, R_ADMIN,0))
-			to_chat(usr, "<span class='danger'>The client chosen is an admin! Cannot mentorize.</span>")
-			return
-	if(SSdbcore.Connect())
-		var/datum/DBQuery/query_get_mentor = SSdbcore.NewQuery("SELECT id FROM [format_table_name("mentor")] WHERE ckey = '[ckey]'")
-		if(query_get_mentor.NextRow())
-			to_chat(usr, "<span class='danger'>[ckey] is already a mentor.</span>")
-			return
-		var/datum/DBQuery/query_add_mentor = SSdbcore.NewQuery("INSERT INTO `[format_table_name("mentor")]` (`id`, `ckey`) VALUES (null, '[ckey]')")
-		if(!query_add_mentor.warn_execute())
-			return
-		var/datum/DBQuery/query_add_admin_log = SSdbcore.NewQuery("INSERT INTO `[format_table_name("admin_log")]` (`id` ,`datetime` ,`adminckey` ,`adminip` ,`log` ) VALUES (NULL , NOW( ) , '[usr.ckey]', '[usr.client.address]', 'Added new mentor [ckey]');")
-		if(!query_add_admin_log.warn_execute())
-			return
-	else
-		to_chat(usr, "<span class='danger'>Failed to establish database connection. The changes will last only for the current round.</span>")
-	new /datum/mentors(ckey)
-	to_chat(usr, "<span class='adminnotice'>New mentor added.</span>")
-
-/datum/admins/proc/removeMentor(ckey)
-	if(!usr.client)
-		return
-	if (!check_rights(0))
-		return
-	if(!ckey)
-		return
-	var/client/C = GLOB.directory[ckey]
-	if(C)
-		if(check_rights_for(C, R_ADMIN,0))
-			to_chat(usr, "<span class='danger'>The client chosen is an admin, not a mentor! Cannot de-mentorize.</span>")
-			return
-		C.remove_mentor_verbs()
-		C.mentor_datum = null
-		GLOB.mentors -= C
-	if(SSdbcore.Connect())
-		var/datum/DBQuery/query_remove_mentor = SSdbcore.NewQuery("DELETE FROM [format_table_name("mentor")] WHERE ckey = '[ckey]'")
-		if(!query_remove_mentor.warn_execute())
-			return
-		var/datum/DBQuery/query_add_admin_log = SSdbcore.NewQuery("INSERT INTO `[format_table_name("admin_log")]` (`id` ,`datetime` ,`adminckey` ,`adminip` ,`log` ) VALUES (NULL , NOW( ) , '[usr.ckey]', '[usr.client.address]', 'Removed mentor [ckey]');")
-		if(!query_add_admin_log.warn_execute())
-			return
-	else
-		to_chat(usr, "<span class='danger'>Failed to establish database connection. The changes will last only for the current round.</span>")
-	to_chat(usr, "<span class='adminnotice'>Mentor removed.</span>")
\ No newline at end of file
diff --git a/tgstation.dme b/tgstation.dme
index 1d64500f75..595ef5eb11 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -3106,7 +3106,6 @@
 #include "modular_citadel\code\modules\admin\chat_commands.dm"
 #include "modular_citadel\code\modules\admin\holder2.dm"
 #include "modular_citadel\code\modules\admin\secrets.dm"
-#include "modular_citadel\code\modules\admin\topic.dm"
 #include "modular_citadel\code\modules\arousal\arousal.dm"
 #include "modular_citadel\code\modules\arousal\genitals.dm"
 #include "modular_citadel\code\modules\arousal\genitals_sprite_accessories.dm"