cib d0735e9a87 Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into feature ...

Conflicts:
	code/ZAS/ZAS_Zones.dm
	code/game/gamemodes/events.dm

2012-12-16 15:10:04 +01:00

..

reagent_containers

Merge remote-tracking branch 'remotes/Baystation12/Baystation12/master' into work_in_progress

2012-12-11 12:38:58 +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

Chemistry on child reagents and in mobs

2012-11-09 20:53:20 +04:00

Chemistry-Machinery.dm

Removed the ability to create vira.

2012-11-05 19:49:30 +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.dm

Rebalanced spaceacillin metabolism.

2012-12-11 13:22:44 +01:00

Chemistry-Recipes.dm

internal explosions

2012-11-09 20:24:44 +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

- 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

Fixes issue #1971

2012-11-18 11:24:17 +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