Leshana 5ae26332fa Merge branch 'master' into aro-tether-wip ...

# Conflicts:
#	code/ZAS/_docs.dm
#	code/game/area/areas.dm
#	code/game/objects/explosion.dm
#	code/modules/holodeck/HolodeckControl.dm
#	code/modules/mob/living/say.dm

2017-05-16 00:26:32 -04:00

..

automata.dm

…

caves.dm

Tether 1,8 work

2017-05-04 17:48:21 -04:00

diona.dm

Removes the datum pool, as it is not performant.

2017-05-04 01:58:33 -04:00