diff --git a/code/modules/modular_computers/NTNet/NTNRC/conversation.dm b/code/modules/modular_computers/NTNet/NTNRC/conversation.dm index 90d703aa0db..5a5e6060240 100644 --- a/code/modules/modular_computers/NTNet/NTNRC/conversation.dm +++ b/code/modules/modular_computers/NTNet/NTNRC/conversation.dm @@ -23,8 +23,8 @@ var/global/ntnrc_uid = 0 log_ntirc("[user.client.ckey]/([username]) : [message]", ckey=key_name(user), conversation=title) for(var/datum/computer_file/program/chatclient/C in clients) - if(C.program_state > PROGRAM_STATE_KILLED && C.username != username) - C.computer.output_message(FONT_SMALL("[get_title(C)]) [username]: [message]"), 0) + if(C.program_state > PROGRAM_STATE_KILLED) + C.computer.output_message(FONT_SMALL("([get_title(C)]) [username]: [message] (Reply)"), 0) message = "[worldtime2text()] [username]: [message]" messages.Add(message) diff --git a/code/modules/modular_computers/file_system/programs/generic/ntnrc_client.dm b/code/modules/modular_computers/file_system/programs/generic/ntnrc_client.dm index 1bff4c0af47..1144b751dea 100644 --- a/code/modules/modular_computers/file_system/programs/generic/ntnrc_client.dm +++ b/code/modules/modular_computers/file_system/programs/generic/ntnrc_client.dm @@ -37,6 +37,21 @@ channel.add_message(message, username, usr) message_dead(FONT_SMALL("([channel.get_dead_title()]) [username]: [message]")) + if(href_list["Reply"]) + . = TRUE + if(!channel || channel.title != href_list["target"]) + to_chat(usr, SPAN_WARNING("The target chat isn't active on your program anymore!")) + return + var/mob/living/user = usr + var/message = sanitize(input(user, "Enter message or leave blank to cancel: ")) + if(!message) + return + if(!channel || channel.title != href_list["target"]) + to_chat(usr, SPAN_WARNING("The target chat isn't active on your program anymore!")) + return + channel.add_message(message, username, usr) + message_dead(FONT_SMALL("([channel.get_dead_title()]) [username]: [message]")) + if(href_list["PRG_joinchannel"]) . = TRUE var/datum/ntnet_conversation/C diff --git a/html/changelogs/geeves-reply_button.yml b/html/changelogs/geeves-reply_button.yml new file mode 100644 index 00000000000..bb2e85c5a7a --- /dev/null +++ b/html/changelogs/geeves-reply_button.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - rscadd: "The NTNet Relay program now shows a message in your chatlog when YOU send a message. It also has a reply button which allows you to send a message back to that channel without opening the UI." \ No newline at end of file