From 0c2cf25f700255e7d7012c5ad83367d58bf12bea Mon Sep 17 00:00:00 2001 From: skull132 Date: Wed, 18 Feb 2015 22:13:24 +0200 Subject: [PATCH 1/3] Emergency Hotfix Bans should now work, and not feed errors. --- code/modules/admin/IsBanned.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/admin/IsBanned.dm b/code/modules/admin/IsBanned.dm index e94ce393..eaae56ad 100644 --- a/code/modules/admin/IsBanned.dm +++ b/code/modules/admin/IsBanned.dm @@ -108,8 +108,8 @@ world/IsBanned(key,address,computer_id) var/desc = "\nReason: You, or another user of this computer or connection ([pckey]) is banned from playing here. The ban reason is:\n[reason]\nThis ban was applied by [ackey] on [bantime], [expires]" - log_access("Failed Login: [key] [computer_id] [address] - Banned [.["reason"]]") - message_admins("\blue Failed Login: [key] id:[computer_id] ip:[address] - Banned [.["reason"]]") + log_access("Failed Login: [key] [computer_id] [address] - Banned [reason]") + message_admins("\blue Failed Login: [key] id:[computer_id] ip:[address] - Banned [reason]") return list("reason"="[bantype]", "desc"="[desc]") From b115649f6091cde9c5d35652f9cb02af9d7e48cb Mon Sep 17 00:00:00 2001 From: skull132 Date: Wed, 18 Feb 2015 22:13:48 +0200 Subject: [PATCH 2/3] Admins get DOSay Yes, that. --- code/modules/admin/verbs/adminsay.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/admin/verbs/adminsay.dm b/code/modules/admin/verbs/adminsay.dm index 1355e34a..f8a4b746 100644 --- a/code/modules/admin/verbs/adminsay.dm +++ b/code/modules/admin/verbs/adminsay.dm @@ -59,7 +59,7 @@ set name = "Dosay" set hidden = 1 - if(!check_rights(R_DUTYOFF)) return + if(!check_rights(R_ADMIN|R_DUTYOFF)) return msg = copytext(sanitize(msg), 1, MAX_MESSAGE_LEN) if(!msg) return From 3a8084a3bd24470b40a48900c92d5571a3bccfc2 Mon Sep 17 00:00:00 2001 From: skull132 Date: Wed, 18 Feb 2015 22:17:16 +0200 Subject: [PATCH 3/3] ID Cards Centre Now centred, fixed. --- icons/obj/card.dmi | Bin 4347 -> 4352 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/obj/card.dmi b/icons/obj/card.dmi index 61abc7577d650b0be85c294ff3dd9e14abd27ddd..f7c2ccfc2e0314a0efb56bf2b9d4f0c4cb122785 100644 GIT binary patch delta 4147 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 AD*ylh delta 4142 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 D4TKoo