diff --git a/src/server/.eslintrc b/src/server/.eslintrc
index e7a1c4f2..a44a15f5 100644
--- a/src/server/.eslintrc
+++ b/src/server/.eslintrc
@@ -310,6 +310,13 @@
 			],
 			"extends": "../client/.eslintrc"
 		},
+		{
+			"files": [
+				"mods/**/ui/*",
+				"mods/**/clientComponents/**/*"
+			],
+			"extends": "../client/.eslintrc"
+		},
 		{
 			"files": [
 				"mods/**/ui/**/*"
diff --git a/src/server/components/equipment.js b/src/server/components/equipment.js
index 978cedec..6a2359fc 100644
--- a/src/server/components/equipment.js
+++ b/src/server/components/equipment.js
@@ -263,19 +263,8 @@ module.exports = {
 			let itemId = eq[slot];
 			let item = inventory.findItem(itemId);
 
-			if (!item) {
-				console.log({
-					error: 'item not found',
-					itemId,
-					slot,
-					factionId,
-					tier,
-					character: this.obj.name,
-					eq: this.eq
-				});
-
+			if (!item)
 				return;
-			}
 
 			let factions = item.factions;
 			if (!factions)
diff --git a/src/server/components/social.js b/src/server/components/social.js
index fff2221b..9d164fbd 100644
--- a/src/server/components/social.js
+++ b/src/server/components/social.js
@@ -63,8 +63,8 @@ module.exports = {
 		});
 	},
 
-	chat: function (msg) {
-		chat(this, msg);
+	chat: async function (msg) {
+		await chat(this, msg);
 	},
 
 	dc: function () {
diff --git a/src/server/components/social/chat.js b/src/server/components/social/chat.js
index 0e7e7326..0b5df2dd 100644
--- a/src/server/components/social/chat.js
+++ b/src/server/components/social/chat.js
@@ -2,7 +2,7 @@ const events = require('../../misc/events');
 const profanities = require('../../misc/profanities');
 const canChat = require('./canChat');
 
-const sendRegularMessage = ({ obj }, msg) => {
+const sendRegularMessage = async ({ obj }, msg) => {
 	const charname = obj.auth.charname;
 
 	const msgEvent = {
@@ -10,16 +10,34 @@ const sendRegularMessage = ({ obj }, msg) => {
 		tagPrefix: '(',
 		tagSuffix: ')',
 		tags: [],
-		msgStyle: 'color-grayB'
+		emojiTag: null,
+		namePrefix: '',
+		nameSuffix: '',
+		msgStyle: 'color-grayB',
+		obj
 	};
 
-	events.emit('onBeforeGetChatStyles', msgEvent);
+	await events.emit('onBeforeGetChatStyles', msgEvent);
+
+	const { emojiTag } = msgEvent;
 
 	let usePrefix = '';
-	if (msgEvent.tags.length)
+	if (emojiTag) {
+		const imgX = (-emojiTag.sprite[0] * emojiTag.spriteSize);
+		const imgY = (-emojiTag.sprite[1] * emojiTag.spriteSize);
+		const backgroundPosition = `${imgX}px ${imgY}px`;
+
+		usePrefix = `<div class='emojiTag' style='background: url("${emojiTag.spritesheet}")  no-repeat scroll ${backgroundPosition} / auto;'></div>`;
+	} else if (msgEvent.tags.length > 0)
 		usePrefix = `${msgEvent.tagPrefix}${msgEvent.tags.join(' ')}${msgEvent.tagSuffix} `;
 
-	const finalMessage = `${usePrefix}${charname}: ${msg.data.message}`;
+	let useCharName = charname;
+	if (msgEvent.namePrefix)
+		useCharName = `${msgEvent.namePrefix}${useCharName}`;
+	if (msgEvent.nameSuffix)
+		useCharName = `${useCharName}${msgEvent.nameSuffix}`;
+
+	const finalMessage = `${usePrefix}${useCharName}: ${msg.data.message}`;
 
 	const item = msg.data.item ? JSON.parse(JSON.stringify(msg.data.item).replace(/(<([^>]+)>)/ig, '')) : undefined;
 
@@ -157,7 +175,7 @@ const sendErrorMsg = (cpnSocial, msgString) => {
 	cpnSocial.sendMessage(msgString, 'color-redA');
 };
 
-module.exports = (cpnSocial, msg) => {
+module.exports = async (cpnSocial, msg) => {
 	const { data: msgData } = msg;
 
 	if (!msgData.message)
@@ -246,5 +264,5 @@ module.exports = (cpnSocial, msg) => {
 	if (!messageHandler)
 		return;
 
-	messageHandler(cpnSocial, msg);
+	await messageHandler(cpnSocial, msg);
 };