cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Communicator Log Fix

Browse Source
This commit is contained in:
Casey
2022-06-10 21:03:28 -04:00
committed by CHOMPStation2
parent b204735fa2
commit a6c21a9adb
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
code/game/objects/items/devices/communicator/messaging.dm
View File

@@ -95,7 +95,24 @@
L = loc L = loc
if(L) if(L)
<<<<<<< HEAD
to_chat(L, "<span class='notice'>[bicon(src)] Message from [who].</span>") to_chat(L, "<span class='notice'>[bicon(src)] Message from [who].</span>")
=======
to_chat(L, "<span class='notice'>[bicon(src)] Message from [who]: <b>\"[text]\"</b> (<a href='?src=\ref[src];action=Reply;target=\ref[candidate]'>Reply</a>)</span>")
// This is the only Topic the communicators really uses
/obj/item/device/communicator/Topic(href, href_list)
switch(href_list["action"])
if("Reply")
var/obj/item/device/communicator/comm = locate(href_list["target"])
var/message = input(usr, "Enter your message below.", "Reply")
if(message)
exonet.send_message(comm.exonet.address, "text", message)
im_list += list(list("address" = exonet.address, "to_address" = comm.exonet.address, "im" = message))
log_pda("(COMM: [src]) sent \"[message]\" to [exonet.get_atom_from_address(comm.exonet.address)]", usr)
to_chat(usr, "<span class='notice'>[bicon(src)] Sent message to [comm.owner], <b>\"[message]\"</b></span>")
>>>>>>> 9d35ab996d... Merge pull request #13063 from ItsSelis/tgui-pda-fix
// Verb: text_communicator() // Verb: text_communicator()
// Parameters: None // Parameters: None

2
code/modules/nifsoft/software/14_commlink.dm
View File

@@ -128,4 +128,4 @@
return return
if(ringer && nif.human) if(ringer && nif.human)
nif.notify("Commlink message from [who]: \"[text]\" (<a href='?src=\ref[nifsoft];open=1'>Open</a>)") nif.notify("Commlink message from [who]: \"[text]\" (<a href='?src=\ref[nifsoft];open=1'>Open</a>) (<a href='?src=\ref[src];action=Reply;target=\ref[candidate]'>Reply</a>)")