[MAJOR CHANGE] Admin rank datum (#17133)

* Admin ranks update

* Permissions fix

* One missing thing

* Further rework to make database also fully work

* Adds admin rank bitflag calculator to tools

* ZA WARUDO

---------

Co-authored-by: C.L. <killer65311@gmail.com>

code/modules/admin/verbs/adminhelp.dm

@@ -257,7 +257,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 	//send this msg to all admins
 
 	for(var/client/X in GLOB.admins)
-		if(!check_rights(R_ADMIN, 0, X))
+		if(!check_rights_for(X, R_ADMIN))
 			continue
 		if(X.prefs?.read_preference(/datum/preference/toggle/holder/play_adminhelp_ping))
 			X << 'sound/effects/adminhelp.ogg'
@@ -684,7 +684,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 	. = list("total" = list(), "noflags" = list(), "afk" = list(), "stealth" = list(), "present" = list())
 	for(var/client/X in GLOB.admins)
 		.["total"] += X
-		if(requiredflags != 0 && !check_rights(rights_required = requiredflags, show_msg = FALSE, C = X))
+		if(requiredflags != 0 && !check_rights_for(X, requiredflags))
 			.["noflags"] += X
 		else if(X.is_afk())
 			.["afk"] += X

code/modules/admin/verbs/adminpm.dm

@@ -203,14 +203,14 @@
 	if(irc)
 		log_admin("PM: [key_name(src)]->IRC: [rawmsg]")
 		for(var/client/X in GLOB.admins)
-			if(!check_rights(R_ADMIN, 0, X))
+			if(!check_rights_for(X, R_ADMIN))
 				continue
 			to_chat(X, span_admin_pm_notice(span_bold("PM: [key_name(src, X, 0)]->IRC:") + " [keywordparsedmsg]"))
 	else
 		log_admin("PM: [key_name(src)]->[key_name(recipient)]: [rawmsg]")
 		//we don't use message_admins here because the sender/receiver might get it too
 		for(var/client/X in GLOB.admins)
-			if(!check_rights(R_ADMIN, 0, X))
+			if(!check_rights_for(X, R_ADMIN))
 				continue
 			if(X.key!=key && X.key!=recipient.key)	//check client/X is an admin and isn't the sender or recipient
 				to_chat(X, span_admin_pm_notice(span_bold("PM: [key_name(src, X, 0)]->[key_name(recipient, X, 0)]:") + " [keywordparsedmsg]"))

code/modules/admin/verbs/adminsay.dm

@@ -12,7 +12,7 @@
 	log_adminsay(msg,src)
 
 	for(var/client/C in GLOB.admins)
-		if(check_rights(R_ADMIN, 0, C))
+		if(check_rights_for(C, R_ADMIN))
 			to_chat(C, span_admin_channel(create_text_tag("admin", "ADMIN:", C) + " " + span_name("[key_name(usr, 1)]") + "([admin_jump_link(mob, src)]): " + span_name("[msg]") ))
 
 	feedback_add_details("admin_verb","M") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

code/modules/admin/verbs/antag-ooc.dm

@@ -27,10 +27,10 @@
 			display_name = usr.client.holder.fakekey
 
 	// Name shown to other players.  Admins whom are not also antags have their rank displayed.
-	var/player_display = (is_admin && !is_antag) ? "[display_name]([usr.client.holder.rank])" : display_name
+	var/player_display = (is_admin && !is_antag) ? "[display_name]([usr.client.holder.rank_names()])" : display_name
 
 	for(var/mob/M in mob_list)
-		if(check_rights(R_ADMIN|R_MOD|R_EVENT, 0, M)) // Staff can see AOOC unconditionally, and with more details.
+		if(check_rights_for(M.client, R_ADMIN|R_MOD|R_EVENT)) // Staff can see AOOC unconditionally, and with more details.
 			to_chat(M, span_ooc(span_aooc("[create_text_tag("aooc", "Antag-OOC:", M.client)] <EM>[get_options_bar(src, 0, 1, 1)]([admin_jump_link(usr, M.client.holder)]):</EM> " + span_message("[msg]"))))
 		else if(M.client) // Players can only see AOOC if observing, or if they are an antag type allowed to use AOOC.
 			var/datum/antagonist/A = null

code/modules/admin/verbs/deadsay.dm

@@ -15,7 +15,7 @@
 		to_chat(src, span_warning("You have deadchat muted."))
 		return
 
-	var/stafftype = uppertext(holder.rank)
+	var/stafftype = uppertext(holder.rank_names())
 
 	msg = sanitize(msg)
 	log_admin("DSAY: [key_name(src)] : [msg]")

code/modules/admin/verbs/pray.dm

@@ -16,7 +16,7 @@
 	var/msg = span_filter_pray(span_blue("[icon2html(cross, GLOB.admins)] <b>" + span_purple("PRAY: ") + "[key_name(src, 1)] [ADMIN_QUE(src)] [ADMIN_PP(src)] [ADMIN_VV(src)] [ADMIN_SM(src)] ([admin_jump_link(src, src)]) [ADMIN_CA(src)] [ADMIN_SC(src)] [ADMIN_SMITE(src)]:</b> [raw_msg]"))
 
 	for(var/client/C in GLOB.admins)
-		if(!check_rights(R_ADMIN, 0, C))
+		if(!check_rights_for(C, R_ADMIN))
 			continue
 		if(C.prefs?.read_preference(/datum/preference/toggle/show_chat_prayers))
 			to_chat(C, msg, type = MESSAGE_TYPE_PRAYER, confidential = TRUE)
@@ -29,7 +29,7 @@
 /proc/CentCom_announce(var/msg, var/mob/Sender, var/iamessage)
 	msg = span_blue(span_bold(span_orange("[uppertext(using_map.boss_short)]M[iamessage ? " IA" : ""]:") + "[key_name(Sender, 1)] [ADMIN_PP(Sender)] [ADMIN_VV(Sender)] [ADMIN_SM(Sender)] ([admin_jump_link(Sender)]) [ADMIN_CA(Sender)] [ADMIN_BSA(Sender)] [ADMIN_CENTCOM_REPLY(Sender)]:") + " [msg]")
 	for(var/client/C in GLOB.admins) //VOREStation Edit - GLOB admins
-		if(!check_rights(R_ADMIN, 0, C))
+		if(!check_rights_for(C, R_ADMIN))
 			continue
 		to_chat(C,msg)
 		C << 'sound/machines/signal.ogg'
@@ -37,7 +37,7 @@
 /proc/Syndicate_announce(var/msg, var/mob/Sender)
 	msg = span_blue(span_bold(span_crimson("ILLEGAL:") + "[key_name(Sender, 1)] [ADMIN_PP(Sender)] [ADMIN_VV(Sender)] [ADMIN_SM(Sender)] ([admin_jump_link(Sender)]) [ADMIN_CA(Sender)] [ADMIN_BSA(Sender)] [ADMIN_SYNDICATE_REPLY(Sender)]:") + " [msg]")
 	for(var/client/C in GLOB.admins) //VOREStation Edit - GLOB admins
-		if(!check_rights(R_ADMIN, 0, C))
+		if(!check_rights_for(C, R_ADMIN))
 			continue
 		to_chat(C,msg)
 		C << 'sound/machines/signal.ogg'

code/modules/admin/verbs/special_verbs.dm

@@ -0,0 +1,30 @@
+// Admin Verbs in this file are special and cannot use the AVD system for some reason or another.
+
+/client/proc/readmin()
+	set name = "Readmin"
+	set category = "Admin.Misc"
+	set desc = "Regain your admin powers."
+
+	var/datum/admins/A = GLOB.deadmins[ckey]
+
+	if(!A)
+		A = GLOB.admin_datums[ckey]
+		if (!A)
+			var/msg = " is trying to readmin but they have no deadmin entry"
+			message_admins("[key_name_admin(src)][msg]")
+			log_admin_private("[key_name(src)][msg]")
+			return
+
+	A.associate(src)
+
+	if(!holder)
+		return //This can happen if an admin attempts to vv themself into somebody elses's deadmin datum by getting ref via brute force
+
+	to_chat(src, span_interface("You are now an admin."), confidential = TRUE)
+	message_admins("[src] re-adminned themselves.")
+	log_admin("[src] re-adminned themselves.")
+	//BLACKBOX_LOG_ADMIN_VERB("Readmin")
+
+	if(isobserver(mob))
+		var/mob/observer/dead/our_mob = mob
+		our_mob.visualnet?.addVisibility(our_mob, src)