More emote fixes

Rosejackie to be readded
rosejackie fix
Merge pull request #10 from XyyxShard/master

Merge