Miauw 61ed6a5e15 Merge branch 'master' of https://github.com/tgstation/-tg-station into kittens ...

Conflicts:
	code/modules/mob/living/simple_animal/simple_animal.dm

2014-01-03 19:27:51 +01:00

..

carbon

Merge branch 'master' of https://github.com/tgstation/-tg-station into pr/2192

2014-01-02 10:00:58 -06:00

silicon

Obsoletes flags = FPRINT | TABLEPASS*

2013-12-30 15:03:17 -06:00

simple_animal

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

2014-01-03 19:27:51 +01:00

damage_procs.dm

Removing a needless line in /mob/living/proc/apply_damage().

2013-01-12 14:16:51 +00:00

death.dm

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

2013-12-27 00:55:44 -05:00

emote.dm

Re-Adds the Sigh emote

2013-09-05 02:01:36 +01:00

living_defense.dm

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

2013-12-18 18:27:22 +00:00

living_defines.dm

Removes several more unused variables

2013-11-24 05:11:15 +08:00

living.dm

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

2013-12-27 02:33:47 -05:00

login.dm

Blob/AI cameras can now be followed by ghosts.

2013-07-21 15:13:43 +01:00

logout.dm

Important!

2012-08-08 20:51:55 +00:00

say.dm

Moved Speech Modification via masks to masks. say and whisper now call the speechModification(message) proc in wear_mask.

2013-12-29 12:12:41 -06:00