Cael_Aislinn 418c140e00 Merge branch 'tg' into bs12_with_tgport ...

Conflicts:
	code/defines/mob/living/carbon/monkey.dm
	code/setup.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

2012-08-22 18:39:44 +10:00

..

observer

Merge branch 'tg' into bs12_with_tgport

2012-08-22 18:39:44 +10:00

death.dm

TG: Fixed dust() and gib() leaving invisible overlays everywhere

2012-05-06 18:50:52 +01:00