Revert "Merge with a twist"

This reverts commit 3d04f87d4d11c5855927c8b712b980572da548ed.
NoIdea
LetsTryAgain
Merge remote-tracking branch 'origin/master'

Conflicts:
	code/modules/mob/living/carbon/emote.dm