From 15a2bcc54f873031c881d8c929b6f29042b7ec58 Mon Sep 17 00:00:00 2001 From: DJSnapshot Date: Mon, 4 Nov 2013 13:07:03 -0800 Subject: [PATCH 1/2] Fix so bans can work again. --- code/modules/admin/DB ban/functions.dm | 2 +- code/modules/admin/topic.dm | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/admin/DB ban/functions.dm b/code/modules/admin/DB ban/functions.dm index ad60ecf496..d656e5f299 100644 --- a/code/modules/admin/DB ban/functions.dm +++ b/code/modules/admin/DB ban/functions.dm @@ -1,7 +1,7 @@ datum/admins/proc/DB_ban_record(var/bantype, var/mob/banned_mob, var/duration = -1, var/reason, var/job = "", var/rounds = 0, var/banckey = null) - if(!check_rights(R_BAN)) return + if(!check_rights(R_BAN | R_MOD)) return establish_db_connection() if(!dbcon.IsConnected()) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index a95b9d625e..f1c911488a 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -685,6 +685,7 @@ if(notbannedlist.len) //at least 1 unbanned job exists in joblist so we have stuff to ban. switch(alert("Temporary Ban?",,"Yes","No", "Cancel")) if("Yes") + if(!check_rights(R_MOD,0) && !check_rights(R_BAN)) return if(config.ban_legacy_system) usr << "\red Your server is using the legacy banning system, which does not support temporary job bans. Consider upgrading. Aborting ban." return @@ -846,7 +847,7 @@ del(M.client) //del(M) // See no reason why to delete mob. Important stuff can be lost. And ban can be lifted before round ends. if("No") - if(check_rights(R_BAN)) return + if(!check_rights(R_BAN)) return var/reason = input(usr,"Reason?","reason","Griefer") as text|null if(!reason) return From c20c84b32885df260a5d14506a2298895e889901 Mon Sep 17 00:00:00 2001 From: DJSnapshot Date: Mon, 4 Nov 2013 13:10:33 -0800 Subject: [PATCH 2/2] Dun goofed --- code/modules/admin/DB ban/functions.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/admin/DB ban/functions.dm b/code/modules/admin/DB ban/functions.dm index d656e5f299..804116fede 100644 --- a/code/modules/admin/DB ban/functions.dm +++ b/code/modules/admin/DB ban/functions.dm @@ -1,7 +1,7 @@ datum/admins/proc/DB_ban_record(var/bantype, var/mob/banned_mob, var/duration = -1, var/reason, var/job = "", var/rounds = 0, var/banckey = null) - if(!check_rights(R_BAN | R_MOD)) return + if(!check_rights(R_MOD,0) && !check_rights(R_BAN)) return establish_db_connection() if(!dbcon.IsConnected())