diff --git a/code/modules/modular_computers/NTNet/NTNRC/conversation.dm b/code/modules/modular_computers/NTNet/NTNRC/conversation.dm index 9ea4d75350c..90d703aa0db 100644 --- a/code/modules/modular_computers/NTNet/NTNRC/conversation.dm +++ b/code/modules/modular_computers/NTNet/NTNRC/conversation.dm @@ -111,6 +111,15 @@ var/global/ntnrc_uid = 0 else return title +/datum/ntnet_conversation/proc/get_dead_title() + if(direct) + var/names = list() + for(var/datum/computer_file/program/chatclient/C in clients) + names += C.username + return "\[DM] [english_list(names)]" + else + return title + /datum/ntnet_conversation/proc/can_see(var/datum/computer_file/program/chatclient/cl) if(cl in clients) return TRUE 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 df15ccbc5b8..8ad8079b497 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 @@ -34,7 +34,7 @@ if(!message || !channel) return channel.add_message(message, username, usr) - message_dead(FONT_SMALL("([channel]) [username]: [message]")) + message_dead(FONT_SMALL("([channel.get_dead_title()]) [username]: [message]")) if(href_list["PRG_joinchannel"]) . = TRUE @@ -59,13 +59,13 @@ channel = C return TRUE C.add_client(src) - message_dead(FONT_SMALL("([channel]) A new client ([username]) has entered the chat.")) + message_dead(FONT_SMALL("([channel.get_dead_title()]) A new client ([username]) has entered the chat.")) channel = C if(href_list["PRG_leavechannel"]) . = TRUE if(channel && !channel.direct) channel.remove_client(src) - message_dead(FONT_SMALL(FONT_SMALL("([channel]) A new client ([username]) has left the chat."))) + message_dead(FONT_SMALL(FONT_SMALL("([channel.get_dead_title()]) A client ([username]) has left the chat."))) channel = null if(href_list["PRG_backtomain"]) . = TRUE @@ -80,7 +80,7 @@ C.add_client(src) C.operator = src channel = C - message_dead(FONT_SMALL("([channel]) A new channel has been made by [username].")) + message_dead(FONT_SMALL("([channel.get_dead_title()]) A new channel has been made by [username].")) if(href_list["PRG_toggleadmin"]) . = TRUE if(netadmin_mode) diff --git a/html/changelogs/geeves-dead_chat_irc_fix.yml b/html/changelogs/geeves-dead_chat_irc_fix.yml new file mode 100644 index 00000000000..216a2ba488f --- /dev/null +++ b/html/changelogs/geeves-dead_chat_irc_fix.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - bugfix: "Deadchat IRC messages have been fixed." \ No newline at end of file