diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm index 9bf17cfc5f1..2479ce2e73f 100644 --- a/code/modules/admin/verbs/pray.dm +++ b/code/modules/admin/verbs/pray.dm @@ -64,12 +64,12 @@ SEND_SOUND(X, sound('sound/effects/adminhelp.ogg')) /proc/ERT_Announce(text, mob/Sender, repeat_warning) - var/msg = sanitize(copytext(text, 1, MAX_MESSAGE_LEN)) + var/msg = sanitizeSafe(text) var/insert_this = list(list( "time" = station_time_timestamp(), "sender_real_name" = "[Sender.real_name ? Sender.real_name : Sender.name]", "sender_uid" = Sender.UID(), - "message" = msg)) + "message" = html_decode(msg))) GLOB.ert_request_messages.Insert(1, insert_this) // insert it to the top of the list msg = "ERT REQUEST: [key_name(Sender, 1)] ([ADMIN_PP(Sender,"PP")]) ([ADMIN_VV(Sender,"VV")]) ([ADMIN_TP(Sender,"TP")]) ([ADMIN_SM(Sender,"SM")]) ([admin_jump_link(Sender)]) ([ADMIN_BSA(Sender,"BSA")]) (RESPOND): [msg]" if(repeat_warning) diff --git a/code/modules/security_levels/keycard_authentication.dm b/code/modules/security_levels/keycard_authentication.dm index 1d2a822b088..0beaad86d60 100644 --- a/code/modules/security_levels/keycard_authentication.dm +++ b/code/modules/security_levels/keycard_authentication.dm @@ -117,7 +117,7 @@ . = TRUE switch(action) if("ert") - ert_reason = stripped_input(usr, "Reason for ERT Call:", "", "") + ert_reason = input(usr, "Reason for ERT Call:", "", "") // we strip this later in ERT_Announce if("reset") reset() if("triggerevent") diff --git a/code/modules/tgui/modules/ert_manager.dm b/code/modules/tgui/modules/ert_manager.dm index 590df8b03fe..da04210d95c 100644 --- a/code/modules/tgui/modules/ert_manager.dm +++ b/code/modules/tgui/modules/ert_manager.dm @@ -104,13 +104,15 @@ slots_list += "paranormal: [paranormal_slots]" if(cyborg_slots > 0) slots_list += "cyborg: [cyborg_slots]" - D.silent = params["silent"] + + var/silenced = text2bool(params["silent"]) + D.silent = silenced var/slot_text = english_list(slots_list) notify_ghosts("An ERT is being dispatched. Type: [ert_type]. Open positions: [slot_text]") - message_admins("[key_name_admin(usr)] dispatched a [params["silent"] ? "silent " : ""][ert_type] ERT. Slots: [slot_text]", 1) - log_admin("[key_name(usr)] dispatched a [params["silent"] ? "silent " : ""][ert_type] ERT. Slots: [slot_text]") - if(!params["silent"]) + message_admins("[key_name_admin(usr)] dispatched a [silenced ? "silent " : ""][ert_type] ERT. Slots: [slot_text]", 1) + log_admin("[key_name(usr)] dispatched a [silenced ? "silent " : ""][ert_type] ERT. Slots: [slot_text]") + if(!silenced) GLOB.major_announcement.Announce("Attention, [station_name()]. We are attempting to assemble an ERT. Standby.", "ERT Protocol Activated") trigger_armed_response_team(D, commander_slots, security_slots, medical_slots, engineering_slots, janitor_slots, paranormal_slots, cyborg_slots, cyborg_security)