diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index f99fc58aa95..c695bf11dc3 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -1,7 +1,7 @@ //admin verb groups - They can overlap if you so wish. Only one of each verb will exist in the verbs list regardless var/list/admin_verbs_default = list( /datum/admins/proc/show_player_panel, //shows an interface for individual players, with various links (links require additional flags, - /client/proc/player_panel, +// /client/proc/player_panel, /client/proc/deadmin_self, //destroys our own admin datum so we can play as a regular player, /client/proc/hide_verbs, //hides all our adminverbs, /client/proc/hide_most_verbs, //hides all our hideable adminverbs, @@ -15,7 +15,7 @@ var/list/admin_verbs_default = list( ) var/list/admin_verbs_admin = list( - /client/proc/player_panel_new, //shows an interface for all players, with links to various panels, + /client/proc/player_panel, //shows an interface for all players, with links to various panels, /datum/admins/proc/set_tcrystals, /datum/admins/proc/add_tcrystals, /client/proc/invisimin, //allows our mob to go invisible/visible, @@ -342,7 +342,7 @@ var/list/admin_verbs_mod = list( /client/proc/cmd_mod_say, /client/proc/cmd_event_say, /datum/admins/proc/show_player_info, - /client/proc/player_panel_new, + /client/proc/player_panel, /client/proc/dsay, /datum/admins/proc/show_skills, /datum/admins/proc/show_player_panel, @@ -524,7 +524,7 @@ var/list/admin_verbs_event_manager = list( to_chat(mob, "Invisimin on. You are now as invisible as a ghost.") mob.alpha = max(mob.alpha - 100, 0) - +/* /client/proc/player_panel() set name = "Player Panel" set category = "Admin" @@ -532,12 +532,12 @@ var/list/admin_verbs_event_manager = list( 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" +*/ +/client/proc/player_panel() + set name = "Player Panel" set category = "Admin" if(holder) - holder.player_panel_new() + holder.player_panel() feedback_add_details("admin_verb","PPN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm index 541da379c1d..05eac994226 100644 --- a/code/modules/admin/player_panel.dm +++ b/code/modules/admin/player_panel.dm @@ -1,5 +1,5 @@ -/datum/admins/proc/player_panel_new()//The new one +/datum/admins/proc/player_panel()//The new one if (!usr.client.holder) return var/dat = "