phil235 99653ed152 Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor ...

Conflicts:
	code/modules/reagents/chemistry/holder.dm

2016-02-06 20:38:16 +01:00

..

environmental

Take to of grouping the atmos files in modules.

2016-01-30 21:09:38 +02:00

gasmixtures

comment style is important

2016-02-06 12:15:21 -06:00

machinery

Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor

2016-02-06 15:42:13 +01:00