Correcting overlooks due to merge from master

When I merged master into [#1245](https://github.com/tgstation/-tg-station/issues/1245) to resolve conflicts, I didn't notice that
the merge did some unintended things, like duplicating conditionals.

These have been corrected, and I also made more things call ..(act) so that
there is less duplicate code in different emote procs.

This is the last fix I swear :frowning: