From 6f5160775b986b8e93ff8ca728a5e5b53726b59b Mon Sep 17 00:00:00 2001 From: Kyep Date: Mon, 16 Oct 2017 20:31:59 -0700 Subject: [PATCH 1/4] Permissions Panel Loop --- code/modules/admin/topic.dm | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 3aabfd3150a..09ca43093dc 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -242,16 +242,19 @@ else if(task == "permissions") if(!D) return - var/list/permissionlist = list() - for(var/i=1, i<=R_MAXPERMISSION, i<<=1) //that <<= is shorthand for i = i << 1. Which is a left bitshift - permissionlist[rights2text(i)] = i - var/new_permission = input("Select a permission to turn on/off", "Permission toggle", null, null) as null|anything in permissionlist - if(!new_permission) return - D.rights ^= permissionlist[new_permission] + while (TRUE) + var/list/permissionlist = list() + for(var/i=1, i<=R_MAXPERMISSION, i<<=1) //that <<= is shorthand for i = i << 1. Which is a left bitshift + permissionlist[rights2text(i)] = i + var/new_permission = input("Select a permission to turn on/off", adm_ckey + "'s Permissions", null, null) as null|anything in permissionlist + if(!new_permission) + return + D.rights ^= permissionlist[new_permission] + + message_admins("[key_name_admin(usr)] toggled the [new_permission] permission of [adm_ckey]") + log_admin("[key_name(usr)] toggled the [new_permission] permission of [adm_ckey]") + log_admin_permission_modification(adm_ckey, permissionlist[new_permission]) - message_admins("[key_name_admin(usr)] toggled the [new_permission] permission of [adm_ckey]") - log_admin("[key_name(usr)] toggled the [new_permission] permission of [adm_ckey]") - log_admin_permission_modification(adm_ckey, permissionlist[new_permission]) edit_admin_permissions() From 168f6799db56f08fce2cd6fa6e7d79a65d2778c8 Mon Sep 17 00:00:00 2001 From: Kyep Date: Mon, 16 Oct 2017 20:38:46 -0700 Subject: [PATCH 2/4] Tiger --- code/modules/admin/topic.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 09ca43093dc..f3b45e343a1 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -242,7 +242,7 @@ else if(task == "permissions") if(!D) return - while (TRUE) + while(TRUE) var/list/permissionlist = list() for(var/i=1, i<=R_MAXPERMISSION, i<<=1) //that <<= is shorthand for i = i << 1. Which is a left bitshift permissionlist[rights2text(i)] = i From 5f66da051a4e20b33855a47a5ca2bd7fcaaae4f4 Mon Sep 17 00:00:00 2001 From: Kyep Date: Mon, 16 Oct 2017 22:20:48 -0700 Subject: [PATCH 3/4] Also tells you if you're toggling on/off --- code/modules/admin/topic.dm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index f3b45e343a1..f1880dff270 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -249,10 +249,14 @@ var/new_permission = input("Select a permission to turn on/off", adm_ckey + "'s Permissions", null, null) as null|anything in permissionlist if(!new_permission) return + var oldrights = D.rights + var toggleresult = "ON" D.rights ^= permissionlist[new_permission] + if(oldrights > D.rights) + toggleresult = "OFF" - message_admins("[key_name_admin(usr)] toggled the [new_permission] permission of [adm_ckey]") - log_admin("[key_name(usr)] toggled the [new_permission] permission of [adm_ckey]") + message_admins("[key_name_admin(usr)] toggled the [new_permission] permission of [adm_ckey] to [toggleresult]") + log_admin("[key_name(usr)] toggled the [new_permission] permission of [adm_ckey] to [toggleresult]") log_admin_permission_modification(adm_ckey, permissionlist[new_permission]) From faa6788b803300f5fcd44254e8aad6f3f1088f3a Mon Sep 17 00:00:00 2001 From: Kyep Date: Thu, 19 Oct 2017 08:28:31 -0700 Subject: [PATCH 4/4] "var X" -> "var/x" --- code/modules/admin/topic.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index f1880dff270..2375cdebf7b 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -249,8 +249,8 @@ var/new_permission = input("Select a permission to turn on/off", adm_ckey + "'s Permissions", null, null) as null|anything in permissionlist if(!new_permission) return - var oldrights = D.rights - var toggleresult = "ON" + var/oldrights = D.rights + var/toggleresult = "ON" D.rights ^= permissionlist[new_permission] if(oldrights > D.rights) toggleresult = "OFF"