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

..

__DEFINES

Merge branch 'master' into buttbots2

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

__HELPERS

Merge pull request #4019 from tigercat2000/disease1

2016-03-30 21:29:58 -04:00

_DATASTRUCTURES

…

_globalvars

Merge branch 'master' into buttbots2

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

_hooks

…

_onclick

Merge branch 'master' into buttbots2

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

ATMOSPHERICS

Removes ability to hide papers.

2016-02-16 21:54:07 +01:00

controllers

Merge branch 'master' into buttbots2

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

datums

Merge branch 'master' into buttbots2

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

defines

Merge branch 'master' into buttbots2

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

game

Merge branch 'master' into buttbots2

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

js

…

LINDA

tweak

2016-02-22 22:20:27 -05:00

modules

Merge branch 'master' into buttbots2

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

_compile_options.dm

…

hub.dm

…

world.dm

…