From 4beac828e23faa56fb4d6577f8a926bf856be130 Mon Sep 17 00:00:00 2001 From: Jordie0608 Date: Thu, 26 Mar 2015 17:30:16 +1100 Subject: [PATCH 1/3] removes old player panel --- code/modules/admin/admin_verbs.dm | 12 +----- code/modules/admin/player_panel.dm | 60 ------------------------------ 2 files changed, 1 insertion(+), 71 deletions(-) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 58469dfd03a..e2ecd71dbe9 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -20,7 +20,6 @@ var/list/admin_verbs_default = list( /client/proc/stop_sounds ) var/list/admin_verbs_admin = list( - /client/proc/player_panel, /*shows an interface for all players, with links to various panels (old style)*/ /client/proc/player_panel_new, /*shows an interface for all players, with links to various panels*/ /client/proc/invisimin, /*allows our mob to go invisible/visible*/ // /datum/admins/proc/show_traitor_panel, /*interface which shows a mob's mind*/ -Removed due to rare practical use. Moved to debug verbs ~Errorage @@ -324,17 +323,8 @@ var/list/admin_verbs_hideable = list( mob.invisibility = INVISIBILITY_OBSERVER mob << "Invisimin on. You are now as invisible as a ghost." - -/client/proc/player_panel() - set name = "Player Panel" - set category = "Admin" - if(holder) - holder.player_panel_old() - feedback_add_details("admin_verb","PP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - return - /client/proc/player_panel_new() - set name = "Player Panel New" + set name = "Player Panel" set category = "Admin" if(holder) holder.player_panel_new() diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm index 10af3669fc4..5b6a45e1366 100644 --- a/code/modules/admin/player_panel.dm +++ b/code/modules/admin/player_panel.dm @@ -304,66 +304,6 @@ usr << browse(dat, "window=players;size=600x480") -//The old one -/datum/admins/proc/player_panel_old() - if(!check_rights()) - return - var/dat = "Player Menu" - dat += "" - //add to this if wanting to add back in IP checking - //add if you want to know their ip to the lists below - var/list/mobs = sortmobs() - - for(var/mob/M in mobs) - if(!M.ckey) continue - - dat += "" - if(isAI(M)) - dat += "" - else if(isrobot(M)) - dat += "" - else if(ishuman(M)) - dat += "" - else if(istype(M, /mob/living/silicon/pai)) - dat += "" - else if(istype(M, /mob/new_player)) - dat += "" - else if(isobserver(M)) - dat += "" - else if(ismonkey(M)) - dat += "" - else if(isalien(M)) - dat += "" - else - dat += "" - - - if(istype(M,/mob/living/carbon/human)) - var/mob/living/carbon/human/H = M - if(H.mind && H.mind.assigned_role) - dat += "" - else - dat += "" - - - dat += {" - - - "} - switch(is_special_character(M)) - if(0) - dat += {""} - if(1) - dat += {""} - if(2) - dat += {""} - - dat += "
NameReal NameAssigned JobKeyOptionsPMTraitor?
IP:(IP: [M.lastKnownIP])
[M.name]AICyborg[M.real_name]pAINew PlayerGhostMonkeyAlienUnknown[H.mind.assigned_role]NA[(M.client ? "[M.client]" : "No client")]XPMTraitor?Traitor?Traitor?
" - - usr << browse(dat, "window=players;size=640x480") - - - /datum/admins/proc/check_antagonists() if (ticker && ticker.current_state >= GAME_STATE_PLAYING) var/dat = "Round Status

Round Status

" From 49388a2b820afeb855d43279b70e202f6567421c Mon Sep 17 00:00:00 2001 From: Jordie0608 Date: Thu, 26 Mar 2015 17:35:28 +1100 Subject: [PATCH 2/3] changelog --- html/changelogs/Jordie0608 pp.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 html/changelogs/Jordie0608 pp.yml diff --git a/html/changelogs/Jordie0608 pp.yml b/html/changelogs/Jordie0608 pp.yml new file mode 100644 index 00000000000..23a673a3668 --- /dev/null +++ b/html/changelogs/Jordie0608 pp.yml @@ -0,0 +1,6 @@ +author: Jordie0608 + +delete-after: True + +changes: + - rscdel: "The admin's old player panel has been removed and the new one has taken it's name." \ No newline at end of file From 2f5fd8c7d451f99f0c15c6005868a31ce2908e92 Mon Sep 17 00:00:00 2001 From: Jordie0608 Date: Thu, 26 Mar 2015 19:23:01 +1100 Subject: [PATCH 3/3] renames player panel in hotkey help --- interface/interface.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/interface.dm b/interface/interface.dm index d8b7cc4613c..ffaeadc5776 100644 --- a/interface/interface.dm +++ b/interface/interface.dm @@ -66,7 +66,7 @@ var/adminhotkeys = {" Admin: \tF5 = Aghost (admin-ghost) -\tF6 = player-panel-new +\tF6 = player-panel \tF7 = admin-pm \tF8 = Invisimin "}