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

Conflicts:
	code/modules/reagents/reagent_containers/food/cans.dm

2014-03-28 18:46:04 -05:00

..

reagent_containers

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

2014-03-28 18:46:04 -05:00

Chemistry-Colours.dm

Rework of colour mixing

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

Chemistry-Holder.dm

Ingested acid and mutagen will now react after the ten second delay.

2014-03-06 20:20:15 +08:00

Chemistry-Machinery.dm

Revert "Merge pull request #4607 from Aryn/master"

2014-03-24 13:54:11 +00: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 'dev-freeze' of github.com:Baystation12/Baystation12 into dev

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

Chemistry-Recipes.dm

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

2014-03-28 18:46:04 -05:00

dartgun.dm

Smallfix.

2013-10-17 04:00:33 +03:00

grenade_launcher.dm

…

reagent_containers.dm

…

reagent_dispenser.dm

Fuel tanks uses explode() proc.

2013-09-02 16:10:43 +01:00

syringe_gun.dm

…