From 4e4324d9ceef3c9a3a8ee1bc0bc1e016f3f0aae9 Mon Sep 17 00:00:00 2001
From: Jordie0608 <jordie0608@gmail.com>
Date: Thu, 3 Sep 2015 20:44:39 +1000
Subject: [PATCH] whoops

---
 code/modules/admin/admin.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index abe9be3cea6..4ab09484427 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -813,10 +813,10 @@ var/global/floorIsLava = 0
 /client/proc/adminGreet(logout)
 	if(ticker && ticker.current_state == GAME_STATE_PLAYING && config && config.announce_admin_login)
 		var/string
-		if(logout)
+		if(logout && config && config.announce_admin_logout)
 			string = pick(
 				"Admin logout: [key_name(src)]")
-		else
+		else if(!logout && config && config.announce_admin_login)
 			string = pick(
 				"Admin login: [key_name(src)]")
 		message_admins("[string]")
\ No newline at end of file