aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUnknown <jtsshieh@outlook.com>2018-02-24 13:25:33 -0500
committerUnknown <jtsshieh@outlook.com>2018-02-24 13:25:33 -0500
commitc6c21db700ff63690ff10b050a3b99c9c034a7a4 (patch)
tree903b33f654438b9e8ff14ec267e15c28a0fdc48d
parent86f123a91dd335ba371f219040bc12791c45282d (diff)
parent6d6e9f38cefc3740f0a41a7b07b8beaf4e398d3f (diff)
downloadPokeBot-c6c21db700ff63690ff10b050a3b99c9c034a7a4.tar.gz
PokeBot-c6c21db700ff63690ff10b050a3b99c9c034a7a4.tar.bz2
PokeBot-c6c21db700ff63690ff10b050a3b99c9c034a7a4.zip
Merge remote-tracking branch 'origin/master'
-rw-r--r--README.md3
-rw-r--r--bot.js1
2 files changed, 4 insertions, 0 deletions
diff --git a/README.md b/README.md
index 3c43f1c..2d20307 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,6 @@
+[![Discord](https://img.shields.io/discord/416629239211884555.svg?colorB=7289DA&label=discord)](https://discord.gg/ecZPbNc)
+[![Github commits (since latest release)](https://img.shields.io/github/commits-since/PokeWorld/PokeBot/latest.svg)]()
+
# Pokebot
Discord Moderation Bot for PokeWorld and other servers.
diff --git a/bot.js b/bot.js
index 57ae4ba..f52bc37 100644
--- a/bot.js
+++ b/bot.js
@@ -13,6 +13,7 @@ function setGame() {
'Catching things',
'Finding pokemon',
'Type p:help for help',
+ 'Fighting AstralMod',
];
bot.user.setPresence({