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 += "[nick] | "
dat += "[chat_channel] | "
- dat += "Write message
"
+ dat += "Write message | "
+ dat += "Help
"
if(chat_channel)
dat += ntrclog[chat_channel]
@@ -651,6 +652,21 @@ var/global/list/obj/item/device/pda/PDAs = list()
ntrclog[chat_channel] = "[ret]
" + ntrclog[chat_channel]
else if(ret == 0)
ntrclog[chat_channel] = "Failure
" + ntrclog[chat_channel]
+ var/list/lt = text2list(t)
+ if(lt[1] == "/join")
+ chat_channel = lt[2]
+
+ if("NTRC Help")
+ var/helptext = "NTRC reference:
"
+ helptext += "General commands
"
+ helptext += "/join #channel
/part
/who
/topic
/register password
/auth password
"
+ helptext += "Moderation commands
"
+ helptext += "/ban targetnick
/unban targetnick
/kick targetnick
/mute targetnick
"
+ helptext += "Management commands
"
+ helptext += "/topic topictext
/opself channelpassword
/pass newchannelpassword
/op targetnick
"
+ helptext += "/deop targetnick
/del WARNING: DELETES THE CHANNEL"
+ 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)