From 7fb460db9a2512f2fd8490139c1608b431fdd70d Mon Sep 17 00:00:00 2001 From: errorage Date: Sun, 17 Nov 2013 04:40:58 +0100 Subject: [PATCH 1/3] - Fixes lastadminrank logging, needed for ban log authentication. --- code/modules/admin/verbs/modifyvariables.dm | 3 ++- code/modules/client/client procs.dm | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/modules/admin/verbs/modifyvariables.dm b/code/modules/admin/verbs/modifyvariables.dm index 5ffda7985a6..f63047b0d86 100644 --- a/code/modules/admin/verbs/modifyvariables.dm +++ b/code/modules/admin/verbs/modifyvariables.dm @@ -1,7 +1,8 @@ var/list/forbidden_varedit_object_types = list( /datum/admins, //Admins editing their own admin-power object? Yup, sounds like a good idea. /obj/machinery/blackbox_recorder, //Prevents people messing with feedback gathering - /datum/feedback_variable //Prevents people messing with feedback gathering + /datum/feedback_variable, //Prevents people messing with feedback gathering + /datum/admin_rank //Admin permissions were moved to this object, shouldn't be editable. ) /* diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm index cea60406f20..60cac6ac10b 100644 --- a/code/modules/client/client procs.dm +++ b/code/modules/client/client procs.dm @@ -193,8 +193,8 @@ var/next_external_rsc = 0 return var/admin_rank = "Player" - if(src.holder) - admin_rank = src.holder.rank + if(src.holder && src.holder.rank) + admin_rank = src.holder.rank.name var/sql_ip = sql_sanitize_text(src.address) var/sql_computerid = sql_sanitize_text(src.computer_id) From 1dbdca4a343db6b3cbc508107b187067af5daaba Mon Sep 17 00:00:00 2001 From: errorage Date: Sun, 17 Nov 2013 04:46:47 +0100 Subject: [PATCH 2/3] - Split hotfix into own pull request --- code/modules/admin/verbs/modifyvariables.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/admin/verbs/modifyvariables.dm b/code/modules/admin/verbs/modifyvariables.dm index f63047b0d86..89c8d20f93f 100644 --- a/code/modules/admin/verbs/modifyvariables.dm +++ b/code/modules/admin/verbs/modifyvariables.dm @@ -2,7 +2,6 @@ var/list/forbidden_varedit_object_types = list( /datum/admins, //Admins editing their own admin-power object? Yup, sounds like a good idea. /obj/machinery/blackbox_recorder, //Prevents people messing with feedback gathering /datum/feedback_variable, //Prevents people messing with feedback gathering - /datum/admin_rank //Admin permissions were moved to this object, shouldn't be editable. ) /* From 7944e9fbf14848c2b30224902eb3770962c24965 Mon Sep 17 00:00:00 2001 From: errorage Date: Sun, 17 Nov 2013 04:47:59 +0100 Subject: [PATCH 3/3] - missed a comma --- code/modules/admin/verbs/modifyvariables.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/admin/verbs/modifyvariables.dm b/code/modules/admin/verbs/modifyvariables.dm index 89c8d20f93f..5ffda7985a6 100644 --- a/code/modules/admin/verbs/modifyvariables.dm +++ b/code/modules/admin/verbs/modifyvariables.dm @@ -1,7 +1,7 @@ var/list/forbidden_varedit_object_types = list( /datum/admins, //Admins editing their own admin-power object? Yup, sounds like a good idea. /obj/machinery/blackbox_recorder, //Prevents people messing with feedback gathering - /datum/feedback_variable, //Prevents people messing with feedback gathering + /datum/feedback_variable //Prevents people messing with feedback gathering ) /*