Ccomp5950 c56ec21ee3 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze ...

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

2014-02-26 09:34:38 -06:00

..

reagent_containers

Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze

2014-02-26 09:34:38 -06:00

Chemistry-Colours.dm

Rework of colour mixing

2014-01-19 21:47:42 +01:00

Chemistry-Holder.dm

Chem grenade fixes

2014-02-13 00:15:02 +13:00

Chemistry-Machinery.dm

Reintroducing the dough-based cooking system.

2014-02-01 02:17:38 +01:00

Chemistry-Readme.dm

Paint mixing

2014-01-11 22:19:02 +01:00

Chemistry-Reagents-Antidepressants.dm

Mining fixes as it was annoying as fuck. Also a random object with nothing in it removed.

2014-01-08 21:33:17 -07:00

Chemistry-Reagents.dm

Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze

2014-02-26 09:34:38 -06:00

Chemistry-Recipes.dm

Fix for #4479.

2014-02-25 03:33:18 +03:00

dartgun.dm

…

grenade_launcher.dm

…

reagent_containers.dm

…

reagent_dispenser.dm

…

syringe_gun.dm

…