From fa0efbf983ad7a30024a3edffc7a1ba230c762ce Mon Sep 17 00:00:00 2001 From: Markolie Date: Thu, 24 Sep 2015 03:18:14 +0200 Subject: [PATCH] Update admin announce, edit memory fix --- code/datums/mind.dm | 2 +- code/modules/admin/admin.dm | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/datums/mind.dm b/code/datums/mind.dm index bdf30f6645e..0d135e29bd5 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -426,7 +426,7 @@ message_admins("[key_name_admin(usr)] has changed [key_name_admin(current)]'s assigned role to [assigned_role]") else if (href_list["memory_edit"]) - var/new_memo = sanitize(copytext(input("Write new memory", "Memory", memory) as null|message,1,MAX_MESSAGE_LEN)) + var/new_memo = copytext(input("Write new memory", "Memory", memory) as null|message,1,MAX_MESSAGE_LEN) if (isnull(new_memo)) return memory = new_memo log_admin("[key_name(usr)] has edited [key_name(current)]'s memory") diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index dc3f4884add..745c6557107 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -541,11 +541,12 @@ var/global/nologevent = 0 if(!check_rights(R_ADMIN)) return - var/message = input("Global message to send:", "Admin Announce", null, null) as message + var/message = input("Global message to send:", "Admin Announce", null, null) as message|null if(message) if(!check_rights(R_SERVER,0)) message = adminscrub(message,500) - world << "\blue [usr.client.holder.fakekey ? "Administrator" : usr.key] Announces:\n \t [message]" + message = replacetext(message, "\n", "
") // required since we're putting it in a

tag + world << "[usr.client.holder.fakekey ? "Administrator" : usr.key] Announces:

[message]

" log_admin("Announce: [key_name(usr)] : [message]") feedback_add_details("admin_verb","A") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!