Revert "Makes the admin logout tracking system actually work"

code/modules/admin/admin.dm

@@ -1001,22 +1001,3 @@ var/gamma_ship_location = 1 // 0 = station , 1 = space
 		qdel(frommob)
 
 		return 1
-
-// Returns a list of the number of admins in various categories
-// result[1] is the number of staff that match the rank mask and are active
-// result[2] is the number of staff that do not match the rank mask
-// result[3] is the number of staff that match the rank mask and are inactive
-/proc/staff_countup(rank_mask = R_BAN)
-	var/list/result = list(0, 0, 0)
-	for(var/client/X in admins)
-		if(rank_mask && !check_rights_for(X, rank_mask))
-			result[2]++
-			continue
-		if(X.holder.fakekey)
-			result[2]++
-			continue
-		if(X.is_afk())
-			result[3]++
-			continue
-		result[1]++
-	return result

code/modules/client/client procs.dm

@@ -238,7 +238,7 @@
 		if((last_message_time + throttle > world.time) && !check_rights(R_ADMIN, 0))
 			var/wait_time = round(((last_message_time + throttle) - world.time) / 10, 1)
 			to_chat(src, "<span class='danger'>You are sending messages to quickly. Please wait [wait_time] [wait_time == 1 ? "second" : "seconds"] before sending another message.</span>")
-			return 1
+			return 1		
 		last_message_time = world.time
 	if(config.automute_on && !check_rights(R_ADMIN, 0) && last_message == message)
 		last_message_count++
@@ -437,7 +437,7 @@
 	var/watchreason = check_watchlist(ckey)
 	if(watchreason)
 		message_admins("<font color='red'><B>Notice: </B></font><font color='blue'>[key_name_admin(src)] is on the watchlist and has just connected - Reason: [watchreason]</font>")
-		send2irc(config.admin_notify_irc, "Watchlist - [key_name(src)] is on the watchlist and has just connected - Reason: [watchreason]")
+		send2adminirc("Watchlist - [key_name(src)] is on the watchlist and has just connected - Reason: [watchreason]")
 
 	//Just the standard check to see if it's actually a number
 	if(sql_id)

code/modules/mob/logout.dm

@@ -3,19 +3,15 @@
 	unset_machine()
 	player_list -= src
 	log_access("Logout: [key_name(src)]")
-	// `holder` is nil'd out by now, so we check the `admin_datums` array directly
-	//Only report this stuff if we are currently playing.
-	if(admin_datums[ckey] && ticker && ticker.current_state == GAME_STATE_PLAYING)
-		var/datum/admins/temp_admin = admin_datums[ckey]
-		// Triggers on people with banhammer power only - no mentors tripping the alarm
-		if(temp_admin.rights & R_BAN)
+	if(admin_datums[src.ckey])
+		if(ticker && ticker.current_state == GAME_STATE_PLAYING) //Only report this stuff if we are currently playing.
+			var/admins_number = admins.len
+
 			message_admins("Admin logout: [key_name_admin(src)]")
-			var/list/admincounter = staff_countup(R_BAN)
-			if(admincounter[1] == 0) // No active admins
-				send2irc(config.admin_notify_irc, "[key_name(src)] logged out - No active admins, [admincounter[2]] non-admin staff, [admincounter[3]] inactive staff.")
-
+			if(admins_number == 0) //Apparently the admin logging out is no longer an admin at this point, so we have to check this towards 0 and not towards 1. Awell.
+				send2adminirc("[key_name(src)] logged out - no more admins online.")
 	..()
-
-	callHook("mob_logout", list("client" = client, "mob" = src))
-
-	return 1
+	
+	callHook("mob_logout", list("client" = client, "mob" = src))	
+	
+	return 1