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

..

air.dm

Clean incorrect styling for the ++ operator

2016-01-02 10:46:01 -08:00

alarm.dm

Display case update, some forceMove updates

2015-09-14 20:21:56 +02:00

animal.dm

Ports tg simple_animal bots

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

bot.dm

Further process tweaks

2015-08-08 09:07:26 -04:00

diseases.dm

-tg- disease1

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

event.dm

Replaces typesof with subtypesof where applicable

2015-08-03 11:04:28 -04:00

garbage.dm

A few more process tweaks

2015-08-08 19:31:13 -04:00

inactivity.dm

Further process tweaks

2015-08-08 09:07:26 -04:00

lighting.dm

Further process tweaks

2015-08-08 09:07:26 -04:00

machinery.dm

removes unused machine profiling

2015-10-19 03:49:36 -04:00

mob.dm

Clean up mob code a bit

2015-10-27 06:19:24 -07:00

nanoui.dm

Further process tweaks

2015-08-08 09:07:26 -04:00

obj.dm

Further process tweaks

2015-08-08 09:07:26 -04:00

pipenet.dm

Pipenet overhaul

2015-09-21 02:11:54 +02:00

shuttles.dm

Shuttle fixes

2016-01-30 22:29:42 -05:00

sun.dm

Further process tweaks

2015-08-08 09:07:26 -04:00

ticker.dm

…

timer.dm

Adds soda dispenser to beach bar.

2016-02-27 03:24:48 -05:00

vote.dm

…