From 735bfdf0122086aba210fc47ca3db7bdd893309e Mon Sep 17 00:00:00 2001 From: Tigercat2000 Date: Sat, 25 Apr 2015 08:08:58 -0700 Subject: [PATCH] Fixes cmd_ghost_drag perms This fixes the cmd_ghost_drag perms to work as they were originally intended to- requiring either varedit OR r_admin + r_debug. The original checks were exclusive, as it checked for no r_varedit OR no r_admin + r_debug, which means that unless the user had all three, it would always fail. --- code/modules/admin/admin.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index a108dd54287..51edf9a4cdf 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -995,8 +995,9 @@ proc/formatPlayerPanel(var/mob/U,var/text="PP") return //extra sanity check to make sure only observers are shoved into things //same as assume-direct-control perm requirements. - if (!check_rights(R_VAREDIT,0) || !check_rights(R_ADMIN|R_DEBUG,0)) - return 0 + if (!check_rights(R_VAREDIT,0)) //no varedit, check if they have r_admin and r_debug + if(!check_rights(R_ADMIN|R_DEBUG,0)) //if they don't have r_admin and r_debug, return + return 0 //otherwise, if they have no varedit, but do have r_admin and r_debug, execute the rest of the code if (!frommob.ckey) return 0