1 files changed, 39 insertions, 16 deletions
diff --git a/conf-tmpl/atcommand_athena.conf b/conf-tmpl/atcommand_athena.conf
index 1c184ed7e..bd7d1d0a2 100644
--- a/conf-tmpl/atcommand_athena.conf
+++ b/conf-tmpl/atcommand_athena.conf
@@ -83,9 +83,7 @@ refresh: 1
 // Give server time. (6 same commands)
 time: 1
 date: 1
-server_date: 1
 serverdate: 1
-server_time: 1
 servertime: 1
 
 // Displays SVN version of the server.
@@ -234,6 +232,9 @@ whomap3: 20
 // Like @who+@who2+who3, but only for GM.
 whogm: 20
 
+// Displays a sorted list of the ammount of zeny each conected player has at hand.
+whozeny: 20
+
 // Change your appearence to other players to a mob.
 disguise: 20
 
@@ -265,12 +266,12 @@ broadcast: 40
 // Broadcast to the map you are on (1 command + /lb, /nlb).
 localbroadcast: 40
 
-// Broadcast (with or without name).
+// Broadcast (with or without name)
 kami: 40
+// Same as kami but with blue color
 kamib: 40
-
-// Enables you to go to a certain map, at (x,y) coordinates. (@mapmove + /mm or /mapmove)
-mapmove: 40
+// Same as kami but you can choose the color (uses different packet)
+kamic: 40
 
 // Enables GVG on a map (2 same commands).
 gvgon: 40
@@ -297,6 +298,9 @@ jump: 40
 return: 40
 load: 40
 
+// Warps you to a specific npc
+tonpc: 40
+
 // Enables lost skills.
 lostskill: 40
 
@@ -306,6 +310,9 @@ memo: 40
 // Set your character display options. (Visual effects of your character)
 option: 40
 
+// Search the pet db for matching entries
+petid: 40
+
 // Sets the level of intemecy of your pet.
 petfriendly: 40
 
@@ -329,6 +336,7 @@ charspeed: 40
 spiritball: 40
 
 // Warp yourself to a certain map, at (x,y) coordinates (2 same commands).
+mapmove: 40 // (also /mm or /mapmove)
 rura: 40
 warp: 40
 
@@ -368,6 +376,9 @@ effect: 40
 // Display all items of a player's cart
 charcartlist: 40
 
+// GM's magnifier
+identify: 40
+
 // drop all your items
 dropall: 40
 
@@ -386,10 +397,13 @@ useskill: 40
 // What skills are required to get this skill
 skilltree: 40
 
-// Marriage skills
+// Marriage commands
 marry: 40
 divorce: 40
 
+// Adopt a novice into a family
+adopt: 40
+
 // make another player killable
 charkillable: 40
 
@@ -518,9 +532,7 @@ reviveid: 60
 reviveid2: 60
 
 // Warp another person to a certain map, at (x,y) coordinates (2 same commands).
-rura+: 60
 charwarp: 60
-shuffle: 60
 
 // Change Status of your character
 str: 60
@@ -611,14 +623,20 @@ chardropall: 60
 // put a players possessions in storage
 charstoreall: 60
 
-//Homunculus commands for gms
+// open a trade window with any player
+trade: 60
+
+// changes the player's appearance (headgear)
+changelook: 60
+
+// Homunculus commands for gms
 homlvup: 60
 homevolution: 60
 makehomun: 60
 homfriendly: 60
 homhungry: 60
 
-//Re-calculates stats, as if the homun was sent back to level 1 and re-leveled
+// Re-calculates stats, as if the homun was sent back to level 1 and re-leveled
 homshuffle: 60
 
 //----------------------
@@ -666,6 +684,9 @@ skillon: 80
 // turn skills off for a map
 skilloff: 80
 
+// Mute a player (prevents talking, usage of skills and commands)
+mute: 80
+
 // Unmute a player
 unmute: 80
 
@@ -678,12 +699,15 @@ kickall: 99
 // Closes Map-Server
 mapexit: 99
 
-// Give information about terrain/area (debug function)
-gat: 99
+// Used for testing packet sends from the client (debug function)
+send: 99
 
 // Enables debugging
 packet: 99
 
+// Give information about terrain/area (debug function)
+gat: 99
+
 // Allows viewing/changing the map's water level (debug function)
 // NOTE: Requires access to the .grf files since the map height properties are not stored in the map cache.
 waterlevel: 99
@@ -742,12 +766,11 @@ adjcmdlvl: 99
 disguiseall: 99
 undisguiseall: 99
 
-// Mute player (admin command)
-mute: 99
+// Mutes every player on screen (admin command)
 mutearea: 99
 stfu: 99
 
-// Makes you inmune to attacks (monsters/players/skills cannot target/hit you, admin command)
+// Makes you immune to attacks (monsters/players/skills cannot target/hit you, admin command)
 monsterignore: 99
 battleignore: 99