Zuhayr 520d1b34d2 Merge resolution.

2013-08-05 08:00:03 -07:00

..

reagent_containers

Merge resolution.

2013-08-05 08:00:03 -07:00

Chemistry-Colours.dm

…

Chemistry-Holder.dm

Fixes #3017

2013-06-09 19:54:43 +04:00

Chemistry-Machinery.dm

…

Chemistry-Readme.dm

…

Chemistry-Reagents-Antidepressants.dm

…

Chemistry-Reagents.dm

Compile fixes for organ/reagent code.

2013-08-04 11:25:40 -07:00

Chemistry-Recipes.dm

Merge branch 'master' into bleeding-edge-freeze

2013-07-19 14:48:40 +01:00

dartgun.dm

Vox gear tweaks. Dartgun buff, removal of tank sounds, addition of multitools.

2013-07-29 06:43:37 -07:00

grenade_launcher.dm

…

reagent_containers.dm

…

reagent_dispenser.dm

Revert #3316 from BEF due to compile errors and (assumed) missing files.

2013-07-20 18:38:00 +01:00

syringe_gun.dm

Dartgun tweaks, vials.

2013-06-24 02:04:44 -07:00