From 314617ea6d74cb889b0f65a81363e3fd93653aa1 Mon Sep 17 00:00:00 2001
From: tkdrg <tkdrg@users.noreply.github.com>
Date: Sun, 26 Oct 2014 22:51:06 -0300
Subject: [PATCH 1/7] PDAs now have a Nanotransen Relay Chat client

---
 code/game/objects/items/devices/PDA/PDA.dm    |  73 ++++++--
 .../objects/items/devices/PDA/chatroom.dm     | 172 ++++++++++++++++--
 code/modules/client/client procs.dm           |   1 +
 html/changelogs/Tkdrg-chatrooms.yml           |   4 +
 4 files changed, 227 insertions(+), 23 deletions(-)
 create mode 100644 html/changelogs/Tkdrg-chatrooms.yml

diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index 06a5fb632d6..3029f965bd4 100644
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -44,6 +44,11 @@ var/global/list/obj/item/device/pda/PDAs = list()
 
 	var/obj/item/device/paicard/pai = null	// A slot for a personal AI device
 
+	var/datum/chatroom/chat_channel = "" //name of our current NTRC channel, without the #
+	var/datum/event/ntrc_event //our ntrc event trigger
+	var/nick = "" //our NTRC nick
+	var/list/ntrclog = list() //NTRC message log
+
 /obj/item/device/pda/medical
 	default_cartridge = /obj/item/weapon/cartridge/medical
 	icon_state = "pda-medical"
@@ -283,7 +288,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 				dat += "<ul>"
 				dat += "<li><a href='byond://?src=\ref[src];choice=1'><img src=pda_notes.png> Notekeeper</a></li>"
 				dat += "<li><a href='byond://?src=\ref[src];choice=2'><img src=pda_mail.png> Messenger</a></li>"
-				//dat += "<li><a href='byond://?src=\red[src];choice=chatroom'><img src=pda_chatroom.png> Nanotrasen Relay Chat</a></li>"
+				dat += "<li><a href='byond://?src=\ref[src];choice=5'><img src=pda_chatroom.png> Nanotrasen Relay Chat</a></li>"
 
 				if (cartridge)
 					if (cartridge.access_clown)
@@ -425,16 +430,22 @@ var/global/list/obj/item/device/pda/PDAs = list()
 				dat += "<br>"
 
 			if (5)
-				dat += "<h4><img src=pda_chatroom.png> Nanotrasen Relay Chat</h4>"
+				if(!nick)
+					nick = copytext(sanitize(owner), 1, 9)
+				dat += "<h4><img src=pda_chatroom.png> Space Station 13 Nanotrasen Relay Chat Network</h4>"
 
-				dat += "<h4><img src=pda_menu.png> Detected Channels</h4>: <li>"
-				for(var/datum/chatroom/C in chatrooms)
-					dat += "<a href='byond://?src=\ref[src];pdachannel=[C.name]'>#[html_encode(lowertext(C.name))]"
-					if(C.password != "")
-						dat += " <img src=pda_locked.png>"
-					dat += "</li>"
+				if(!chat_channel)
+					dat += "<a href='byond://?src=\ref[src];choice=Set Nick'><img src=pda_status.png>[strip_html_properly(nick)]</a>"
+					dat += "<h4><img src=pda_menu.png> Detected Channels</h4>"
+					for(var/C in chatchannels)
+						dat += "<li><a href='byond://?src=\ref[src];choice=Set Channel;C=[C]'>#[html_encode(C)]</a></li>"
 
+				else
 
+					dat += "<a href='byond://?src=\ref[src];choice=Set Nick'>[strip_html_properly(nick)]</a> | "
+					dat += "<a href='byond://?src=\ref[src];choice=Set Channel'>#[strip_html_properly(chat_channel)]</a> | "
+					dat += "<a href='byond://?src=\ref[src];choice=NTRC Message'>Write message</a><br>"
+					dat += ntrclog[chat_channel]
 
 			else//Else it links to the cart menu proc. Although, it really uses menu hub 4--menu 4 doesn't really exist as it simply redirects to hub.
 				dat += cart
@@ -502,8 +513,6 @@ var/global/list/obj/item/device/pda/PDAs = list()
 				mode = 3
 			if("4")//Redirects to hub
 				mode = 0
-			if("chatroom") // chatroom hub
-				mode = 5
 
 
 //MAIN FUNCTIONS===================================
@@ -607,6 +616,40 @@ var/global/list/obj/item/device/pda/PDAs = list()
 					return
 
 
+//CHATROOM FUNCTIONS====================================
+
+			if("Set Nick")
+				var/t = input(U, "Please enter nickname", name, null) as text
+				nick = copytext(sanitize(t), 1, 9)
+
+			if("Set Channel")
+				var/t = href_list["C"]
+				if(!t)
+					if(chat_channel)
+						var/datum/chatroom/C = chatchannels[chat_channel]
+						C.events.clearEvent("msg_chat", ntrc_event)
+					chat_channel = ""
+				else
+					chat_channel = t
+					var/datum/chatroom/C = chatchannels[chat_channel]
+					var/ret = C.parse_msg(src,nick,"/join")
+					if(findtextEx(ret,"ERR_",1,5))
+						ntrclog[chat_channel] = "<font color=\"red\">[ret]</font><br>" + ntrclog[chat_channel]
+					else
+						ntrc_event = ret
+
+			if("NTRC Message")
+				var/t = input(U, "Please enter message", name, null) as text
+				t = strip_html_properly(t)
+				var/datum/chatroom/C = chatchannels[chat_channel]
+				if(C)
+					var/ret = C.parse_msg(src,nick,t)
+					if(findtextEx(ret,"ERR_",1,5))
+						ntrclog[chat_channel] = "<font color=\"red\">[ret]</font><br>" + ntrclog[chat_channel]
+					else if(ret == 0)
+						ntrclog[chat_channel] = "<font color=\"red\">Failure</font><br>" + ntrclog[chat_channel]
+
+
 //SYNDICATE FUNCTIONS===================================
 
 			if("Toggle Door")
@@ -773,7 +816,6 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	else
 		U << "<span class='notice'>ERROR: Server isn't responding.</span>"
 
-
 /obj/item/device/pda/verb/verb_remove_id()
 	set category = "Object"
 	set name = "Remove id"
@@ -1076,6 +1118,15 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	spawn(200 * severity)
 		emped -= 1
 
+//ntrc handler proc
+/obj/item/device/pda/proc/msg_chat(channel as text, sender as text, message as text)
+	var/msg = "<b>[strip_html_properly(sender)]</b>| [strip_html_properly(message)]<br>"
+	if(!channel)
+		for(var/C in ntrclog)
+			ntrclog[C] = msg + ntrclog[C]
+	else
+		ntrclog[channel] = msg + ntrclog[channel]
+
 /proc/get_viewable_pdas()
 	. = list()
 	// Returns a list of PDAs which can be viewed from another PDA/message monitor.
diff --git a/code/game/objects/items/devices/PDA/chatroom.dm b/code/game/objects/items/devices/PDA/chatroom.dm
index 007d3892c20..054eb45d928 100644
--- a/code/game/objects/items/devices/PDA/chatroom.dm
+++ b/code/game/objects/items/devices/PDA/chatroom.dm
@@ -1,16 +1,164 @@
-var/list/chatrooms = list()
+var/datum/chatroom/default_ntrc_chatroom = new("")
+var/list/chatchannels = list(default_ntrc_chatroom.name = default_ntrc_chatroom)
+
+//procs that can be used directly:
+//channel.parse_msg
 
 /datum/chatroom
-	var/name = "Generic Chatroom"
-	var/list/logged_in = list()
+	var/name = "ss13"
+	var/channelpassword = ""
+	var/operator = ""
+	var/topic = "Welcome to #ss13! The best NTRC channel in this sector of the galaxy!" // topic message for the chatroom
 	var/list/logs = list() // chat logs
-	var/list/banned = list() // banned users
-	var/list/whitelist = list() // whitelisted users
-	var/list/muted = list()
-	var/topic = "" // topic message for the chatroom
-	var/password = "" // blank for no password.
-	var/operator = "" // name of the operator
+	var/list/muted = list() // muted users
+	var/list/auth = list()
+	var/list/pass = list()
+	var/datum/events/events = new ()
 
-/datum/chatroom/proc/attempt_connect(var/obj/item/device/pda/device, var/obj/password)
-	if(!device)
-		return
+/datum/chatroom/New()
+	channelpassword = rand()
+
+//parse_msg() is the exposed interface
+//clients should interact with parse_msg() and parse_msg() only
+
+/datum/chatroom/proc/parse_msg(client,nick,message)
+	if(!check_server(client))
+		return "ERR_TCOM"
+
+	if(!nick || length(nick) > 8)
+		return "ERR_NICK"
+
+	if(findtext(message,"/",1,2))
+		return handle_command(client,nick,copytext(message,2))
+
+	else
+		return send_message(client,nick,message)
+
+//the following are for internal use only
+
+/datum/chatroom/proc/check_server(client)
+	var/atom/C = client
+	var/turf/CT = get_turf(C)
+	if(message_servers)
+		for (var/obj/machinery/message_server/MS in message_servers)
+			var/turf/T = get_turf(MS)
+			if(MS.active && (T.z == CT.z))
+				return 1
+	return 0
+
+/datum/chatroom/proc/handle_command(client,nick,command) //command parser
+	var/list/cmd=text2list(command, " ")
+
+	if(cmd[1] == "auth" && cmd.len > 1) //parsed here to avoid triggering ERR_AUTH
+		return attempt_auth(client,nick,cmd[2])
+
+	if(!get_auth(client,nick))
+		return "ERR_AUTH"
+
+	switch(cmd[1]) //argument-less commmands
+		if("join")
+			return channel_join(client,nick)
+		if("topic")
+			if(cmd.len == 1)
+				return get_topic(client)
+			else
+				return set_topic(client,nick,cmd[2])
+		if("del")
+			return delete_channel(client,nick)
+
+	if(cmd.len == 1)
+		return "ERR_ARGS"
+
+	switch(cmd[1]) //commands with 1 arg
+		if("op")
+			return operator_auth(client,nick,cmd[2])
+		if("register")
+			return register_auth(client,nick,cmd[2])
+		if("mute")
+			return mute_nick(client,nick,cmd[2])
+		if("new")
+			return new_channel(client,nick,cmd[2])
+		if("pass")
+			return new_pass(client,nick,cmd[2])
+
+	return "ERR_WCMD"
+
+/datum/chatroom/proc/send_message(client,nick,message) //standard message
+	if(nick in muted)
+		return "ERR_MUTE"
+	if(!message)
+		return "ERR_BLNK"
+	logs += "[strip_html_properly(nick)]> [strip_html_properly(message)]<"
+	events.fireEvent("msg_chat",name,nick,message)
+	return 1
+
+/datum/chatroom/proc/get_auth(client,nick) //check auth
+	if(!pass[nick] || (auth[nick] == client))
+		return 1
+	return 0
+
+//chat commands go here
+/datum/chatroom/proc/attempt_auth(client,nick,password) //auth
+	if(pass[nick] == password)
+		auth[nick] = client
+		return 1
+	return 0
+
+/datum/chatroom/proc/register_auth(client,nick,password) //register
+	if(pass[nick] && (get_auth(client,nick) != client))
+		return 0
+	pass[nick] = password
+	return 1
+
+/datum/chatroom/proc/delete_channel(client,nick) //delete
+	if(nick == operator)
+		for(var/event in events.events)
+			events.clearEvent("msg_chat",event)
+		qdel(src)
+		return 1
+	return 0
+
+/datum/chatroom/proc/channel_join(client,nick) //join
+	get_topic(client,nick)
+	return events.addEvent("msg_chat",client,"msg_chat")
+
+/datum/chatroom/proc/operator_auth(client,nick,pass) //op
+	if(pass == channelpassword)
+		operator += nick
+		return 1
+	return 0
+
+/datum/chatroom/proc/set_topic(client,nick,newtopic) //topic
+	if(operator == nick)
+		topic = strip_html_properly(newtopic)
+		return 1
+	return 0
+
+/datum/chatroom/proc/get_topic(client,nick) //topic
+	call(client,"msg_chat")(name,"NTbot",topic)
+	return 1
+
+/datum/chatroom/proc/get_log(client,nick,lines) //log
+	for(var/i=0;i<lines;i++)
+		call(client,"msg_chat")(name,"NTbot",logs[logs.len-i])
+	return 1
+
+/datum/chatroom/proc/mute_nick(client,nick,target) //mute
+	if(operator == nick)
+		muted += target
+		return 1
+	return 0
+
+/datum/chatroom/proc/new_channel(client,nick,target) //new
+	if(!(target in chatchannels))
+		chatchannels[target] = new /datum/chatroom()
+	var/datum/chatroom/C = chatchannels[target]
+	C.name = target
+	C.operator = nick
+	return 1
+
+/datum/chatroom/proc/new_pass(client,nick,target) //pass
+	if(operator == nick)
+		channelpassword = target
+		return 1
+	return 0
diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm
index 9cec6893165..e8fa448fce2 100644
--- a/code/modules/client/client procs.dm	
+++ b/code/modules/client/client procs.dm	
@@ -258,6 +258,7 @@ var/next_external_rsc = 0
 		'icons/pda_icons/pda_blank.png',
 		'icons/pda_icons/pda_boom.png',
 		'icons/pda_icons/pda_bucket.png',
+		'icons/pda_icons/pda_chatroom.png',
 		'icons/pda_icons/pda_crate.png',
 		'icons/pda_icons/pda_cuffs.png',
 		'icons/pda_icons/pda_eject.png',
diff --git a/html/changelogs/Tkdrg-chatrooms.yml b/html/changelogs/Tkdrg-chatrooms.yml
new file mode 100644
index 00000000000..207891b2727
--- /dev/null
+++ b/html/changelogs/Tkdrg-chatrooms.yml
@@ -0,0 +1,4 @@
+author: Tkdrg
+delete-after: true
+changes:
+  - rscadd: "Cutting-edge research in a secret Nanotransen lab has shed light into a revolutionary form of communication technology known as 'chat'. The Personal Data Assistants of Space Station 13 have been deployed with an experimental module implementing this system, dubbed 'Nanotransen Relay Chat'."

From 4d79788e24a71b4b389c1f847b0092196d2ab0d1 Mon Sep 17 00:00:00 2001
From: tkdrg <tkdrg@users.noreply.github.com>
Date: Mon, 27 Oct 2014 11:46:19 -0300
Subject: [PATCH 2/7] Removes the <font> from NTRC errors

---
 code/game/objects/items/devices/PDA/PDA.dm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index 3029f965bd4..a1b781c0e64 100644
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -634,7 +634,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 					var/datum/chatroom/C = chatchannels[chat_channel]
 					var/ret = C.parse_msg(src,nick,"/join")
 					if(findtextEx(ret,"ERR_",1,5))
-						ntrclog[chat_channel] = "<font color=\"red\">[ret]</font><br>" + ntrclog[chat_channel]
+						ntrclog[chat_channel] = "[ret]<br>" + ntrclog[chat_channel]
 					else
 						ntrc_event = ret
 
@@ -645,9 +645,9 @@ var/global/list/obj/item/device/pda/PDAs = list()
 				if(C)
 					var/ret = C.parse_msg(src,nick,t)
 					if(findtextEx(ret,"ERR_",1,5))
-						ntrclog[chat_channel] = "<font color=\"red\">[ret]</font><br>" + ntrclog[chat_channel]
+						ntrclog[chat_channel] = "[ret]<br>" + ntrclog[chat_channel]
 					else if(ret == 0)
-						ntrclog[chat_channel] = "<font color=\"red\">Failure</font><br>" + ntrclog[chat_channel]
+						ntrclog[chat_channel] = "Failure<br>" + ntrclog[chat_channel]
 
 
 //SYNDICATE FUNCTIONS===================================

From 3a862deb6bb31e6e093fc2eba9e37d6e819e0dd8 Mon Sep 17 00:00:00 2001
From: tkdrg <tkdrg@users.noreply.github.com>
Date: Tue, 28 Oct 2014 18:05:08 -0300
Subject: [PATCH 3/7] Adds chatroom logging (both admin and IC).

---
 code/__HELPERS/_logging.dm                    |   6 +-
 code/game/machinery/computer/message.dm       |  35 ++++++
 code/game/objects/items/devices/PDA/PDA.dm    |  81 ++++++-------
 .../objects/items/devices/PDA/chatroom.dm     | 112 ++++++++++++++----
 code/modules/research/message_server.dm       |  21 ++++
 5 files changed, 189 insertions(+), 66 deletions(-)

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 += "<dd><A href='?src=\ref[src];view=1'>&#09;[++i]. View Message Logs </a><br></dd>"
 					dat += "<dd><A href='?src=\ref[src];viewr=1'>&#09;[++i]. View Request Console Logs </a></br></dd>"
+					dat += "<dd><A href='?src=\ref[src];viewc=1'>&#09;[++i]. View Chatroom Logs </a></br></dd>"
 					dat += "<dd><A href='?src=\ref[src];clear=1'>&#09;[++i]. Clear Message Logs</a><br></dd>"
 					dat += "<dd><A href='?src=\ref[src];clearr=1'>&#09;[++i]. Clear Request Console Logs</a><br></dd>"
+					dat += "<dd><A href='?src=\ref[src];clearc=1'>&#09;[++i]. Clear Chatroom Logs</a><br></dd>"
 					dat += "<dd><A href='?src=\ref[src];pass=1'>&#09;[++i]. Set Custom Key</a><br></dd>"
 					dat += "<dd><A href='?src=\ref[src];msg=1'>&#09;[++i]. Send Admin Message</a><br></dd>"
 			else
@@ -236,6 +238,24 @@
 				<td width='15%'>[rc.rec_dpt]</td><td width='300px'>[rc.message]</td><td width='15%'>[rc.stamp]</td><td width='15%'>[rc.id_auth]</td><td width='15%'>[rc.priority]</td></tr>"}
 			dat += "</table>"
 
+		//Chatroom Logs
+		if(5)
+
+			var/index = 0
+			//var/sender = "Anon"
+			//var/channel = "ss13"
+			//var/message = "Blank"
+			dat += "<center><A href='?src=\ref[src];back=1'>Back</a> - <A href='?src=\ref[src];refresh=1'>Refresh</center><hr>"
+			dat += "<table border='1' width='100%'><tr><th width = '5%'>X</th><th width='15%'>Channel</th><th width='15%'>Nick</th><th width='300px' word-wrap: break-word>Message</th></tr>"
+			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 += "<tr><td width = '5%'><center><A href='?src=\ref[src];delete=\ref[msg]' style='color: rgb(255,0,0)'>X</a></center></td><td width='15%'>[msg.channel]</td><td width='15%'>[msg.sender]</td><td width='300px'>[msg.message]</td></tr>"
+			dat += "</table>"
+
 	message = defaultmsg
 	//user << browse(dat, "window=message;size=700x700")
 	//onclose(user, "message")
@@ -321,6 +341,14 @@
 				if(auth)
 					src.linkedServer.rc_msgs = list()
 					message = "<span class='notice'>NOTICE: Logs cleared.</span>"
+		//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 = "<span class='notice'>NOTICE: Logs cleared.</span>"
 		//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 a1b781c0e64..0e652086ee9 100644
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -44,7 +44,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 
 	var/obj/item/device/paicard/pai = null	// A slot for a personal AI device
 
-	var/datum/chatroom/chat_channel = "" //name of our current NTRC channel, without the #
+	var/chat_channel = "#ss13" //name of our current NTRC channel
 	var/datum/event/ntrc_event //our ntrc event trigger
 	var/nick = "" //our NTRC nick
 	var/list/ntrclog = list() //NTRC message log
@@ -430,21 +430,16 @@ var/global/list/obj/item/device/pda/PDAs = list()
 				dat += "<br>"
 
 			if (5)
-				if(!nick)
+				if(!nick) //first time join
 					nick = copytext(sanitize(owner), 1, 9)
-				dat += "<h4><img src=pda_chatroom.png> Space Station 13 Nanotrasen Relay Chat Network</h4>"
+					var/datum/chatroom/C = chatchannels[chat_channel]
+					C.parse_msg(src, nick, "/join [chat_channel]")
+				dat += "<h4><img src=pda_chatroom.png> SS13 Nanotrasen Relay Chat Network</h4>"
 
-				if(!chat_channel)
-					dat += "<a href='byond://?src=\ref[src];choice=Set Nick'><img src=pda_status.png>[strip_html_properly(nick)]</a>"
-					dat += "<h4><img src=pda_menu.png> Detected Channels</h4>"
-					for(var/C in chatchannels)
-						dat += "<li><a href='byond://?src=\ref[src];choice=Set Channel;C=[C]'>#[html_encode(C)]</a></li>"
-
-				else
-
-					dat += "<a href='byond://?src=\ref[src];choice=Set Nick'>[strip_html_properly(nick)]</a> | "
-					dat += "<a href='byond://?src=\ref[src];choice=Set Channel'>#[strip_html_properly(chat_channel)]</a> | "
-					dat += "<a href='byond://?src=\ref[src];choice=NTRC Message'>Write message</a><br>"
+				dat += "<a href='byond://?src=\ref[src];choice=Set Nick'>[nick]</a> | "
+				dat += "<a href='byond://?src=\ref[src];choice=Set Channel'>[chat_channel]</a> | "
+				dat += "<a href='byond://?src=\ref[src];choice=NTRC Message'>Write message</a><br>"
+				if(chat_channel)
 					dat += ntrclog[chat_channel]
 
 			else//Else it links to the cart menu proc. Although, it really uses menu hub 4--menu 4 doesn't really exist as it simply redirects to hub.
@@ -513,6 +508,8 @@ var/global/list/obj/item/device/pda/PDAs = list()
 				mode = 3
 			if("4")//Redirects to hub
 				mode = 0
+			if("5")//Chatroom
+				mode = 5
 
 
 //MAIN FUNCTIONS===================================
@@ -619,28 +616,22 @@ var/global/list/obj/item/device/pda/PDAs = list()
 //CHATROOM FUNCTIONS====================================
 
 			if("Set Nick")
-				var/t = input(U, "Please enter nickname", name, null) as text
+				var/t = stripped_input(U, "Please enter nickname", name, null) as text
 				nick = copytext(sanitize(t), 1, 9)
 
 			if("Set Channel")
-				var/t = href_list["C"]
-				if(!t)
-					if(chat_channel)
-						var/datum/chatroom/C = chatchannels[chat_channel]
-						C.events.clearEvent("msg_chat", ntrc_event)
-					chat_channel = ""
-				else
-					chat_channel = t
+				var/t = stripped_input(U, "Please enter channel", name, (chat_channel)) as text
+
+				if(t && t in chatchannels)
+					ntrclog[chat_channel] = "<hr>" + ntrclog[chat_channel]
 					var/datum/chatroom/C = chatchannels[chat_channel]
-					var/ret = C.parse_msg(src,nick,"/join")
-					if(findtextEx(ret,"ERR_",1,5))
-						ntrclog[chat_channel] = "[ret]<br>" + ntrclog[chat_channel]
-					else
-						ntrc_event = ret
+					chat_channel = t
+					var/ret = C.parse_msg(src, nick, "/join [chat_channel]")
+					if(ret == "ERR_AUTH")
+						ntrclog[chat_channel] = "Please use /auth password to authenticate and then join again." + ntrclog[chat_channel]
 
 			if("NTRC Message")
-				var/t = input(U, "Please enter message", name, null) as text
-				t = strip_html_properly(t)
+				var/t = msg_input(U) as text
 				var/datum/chatroom/C = chatchannels[chat_channel]
 				if(C)
 					var/ret = C.parse_msg(src,nick,t)
@@ -710,8 +701,9 @@ var/global/list/obj/item/device/pda/PDAs = list()
 
 			else//Cartridge menu linking
 				mode = text2num(href_list["choice"])
-				cartridge.mode = mode
-				cartridge.unlock()
+				if(cartridge)
+					cartridge.mode = mode
+					cartridge.unlock()
 	else//If not in range, can't interact or not using the pda.
 		U.unset_machine()
 		U << browse(null, "window=pda")
@@ -743,40 +735,39 @@ var/global/list/obj/item/device/pda/PDAs = list()
 			id.loc = get_turf(src)
 		id = null
 
-/obj/item/device/pda/proc/create_message(var/mob/living/U = usr, var/obj/item/device/pda/P)
-
+/obj/item/device/pda/proc/msg_input(var/mob/living/U = usr)
 	var/t = input(U, "Please enter message", name, null) as text
 	t = copytext(sanitize(t), 1, MAX_MESSAGE_LEN)
-	if (!t || !istype(P))
+	if (!t || toff)
 		return
 	if (!in_range(src, U) && loc != U)
 		return
-
-	if (isnull(P)||P.toff || toff)
+	if(!can_use(U))
 		return
+	if(emped)
+		t = Gibberish(t, 100)
+	return t
+
+/obj/item/device/pda/proc/create_message(var/mob/living/U = usr, var/obj/item/device/pda/P)
+
+	var/t = msg_input(U)
 
 	if (last_text && world.time < last_text + 5)
 		return
 
-	if(!can_use(U))
+	if (isnull(P) || P.toff || !istype(P))
 		return
 
 	last_text = world.time
-	// check if telecomms I/O route 1459 is stable
-	//var/telecomms_intact = telecomms_process(P.owner, owner, t)
 	var/obj/machinery/message_server/useMS = null
 	if(message_servers)
 		for (var/obj/machinery/message_server/MS in message_servers)
 		//PDAs are now dependant on the Message Server.
 			if(MS.active)
 				useMS = MS
-				break
 
 	var/datum/signal/signal = src.telecomms_process()
 
-	if(emped)
-		t = Gibberish(t, 100)
-
 	var/useTC = 0
 	if(signal)
 		if(signal.data["done"])
@@ -1126,6 +1117,8 @@ var/global/list/obj/item/device/pda/PDAs = list()
 			ntrclog[C] = msg + ntrclog[C]
 	else
 		ntrclog[channel] = msg + ntrclog[channel]
+	if (!silent)
+		loc.audible_message("\icon[src] *[ttone]*", null, 3)
 
 /proc/get_viewable_pdas()
 	. = list()
diff --git a/code/game/objects/items/devices/PDA/chatroom.dm b/code/game/objects/items/devices/PDA/chatroom.dm
index 054eb45d928..5451314d326 100644
--- a/code/game/objects/items/devices/PDA/chatroom.dm
+++ b/code/game/objects/items/devices/PDA/chatroom.dm
@@ -5,29 +5,35 @@ var/list/chatchannels = list(default_ntrc_chatroom.name = default_ntrc_chatroom)
 //channel.parse_msg
 
 /datum/chatroom
-	var/name = "ss13"
+	var/name = "#ss13"
 	var/channelpassword = ""
-	var/operator = ""
 	var/topic = "Welcome to #ss13! The best NTRC channel in this sector of the galaxy!" // topic message for the chatroom
+	var/list/operators = list() // chat operators
 	var/list/logs = list() // chat logs
 	var/list/muted = list() // muted users
-	var/list/auth = list()
-	var/list/pass = list()
+	var/list/banned = list() // banned users
+	var/list/auth = list() // authenticated clients
+	var/list/pass = list() // user passwords
+	var/list/users = list() // current users
 	var/datum/events/events = new ()
+	var/list/datum/event/evlist = list()
 
 /datum/chatroom/New()
 	channelpassword = rand()
 
-//parse_msg() is the exposed interface
+//parse_msg() is the exposed interface chat
 //clients should interact with parse_msg() and parse_msg() only
 
 /datum/chatroom/proc/parse_msg(client,nick,message)
-	if(!check_server(client))
+	var/obj/machinery/message_server/MS = check_server(client)
+	if(!MS)
 		return "ERR_TCOM"
 
 	if(!nick || length(nick) > 8)
 		return "ERR_NICK"
 
+	MS.send_chat_message(nick,name,message)
+
 	if(findtext(message,"/",1,2))
 		return handle_command(client,nick,copytext(message,2))
 
@@ -43,7 +49,7 @@ var/list/chatchannels = list(default_ntrc_chatroom.name = default_ntrc_chatroom)
 		for (var/obj/machinery/message_server/MS in message_servers)
 			var/turf/T = get_turf(MS)
 			if(MS.active && (T.z == CT.z))
-				return 1
+				return MS
 	return 0
 
 /datum/chatroom/proc/handle_command(client,nick,command) //command parser
@@ -56,22 +62,36 @@ var/list/chatchannels = list(default_ntrc_chatroom.name = default_ntrc_chatroom)
 		return "ERR_AUTH"
 
 	switch(cmd[1]) //argument-less commmands
-		if("join")
-			return channel_join(client,nick)
 		if("topic")
 			if(cmd.len == 1)
 				return get_topic(client)
 			else
 				return set_topic(client,nick,cmd[2])
+		if("part")
+			return channel_part(client,nick)
 		if("del")
 			return delete_channel(client,nick)
+		if("who")
+			return get_who(client, nick)
 
 	if(cmd.len == 1)
 		return "ERR_ARGS"
 
 	switch(cmd[1]) //commands with 1 arg
-		if("op")
+		if("join")
+			return channel_join(client,nick,cmd[2])
+		if("opself")
 			return operator_auth(client,nick,cmd[2])
+		if("op")
+			return make_op(client,nick,cmd[2])
+		if("deop")
+			return deop(client,nick,cmd[2])
+		if("ban")
+			return ban(client,nick,cmd[2])
+		if("unban")
+			return unban(client,nick,cmd[2])
+		if("kick")
+			return kick(client,nick,cmd[2])
 		if("register")
 			return register_auth(client,nick,cmd[2])
 		if("mute")
@@ -88,7 +108,8 @@ var/list/chatchannels = list(default_ntrc_chatroom.name = default_ntrc_chatroom)
 		return "ERR_MUTE"
 	if(!message)
 		return "ERR_BLNK"
-	logs += "[strip_html_properly(nick)]> [strip_html_properly(message)]<"
+	logs += "[strip_html_properly(nick)]> [strip_html_properly(message)]"
+	log_chat("[usr]/([usr.ckey]) as [nick] sent to [name]: [message]")
 	events.fireEvent("msg_chat",name,nick,message)
 	return 1
 
@@ -111,25 +132,69 @@ var/list/chatchannels = list(default_ntrc_chatroom.name = default_ntrc_chatroom)
 	return 1
 
 /datum/chatroom/proc/delete_channel(client,nick) //delete
-	if(nick == operator)
+	if(nick in operators)
 		for(var/event in events.events)
 			events.clearEvent("msg_chat",event)
 		qdel(src)
 		return 1
 	return 0
 
-/datum/chatroom/proc/channel_join(client,nick) //join
-	get_topic(client,nick)
-	return events.addEvent("msg_chat",client,"msg_chat")
+/datum/chatroom/proc/channel_join(client,nick,channel) //join
+	if(channel == name)
+		if(nick in banned || nick in users)
+			return 0
+		users += nick
+		get_topic(client,nick)
+		evlist[nick] = events.addEvent("msg_chat",client,"msg_chat")
+		return 1
+	else
+		channel_part(client,nick)
+		var/datum/chatroom/C = chatchannels[channel]
+		return C.parse_msg(client,nick,"/join [channel]")
 
-/datum/chatroom/proc/operator_auth(client,nick,pass) //op
+/datum/chatroom/proc/channel_part(client,nick) //part
+	users -= nick
+	events.clearEvent("msg_chat",evlist[nick])
+	return 1
+
+/datum/chatroom/proc/operator_auth(client,nick,pass) //opself
 	if(pass == channelpassword)
-		operator += nick
+		operators += nick
+		return 1
+	return 0
+
+/datum/chatroom/proc/make_op(client,nick,target) //op
+	if(nick in operators)
+		operators += target
+		return 1
+	return 0
+
+/datum/chatroom/proc/deop(client,nick,target) //deop
+	if(nick in operators)
+		operators -= target
+		return 1
+	return 0
+
+/datum/chatroom/proc/ban(client,nick,target) //ban
+	if(nick in operators)
+		banned += target
+		return 1
+	return 0
+
+/datum/chatroom/proc/unban(client,nick,target) //unban
+	if(nick in operators)
+		banned -= target
+		return 1
+	return 0
+
+/datum/chatroom/proc/kick(client,nick,target) //kick
+	if(nick in operators)
+		channel_part(null,nick)
 		return 1
 	return 0
 
 /datum/chatroom/proc/set_topic(client,nick,newtopic) //topic
-	if(operator == nick)
+	if(nick in operators)
 		topic = strip_html_properly(newtopic)
 		return 1
 	return 0
@@ -138,13 +203,18 @@ var/list/chatchannels = list(default_ntrc_chatroom.name = default_ntrc_chatroom)
 	call(client,"msg_chat")(name,"NTbot",topic)
 	return 1
 
+/datum/chatroom/proc/get_who(client,nick) //who
+	for(var/user in users)
+		call(client,"msg_chat")(name,"NTbot",user)
+	return 1
+
 /datum/chatroom/proc/get_log(client,nick,lines) //log
 	for(var/i=0;i<lines;i++)
 		call(client,"msg_chat")(name,"NTbot",logs[logs.len-i])
 	return 1
 
 /datum/chatroom/proc/mute_nick(client,nick,target) //mute
-	if(operator == nick)
+	if(nick in operators)
 		muted += target
 		return 1
 	return 0
@@ -154,11 +224,11 @@ var/list/chatchannels = list(default_ntrc_chatroom.name = default_ntrc_chatroom)
 		chatchannels[target] = new /datum/chatroom()
 	var/datum/chatroom/C = chatchannels[target]
 	C.name = target
-	C.operator = nick
+	C.operators += nick
 	return 1
 
 /datum/chatroom/proc/new_pass(client,nick,target) //pass
-	if(operator == nick)
+	if(nick in operators)
 		channelpassword = target
 		return 1
 	return 0
diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm
index c5dd5d2ae50..786b39cf98d 100644
--- a/code/modules/research/message_server.dm
+++ b/code/modules/research/message_server.dm
@@ -1,5 +1,18 @@
 var/global/list/obj/machinery/message_server/message_servers = list()
 
+/datum/data_chat_msg
+	var/sender = "Anon"
+	var/channel = "ss13"
+	var/message = "Blank"
+
+/datum/data_chat_msg/New(var/param_sen = "", var/param_chan = "", var/param_msg = "")
+	if(param_sen)
+		sender = param_sen
+	if(param_chan)
+		channel = param_chan
+	if(param_msg)
+		message = param_msg
+
 /datum/data_pda_msg
 	var/recipient = "Unspecified" //name of the person
 	var/sender = "Unspecified" //name of the sender
@@ -54,6 +67,7 @@ var/global/list/obj/machinery/message_server/message_servers = list()
 	idle_power_usage = 10
 	active_power_usage = 100
 
+	var/list/datum/data_chat_msg/chat_msgs = list()
 	var/list/datum/data_pda_msg/pda_msgs = list()
 	var/list/datum/data_rc_msg/rc_msgs = list()
 	var/active = 1
@@ -88,6 +102,9 @@ var/global/list/obj/machinery/message_server/message_servers = list()
 	update_icon()
 	return
 
+/obj/machinery/message_server/proc/send_chat_message(var/sender = "", var/channel = "", var/message = "")
+	chat_msgs += new/datum/data_chat_msg(sender,channel,message)
+
 /obj/machinery/message_server/proc/send_pda_message(var/recipient = "",var/sender = "",var/message = "")
 	pda_msgs += new/datum/data_pda_msg(recipient,sender,message)
 
@@ -238,10 +255,13 @@ var/obj/machinery/blackbox_recorder/blackbox
 
 /obj/machinery/blackbox_recorder/proc/round_end_data_gathering()
 
+	var/chat_msg_amt = 0
 	var/pda_msg_amt = 0
 	var/rc_msg_amt = 0
 
 	for(var/obj/machinery/message_server/MS in world)
+		if(MS.chat_msgs.len > chat_msg_amt)
+			chat_msg_amt = MS.chat_msgs.len
 		if(MS.pda_msgs.len > pda_msg_amt)
 			pda_msg_amt = MS.pda_msgs.len
 		if(MS.rc_msgs.len > rc_msg_amt)
@@ -260,6 +280,7 @@ var/obj/machinery/blackbox_recorder/blackbox
 	feedback_add_details("radio_usage","SRV-[msg_service.len]")
 	feedback_add_details("radio_usage","CAR-[msg_cargo.len]")
 	feedback_add_details("radio_usage","OTH-[messages.len]")
+	feedback_add_details("radio_usage","CHA-[chat_msg_amt]")
 	feedback_add_details("radio_usage","PDA-[pda_msg_amt]")
 	feedback_add_details("radio_usage","RC-[rc_msg_amt]")
 

From ab6ca61e2a50f5e4dd4dad92a170ae24f9370310 Mon Sep 17 00:00:00 2001
From: tkdrg <tkdrg@users.noreply.github.com>
Date: Wed, 29 Oct 2014 19:32:23 -0300
Subject: [PATCH 4/7] Lets AIs and pAIs use the chatroom function in their
 built-in PDAs.

---
 code/game/objects/items/devices/PDA/PDA.dm    | 22 ++++++++++++++++---
 .../mob/living/silicon/pai/software.dm        | 12 +++++++++-
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index e9f9eedb451..4f593f760c6 100644
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -49,6 +49,8 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	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
+
 /obj/item/device/pda/medical
 	default_cartridge = /obj/item/weapon/cartridge/medical
 	icon_state = "pda-medical"
@@ -191,13 +193,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"
@@ -262,7 +266,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 
 	if ((!isnull(cartridge)) && (mode == 0))
 		dat += " | <a href='byond://?src=\ref[src];choice=Eject'><img src=pda_eject.png> Eject [cartridge]</a>"
-	if (mode)
+	if (mode && !noreturn)
 		dat += " | <a href='byond://?src=\ref[src];choice=Return'><img src=pda_menu.png> Return</a>"
 	dat += " | <a href='byond://?src=\ref[src];choice=Refresh'><img src=pda_refresh.png> Refresh</a>"
 
@@ -1077,6 +1081,18 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	else
 		usr << "You do not have a PDA. You should make an issue report about this."
 
+/mob/living/silicon/ai/verb/cmd_use_chatroom()
+	set category = "AI Commands"
+	set name = "PDA - Chatrooms"
+	if(usr.stat == 2)
+		usr << "You can't do that because you are dead!"
+		return
+	if(!isnull(aiPDA))
+		aiPDA.mode = 5
+		aiPDA.attack_self(src)
+	else
+		usr << "You do not have a PDA. You should make an issue report about this."
+
 /mob/living/silicon/ai/proc/cmd_show_message_log(mob/user as mob)
 	if(user.stat == 2)
 		user << "You can't do that because you are dead!"
@@ -1134,4 +1150,4 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	for(var/obj/item/device/pda/P in PDAs)
 		if(!P.owner || P.toff || P.hidden) continue
 		. += P
-	return .
+	return .
diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm
index c11523d239a..3e8094711de 100644
--- a/code/modules/mob/living/silicon/pai/software.dm
+++ b/code/modules/mob/living/silicon/pai/software.dm
@@ -9,6 +9,7 @@
 /mob/living/silicon/pai/var/list/available_software = list(
 															"crew manifest" = 5,
 															"digital messenger" = 5,
+															"chatroom client" = 5,
 															"medical records" = 15,
 															"security records" = 15,
 															//"camera jack" = 10,
@@ -66,6 +67,8 @@
 				left_part = src.softwareCamera()
 			if("signaller")
 				left_part = src.softwareSignal()
+			if("chatroom")
+				src.chatroom() //snowflake? maybe, but it's less effort this way
 
 	//usr << browse_rsc('windowbak.png')		// This has been moved to the mob's Login() proc
 
@@ -276,6 +279,8 @@
 	for(var/s in src.software)
 		if(s == "digital messenger")
 			dat += "<a href='byond://?src=\ref[src];software=pdamessage;sub=0'>Digital Messenger</a> <br>"
+		if(s == "chatroom client")
+			dat += "<a href='byond://?src=\ref[src];software=chatroom;sub=0'>Chatroom Client</a> <br>"
 		if(s == "crew manifest")
 			dat += "<a href='byond://?src=\ref[src];software=manifest;sub=0'>Crew Manifest</a> <br>"
 		if(s == "medical records")
@@ -631,4 +636,9 @@
 	dat += "</ul>"
 	dat += "<br><br>"
 	dat += "Messages: <hr> [pda.tnote]"
-	return dat
\ No newline at end of file
+	return dat
+
+/mob/living/silicon/pai/proc/chatroom()
+
+	pda.mode = 5
+	pda.attack_self()
\ No newline at end of file

From 571a0953b415e87ce7ffcfa908aec28bf47daca5 Mon Sep 17 00:00:00 2001
From: tkdrg <tkdrg@users.noreply.github.com>
Date: Wed, 29 Oct 2014 20:17:16 -0300
Subject: [PATCH 5/7] Fixes chatroom runtime (thanks Gun Hog!), auto-adds # if
 the channel does not contain it already, obsoletes /new (its functionality is
 now included in /join)

---
 code/game/objects/items/devices/PDA/chatroom.dm | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/code/game/objects/items/devices/PDA/chatroom.dm b/code/game/objects/items/devices/PDA/chatroom.dm
index 5451314d326..a2d050d40a9 100644
--- a/code/game/objects/items/devices/PDA/chatroom.dm
+++ b/code/game/objects/items/devices/PDA/chatroom.dm
@@ -96,8 +96,6 @@ var/list/chatchannels = list(default_ntrc_chatroom.name = default_ntrc_chatroom)
 			return register_auth(client,nick,cmd[2])
 		if("mute")
 			return mute_nick(client,nick,cmd[2])
-		if("new")
-			return new_channel(client,nick,cmd[2])
 		if("pass")
 			return new_pass(client,nick,cmd[2])
 
@@ -140,6 +138,8 @@ var/list/chatchannels = list(default_ntrc_chatroom.name = default_ntrc_chatroom)
 	return 0
 
 /datum/chatroom/proc/channel_join(client,nick,channel) //join
+	if(!dd_hasprefix(channel,"#"))
+		channel = "#" + channel
 	if(channel == name)
 		if(nick in banned || nick in users)
 			return 0
@@ -148,6 +148,10 @@ var/list/chatchannels = list(default_ntrc_chatroom.name = default_ntrc_chatroom)
 		evlist[nick] = events.addEvent("msg_chat",client,"msg_chat")
 		return 1
 	else
+		if(!(channel in chatchannels))
+			var/ret = new_channel(client,nick,channel)
+			if(!ret)
+				return 0
 		channel_part(client,nick)
 		var/datum/chatroom/C = chatchannels[channel]
 		return C.parse_msg(client,nick,"/join [channel]")
@@ -219,9 +223,10 @@ var/list/chatchannels = list(default_ntrc_chatroom.name = default_ntrc_chatroom)
 		return 1
 	return 0
 
-/datum/chatroom/proc/new_channel(client,nick,target) //new
-	if(!(target in chatchannels))
-		chatchannels[target] = new /datum/chatroom()
+/datum/chatroom/proc/new_channel(client,nick,target) //called by join
+	if(target in chatchannels)
+		return 0
+	chatchannels[target] = new /datum/chatroom()
 	var/datum/chatroom/C = chatchannels[target]
 	C.name = target
 	C.operators += nick

From cc96d09843283b5bf0b09ce3490c4e2ed31b2d63 Mon Sep 17 00:00:00 2001
From: tkdrg <tkdrg@users.noreply.github.com>
Date: Wed, 29 Oct 2014 20:47:07 -0300
Subject: [PATCH 6/7] Adds NTRC help screen, fixes PDA /join bug that let you
 join multiple times without updating chat_channel

---
 code/game/objects/items/devices/PDA/PDA.dm     | 18 +++++++++++++++++-
 .../game/objects/items/devices/PDA/chatroom.dm |  2 +-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index 4f593f760c6..1c1a1ec9966 100644
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -450,7 +450,8 @@ var/global/list/obj/item/device/pda/PDAs = list()
 
 				dat += "<a href='byond://?src=\ref[src];choice=Set Nick'>[nick]</a> | "
 				dat += "<a href='byond://?src=\ref[src];choice=Set Channel'>[chat_channel]</a> | "
-				dat += "<a href='byond://?src=\ref[src];choice=NTRC Message'>Write message</a><br>"
+				dat += "<a href='byond://?src=\ref[src];choice=NTRC Message'>Write message</a> | "
+				dat += "<a href='byond://?src=\ref[src];choice=NTRC Help'>Help</a><br>"
 				if(chat_channel)
 					dat += ntrclog[chat_channel]
 
@@ -651,6 +652,21 @@ var/global/list/obj/item/device/pda/PDAs = list()
 						ntrclog[chat_channel] = "[ret]<br>" + ntrclog[chat_channel]
 					else if(ret == 0)
 						ntrclog[chat_channel] = "Failure<br>" + ntrclog[chat_channel]
+					var/list/lt = text2list(t)
+					if(lt[1] == "/join")
+						chat_channel = lt[2]
+
+			if("NTRC Help")
+				var/helptext = "<b>NTRC reference:</b><br><br>"
+				helptext += "<i>General commands</i><br>"
+				helptext += "/join #channel<br>/part<br>/who<br>/topic<br>/register password<br>/auth password<br><br>"
+				helptext += "<i>Moderation commands</i><br>"
+				helptext += "/ban targetnick<br>/unban targetnick<br>/kick targetnick<br>/mute targetnick<br><br>"
+				helptext += "<i>Management commands</i><br>"
+				helptext += "/topic topictext<br>/opself channelpassword<br>/pass newchannelpassword<br>/op targetnick<br>"
+				helptext += "/deop targetnick<br>/del <i>WARNING: DELETES THE CHANNEL</i>"
+				usr << browse(helptext, "window=ntrchelp;size=400x444;border=1;can_resize=1;can_close=1;can_minimize=0")
+
 
 
 //SYNDICATE FUNCTIONS===================================
diff --git a/code/game/objects/items/devices/PDA/chatroom.dm b/code/game/objects/items/devices/PDA/chatroom.dm
index a2d050d40a9..1431bf81a22 100644
--- a/code/game/objects/items/devices/PDA/chatroom.dm
+++ b/code/game/objects/items/devices/PDA/chatroom.dm
@@ -141,7 +141,7 @@ var/list/chatchannels = list(default_ntrc_chatroom.name = default_ntrc_chatroom)
 	if(!dd_hasprefix(channel,"#"))
 		channel = "#" + channel
 	if(channel == name)
-		if(nick in banned || nick in users)
+		if((nick in banned) || (nick in users))
 			return 0
 		users += nick
 		get_topic(client,nick)

From 7db4f1f9a245817a21bb3acb7c9cac3968294971 Mon Sep 17 00:00:00 2001
From: tkdrg <tkdrg@users.noreply.github.com>
Date: Wed, 29 Oct 2014 23:00:23 -0300
Subject: [PATCH 7/7] Fixes chat channel bugs, removes PDA authentication
 because apparently our players are too dumb to not share passwords between
 ss13 and banking accounts

---
 code/game/objects/items/devices/PDA/PDA.dm    | 31 +++++-----
 .../objects/items/devices/PDA/chatroom.dm     | 59 +++++--------------
 2 files changed, 33 insertions(+), 57 deletions(-)

diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index 1c1a1ec9966..7b075ba210f 100644
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -45,11 +45,10 @@ 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/datum/event/ntrc_event //our ntrc event trigger
 	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
+	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
@@ -635,36 +634,40 @@ var/global/list/obj/item/device/pda/PDAs = list()
 			if("Set Channel")
 				var/t = stripped_input(U, "Please enter channel", name, (chat_channel)) as text
 
-				if(t && t in chatchannels)
+				if(t)
 					ntrclog[chat_channel] = "<hr>" + ntrclog[chat_channel]
 					var/datum/chatroom/C = chatchannels[chat_channel]
+					if(!findtext(t,"#",1,2))
+						t = "#" + t
 					chat_channel = t
-					var/ret = C.parse_msg(src, nick, "/join [chat_channel]")
-					if(ret == "ERR_AUTH")
-						ntrclog[chat_channel] = "Please use /auth password to authenticate and then join again." + ntrclog[chat_channel]
+					C.parse_msg(src, nick, "/join [chat_channel]")
 
 			if("NTRC Message")
 				var/t = msg_input(U) as text
 				var/datum/chatroom/C = chatchannels[chat_channel]
 				if(C)
+					var/lt = text2list(t, " ")
+					if(lt[1] == "/join")
+						if(!findtext(lt[2],"#",1,2))
+							lt[2] = "#" + lt[2]
 					var/ret = C.parse_msg(src,nick,t)
 					if(findtextEx(ret,"ERR_",1,5))
 						ntrclog[chat_channel] = "[ret]<br>" + ntrclog[chat_channel]
-					else if(ret == 0)
-						ntrclog[chat_channel] = "Failure<br>" + ntrclog[chat_channel]
-					var/list/lt = text2list(t)
-					if(lt[1] == "/join")
-						chat_channel = lt[2]
+					else
+						if(ret == 0)
+							ntrclog[chat_channel] = "Failure<br>" + ntrclog[chat_channel]
+						else
+							if(lt[1] == "/join")
+								chat_channel = lt[2]
 
 			if("NTRC Help")
 				var/helptext = "<b>NTRC reference:</b><br><br>"
 				helptext += "<i>General commands</i><br>"
-				helptext += "/join #channel<br>/part<br>/who<br>/topic<br>/register password<br>/auth password<br><br>"
+				helptext += "/join #channel<br>/part<br>/log amountoflines<br>/who<br>/topic<br>/register<br><br>"
 				helptext += "<i>Moderation commands</i><br>"
 				helptext += "/ban targetnick<br>/unban targetnick<br>/kick targetnick<br>/mute targetnick<br><br>"
 				helptext += "<i>Management commands</i><br>"
-				helptext += "/topic topictext<br>/opself channelpassword<br>/pass newchannelpassword<br>/op targetnick<br>"
-				helptext += "/deop targetnick<br>/del <i>WARNING: DELETES THE CHANNEL</i>"
+				helptext += "/topic topictext<br>/op targetnick<br>/deop targetnick<br>/delchannel"
 				usr << browse(helptext, "window=ntrchelp;size=400x444;border=1;can_resize=1;can_close=1;can_minimize=0")
 
 
diff --git a/code/game/objects/items/devices/PDA/chatroom.dm b/code/game/objects/items/devices/PDA/chatroom.dm
index 1431bf81a22..1ba6a4c5813 100644
--- a/code/game/objects/items/devices/PDA/chatroom.dm
+++ b/code/game/objects/items/devices/PDA/chatroom.dm
@@ -6,21 +6,16 @@ var/list/chatchannels = list(default_ntrc_chatroom.name = default_ntrc_chatroom)
 
 /datum/chatroom
 	var/name = "#ss13"
-	var/channelpassword = ""
-	var/topic = "Welcome to #ss13! The best NTRC channel in this sector of the galaxy!" // topic message for the chatroom
+	var/topic = "Welcome to the best NTRC channel in this sector of the galaxy!" // topic message for the chatroom
 	var/list/operators = list() // chat operators
 	var/list/logs = list() // chat logs
 	var/list/muted = list() // muted users
 	var/list/banned = list() // banned users
 	var/list/auth = list() // authenticated clients
-	var/list/pass = list() // user passwords
 	var/list/users = list() // current users
 	var/datum/events/events = new ()
 	var/list/datum/event/evlist = list()
 
-/datum/chatroom/New()
-	channelpassword = rand()
-
 //parse_msg() is the exposed interface chat
 //clients should interact with parse_msg() and parse_msg() only
 
@@ -55,9 +50,6 @@ var/list/chatchannels = list(default_ntrc_chatroom.name = default_ntrc_chatroom)
 /datum/chatroom/proc/handle_command(client,nick,command) //command parser
 	var/list/cmd=text2list(command, " ")
 
-	if(cmd[1] == "auth" && cmd.len > 1) //parsed here to avoid triggering ERR_AUTH
-		return attempt_auth(client,nick,cmd[2])
-
 	if(!get_auth(client,nick))
 		return "ERR_AUTH"
 
@@ -69,10 +61,12 @@ var/list/chatchannels = list(default_ntrc_chatroom.name = default_ntrc_chatroom)
 				return set_topic(client,nick,cmd[2])
 		if("part")
 			return channel_part(client,nick)
-		if("del")
+		if("delchannel")
 			return delete_channel(client,nick)
 		if("who")
 			return get_who(client, nick)
+		if("register")
+			return register_auth(client,nick)
 
 	if(cmd.len == 1)
 		return "ERR_ARGS"
@@ -80,8 +74,8 @@ var/list/chatchannels = list(default_ntrc_chatroom.name = default_ntrc_chatroom)
 	switch(cmd[1]) //commands with 1 arg
 		if("join")
 			return channel_join(client,nick,cmd[2])
-		if("opself")
-			return operator_auth(client,nick,cmd[2])
+		if("log")
+			return get_log(client,nick,cmd[2])
 		if("op")
 			return make_op(client,nick,cmd[2])
 		if("deop")
@@ -92,12 +86,8 @@ var/list/chatchannels = list(default_ntrc_chatroom.name = default_ntrc_chatroom)
 			return unban(client,nick,cmd[2])
 		if("kick")
 			return kick(client,nick,cmd[2])
-		if("register")
-			return register_auth(client,nick,cmd[2])
 		if("mute")
 			return mute_nick(client,nick,cmd[2])
-		if("pass")
-			return new_pass(client,nick,cmd[2])
 
 	return "ERR_WCMD"
 
@@ -112,24 +102,18 @@ var/list/chatchannels = list(default_ntrc_chatroom.name = default_ntrc_chatroom)
 	return 1
 
 /datum/chatroom/proc/get_auth(client,nick) //check auth
-	if(!pass[nick] || (auth[nick] == client))
+	if((!(nick in auth)) || (auth[nick] == client))
 		return 1
 	return 0
 
 //chat commands go here
-/datum/chatroom/proc/attempt_auth(client,nick,password) //auth
-	if(pass[nick] == password)
-		auth[nick] = client
-		return 1
-	return 0
-
-/datum/chatroom/proc/register_auth(client,nick,password) //register
-	if(pass[nick] && (get_auth(client,nick) != client))
+/datum/chatroom/proc/register_auth(client,nick) //register
+	if(!get_auth(client,nick))
 		return 0
-	pass[nick] = password
+	auth[nick] = client
 	return 1
 
-/datum/chatroom/proc/delete_channel(client,nick) //delete
+/datum/chatroom/proc/delete_channel(client,nick) //delchannel
 	if(nick in operators)
 		for(var/event in events.events)
 			events.clearEvent("msg_chat",event)
@@ -138,7 +122,7 @@ var/list/chatchannels = list(default_ntrc_chatroom.name = default_ntrc_chatroom)
 	return 0
 
 /datum/chatroom/proc/channel_join(client,nick,channel) //join
-	if(!dd_hasprefix(channel,"#"))
+	if(!findtext(channel,"#",1,2))
 		channel = "#" + channel
 	if(channel == name)
 		if((nick in banned) || (nick in users))
@@ -161,12 +145,6 @@ var/list/chatchannels = list(default_ntrc_chatroom.name = default_ntrc_chatroom)
 	events.clearEvent("msg_chat",evlist[nick])
 	return 1
 
-/datum/chatroom/proc/operator_auth(client,nick,pass) //opself
-	if(pass == channelpassword)
-		operators += nick
-		return 1
-	return 0
-
 /datum/chatroom/proc/make_op(client,nick,target) //op
 	if(nick in operators)
 		operators += target
@@ -204,17 +182,18 @@ var/list/chatchannels = list(default_ntrc_chatroom.name = default_ntrc_chatroom)
 	return 0
 
 /datum/chatroom/proc/get_topic(client,nick) //topic
-	call(client,"msg_chat")(name,"NTbot",topic)
+	call(client,"msg_chat")(name,"NTbot","TOPIC: [topic]")
 	return 1
 
 /datum/chatroom/proc/get_who(client,nick) //who
 	for(var/user in users)
-		call(client,"msg_chat")(name,"NTbot",user)
+		call(client,"msg_chat")(name,"NTbot","WHO: [user]")
 	return 1
 
 /datum/chatroom/proc/get_log(client,nick,lines) //log
 	for(var/i=0;i<lines;i++)
-		call(client,"msg_chat")(name,"NTbot",logs[logs.len-i])
+		var/mylog = logs[logs.len-i]
+		call(client,"msg_chat")(name,"NTbot","LOG[i]: [mylog]")
 	return 1
 
 /datum/chatroom/proc/mute_nick(client,nick,target) //mute
@@ -231,9 +210,3 @@ var/list/chatchannels = list(default_ntrc_chatroom.name = default_ntrc_chatroom)
 	C.name = target
 	C.operators += nick
 	return 1
-
-/datum/chatroom/proc/new_pass(client,nick,target) //pass
-	if(nick in operators)
-		channelpassword = target
-		return 1
-	return 0