summaryrefslogtreecommitdiff
path: root/data/help/commands.txt
diff options
context:
space:
mode:
Diffstat (limited to 'data/help/commands.txt')
-rw-r--r--data/help/commands.txt8
1 files changed, 8 insertions, 0 deletions
diff --git a/data/help/commands.txt b/data/help/commands.txt
index eaacdf02..e80c537e 100644
--- a/data/help/commands.txt
+++ b/data/help/commands.txt
@@ -17,6 +17,7 @@
##2F5##P toggle skills window
##2F6##P toggle minimap
##2F7##P toggle chat window
+ ##2F8##P toggle shortcut window
##2F9##P show setup window
##2F10##P toggle debug window
##2Alt + 0-9##P show emotions
@@ -47,11 +48,18 @@
/whisper <name> <message>
+<<<<<<< HEAD:data/help/commands.txt
This will send <message> to player <name>, if that player is logged in.
to whisper to users with spaces in there name you must incase the user name in qoutes
(e.g. /whisper "user name" <message>)
For further help type /help in the chat console.
+=======
+ This will send <message> to player <name>, if that player is logged in. If the
+ name has a space in it, put double quotes around it like this:
+
+ /whisper "<name>" <message>
+>>>>>>> a7c21e6f8add37af7412449742ec55c8daa8571a:data/help/commands.txt
##2IGNORING COMMUNICATION