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

Conflicts:
	code/modules/reagents/Chemistry-Reagents/Blob-Reagents.dm

2015-06-24 21:15:09 +02:00

..

effect_system.dm

Lots of work on acids, smoke, foam, reagents reaction() proc.

2015-06-22 00:35:24 +02:00

effects_foam.dm

- Foam/moke lifetime is no longer affected by reagents volume.

2015-06-24 20:58:22 +02:00

effects_other.dm

…

effects_smoke.dm

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

2015-06-24 21:15:09 +02:00

effects_sparks.dm

…

effects_water.dm

…