From 910d48c0c58f51c128bb8e7b9d75944fa81643de Mon Sep 17 00:00:00 2001 From: "mport2004@gmail.com" Date: Sun, 29 Jul 2012 15:55:03 +0000 Subject: [PATCH] Seems the adminwho thing was actually a bug, removing the config option. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4217 316c924e-a436-60f5-8080-3fe189b3f50e --- code/datums/configuration.dm | 4 ---- code/game/verbs/who.dm | 2 +- config/config.txt | 3 --- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/code/datums/configuration.dm b/code/datums/configuration.dm index b4a4597ef3c..cbfcd3bef13 100644 --- a/code/datums/configuration.dm +++ b/code/datums/configuration.dm @@ -30,7 +30,6 @@ var/feature_object_spell_system = 0 //spawns a spellbook which gives object-type spells instead of verb-type spells for the wizard var/traitor_scaling = 0 //if amount of traitors scales based on amount of players var/protect_roles_from_antagonist = 0// If security and such can be tratior/cult/other - var/show_admin_info = 0 //If true will show players extended admin info in adminwho, aka a bad idea. var/Tensioner_Active = 0 // If the tensioner is running. var/allow_Metadata = 0 // Metadata is supported. var/popup_admin_pm = 0 //adminPMs to non-admins show in a pop-up 'reply' window when set to 1. @@ -248,9 +247,6 @@ if("protect_roles_from_antagonist") config.protect_roles_from_antagonist = 1 - if("show_admin_info") - config.show_admin_info = 1 - if("tensioner_active") config.Tensioner_Active = 1 diff --git a/code/game/verbs/who.dm b/code/game/verbs/who.dm index fe33576acbd..f15784b766d 100644 --- a/code/game/verbs/who.dm +++ b/code/game/verbs/who.dm @@ -46,7 +46,7 @@ proc/get_all_admin_clients() for (var/mob/M in admin_list) if(M && M.client && M.client.holder) - if((usr.client && usr.client.holder) || config.show_admin_info) + if(usr.client && usr.client.holder) var/afk = 0 if( M.client.inactivity > AFK_THRESHOLD ) //When I made this, the AFK_THRESHOLD was 3000ds = 300s = 5m, see setup.dm for the new one. afk = 1 diff --git a/config/config.txt b/config/config.txt index da4814190a6..eab32a5494b 100644 --- a/config/config.txt +++ b/config/config.txt @@ -141,9 +141,6 @@ FEATURE_OBJECT_SPELL_SYSTEM ##Toggle for having jobs load up from the .txt # LOAD_JOBS_FROM_TXT -## Will show players extended information about admins in adminwho, aka a bad idea. -# SHOW_ADMIN_INFO - ##Remove the # mark infront of this to forbid admins from posssessing the singularity. #FORBID_SINGULO_POSSESSION