Merge pull request #144 from SamCroswell/master

Ninja HUD flash fix
New preferences
Conflicts:
	code/modules/mob/new_player/preferences_setup.dm
Merge branch 'master' of https://github.com/ZomgPonies/Paradise
Merge pull request #9 from ZomgPonies/master

Merge from master
Various Tweaks and Fixes

Adds a replacement for Doctor's Delight (For Syndicakes, valid salad,
etc), fixed chem dispenser NanoUI sizing, and change plasma color from
orange to the canonical purple.
Merge pull request #145 from Fox-McCloud/Various-Tweaks

Various tweaks and Fixes
Broken heart fix

Code was using a switch with variables in it. This doesn't work.
Replaced it with an if..else sequence.

Thanks to the guys from Paradise for finding this.

Note: this only fixes literal heart problems, it won't do anything for relationship issues.

Conflicts:
	code/modules/organs/blood.dm
Cryopod icon_state fix.

Missing _ in the icon states.
Bugfixes
Merge pull request #6 from ZomgPonies/master

Update