Chinsky c4997a34f1 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 ...

Conflicts:
	code/modules/mob/new_player/new_player.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/Chemistry-Recipes.dm

2013-02-02 20:00:10 +04:00

..

reagent_containers

Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport

2013-01-23 00:48:07 +10: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

Blood now goes to vessels again.

2013-01-24 17:14:36 +04:00

Chemistry-Machinery.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

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.dm

Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12

2013-02-02 20:00:10 +04:00

Chemistry-Recipes.dm

Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12

2013-02-02 20:00:10 +04: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

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

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