Zuhayr b702c81060 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into randmap ...

Conflicts:
	code/game/turfs/simulated/floor_types.dm

2015-08-22 03:57:12 +09:30

..

automata.dm

…

caves.dm

Removed turf_animation for now, ported vg hasproximity optimisation. Rewrite and refactor of how turfs handle icon updates, edge smoothing and

2015-08-16 06:05:21 -07:00

diona.dm

…