Should fully resolve issue #344

Conflicts:
	code/modules/mob/mob.dm
clean up the code

Conflicts:
	code/modules/mob/mob.dm