Cael_Aislinn 9340f70252 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport ...

Conflicts:
	icons/obj/items.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

2012-10-22 19:35:03 +10:00

..

reagent_containers

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport

2012-10-21 01:25:04 +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

Whoops forgot a thing also reenabled a warning message but with a added check

2012-10-17 19:00:20 +02:00

Chemistry-Machinery.dm

Roller beds are collapsible and the ChemMaster lets you specify pill/bottle color, once more

2012-10-13 03:44:19 -07: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 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport

2012-10-21 01:25:04 +10:00

Chemistry-Recipes.dm

Merge remote-tracking branch 'remotes/git-svn' tgstation r4838 into bs12_with_tgport

2012-10-09 23:07:41 +10: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

- 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

reagent_dispenser.dm

Added ability to rig fueltanks

2012-10-20 22:31:13 +04:00

syringe_gun.dm

Added attack logging, some moderator groundwork, fixed alien species and save files.

2012-09-23 21:49:25 +01:00