UI improvements, health doll final

Merge branch 'master' of https://github.com/tgstation/-tg-station into injurydoll
removes smiley faces from o2 and kpa icons
Merge branch 'injurydoll' of https://github.com/paprka/-tg-station into injurydoll

Conflicts:
	icons/mob/screen_gen.dmi