diff options
| author |  mathsman5133 <[email protected]> | 2018-10-12 10:39:40 +1100 |
|---|---|---|
| committer | mathsman5133 <[email protected]> | 2018-10-12 10:39:40 +1100 |
| commit | 58ceedd1de81c4a800c668e5b137233cc9807ade (patch) | |
| tree | 63fff09a62b94ca8dd5e80c24f57a8525f3b1094 /bot/cogs/candy_collection.py | |
| parent | Merge remote-tracking branch 'upstream/master' into candy-collection (diff) | |
| parent | fixed colour for spooky msg (diff) | |
Merge branch 'candy-collection' of https://github.com/mathsman5133/hacktoberbot-1 into candy-collection
Diffstat (limited to 'bot/cogs/candy_collection.py')
| -rw-r--r-- | bot/cogs/candy_collection.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/bot/cogs/candy_collection.py b/bot/cogs/candy_collection.py index 1e066cb0..63ce9cb6 100644 --- a/bot/cogs/candy_collection.py +++ b/bot/cogs/candy_collection.py @@ -156,7 +156,11 @@ class CandyCollection: pass async def send_spook_msg(self, author, channel, candies): +<<<<<<< HEAD """Send a spooky message""" +======= + """Send a (lame) spooky message""" +>>>>>>> 4c29c2b470d6f27416a97c3be1e41f753e0a1ea6 e = discord.Embed(colour=author.colour) e.set_author(name="Ghosts and Ghouls and Jack o' lanterns at night; " f"I took {candies} candies and quickly took flight.") @@ -200,7 +204,7 @@ class CandyCollection: e.add_field(name='\u200b', value=f"Candies will randomly appear on messages sent. " f"\nHit the candy when it appears as fast as possible to get the candy! " - f"\nBut beware the witch...", + f"\nBut beware the ghosts...", inline=False) await ctx.send(embed=e) |