Zuhayr 9e71180e1b Merge conflict resolution, using BEF.

2013-06-05 14:22:04 +09:30

..

reagent_containers

Added lids for bottles and beakers.

2013-05-26 06:38:38 +04:00

Chemistry-Colours.dm

- Reagent code reorganization commit 5 (Some big errors... Yeah, renaming files in explorer and expecting SVN to understand is a bad idea.)

2012-08-18 22:06:04 +00:00

Chemistry-Holder.dm

Runtime fixes, tweaks.

2013-06-04 16:25:41 +04:00

Chemistry-Machinery.dm

Merged master into BEF.

2013-05-06 15:43:50 +01:00

Chemistry-Readme.dm

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10:00

Chemistry-Reagents-Antidepressants.dm

Fixed paroxetine.

2013-02-25 18:40:42 +01:00

Chemistry-Reagents.dm

Fixes #2954

2013-06-04 13:14:51 +04:00

Chemistry-Recipes.dm

Merged master into BEF.

2013-05-06 15:43:50 +01: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

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

syringe_gun.dm

Made syringe gun work with aiming system.

2013-06-01 08:23:38 +04:00