phil235 3e9ab4e3c1 Merge branch 'master' of https://github.com/tgstation/-tg-station into SmokeFoamBuff ...

Conflicts:
	code/ATMOSPHERICS/atmospherics.dm
	code/__HELPERS/unsorted.dm
	code/game/objects/items/weapons/tanks/watertank.dm
	code/modules/reagents/Chemistry-Recipes.dm

2015-07-16 14:09:12 +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

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

2015-07-16 14:09:12 +02:00

effects_other.dm

"You hear something" set to italics.

2015-04-24 21:06:16 +03:00

effects_smoke.dm

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

2015-07-16 14:09:12 +02:00

effects_sparks.dm

Effect pooling

2015-03-24 11:44:49 -07:00

effects_water.dm

Effect pooling

2015-03-24 11:44:49 -07:00