diff --git a/README.md b/README.md index c322b994d..02ea46df0 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Epicyon is a modern [ActivityPub](https://www.w3.org/TR/activitypub) compliant s Matrix room: **#epicyon:matrix.freedombone.net** -Includes emojis designed by [OpenMoji](https://openmoji.org) – the open-source emoji and icon project. License: [CC BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0). Blob Cat Emoji and Meowmoji were made by Nitro Blob Hub, licensed under [Apache 2.0](https://www.apache.org/licenses/LICENSE-2.0). +Includes emojis designed by [OpenMoji](https://openmoji.org) – the open-source emoji and icon project. License: [CC BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0). Blob Cat Emoji and Meowmoji were made by Nitro Blob Hub, licensed under [Apache 2.0](https://www.apache.org/licenses/LICENSE-2.0). [Digital Pets emoji](https://opengameart.org/content/16x16-emotes-for-rpgs-and-digital-pets) were made by Tomcat94 and licensed under CC0. diff --git a/emoji/angryEmote.png b/emoji/angryEmote.png new file mode 100644 index 000000000..b9662f791 Binary files /dev/null and b/emoji/angryEmote.png differ diff --git a/emoji/blankEmoteMid.png b/emoji/blankEmoteMid.png new file mode 100644 index 000000000..5bd7afe8a Binary files /dev/null and b/emoji/blankEmoteMid.png differ diff --git a/emoji/boredEmote.png b/emoji/boredEmote.png new file mode 100644 index 000000000..b0f752404 Binary files /dev/null and b/emoji/boredEmote.png differ diff --git a/emoji/confusedEmote.png b/emoji/confusedEmote.png new file mode 100644 index 000000000..2a6306edf Binary files /dev/null and b/emoji/confusedEmote.png differ diff --git a/emoji/default_emoji.json b/emoji/default_emoji.json index 104b0d2d0..5a81bfa7c 100644 --- a/emoji/default_emoji.json +++ b/emoji/default_emoji.json @@ -773,5 +773,17 @@ "python": "python", "vim": "vim", "emacs": "emacs", - "terminal": "terminal" + "terminal": "terminal", + "angryemote": "angryEmote", + "blankemote": "blankEmoteMid", + "boredemote": "boredEmote", + "confusedemote": "confusedEmote", + "dohemote": "dohEmote" + "happyemote": "happyEmote", + "neutralemote": "neutralEmote", + "sademote": "sadEmote", + "talkingemote": "talkingEmote", + "talkingemote2": "talkingEmote2", + "veryhappyemote": "veryHappyEmote", + "worriedemote": "worriedEmote" } diff --git a/emoji/dohEmote.png b/emoji/dohEmote.png new file mode 100644 index 000000000..ac7e501af Binary files /dev/null and b/emoji/dohEmote.png differ diff --git a/emoji/happyEmote.png b/emoji/happyEmote.png new file mode 100644 index 000000000..6586cf0fa Binary files /dev/null and b/emoji/happyEmote.png differ diff --git a/emoji/neutralEmote.png b/emoji/neutralEmote.png new file mode 100644 index 000000000..0fceda6db Binary files /dev/null and b/emoji/neutralEmote.png differ diff --git a/emoji/sadEmote.png b/emoji/sadEmote.png new file mode 100644 index 000000000..ccb8b84d7 Binary files /dev/null and b/emoji/sadEmote.png differ diff --git a/emoji/talkingEmote.png b/emoji/talkingEmote.png new file mode 100644 index 000000000..c4d9f5ff9 Binary files /dev/null and b/emoji/talkingEmote.png differ diff --git a/emoji/talkingEmote2.png b/emoji/talkingEmote2.png new file mode 100644 index 000000000..be5c05fe0 Binary files /dev/null and b/emoji/talkingEmote2.png differ diff --git a/emoji/veryHappyEmote.png b/emoji/veryHappyEmote.png new file mode 100644 index 000000000..1b424dc86 Binary files /dev/null and b/emoji/veryHappyEmote.png differ diff --git a/emoji/worriedEmote.png b/emoji/worriedEmote.png new file mode 100644 index 000000000..11e3191e0 Binary files /dev/null and b/emoji/worriedEmote.png differ