more fixes, smart_animal

Conflicts:
	baystation12.dme
	code/modules/mob/living/carbon/human/life.dm