Merge pull request #150 from MisterFox/master

Retired Admins rank

code/game/verbs/ooc.dm

@@ -41,6 +41,8 @@
 //			C << "<span class=\"adminooc\"><span class=\"prefix\">OOC:</span> <span class=\"name\">[src.key]:</span> <span class=\"message\">[msg]</span></span>"
 			if (src.client.holder.rank == "Admin Observer")
 				C << "<span class=\"gfartooc\"><span class=\"prefix\">OOC:</span> <span class=\"name\">[src.key][src.client.stealth ? "/([src.client.fakekey])" : ""]:</span> <span class=\"message\">[msg]</span></span>"
+			else if (src.client.holder.rank == "Retired Admin")
+				C << "<span class=\"ooc\"><span class=\"prefix\">OOC:</span> <span class=\"name\">[src.key][src.client.stealth ? "/([src.client.fakekey])" : ""]:</span> <span class=\"message\">[msg]</span></span>"
 			else
 				C << "<font color=[src.client.ooccolor]><b><span class=\"prefix\">OOC:</span> <span class=\"name\">[src.key][src.client.stealth ? "/([src.client.fakekey])" : ""]:</span> <span class=\"message\">[msg]</span></b></font>"
 

code/game/verbs/who.dm

@@ -42,5 +42,5 @@
 		if(M && M.client && M.client.holder && M.client.authenticated)
 			if(usr.client.holder)
 				usr << "[M.key] is a [M.client.holder.rank][M.client.stealth ? " <i>(as [M.client.fakekey])</i>" : ""]"
-			else if(!M.client.stealth)
+			else if(!M.client.stealth && (M.client.holder.level != -3))
 				usr << "\t[M.client]"

code/modules/admin/admin.dm

@@ -970,6 +970,7 @@
 				<A href='?src=\ref[src];chgadlvl=Temporary Admin;client4ad=\ref[C]'>Temporary Admin</A> // Secondary Admin<BR>
 				<A href='?src=\ref[src];chgadlvl=Moderator;client4ad=\ref[C]'>Moderator</A> // Moderator<BR>
 				<A href='?src=\ref[src];chgadlvl=Admin Observer;client4ad=\ref[C]'>Admin Observer</A> // Filthy Xeno<BR>
+				<A href='?src=\ref[src];chgadlvl=Retired Admin;client4ad=\ref[C]'>Retired Admin</A> // Retired Administrator<BR>
 				<A href='?src=\ref[src];chgadlvl=Remove;client4ad=\ref[C]'>Remove Admin</A><BR>"}
 			else if(src.level == 5)
 			//coder
@@ -980,6 +981,7 @@
 				<A href='?src=\ref[src];chgadlvl=Temporary Admin;client4ad=\ref[C]'>Temporary Admin</A> // Secondary Admin<BR>
 				<A href='?src=\ref[src];chgadlvl=Moderator;client4ad=\ref[C]'>Moderator</A> // Moderator<BR>
 				<A href='?src=\ref[src];chgadlvl=Admin Observer;client4ad=\ref[C]'>Admin Observer</A> // Filthy Xeno<BR>
+				<A href='?src=\ref[src];chgadlvl=Retired Admin;client4ad=\ref[C]'>Retired Admin</A> // Retired Administrator<BR>
 				<A href='?src=\ref[src];chgadlvl=Remove;client4ad=\ref[C]'>Remove Admin</A><BR>"}
 			else
 				alert("Not a high enough level admin, sorry.")

code/modules/admin/admin_verbs.dm

@@ -118,6 +118,9 @@
 			del(src)
 			return
 
+		if ("Retired Admin")
+			holder.level = -3
+
 		else
 			del(holder)
 			return
@@ -271,6 +274,9 @@
 			verbs += /client/proc/cmd_admin_say
 			verbs += /client/proc/cmd_admin_gib_self
 
+		if (holder.level == -3)//Retired Admin, skips banned
+			verbs += /client/proc/cmd_admin_say
+
 
 /client/proc/clear_admin_verbs()
 	deadchat = 0

code/modules/admin/verbs/adminhelp.dm

@@ -14,7 +14,7 @@
 		return
 
 	for (var/mob/M in world)
-		if (M.client && M.client.holder)
+		if (M.client && M.client.holder && (M.client.holder.level != -3))
 			if(M.client.sound_adminhelp)
 				M << 'adminhelp.ogg'
 			M << "\blue <b><font color=red>HELP: </font>[key_name(src, M)] (<A HREF='?src=\ref[M.client.holder];adminplayeropts=\ref[src]'>PP</A>) (<A HREF='?src=\ref[M.client.holder];adminplayervars=\ref[src]'>VV</A>) (<A HREF='?src=\ref[M.client.holder];adminplayersubtlemessage=\ref[src]'>SM</A>) (<A HREF='?src=\ref[M.client.holder];adminplayerobservejump=\ref[src]'>JMP</A>) (<A HREF='?src=\ref[M.client.holder];secretsadmin=check_antagonist'>CA</A>):</b> [msg]"

config/admins.txt

@@ -4,12 +4,15 @@ cacophony - Game Admin
 cajoes - Game Admin
 cib - Game Master
 compactninja - Game Master
+dysthymia - Retired Admin
 hawkv3 - Game Admin
 headswe - Game Master
 iaryni - Game Master
 masterofapples - Game Admin
 megacaesar - Game Admin
 miniature - Game Master
+misterfox - Retired Admin
 mloc - Game Master
 spaceman96 - Game Admin
+strumpetplaya - Retired Admin
 uristqwerty - Game Master