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

Conflicts:
	code/modules/clothing/masks/gasmask.dm

2015-06-28 15:22:21 +02:00

..

jetpack.dm

more spans

2015-04-24 20:52:00 +03:00

tank_types.dm

Adds Plasmamen! Adds the ability for species to breathe other gases!

2015-04-28 20:48:14 +01:00

tanks.dm

The initial tweaks are in place, ran out of time to finish it though.

2015-05-11 18:54:31 +01:00

watertank.dm

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

2015-06-28 15:22:21 +02:00