diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm index d333851fb73..4dba24ce357 100644 --- a/code/datums/datumvars.dm +++ b/code/datums/datumvars.dm @@ -405,7 +405,7 @@ client if(href_list["Vars"]) debug_variables(locate(href_list["Vars"])) - if(href_list["datumrefresh"]) + else if(href_list["datumrefresh"]) var/datum/DAT = locate(href_list["datumrefresh"]) if(!istype(DAT, /datum)) return diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 54209b4b4b4..384b2171c29 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -13,7 +13,9 @@ var/list/admin_verbs_default = list( /client/proc/toggle_hear_radio, /*toggles whether we hear the radio*/ /client/proc/investigate_show, /*various admintools for investigation. Such as a singulo grief-log*/ /client/proc/secrets, - /client/proc/reload_admins + /client/proc/reload_admins, + /client/proc/cmd_admin_pm_context, /*right-click adminPM interface*/ + /client/proc/cmd_admin_pm_panel /*admin-pm list*/ ) var/list/admin_verbs_admin = list( /client/proc/player_panel, /*shows an interface for all players, with links to various panels (old style)*/ @@ -33,8 +35,6 @@ var/list/admin_verbs_admin = list( /client/proc/toggle_view_range, /*changes how far we can see*/ /datum/admins/proc/view_txt_log, /*shows the server log (diary) for today*/ /datum/admins/proc/view_atk_log, /*shows the server combat-log, doesn't do anything presently*/ - /client/proc/cmd_admin_pm_context, /*right-click adminPM interface*/ - /client/proc/cmd_admin_pm_panel, /*admin-pm list*/ /client/proc/cmd_admin_subtle_message, /*send an message to somebody as a 'voice in their head'*/ /client/proc/cmd_admin_delete, /*delete an instance/object/mob/etc*/ /client/proc/cmd_admin_check_contents, /*displays the contents of an instance*/ diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index b1a5e9de492..0d94167f7f8 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1203,7 +1203,7 @@ show_player_panel(M) else if(href_list["adminplayerobservejump"]) - if(!check_rights(R_ADMIN)) return + if(!isobserver(usr) && !check_rights(R_ADMIN)) return var/mob/M = locate(href_list["adminplayerobservejump"]) @@ -1213,7 +1213,7 @@ C.jumptomob(M) else if(href_list["adminplayerobservecoodjump"]) - if(!check_rights(R_ADMIN)) return + if(!isobserver(usr) && !check_rights(R_ADMIN)) return var/x = text2num(href_list["X"]) var/y = text2num(href_list["Y"]) @@ -1372,7 +1372,7 @@ H << "You hear something crackle in your ears for a moment before a voice speaks. \"Please stand by for a message from your benefactor. Message as follows, agent. [input]. Message ends.\"" else if(href_list["jumpto"]) - if(!check_rights(R_ADMIN)) return + if(!isobserver(usr) && !check_rights(R_ADMIN)) return var/mob/M = locate(href_list["jumpto"]) usr.client.jumptomob(M)