diff --git a/code/__HELPERS/_logging.dm b/code/__HELPERS/_logging.dm index 03265398796..8a81f7992ca 100644 --- a/code/__HELPERS/_logging.dm +++ b/code/__HELPERS/_logging.dm @@ -70,4 +70,8 @@ /proc/log_pda(text) if (config.log_pda) - diary << "\[[time_stamp()]]PDA: [text]" \ No newline at end of file + diary << "\[[time_stamp()]]PDA: [text]" + +/proc/log_chat(text) + if (config.log_pda) //reusing this for now, can change if needed + diary << "\[[time_stamp()]]CHAT: [text]" \ No newline at end of file diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm index 04226b689d2..0790775530f 100644 --- a/code/game/machinery/computer/message.dm +++ b/code/game/machinery/computer/message.dm @@ -114,8 +114,10 @@ else dat += "
[++i]. View Message Logs
" dat += "
[++i]. View Request Console Logs
" + dat += "
[++i]. View Chatroom Logs
" dat += "
[++i]. Clear Message Logs
" dat += "
[++i]. Clear Request Console Logs
" + dat += "
[++i]. Clear Chatroom Logs
" dat += "
[++i]. Set Custom Key
" dat += "
[++i]. Send Admin Message
" else @@ -236,6 +238,24 @@ [rc.rec_dpt][rc.message][rc.stamp][rc.id_auth][rc.priority]"} dat += "" + //Chatroom Logs + if(5) + + var/index = 0 + //var/sender = "Anon" + //var/channel = "ss13" + //var/message = "Blank" + dat += "
Back - Refresh

" + dat += "" + for(var/datum/data_chat_msg/msg in src.linkedServer.chat_msgs) + index++ + if(index > 3000) + break + // Del - Channel - Sender - Message + // X - #ss13 - bigdik - hi asl + dat += "" + dat += "
XChannelNickMessage
X
[msg.channel][msg.sender][msg.message]
" + message = defaultmsg //user << browse(dat, "window=message;size=700x700") //onclose(user, "message") @@ -321,6 +341,14 @@ if(auth) src.linkedServer.rc_msgs = list() message = "NOTICE: Logs cleared." + //Clears the chatroom logs - KEY REQUIRED + if (href_list["clearc"]) + if(!linkedServer || (src.linkedServer.stat & (NOPOWER|BROKEN))) + message = noserver + else + if(auth) + src.linkedServer.chat_msgs = list() + message = "NOTICE: Logs cleared." //Change the password - KEY REQUIRED if (href_list["pass"]) if(!linkedServer || (src.linkedServer.stat & (NOPOWER|BROKEN))) @@ -464,6 +492,13 @@ else if(auth) src.screen = 4 + //Chatroom Logs - KEY REQUIRED + if(href_list["viewc"]) + if(src.linkedServer == null || (src.linkedServer.stat & (NOPOWER|BROKEN))) + message = noserver + else + if(auth) + src.screen = 5 //usr << href_list["select"] diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 8542b19e0d5..ac5181f751f 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -44,6 +44,12 @@ var/global/list/obj/item/device/pda/PDAs = list() var/obj/item/device/paicard/pai = null // A slot for a personal AI device + var/chat_channel = "#ss13" //name of our current NTRC channel + var/nick = "" //our NTRC nick + var/list/ntrclog = list() //NTRC message log + + var/noreturn = 0 //whether the PDA can use the Return button, used for the aiPDA chatroom + /obj/item/device/pda/medical default_cartridge = /obj/item/weapon/cartridge/medical icon_state = "pda-medical" @@ -186,13 +192,15 @@ var/global/list/obj/item/device/pda/PDAs = list() /obj/item/device/pda/ai icon_state = "NONE" ttone = "data" + mode = 5 + noreturn = 1 detonate = 0 /obj/item/device/pda/ai/attack_self(mob/user as mob) if ((honkamt > 0) && (prob(60)))//For clown virus. honkamt-- playsound(loc, 'sound/items/bikehorn.ogg', 30, 1) - return + ..() /obj/item/device/pda/ai/pai ttone = "assist" @@ -257,7 +265,7 @@ var/global/list/obj/item/device/pda/PDAs = list() if ((!isnull(cartridge)) && (mode == 0)) dat += " |
Eject [cartridge]" - if (mode) + if (mode && !noreturn) dat += " | Return" dat += " | Refresh" @@ -283,7 +291,7 @@ var/global/list/obj/item/device/pda/PDAs = list() dat += "