X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=config%2Femoji.txt;h=4b163b88ef102f8f5c0145a33e986f7081759e60;hb=c0b7bc2927cb7d4826fe2c992a90c571a06e94c1;hp=7afacb09fdffa95b36e9d2ea4bc3d450aba0c88d;hpb=7e1d4819ca6d86a7f5bdfac1ca1dce900c168405;p=akkoma

diff --git a/config/emoji.txt b/config/emoji.txt
index 7afacb09f..4b163b88e 100644
--- a/config/emoji.txt
+++ b/config/emoji.txt
@@ -1,5 +1,5 @@
-firefox, /emoji/Firefox.gif
-blank, /emoji/blank.png
+firefox, /emoji/Firefox.gif, Gif,Fun
+blank, /emoji/blank.png, Fun
 f_00b, /emoji/f_00b.png
 f_00b11b, /emoji/f_00b11b.png
 f_00b33b, /emoji/f_00b33b.png
@@ -28,4 +28,8 @@ f_33b00b, /emoji/f_33b00b.png
 f_33b22b, /emoji/f_33b22b.png
 f_33h, /emoji/f_33h.png
 f_33t, /emoji/f_33t.png
-
+mayushii, /emoji/mayushii.png
+hahaendme, /emoji/death.png
+stabby, /emoji/stabs.png
+endme, /emoji/end_me.png
+fingerguns, /emoji/fingergun.png