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

Smallfix.

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

grenade_launcher.dm

New lighting, it's essentially just the old DAL system with a queue.

2012-08-25 16:06:57 +00:00

reagent_containers.dm

Committing suomynonAyletamitlU's storage item standardisation commit: http://forums.nanotrasen.com/viewtopic.php?f=16&t=11746

2013-01-08 19:11:56 +00:00

reagent_dispenser.dm

Fuel tanks uses explode() proc.

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

syringe_gun.dm

Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs.

2013-08-28 03:33:04 +01:00