diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index d250cc60319..10fffa8c024 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -137,7 +137,7 @@ if(message_cooldown > world.time) to_chat(usr, "Please allow at least one minute to pass between announcements.") return - var/input = input(usr, "Please write a message to announce to the station crew.", "Priority Announcement") + var/input = input(usr, "Please write a message to announce to the station crew.", "Priority Announcement") as null|message if(!input || message_cooldown > world.time || ..() || !(is_authenticated(usr) >= COMM_AUTHENTICATION_CAPT)) return if(length(input) < COMM_MSGLEN_MINIMUM) diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index 2d04d04644a..487ec245466 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -193,7 +193,7 @@ GLOBAL_LIST_EMPTY(allRequestConsoles) reset_message(TRUE) if("writeAnnouncement") - var/new_message = sanitize(input("Write your message:", "Awaiting Input", "")) + var/new_message = input("Write your message:", "Awaiting Input", message) as message|null if(new_message) message = new_message else @@ -202,7 +202,7 @@ GLOBAL_LIST_EMPTY(allRequestConsoles) if("sendAnnouncement") if(!announcementConsole) return - announcement.Announce(message, msg_sanitized = TRUE) + announcement.Announce(message) reset_message(TRUE) if("department")