phil235 aecb365f84 Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal ...

Conflicts:
	code/modules/mob/living/carbon/alien/life.dm
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/living/simple_animal/slime/life.dm

2015-03-20 19:32:16 +01:00

..

ooc.dm

Moves chat toggles into their own variable.

2015-03-05 18:38:07 +01:00

suicide.dm

slime from carbon to simple animal

2015-03-14 23:40:57 +01:00

who.dm

I accidentally broke who for people without +ADMIN who were admins.

2013-08-31 13:39:47 -07:00