Tastyfish 6a8ea815b2 Merge branch 'master' into buttbots2 ...

Conflicts:
	code/defines/procs/AStar.dm
	code/modules/mob/living/simple_animal/bot/cleanbot.dm
	code/modules/mob/living/simple_animal/bot/medbot.dm
	paradise.dme

2016-03-31 13:33:46 -04:00

..

aliens.dm

Finally got colored blood working properly

2015-03-03 13:45:46 -05:00

fuel.dm

Pass II

2015-07-09 19:51:40 -04:00

humans.dm

-tg- disease1

2016-03-27 21:24:00 -07:00

misc.dm

-tg- disease1

2016-03-27 21:24:00 -07:00

robots.dm

refactored datum/effect/system because it was a complete mess

2015-11-22 19:43:01 -05:00

tracks.dm

Ports tg simple_animal bots

2016-03-28 00:22:04 -04:00