modules

2018-03-06 21:45:16 -06:00
parent 95cb6b23f2
commit 455ee7e687
36 changed files with 691 additions and 531 deletions
--- a/code/modules/admin/IsBanned.dm
+++ b/code/modules/admin/IsBanned.dm
@@ -39,7 +39,7 @@
 			return list("reason"="guest", "desc"="\nReason: Guests not allowed. Please sign in with a byond account.")
 		if (CONFIG_GET(flag/panic_bunker) && SSdbcore.Connect())
 			log_access("Failed Login: [key] - Guests not allowed during panic bunker")
-			return list("reason"="guest", "desc"="\nReason: You must first join the Discord to verify your account before joining this server. Please ping an admin once you've joined and read the rules. https://discord.gg/E6SQuhz")
+			return list("reason"="guest", "desc"="\nReason: Sorry but the server is currently not accepting connections from never before seen players or guests. If you have played on this server with a byond account before, please log in to the byond account you have played from.")

 	//Population Cap Checking
 	var/extreme_popcap = CONFIG_GET(number/extreme_popcap)
--- a/code/modules/admin/admin_ranks.dm
+++ b/code/modules/admin/admin_ranks.dm
@@ -1,13 +1,17 @@
 GLOBAL_LIST_EMPTY(admin_ranks)								//list of all admin_rank datums
 GLOBAL_PROTECT(admin_ranks)

+GLOBAL_LIST_EMPTY(protected_ranks)								//admin ranks loaded from txt
+GLOBAL_PROTECT(protected_ranks)
+
 /datum/admin_rank
 	var/name = "NoRank"
 	var/rights = R_DEFAULT
-	var/list/adds
-	var/list/subs
+	var/exclude_rights = 0
+	var/include_rights = 0
+	var/can_edit_rights = 0

-/datum/admin_rank/New(init_name, init_rights, list/init_adds, list/init_subs)
+/datum/admin_rank/New(init_name, init_rights, init_exclude_rights, init_edit_rights)
 	if(IsAdminAdvancedProcCall())
 		var/msg = " has tried to elevate permissions!"
 		message_admins("[key_name_admin(usr)][msg]")
@@ -17,19 +21,18 @@ GLOBAL_PROTECT(admin_ranks)
 			CRASH("Admin proc call creation of admin datum")
 		return
 	name = init_name
-	switch(name)
-		if("Removed",null,"")
-			QDEL_IN(src, 0)
-			throw EXCEPTION("invalid admin-rank name")
-			return
+	if(!name)
+		qdel(src)
+		throw EXCEPTION("Admin rank created without name.")
+		return
 	if(init_rights)
 		rights = init_rights
-	if(!init_adds)
-		init_adds = list()
-	if(!init_subs)
-		init_subs = list()
-	adds = init_adds
-	subs = init_subs
+	include_rights = rights
+	if(init_exclude_rights)
+		exclude_rights = init_exclude_rights
+		rights &= ~exclude_rights
+	if(init_edit_rights)
+		can_edit_rights = init_edit_rights

 /datum/admin_rank/Destroy()
 	if(IsAdminAdvancedProcCall())
@@ -75,13 +78,12 @@ GLOBAL_PROTECT(admin_ranks)
 			flag = R_SPAWN
 		if("autologin", "autoadmin")
 			flag = R_AUTOLOGIN
+		if("dbranks")
+			flag = R_DBRANKS
 		if("@","prev")
 			flag = previous_rights
 	return flag

-/proc/admin_keyword_to_path(word) //use this with verb keywords eg +/client/proc/blah
-	return text2path(copytext(word, 2, findtext(word, " ", 2, 0)))
-
 // Adds/removes rights to this admin_rank
 /datum/admin_rank/proc/process_keyword(word, previous_rights=0)
 	if(IsAdminAdvancedProcCall())
@@ -94,157 +96,156 @@ GLOBAL_PROTECT(admin_ranks)
 		switch(text2ascii(word,1))
 			if(43)
 				rights |= flag	//+
+				include_rights	|= flag
 			if(45)
 				rights &= ~flag	//-
-	else
-		//isn't a keyword so maybe it's a verbpath?
-		var/path = admin_keyword_to_path(word)
-		if(path)
-			switch(text2ascii(word,1))
-				if(43)
-					if(!subs.Remove(path))
-						adds += path	//+
-				if(45)
-					if(!adds.Remove(path))
-						subs += path	//-
-
+				exclude_rights	|= flag
+			if(42)
+				can_edit_rights |= flag	//*

 // Checks for (keyword-formatted) rights on this admin
 /datum/admins/proc/check_keyword(word)
 	var/flag = admin_keyword_to_flag(word)
 	if(flag)
 		return ((rank.rights & flag) == flag) //true only if right has everything in flag
-	else
-		var/path = admin_keyword_to_path(word)
-		for(var/i in owner.verbs) //this needs to be a foreach loop for some reason. in operator and verbs.Find() don't work
-			if(i == path)
-				return 1
-		return 0

 //load our rank - > rights associations
-/proc/load_admin_ranks()
+/proc/load_admin_ranks(dbfail)
 	if(IsAdminAdvancedProcCall())
 		to_chat(usr, "<span class='admin prefix'>Admin Reload blocked: Advanced ProcCall detected.</span>")
 		return
 	GLOB.admin_ranks.Cut()
-
-	if(CONFIG_GET(flag/admin_legacy_system))
-		var/previous_rights = 0
-		//load text from file and process each line separately
-		for(var/line in world.file2list("[global.config.directory]/admin_ranks.txt"))
-			if(!line)
-				continue
-			if(findtextEx(line,"#",1,2))
-				continue
-
-			var/next = findtext(line, "=")
-			var/datum/admin_rank/R = new(ckeyEx(copytext(line, 1, next)))
-			if(!R)
-				continue
-			GLOB.admin_ranks += R
-
-			var/prev = findchar(line, "+-", next, 0)
-			while(prev)
-				next = findchar(line, "+-", prev + 1, 0)
-				R.process_keyword(copytext(line, prev, next), previous_rights)
-				prev = next
-
-			previous_rights = R.rights
-	else
-		if(!SSdbcore.Connect())
-			if(CONFIG_GET(flag/sql_enabled))
-				var/msg = "Failed to connect to database in load_admin_ranks(). Reverting to legacy system."
-				log_world(msg)
-				WRITE_FILE(GLOB.world_game_log, msg)
-			CONFIG_SET(flag/admin_legacy_system, TRUE)
-			load_admin_ranks()
-			return
-
-		var/datum/DBQuery/query_load_admin_ranks = SSdbcore.NewQuery("SELECT rank, flags FROM [format_table_name("admin_ranks")]")
+	GLOB.protected_ranks.Cut()
+	var/previous_rights = 0
+	//load text from file and process each line separately
+	for(var/line in world.file2list("[global.config.directory]/admin_ranks.txt"))
+		if(!line || findtextEx(line,"#",1,2))
+			continue
+		var/next = findtext(line, "=")
+		var/datum/admin_rank/R = new(ckeyEx(copytext(line, 1, next)))
+		if(!R)
+			continue
+		GLOB.admin_ranks += R
+		GLOB.protected_ranks += R
+		var/prev = findchar(line, "+-*", next, 0)
+		while(prev)
+			next = findchar(line, "+-*", prev + 1, 0)
+			R.process_keyword(copytext(line, prev, next), previous_rights)
+			prev = next
+		previous_rights = R.rights
+	if(!CONFIG_GET(flag/admin_legacy_system) || dbfail)
+		var/datum/DBQuery/query_load_admin_ranks = SSdbcore.NewQuery("SELECT rank, flags, exclude_flags, can_edit_flags FROM [format_table_name("admin_ranks")]")
 		if(!query_load_admin_ranks.Execute())
+			message_admins("Error loading admin ranks from database. Loading from backup.")
+			log_sql("Error loading admin ranks from database. Loading from backup.")
+			dbfail = 1
+		else
+			while(query_load_admin_ranks.NextRow())
+				var/skip
+				var/rank_name = query_load_admin_ranks.item[1]
+				for(var/datum/admin_rank/R in GLOB.admin_ranks)
+					if(R.name == rank_name) //this rank was already loaded from txt override
+						skip = 1
+						break
+				if(!skip)
+					var/rank_flags = text2num(query_load_admin_ranks.item[2])
+					var/rank_exclude_flags = text2num(query_load_admin_ranks.item[3])
+					var/rank_can_edit_flags = text2num(query_load_admin_ranks.item[4])
+					var/datum/admin_rank/R = new(rank_name, rank_flags, rank_exclude_flags, rank_can_edit_flags)
+					if(!R)
+						continue
+					GLOB.admin_ranks += R
+	//load ranks from backup file
+	if(dbfail)
+		var/backup_file = file("data/admins_backup.json")
+		if(!fexists(backup_file))
+			log_world("Unable to locate admins backup file.")
 			return
-		while(query_load_admin_ranks.NextRow())
-			var/rank_name = ckeyEx(query_load_admin_ranks.item[1])
-			var/flags = query_load_admin_ranks.item[2]
-			if(istext(flags))
-				flags = text2num(flags)
-			var/datum/admin_rank/R = new(rank_name, flags)
+		var/list/json = json_decode(file2text(backup_file))
+		for(var/J in json["ranks"])
+			for(var/datum/admin_rank/R in GLOB.admin_ranks)
+				if(R.name == "[J]") //this rank was already loaded from txt override
+					continue
+			var/datum/admin_rank/R = new("[J]", json["ranks"]["[J]"]["include rights"], json["ranks"]["[J]"]["exclude rights"], json["ranks"]["[J]"]["can edit rights"])
 			if(!R)
 				continue
 			GLOB.admin_ranks += R
-
+		return 1
 	#ifdef TESTING
 	var/msg = "Permission Sets Built:\n"
 	for(var/datum/admin_rank/R in GLOB.admin_ranks)
 		msg += "\t[R.name]"
-		var/rights = rights2text(R.rights,"\n\t\t",R.adds,R.subs)
+		var/rights = rights2text(R.rights,"\n\t\t")
 		if(rights)
 			msg += "\t\t[rights]\n"
 	testing(msg)
 	#endif

-
 /proc/load_admins()
+	var/dbfail
+	if(!CONFIG_GET(flag/admin_legacy_system) && !SSdbcore.Connect())
+		message_admins("Failed to connect to database while loading admins. Loading from backup.")
+		log_sql("Failed to connect to database while loading admins. Loading from backup.")
+		dbfail = 1
 	//clear the datums references
-
 	GLOB.admin_datums.Cut()
 	for(var/client/C in GLOB.admins)
 		C.remove_admin_verbs()
 		C.holder = null
 	GLOB.admins.Cut()
+	GLOB.protected_admins.Cut()
 	GLOB.deadmins.Cut()
-	load_admin_ranks()
+	dbfail = load_admin_ranks(dbfail)
 	//Clear profile access
 	for(var/A in world.GetConfig("admin"))
 		world.SetConfig("APP/admin", A, null)
-
 	var/list/rank_names = list()
 	for(var/datum/admin_rank/R in GLOB.admin_ranks)
 		rank_names[R.name] = R
-
-	if(CONFIG_GET(flag/admin_legacy_system))
-		//load text from file
-		var/list/lines = world.file2list("[global.config.directory]/admins.txt")
-
-		//process each line separately
-		for(var/line in lines)
-			if(!length(line))
-				continue
-			if(findtextEx(line, "#", 1, 2))
-				continue
-
-			var/list/entry = splittext(line, "=")
-			if(entry.len < 2)
-				continue
-
-			var/ckey = ckey(entry[1])
-			var/rank = ckeyEx(entry[2])
-			if(!ckey || !rank)
-				continue
-
-			new /datum/admins(rank_names[rank], ckey)
-
-	else
-		if(!SSdbcore.Connect())
-			log_world("Failed to connect to database in load_admins(). Reverting to legacy system.")
-			WRITE_FILE(GLOB.world_game_log, "Failed to connect to database in load_admins(). Reverting to legacy system.")
-			CONFIG_SET(flag/admin_legacy_system, TRUE)
-			load_admins()
-			return
-
+	//ckeys listed in admins.txt are always made admins before sql loading is attempted
+	var/list/lines = world.file2list("[global.config.directory]/admins.txt")
+	for(var/line in lines)
+		if(!length(line) || findtextEx(line, "#", 1, 2))
+			continue
+		var/list/entry = splittext(line, "=")
+		if(entry.len < 2)
+			continue
+		var/ckey = ckey(entry[1])
+		var/rank = ckeyEx(entry[2])
+		if(!ckey || !rank)
+			continue
+		new /datum/admins(rank_names[rank], ckey, 0, 1)
+	if(!CONFIG_GET(flag/admin_legacy_system) || dbfail)
 		var/datum/DBQuery/query_load_admins = SSdbcore.NewQuery("SELECT ckey, rank FROM [format_table_name("admin")]")
 		if(!query_load_admins.Execute())
+			message_admins("Error loading admins from database. Loading from backup.")
+			log_sql("Error loading admins from database. Loading from backup.")
+			dbfail = 1
+		else
+			while(query_load_admins.NextRow())
+				var/admin_ckey = query_load_admins.item[1]
+				var/admin_rank = query_load_admins.item[2]
+				var/skip
+				if(rank_names[admin_rank] == null)
+					message_admins("[admin_ckey] loaded with invalid admin rank [admin_rank].")
+					log_sql("[admin_ckey] loaded with invalid admin rank [admin_rank].")
+					skip = 1
+				if(GLOB.admin_datums[admin_ckey] || GLOB.deadmins[admin_ckey])
+					skip = 1
+				if(!skip)
+					new /datum/admins(rank_names[admin_rank], admin_ckey)
+	//load admins from backup file
+	if(dbfail)
+		var/backup_file = file("data/admins_backup.json")
+		if(!fexists(backup_file))
+			log_world("Unable to locate admins backup file.")
 			return
-		while(query_load_admins.NextRow())
-			var/ckey = ckey(query_load_admins.item[1])
-			var/rank = ckeyEx(query_load_admins.item[2])
-
-			if(rank_names[rank] == null)
-				WARNING("Admin rank ([rank]) does not exist.")
-				continue
-
-			new /datum/admins(rank_names[rank], ckey)
-
+		var/list/json = json_decode(file2text(backup_file))
+		for(var/J in json["admins"])
+			for(var/A in GLOB.admin_datums + GLOB.deadmins)
+				if(A == "[J]") //this admin was already loaded from txt override
+					continue
+			new /datum/admins(rank_names[json["admins"]["[J]"]], "[J]")
 	#ifdef TESTING
 	var/msg = "Admins Built:\n"
 	for(var/ckey in GLOB.admin_datums)
@@ -252,7 +253,7 @@ GLOBAL_PROTECT(admin_ranks)
 		msg += "\t[ckey] - [D.rank.name]\n"
 	testing(msg)
 	#endif
-
+	return dbfail

 #ifdef TESTING
 /client/verb/changerank(newrank in GLOB.admin_ranks)
@@ -271,149 +272,3 @@ GLOBAL_PROTECT(admin_ranks)
 	remove_admin_verbs()
 	holder.associate(src)
 #endif
-
-/datum/admins/proc/edit_rights_topic(list/href_list)
-	if(!check_rights(R_PERMISSIONS))
-		message_admins("[key_name_admin(usr)] attempted to edit the admin permissions without sufficient rights.")
-		log_admin("[key_name(usr)] attempted to edit the admin permissions without sufficient rights.")
-		return
-	if(IsAdminAdvancedProcCall())
-		to_chat(usr, "<span class='admin prefix'>Admin Edit blocked: Advanced ProcCall detected.</span>")
-		return
-
-	var/adm_ckey
-	var/task = href_list["editrights"]
-	switch(task)
-		if("add")
-			var/new_ckey = ckey(input(usr,"New admin's ckey","Admin ckey", null) as text|null)
-			if(!new_ckey)
-				return
-			if(new_ckey in GLOB.admin_datums)
-				to_chat(usr, "<font color='red'>Error: Topic 'editrights': [new_ckey] is already an admin</font>")
-				return
-			adm_ckey = new_ckey
-			task = "rank"
-		else
-			adm_ckey = ckey(href_list["ckey"])
-			if(!adm_ckey)
-				to_chat(usr, "<font color='red'>Error: Topic 'editrights': No valid ckey</font>")
-				return
-
-	var/datum/admins/D = GLOB.admin_datums[adm_ckey]
-	if (!D)
-		D = GLOB.deadmins[adm_ckey]
-
-	switch(task)
-		if("remove")
-			if(alert("Are you sure you want to remove [adm_ckey]?","Message","Yes","Cancel") == "Yes")
-				if(!D)
-					return
-				if(!check_if_greater_rights_than_holder(D))
-					message_admins("[key_name_admin(usr)] attempted to remove [adm_ckey] from the admins list without sufficient rights.")
-					log_admin("[key_name(usr)] attempted to remove [adm_ckey] from the admins list without sufficient rights.")
-					return
-				GLOB.admin_datums -= adm_ckey
-				GLOB.deadmins -= adm_ckey
-				D.disassociate()
-
-				updateranktodb(adm_ckey, "player")
-				message_admins("[key_name_admin(usr)] removed [adm_ckey] from the admins list")
-				log_admin("[key_name(usr)] removed [adm_ckey] from the admins list")
-				log_admin_rank_modification(adm_ckey, "Removed")
-
-		if("rank")
-			var/datum/admin_rank/R
-
-			var/list/rank_names = list("*New Rank*")
-			for(R in GLOB.admin_ranks)
-				rank_names[R.name] = R
-
-			var/new_rank = input("Please select a rank", "New rank", null, null) as null|anything in rank_names
-
-			switch(new_rank)
-				if(null)
-					return
-				if("*New Rank*")
-					new_rank = ckeyEx(input("Please input a new rank", "New custom rank", null, null) as null|text)
-					if(!new_rank)
-						return
-
-			if(D)
-				if(!check_if_greater_rights_than_holder(D))
-					message_admins("[key_name_admin(usr)] attempted to change the rank of [adm_ckey] to [new_rank] without sufficient rights.")
-					log_admin("[key_name(usr)] attempted to change the rank of [adm_ckey] to [new_rank] without sufficient rights.")
-					return
-
-			R = rank_names[new_rank]
-			if(!R)	//rank with that name doesn't exist yet - make it
-				if(D)
-					R = new(new_rank, D.rank.rights, D.rank.adds, D.rank.subs)	//duplicate our previous admin_rank but with a new name
-				else
-					R = new(new_rank)							//blank new admin_rank
-				GLOB.admin_ranks += R
-
-			if(D)	//they were previously an admin
-				D.disassociate()	//existing admin needs to be disassociated
-				D.rank = R			//set the admin_rank as our rank
-				D.associate()
-			else
-				D = new(R, adm_ckey, TRUE)	//new admin
-
-			updateranktodb(adm_ckey, new_rank)
-			message_admins("[key_name_admin(usr)] edited the admin rank of [adm_ckey] to [new_rank]")
-			log_admin("[key_name(usr)] edited the admin rank of [adm_ckey] to [new_rank]")
-			log_admin_rank_modification(adm_ckey, new_rank)
-
-		if("permissions")
-			if(!D)
-				return	//they're not an admin!
-
-			var/keyword = input("Input permission keyword (one at a time):\ne.g. +BAN or -FUN or +/client/proc/someverb", "Permission toggle", null, null) as null|text
-			if(!keyword)
-				return
-
-			if(!check_keyword(keyword) || !check_if_greater_rights_than_holder(D))
-				message_admins("[key_name_admin(usr)] attempted to give [adm_ckey] the keyword [keyword] without sufficient rights.")
-				log_admin("[key_name(usr)] attempted to give [adm_ckey] the keyword [keyword] without sufficient rights.")
-				return
-
-			D.disassociate()
-
-			if(!findtext(D.rank.name, "([adm_ckey])"))	//not a modified subrank, need to duplicate the admin_rank datum to prevent modifying others too
-				D.rank = new("[D.rank.name]([adm_ckey])", D.rank.rights, D.rank.adds, D.rank.subs)	//duplicate our previous admin_rank but with a new name
-				//we don't add this clone to the admin_ranks list, as it is unique to that ckey
-			D.rank.process_keyword(keyword)
-
-			var/client/C = GLOB.directory[adm_ckey]	//find the client with the specified ckey (if they are logged in)
-			D.associate(C)						//link up with the client and add verbs
-
-			message_admins("[key_name(usr)] added keyword [keyword] to permission of [adm_ckey]")
-			log_admin("[key_name(usr)] added keyword [keyword] to permission of [adm_ckey]")
-			log_admin_permission_modification(adm_ckey, D.rank.rights)
-		if("activate") //forcefully readmin
-			if(!D || !D.deadmined)
-				return
-
-			D.activate()
-
-			message_admins("[key_name_admin(usr)] forcefully readmined [adm_ckey]")
-			log_admin("[key_name(usr)] forcefully readmined [adm_ckey]")
-		if("deactivate") //forcefully deadmin
-			if(!D || D.deadmined)
-				return
-
-			message_admins("[key_name_admin(usr)] forcefully deadmined [adm_ckey]")
-			log_admin("[key_name(usr)] forcefully deadmined [adm_ckey]")
-
-			D.deactivate() //after logs so the deadmined admin can see the message.
-
-	edit_admin_permissions()
-
-/datum/admins/proc/updateranktodb(ckey,newrank)
-	if(!SSdbcore.Connect())
-		return
-	var/sql_ckey = sanitizeSQL(ckey)
-	var/sql_admin_rank = sanitizeSQL(newrank)
-
-	var/datum/DBQuery/query_admin_rank_update = SSdbcore.NewQuery("UPDATE [format_table_name("player")] SET lastadminrank = '[sql_admin_rank]' WHERE ckey = '[sql_ckey]'")
-	query_admin_rank_update.Execute()
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -18,7 +18,6 @@ GLOBAL_LIST_INIT(admin_verbs_default, world.AVerbsDefault())
 	/client/proc/cmd_admin_pm_context,	/*right-click adminPM interface*/
 	/client/proc/cmd_admin_pm_panel,		/*admin-pm list*/
 	/client/proc/cmd_admin_ticket_panel,
-	/client/proc/panicbunker,
 	/client/proc/stop_sounds
 	)
 GLOBAL_PROTECT(admin_verbs_admin)
@@ -117,6 +116,7 @@ GLOBAL_LIST_INIT(admin_verbs_server, world.AVerbsServer())
 	/client/proc/toggle_random_events,
 	/client/proc/forcerandomrotate,
 	/client/proc/adminchangemap,
+	/client/proc/panicbunker,
 	/client/proc/toggle_hub
 	)
 GLOBAL_PROTECT(admin_verbs_debug)
@@ -157,7 +157,7 @@ GLOBAL_LIST_INIT(admin_verbs_debug, world.AVerbsDebug())
 	/client/proc/pump_random_event,
 	/client/proc/cmd_display_init_log,
 	/client/proc/cmd_display_overlay_log,
-	/datum/admins/proc/create_or_modify_area
+	/datum/admins/proc/create_or_modify_area,
 	)
 GLOBAL_PROTECT(admin_verbs_possess)
 GLOBAL_LIST_INIT(admin_verbs_possess, list(/proc/possess, /proc/release))
@@ -267,11 +267,6 @@ GLOBAL_LIST_INIT(admin_verbs_hideable, list(
 		if(rights & R_SPAWN)
 			verbs += GLOB.admin_verbs_spawn

-		for(var/path in holder.rank.adds)
-			verbs += path
-		for(var/path in holder.rank.subs)
-			verbs -= path
-
 /client/proc/remove_admin_verbs()
 	verbs.Remove(
 		GLOB.admin_verbs_default,
@@ -306,8 +301,6 @@ GLOBAL_LIST_INIT(admin_verbs_hideable, list(
 		/client/proc/cmd_admin_areatest_station,
 		/client/proc/readmin
 		)
-	if(holder)
-		verbs.Remove(holder.rank.adds)

 /client/proc/hide_most_verbs()//Allows you to keep some functionality while hiding some verbs
 	set name = "Adminverbs - Hide Most"
@@ -528,8 +521,10 @@ GLOBAL_LIST_INIT(admin_verbs_hideable, list(
 	set desc = "Get the estimated range of a bomb, using explosive power."

 	var/ex_power = input("Explosive Power:") as null|num
+	if (isnull(ex_power))
+		return
 	var/range = round((2 * ex_power)**GLOB.DYN_EX_SCALE)
-	to_chat(usr, "Estimated Explosive Range: (Devestation: [round(range*0.25)], Heavy: [round(range*0.5)], Light: [round(range)])")
+	to_chat(usr, "Estimated Explosive Range: (Devastation: [round(range*0.25)], Heavy: [round(range*0.5)], Light: [round(range)])")

 /client/proc/get_dynex_power()
 	set category = "Debug"
@@ -537,6 +532,8 @@ GLOBAL_LIST_INIT(admin_verbs_hideable, list(
 	set desc = "Get the estimated required power of a bomb, to reach a specific range."

 	var/ex_range = input("Light Explosion Range:") as null|num
+	if (isnull(ex_range))
+		return
 	var/power = (0.5 * ex_range)**(1/GLOB.DYN_EX_SCALE)
 	to_chat(usr, "Estimated Explosive Power: [power]")

--- a/code/modules/admin/holder2.dm
+++ b/code/modules/admin/holder2.dm
@@ -1,5 +1,7 @@
 GLOBAL_LIST_EMPTY(admin_datums)
 GLOBAL_PROTECT(admin_datums)
+GLOBAL_LIST_EMPTY(protected_admins)
+GLOBAL_PROTECT(protected_admins)

 GLOBAL_VAR_INIT(href_token, GenerateToken())
 GLOBAL_PROTECT(href_token)
@@ -26,7 +28,7 @@ GLOBAL_PROTECT(href_token)

 	var/deadmined

-/datum/admins/New(datum/admin_rank/R, ckey, force_active = FALSE)
+/datum/admins/New(datum/admin_rank/R, ckey, force_active = FALSE, protected)
 	if(IsAdminAdvancedProcCall())
 		var/msg = " has tried to elevate permissions!"
 		message_admins("[key_name_admin(usr)][msg]")
@@ -51,6 +53,8 @@ GLOBAL_PROTECT(href_token)
 	if(R.rights & R_DEBUG) //grant profile access
 		world.SetConfig("APP/admin", ckey, "role=admin")
 	//only admins with +ADMIN start admined
+	if(protected)
+		GLOB.protected_admins[target] = src
 	if (force_active || (R.rights & R_AUTOLOGIN))
 		activate()
 	else
--- a/code/modules/admin/permissionedit.dm
+++ b/code/modules/admin/permissionedit.dm
@@ -0,0 +1,274 @@
+/client/proc/edit_admin_permissions()
+	set category = "Admin"
+	set name = "Permissions Panel"
+	set desc = "Edit admin permissions"
+	if(!check_rights(R_PERMISSIONS))
+		return
+	usr.client.holder.edit_admin_permissions()
+
+/datum/admins/proc/edit_admin_permissions()
+	if(!check_rights(R_PERMISSIONS))
+		return
+
+	var/list/output = list({"<!DOCTYPE html>
+<html>
+<head>
+<title>Permissions Panel</title>
+<script type='text/javascript' src='search.js'></script>
+<link rel='stylesheet' type='text/css' href='panels.css'>
+</head>
+<body onload='selectTextField();updateSearch();'>
+<div id='main'><table id='searchable' cellspacing='0'>
+<tr class='title'>
+<th style='width:150px;text-align:right;'>CKEY <a class='small' href='?src=[REF(src)];[HrefToken()];editrights=add'>\[+\]</a></th>
+<th style='width:125px;'>RANK</th>
+<th style='width:40%;'>PERMISSIONS</th>
+<th style='width:20%;'>DENIED</th>
+<th style='width:40%;'>ALLOWED TO EDIT</th>
+</tr>
+"})
+
+	for(var/adm_ckey in GLOB.admin_datums+GLOB.deadmins)
+		var/datum/admins/D = GLOB.admin_datums[adm_ckey]
+		if(!D)
+			D = GLOB.deadmins[adm_ckey]
+			if (!D)
+				continue
+
+		var/deadminlink = ""
+		if (D.deadmined)
+			deadminlink = " <a class='small' href='?src=[REF(src)];[HrefToken()];editrights=activate;ckey=[adm_ckey]'>\[RA\]</a>"
+		else
+			deadminlink = " <a class='small' href='?src=[REF(src)];[HrefToken()];editrights=deactivate;ckey=[adm_ckey]'>\[DA\]</a>"
+
+		output += "<tr>"
+		output += "<td style='text-align:right;'>[adm_ckey] [deadminlink]<a class='small' href='?src=[REF(src)];[HrefToken()];editrights=remove;ckey=[adm_ckey]'>\[-\]</a></td>"
+		output += "<td><a href='?src=[REF(src)];[HrefToken()];editrights=rank;ckey=[adm_ckey]'>[D.rank.name]</a></td>"
+		output += "<td><a class='small' href='?src=[REF(src)];[HrefToken()];editrights=permissions;ckey=[adm_ckey]'>[rights2text(D.rank.include_rights," ")]</a></td>"
+		output += "<td><a class='small' href='?src=[REF(src)];[HrefToken()];editrights=permissions;ckey=[adm_ckey]'>[rights2text(D.rank.exclude_rights," ", "-")]</a></td>"
+		output += "<td><a class='small' href='?src=[REF(src)];[HrefToken()];editrights=permissions;ckey=[adm_ckey]'>[rights2text(D.rank.can_edit_rights," ", "*")]</a></td>"
+		output += "</tr>"
+
+	output += {"
+</table></div>
+<div id='top'><b>Search:</b> <input type='text' id='filter' value='' style='width:70%;' onkeyup='updateSearch();'></div>
+</body>
+</html>"}
+
+	usr << browse(jointext(output, ""),"window=editrights;size=1000x650")
+
+/datum/admins/proc/edit_rights_topic(list/href_list)
+	if(!check_rights(R_PERMISSIONS))
+		message_admins("[key_name_admin(usr)] attempted to edit admin permissions without sufficient rights.")
+		log_admin("[key_name(usr)] attempted to edit admin permissions without sufficient rights.")
+		return
+	if(IsAdminAdvancedProcCall())
+		to_chat(usr, "<span class='admin prefix'>Admin Edit blocked: Advanced ProcCall detected.</span>")
+		return
+	var/datum/asset/permissions_assets = get_asset_datum(/datum/asset/simple/permissions)
+	permissions_assets.send(src)
+	var/admin_ckey = ckey(href_list["ckey"])
+	var/datum/admins/D = GLOB.admin_datums[admin_ckey]
+	var/use_db
+	var/task = href_list["editrights"]
+	var/skip
+	if(task == "activate" || task == "deactivate")
+		skip = 1
+	if(!CONFIG_GET(flag/admin_legacy_system) && CONFIG_GET(flag/protect_legacy_admins) && task == "rank")
+		if(admin_ckey in GLOB.protected_admins)
+			to_chat(usr, "<span class='admin prefix'>Editing the rank of this admin is blocked by server configuration.</span>")
+			return
+	if(!CONFIG_GET(flag/admin_legacy_system) && CONFIG_GET(flag/protect_legacy_ranks) && task == "permissions")
+		if(D.rank in GLOB.protected_ranks)
+			to_chat(usr, "<span class='admin prefix'>Editing the flags of this rank is blocked by server configuration.</span>")
+			return
+	if(check_rights(R_DBRANKS, 0))
+		if(!skip)
+			if(!SSdbcore.Connect())
+				to_chat(usr, "<span class='danger'>Unable to connect to database, changes are temporary only.</span>")
+				use_db = "Temporary"
+			if(!use_db)
+				use_db = alert("Permanent changes are saved to the database for future rounds, temporary changes will affect only the current round", "Permanent or Temporary?", "Permanent", "Temporary", "Cancel")
+				if(use_db == "Cancel")
+					return
+				if(use_db == "Permanent")
+					use_db = 1
+					admin_ckey = sanitizeSQL(admin_ckey)
+				else
+					use_db = 0
+	if(task != "add")
+		D = GLOB.admin_datums[admin_ckey]
+		if(!D)
+			D = GLOB.deadmins[admin_ckey]
+		if(!D)
+			return
+		if(!check_if_greater_rights_than_holder(D))
+			message_admins("[key_name_admin(usr)] attempted to change the rank of [admin_ckey] without sufficient rights.")
+			log_admin("[key_name(usr)] attempted to change the rank of [admin_ckey] without sufficient rights.")
+	switch(task)
+		if("add")
+			admin_ckey = add_admin(use_db)
+			if(!admin_ckey)
+				return
+			change_admin_rank(admin_ckey, use_db)
+		if("remove")
+			remove_admin(admin_ckey, use_db, D)
+		if("rank")
+			change_admin_rank(admin_ckey, use_db, D)
+		if("permissions")
+			change_admin_flags(admin_ckey, use_db, D)
+		if("activate")
+			force_readmin(admin_ckey, D)
+		if("deactivate")
+			force_deadmin(admin_ckey, D)
+	edit_admin_permissions()
+
+/datum/admins/proc/add_admin(use_db)
+	. = sanitizeSQL(ckey(input("New admin's ckey","Admin ckey") as text|null))
+	if(!.)
+		return 0
+	if(. in GLOB.admin_datums+GLOB.deadmins)
+		to_chat(usr, "<span class='danger'>[.] is already an admin.</span>")
+		return 0
+	if(use_db)
+		var/datum/DBQuery/query_add_admin = SSdbcore.NewQuery("INSERT INTO [format_table_name("admin")] (ckey, rank) VALUES ('[.]', 'NEW ADMIN')")
+		if(!query_add_admin.warn_execute())
+			return 0
+		var/datum/DBQuery/query_add_admin_log = SSdbcore.NewQuery("INSERT INTO [format_table_name("admin_log")] (datetime, adminckey, adminip, operation, log) VALUES ('[SQLtime()]', '[sanitizeSQL(usr.ckey)]', INET_ATON('[sanitizeSQL(usr.client.address)]'), 'add admin', 'New admin added: [.]')")
+		if(!query_add_admin_log.warn_execute())
+			return 0
+
+/datum/admins/proc/remove_admin(admin_ckey, use_db, datum/admins/D)
+	if(alert("Are you sure you want to remove [admin_ckey]?","Confirm Removal","Do it","Cancel") == "Do it")
+		GLOB.admin_datums -= admin_ckey
+		GLOB.deadmins -= admin_ckey
+		D.disassociate()
+		if(use_db)
+			var/datum/DBQuery/query_add_rank = SSdbcore.NewQuery("DELETE FROM [format_table_name("admin")] WHERE ckey = '[admin_ckey]'")
+			if(!query_add_rank.warn_execute())
+				return
+			var/datum/DBQuery/query_add_rank_log = SSdbcore.NewQuery("INSERT INTO [format_table_name("admin_log")] (datetime, adminckey, adminip, operation, log) VALUES ('[SQLtime()]', '[sanitizeSQL(usr.ckey)]', INET_ATON('[sanitizeSQL(usr.client.address)]'), 'remove admin', 'Admin removed: [admin_ckey]')")
+			if(!query_add_rank_log.warn_execute())
+				return
+		message_admins("[key_name_admin(usr)] removed [admin_ckey] from the admins list [use_db ? "permanently" : "temporarily"]")
+		log_admin("[key_name(usr)] removed [admin_ckey] from the admins list [use_db ? "permanently" : "temporarily"]")
+
+/datum/admins/proc/force_readmin(admin_ckey, datum/admins/D)
+	if(!D || !D.deadmined)
+		return
+	D.activate()
+	message_admins("[key_name_admin(usr)] forcefully readmined [admin_ckey]")
+	log_admin("[key_name(usr)] forcefully readmined [admin_ckey]")
+
+/datum/admins/proc/force_deadmin(admin_ckey, datum/admins/D)
+	if(!D || D.deadmined)
+		return
+	message_admins("[key_name_admin(usr)] forcefully deadmined [admin_ckey]")
+	log_admin("[key_name(usr)] forcefully deadmined [admin_ckey]")
+	D.deactivate() //after logs so the deadmined admin can see the message.
+
+/datum/admins/proc/change_admin_rank(admin_ckey, use_db, datum/admins/D)
+	var/datum/admin_rank/R
+	var/list/rank_names = list("*New Rank*")
+	for(R in GLOB.admin_ranks)
+		if((R.rights & usr.client.holder.rank.can_edit_rights) == R.rights)
+			rank_names[R.name] = R
+	var/new_rank = input("Please select a rank", "New rank") as null|anything in rank_names
+	if(new_rank == "*New Rank*")
+		new_rank = sanitizeSQL(ckeyEx(input("Please input a new rank", "New custom rank") as text|null))
+	if(!new_rank)
+		return
+	R = rank_names[new_rank]
+	if(!R) //rank with that name doesn't exist yet - make it
+		if(D)
+			R = new(new_rank, D.rank.rights) //duplicate our previous admin_rank but with a new name
+		else
+			R = new(new_rank) //blank new admin_rank
+		GLOB.admin_ranks += R
+	if(use_db)
+		if(!R)
+			var/datum/DBQuery/query_add_rank = SSdbcore.NewQuery("INSERT INTO [format_table_name("admin_ranks")] (rank, flags, exclude_flags, can_edit_rights) VALUES ('[new_rank]', '0', '0', '0')")
+			if(!query_add_rank.warn_execute())
+				return
+			var/datum/DBQuery/query_add_rank_log = SSdbcore.NewQuery("INSERT INTO [format_table_name("admin_log")] (datetime, adminckey, adminip, operation, log) VALUES ('[SQLtime()]', '[sanitizeSQL(usr.ckey)]', INET_ATON('[sanitizeSQL(usr.client.address)]'), 'add rank', 'New rank added: [admin_ckey]')")
+			if(!query_add_rank_log.warn_execute())
+				return
+		var/old_rank
+		var/datum/DBQuery/query_get_rank = SSdbcore.NewQuery("SELECT rank FROM [format_table_name("admin")] WHERE ckey = '[admin_ckey]'")
+		if(!query_get_rank.warn_execute())
+			return
+		if(query_get_rank.NextRow())
+			old_rank = query_get_rank.item[1]
+		var/datum/DBQuery/query_change_rank = SSdbcore.NewQuery("UPDATE [format_table_name("admin")] SET rank = '[new_rank]' WHERE ckey = '[admin_ckey]'")
+		if(!query_change_rank.warn_execute())
+			return
+		var/datum/DBQuery/query_change_rank_log = SSdbcore.NewQuery("INSERT INTO [format_table_name("admin_log")] (datetime, adminckey, adminip, operation, log) VALUES ('[SQLtime()]', '[sanitizeSQL(usr.ckey)]', INET_ATON('[sanitizeSQL(usr.client.address)]'), 'change admin rank', 'Rank of [admin_ckey] changed from [old_rank] to [new_rank]')")
+		if(!query_change_rank_log.warn_execute())
+			return
+	if(D) //they were previously an admin
+		D.disassociate() //existing admin needs to be disassociated
+		D.rank = R //set the admin_rank as our rank
+		D.associate()
+	else
+		D = new(R, admin_ckey, TRUE) //new admin
+	message_admins("[key_name_admin(usr)] edited the admin rank of [admin_ckey] to [new_rank] [use_db ? "permanently" : "temporarily"]")
+	log_admin("[key_name(usr)] edited the admin rank of [admin_ckey] to [new_rank] [use_db ? "permanently" : "temporarily"]")
+
+/datum/admins/proc/change_admin_flags(admin_ckey, use_db, datum/admins/D)
+	var/new_flags = input_bitfield(usr, "Include permission flags<br>[use_db ? "This will affect ALL admins with this rank." : "This will affect only the current admin [admin_ckey]"]", "admin_flags", D.rank.include_rights, 350, 590, allowed_edit_list = usr.client.holder.rank.can_edit_rights)
+	if(isnull(new_flags))
+		return
+	var/new_exclude_flags = input_bitfield(usr, "Exclude permission flags<br>Flags enabled here will be removed from a rank.<br>Note these take precedence over included flags.<br>[use_db ? "This will affect ALL admins with this rank." : "This will affect only the current admin [admin_ckey]"]", "admin_flags", D.rank.exclude_rights, 350, 660, "red", usr.client.holder.rank.can_edit_rights)
+	if(isnull(new_exclude_flags))
+		return
+	var/new_can_edit_flags = input_bitfield(usr, "Editable permission flags<br>These are the flags this rank is allowed to edit if they have access to the permissions panel.<br>They will be unable to modify admins to a rank that has a flag not included here.<br>[use_db ? "This will affect ALL admins with this rank." : "This will affect only the current admin [admin_ckey]"]", "admin_flags", D.rank.can_edit_rights, 350, 710, allowed_edit_list = usr.client.holder.rank.can_edit_rights)
+	if(isnull(new_can_edit_flags))
+		return
+	if(use_db)
+		var/old_flags
+		var/old_exclude_flags
+		var/old_can_edit_flags
+		var/datum/DBQuery/query_get_rank_flags = SSdbcore.NewQuery("SELECT flags, exclude_flags, can_edit_flags FROM [format_table_name("admin_ranks")] WHERE rank = '[D.rank.name]'")
+		if(!query_get_rank_flags.warn_execute())
+			return
+		if(query_get_rank_flags.NextRow())
+			old_flags = text2num(query_get_rank_flags.item[1])
+			old_exclude_flags = text2num(query_get_rank_flags.item[2])
+			old_can_edit_flags = text2num(query_get_rank_flags.item[3])
+		var/datum/DBQuery/query_change_rank_flags = SSdbcore.NewQuery("UPDATE [format_table_name("admin_ranks")] SET flags = '[new_flags]', exclude_flags = '[new_exclude_flags]', can_edit_flags = '[new_can_edit_flags]' WHERE rank = '[D.rank.name]'")
+		if(!query_change_rank_flags.warn_execute())
+			return
+		var/datum/DBQuery/query_change_rank_flags_log = SSdbcore.NewQuery("INSERT INTO [format_table_name("admin_log")] (datetime, adminckey, adminip, operation, log) VALUES ('[SQLtime()]', '[sanitizeSQL(usr.ckey)]', INET_ATON('[sanitizeSQL(usr.client.address)]'), 'change rank flags', 'Permissions of [admin_ckey] changed from[rights2text(old_flags," ")][rights2text(old_exclude_flags," ", "-")][rights2text(old_can_edit_flags," ", "*")] to[rights2text(new_flags," ")][rights2text(new_exclude_flags," ", "-")][rights2text(new_can_edit_flags," ", "*")]')")
+		if(!query_change_rank_flags_log.warn_execute())
+			return
+		for(var/datum/admin_rank/R in GLOB.admin_ranks)
+			if(R.name != D.rank.name)
+				continue
+			R.rights = new_flags &= ~new_exclude_flags
+			R.exclude_rights = new_exclude_flags
+			R.include_rights = new_flags
+			R.can_edit_rights = new_can_edit_flags
+		for(var/i in GLOB.admin_datums+GLOB.deadmins)
+			var/datum/admins/A = GLOB.admin_datums[i]
+			if(!A)
+				A = GLOB.deadmins[i]
+				if (!A)
+					continue
+			if(A.rank.name != D.rank.name)
+				continue
+			var/client/C = GLOB.directory[A.target]
+			A.disassociate()
+			A.associate(C)
+	else
+		D.disassociate()
+		if(!findtext(D.rank.name, "([admin_ckey])")) //not a modified subrank, need to duplicate the admin_rank datum to prevent modifying others too
+			D.rank = new("[D.rank.name]([admin_ckey])", new_flags, new_exclude_flags, new_can_edit_flags) //duplicate our previous admin_rank but with a new name
+			//we don't add this clone to the admin_ranks list, as it is unique to that ckey
+		else
+			D.rank.rights = new_flags &= ~new_exclude_flags
+			D.rank.include_rights = new_flags
+			D.rank.exclude_rights = new_exclude_flags
+		var/client/C = GLOB.directory[admin_ckey] //find the client with the specified ckey (if they are logged in)
+		D.associate(C) //link up with the client and add verbs
+	message_admins("[key_name_admin(usr)] edited the permissions of [use_db ? " rank [D.rank.name] permanently" : "[admin_ckey] temporarily"]")
+	log_admin("[key_name(usr)] edited the permissions of [use_db ? " rank [D.rank.name] permanently" : "[admin_ckey] temporarily"]")
--- a/code/modules/admin/secrets.dm
+++ b/code/modules/admin/secrets.dm
@@ -31,6 +31,7 @@
 			<A href='?src=[REF(src)];[HrefToken()];secrets=tdomereset'>Reset Thunderdome to default state</A><BR>
 			<A href='?src=[REF(src)];[HrefToken()];secrets=set_name'>Rename Station Name</A><BR>
 			<A href='?src=[REF(src)];[HrefToken()];secrets=reset_name'>Reset Station Name</A><BR>
+			<A href='?src=[REF(src)];[HrefToken()];secrets=night_shift_set'>Set Night Shift Mode</A><BR>
 			<BR>
 			<B>Shuttles</B><BR>
 			<BR>
@@ -54,7 +55,6 @@
 			<A href='?src=[REF(src)];[HrefToken()];secrets=quickpower'>Power all SMES</A><BR>
 			<A href='?src=[REF(src)];[HrefToken()];secrets=tripleAI'>Triple AI mode (needs to be used in the lobby)</A><BR>
 			<A href='?src=[REF(src)];[HrefToken()];secrets=traitor_all'>Everyone is the traitor</A><BR>
-			<A href='?src=\ref[src];[HrefToken()];secrets=ak47s'>AK-47s For Everyone!</A><BR>
 			<A href='?src=[REF(src)];[HrefToken()];secrets=guns'>Summon Guns</A><BR>
 			<A href='?src=[REF(src)];[HrefToken()];secrets=magic'>Summon Magic</A><BR>
 			<A href='?src=[REF(src)];[HrefToken()];secrets=events'>Summon Events (Toggle)</A><BR>
@@ -107,8 +107,6 @@
 				dat += "No-one has done anything this round!"
 			usr << browse(dat, "window=admin_log")

-		if("mentor_log")
-			CitadelMentorLogSecret()
 		if("list_job_debug")
 			var/dat = "<B>Job Debug info.</B><HR>"
 			for(var/line in SSjob.job_debug)
@@ -167,6 +165,23 @@
 			log_admin("[key_name(usr)] renamed the station to \"[new_name]\".")
 			message_admins("<span class='adminnotice'>[key_name_admin(usr)] renamed the station to: [new_name].</span>")
 			priority_announce("[command_name()] has renamed the station to \"[new_name]\".")
+		if("night_shift_set")
+			if(!check_rights(R_ADMIN))
+				return
+			var/val = alert(usr, "What do you want to set night shift to? This will override the automatic system until set to automatic again.", "On", "Off", "Automatic")
+			switch(val)
+				if("Automatic")
+					if(CONFIG_GET(flag/enable_night_shifts))
+						SSnightshift.can_fire = TRUE
+						SSnightshift.fire()
+					else
+						SSnightshift.update_nightshift(FALSE, TRUE)
+				if("On")
+					SSnightshift.can_fire = FALSE
+					SSnightshift.update_nightshift(TRUE, TRUE)
+				if("Off")
+					SSnightshift.can_fire = FALSE
+					SSnightshift.update_nightshift(FALSE, TRUE)

 		if("reset_name")
 			if(!check_rights(R_ADMIN))
@@ -460,13 +475,6 @@
 			message_admins("[key_name_admin(usr)] activated Egalitarian Station mode")
 			priority_announce("CentCom airlock control override activated. Please take this time to get acquainted with your coworkers.", null, 'sound/ai/commandreport.ogg')

-		if("ak47s")
-			if(!check_rights(R_FUN))
-				return
-			message_admins("[key_name_admin(usr)] activated AK-47s for Everyone!")
-			usr.client.ak47s()
-			sound_to_playing_players('sound/misc/ak47s.ogg')
-			
 		if("guns")
 			if(!check_rights(R_FUN))
 				return
@@ -613,13 +621,13 @@
 			var/list/new_movement = list()
 			for(var/i in 1 to movement_keys.len)
 				var/key = movement_keys[i]
-				
+
 				var/msg = "Please input the new movement direction when the user presses [key]. Ex. northeast"
 				var/title = "New direction for [key]"
 				var/new_direction = text2dir(input(usr, msg, title) as text|null)
 				if(!new_direction)
 					new_direction = movement_keys[key]
-				
+
 				new_movement[key] = new_direction
 			SSinput.movement_keys = new_movement
 			message_admins("[key_name_admin(usr)] has configured all movement directions.")
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -271,50 +271,6 @@
 			return
 		create_message("note", banckey, null, banreason, null, null, 0, 0)

-	else if(href_list["mentor"])
-		if(!check_rights(R_ADMIN))	return
-
-		var/mob/M = locate(href_list["mentor"])
-		if(!ismob(M))
-			to_chat(usr, "<span class='danger'>this can be only used on instances of type /mob!</span>")
-			return
-
-		if(!M.client)
-			to_chat(usr, "<span class='danger'>No client.</span>")
-			return
-
-		log_admin("[key_name(usr)] has granted [key_name(M)] mentor access")
-		message_admins("<span class='adminnotice'> [key_name_admin(usr)] has granted [key_name_admin(M)] mentor access.</span>")
-
-		var/datum/DBQuery/query_add_mentors = SSdbcore.NewQuery("INSERT INTO [format_table_name("mentor")] (ckey) VALUES ('[M.client.ckey]')")
-		if(!query_add_mentors.Execute())
-			var/err = query_add_mentors.ErrorMsg()
-			log_game("SQL ERROR during adding new mentor. Error : \[[err]\]\n")
-		load_mentors()
-		M.verbs += /client/proc/cmd_mentor_say
-		M.verbs += /client/proc/show_mentor_memo
-		to_chat(M, "<span class='adminnotice'> You've been granted mentor access! Help people who send mentor-pms.</span>")
-
-	else if(href_list["removementor"])
-		if(!check_rights(R_ADMIN))	return
-
-		var/mob/living/carbon/human/M = locate(href_list["removementor"])
-		if(!ismob(M))
-			usr << "this can be only used on instances of type /mob"
-			return
-
-		log_admin("[key_name(usr)] has removed mentor access from [key_name(M)]")
-		message_admins("<span class='adminnotice'> [key_name_admin(usr)] has removed mentor access from [key_name_admin(M)].</span>")
-
-		var/datum/DBQuery/query_remove_mentors = SSdbcore.NewQuery("DELETE FROM [format_table_name("mentor")] WHERE ckey = '[M.client.ckey]'")
-		if(!query_remove_mentors.Execute())
-			var/err = query_remove_mentors.ErrorMsg()
-			log_game("SQL ERROR during removing mentor. Error : \[[err]\]\n")
-		load_mentors()
-		to_chat(M, "<span class='adminnotice'>Your mentor access has been revoked.</span>")
-		M.verbs -= /client/proc/cmd_mentor_say
-		M.verbs -= /client/proc/show_mentor_memo
-
 	else if(href_list["editrights"])
 		edit_rights_topic(href_list)

@@ -916,12 +872,6 @@
 		else
 			dat += "<td width='20%'><a href='?src=[REF(src)];[HrefToken()];jobban3=abductor;jobban4=[REF(M)]'>Abductor</a></td>"

-		//Borer
-		if(jobban_isbanned(M, "borer") || isbanned_dept)
-			dat += "<td width='20%'><a href='?src=[REF(src)];[HrefToken()];jobban3=borer;jobban4=[REF(M)]'><font color=red>Borer</font></a></td>"
-		else
-			dat += "<td width='20%'><a href='?src=[REF(src)];[HrefToken()];jobban3=borer;jobban4=[REF(M)]'>Borer</a></td>"
-
 		//Alien
 		if(jobban_isbanned(M, ROLE_ALIEN) || isbanned_dept)
 			dat += "<td width='20%'><a href='?src=[REF(src)];[HrefToken()];jobban3=alien;jobban4=[REF(M)]'><font color=red>Alien</font></a></td>"
@@ -1709,7 +1659,7 @@
 			var/mob/living/L = M
 			var/status
 			switch (M.stat)
-				if (CONSCIOUS)
+				if(CONSCIOUS)
 					status = "Alive"
 				if(SOFT_CRIT)
 					status = "<font color='orange'><b>Dying</b></font>"
--- a/code/modules/admin/verbs/playsound.dm
+++ b/code/modules/admin/verbs/playsound.dm
@@ -24,7 +24,7 @@
 	admin_sound.status = SOUND_STREAM
 	admin_sound.volume = vol

-	var/res = alert(usr, "Show the title of this song to the players?",, "No", "Yes", "Cancel")
+	var/res = alert(usr, "Show the title of this song to the players?",, "Yes","No", "Cancel")
 	switch(res)
 		if("Yes")
 			to_chat(world, "<span class='boldannounce'>An admin played: [S]</span>")