Midaychi/Paradise-daychi — pull request #2 by Midaychi (2014-08-03 02:27:13+00:00)
Title: Psychiatrist/Psychologist update.

Conflicts:
code/game/jobs/job/medical.dm
icons/mob/uniform.dmi
icons/obj/clothing/uniforms.dmi