From d9bcca3dfb954d659ffbd69ba488d622e06b4198 Mon Sep 17 00:00:00 2001 From: naut Date: Tue, 13 Aug 2024 20:56:27 +0800 Subject: [PATCH] customizable title + conflict fix --- .../game_master/extra_buttons/marine_announce.dm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/code/modules/admin/game_master/extra_buttons/marine_announce.dm b/code/modules/admin/game_master/extra_buttons/marine_announce.dm index 33f5723770..6a0a903b8a 100644 --- a/code/modules/admin/game_master/extra_buttons/marine_announce.dm +++ b/code/modules/admin/game_master/extra_buttons/marine_announce.dm @@ -1,14 +1,16 @@ /client/proc/admin_marine_announcement() - set name = "Marine Announcement" + set name = "Command Announcement" set category = "Game Master.Extras" if(!check_rights(R_ADMIN)) return - var/input = tgui_input_text(src, "Enter the text for the announcement.", title = "Make Marine Announcement", multiline = TRUE, encode = FALSE) - if(!input) + var/body = tgui_input_text(src, "Enter the body text for the announcement.", title = "Announcement Body", multiline = TRUE, encode = FALSE) + if(!body) return - else - marine_announcement(input, "[COMMAND_ANNOUNCE]") - message_admins("[key_name_admin(src)] has made an admin command announcement.") - log_admin("[key_name_admin(src)] made an admin command announcement: [input]") + var/title = tgui_input_text(src, "Enter the title of the announcement. Leave blank for the default title.", title = "Announcement Title") + if(!title) + title = COMMAND_ANNOUNCE + marine_announcement(body, "[title]") + message_admins("[key_name_admin(src)] has made an admin command announcement.") + log_admin("[key_name_admin(src)] made an admin command announcement: [body]")