diff --git a/commands/guild-info/emoji.js b/commands/guild-info/emoji.js
new file mode 100644
index 00000000..c8eb39c6
--- /dev/null
+++ b/commands/guild-info/emoji.js
@@ -0,0 +1,18 @@
+const Command = require('../../structures/Command');
+
+module.exports = class EmojiCommand extends Command {
+	constructor(client) {
+		super(client, {
+			name: 'emoji',
+			group: 'guild-info',
+			memberName: 'emoji',
+			description: 'Responds with a list of the server\'s custom emoji.',
+			guildOnly: true
+		});
+	}
+
+	run(msg) {
+		if (!msg.guild.emojis.size) return msg.say('This server has no custom emoji.');
+		return msg.say(msg.guild.emojis.map(e => e).join(''));
+	}
+};
diff --git a/package.json b/package.json
index c008aa72..253789b5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "xiaobot",
-  "version": "36.0.1",
+  "version": "36.1.0",
   "description": "Your personal server companion.",
   "main": "Shard.js",
   "scripts": {