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

Conflicts:
	code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm
	icons/obj/assemblies/new_assemblies.dmi

2015-09-10 21:49:39 +02:00

..

Chemistry-Reagents

Merge pull request #11525 from xxalpha/dryshoes

2015-09-10 22:01:03 +03:00

Chemistry-Recipes

Drying agent. Recolor dry shoes

2015-09-01 22:59:30 +01:00

reagent_containers

Correct 'You inject' text

2015-09-05 16:47:21 -06:00

Chemistry-Colours.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

Chemistry-Holder.dm

makes all Destroy()'s return properly

2015-08-31 00:21:01 -06:00

Chemistry-Machinery.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

Chemistry-Readme.dm

Readds blob smoke reagent effect.

2015-08-15 20:56:56 +02:00

Chemistry-Reagents.dm

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

2015-09-10 21:49:39 +02:00

Chemistry-Recipes.dm

Cleans up gold slime moblist code.

2015-08-30 21:45:31 -07:00

reagent_containers.dm

Fixes sleeping smoke never disappearing. Also switching processing.Add(src) to processing |= src.

2015-07-31 15:01:35 +02:00

reagent_dispenser.dm

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

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