MrPerson 24dcf08b2e Merge branch 'master' of https://github.com/tgstation/-tg-station into alert_alert_ur_a_faget ...

Conflicts:
	code/modules/mob/living/carbon/alien/humanoid/life.dm
	code/modules/mob/living/carbon/alien/larva/life.dm
	code/modules/mob/living/carbon/alien/life.dm
	code/modules/mob/living/carbon/monkey/life.dm
	icons/mob/screen_alien.dmi

2015-03-02 12:04:38 -08:00

..

death.dm

…

emote.dm

Fixes some runtimes from audible_message proc. Fixes silent PDAs calling audible message when receiving a message.

2015-01-14 18:00:17 +01:00

examine.dm

Disregard that I suck cocks

2014-08-21 07:35:51 -07:00

inventory.dm

SPANCLASSES!!!!!

2014-08-26 09:52:13 +02:00

life.dm

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

2015-03-02 12:04:38 -08:00

login.dm

…

monkey.dm

Fixes a lot of duplicated code in life and its subprocs for carbon mobs.

2015-02-21 00:37:04 +01:00

say.dm

Converts whispers to the new system

2014-08-05 17:49:03 +02:00

update_icons.dm

optimizations to the way inhand files are found

2015-01-18 21:14:47 -08:00