Cael_Aislinn 419247adfe Merge remote-tracking branch 'remotes/git-svn' 4847 into bs12_with_tgport ...

Conflicts:
	baystation12.dme
	code/game/verbs/ooc.dm
	code/modules/admin/admin_verbs.dm
	code/modules/food/recipes_microwave.dm
	html/changelog.html

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

2012-10-12 17:53:17 +10:00

..

reagent_containers

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

2012-10-12 17:53:17 +10:00

Chemistry-Colours.dm

…

Chemistry-Holder.dm

…

Chemistry-Machinery.dm

-Adds cherry seeds to the seed vendor

2012-10-09 21:54:36 +00:00

Chemistry-Readme.dm

…

Chemistry-Reagents.dm

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

2012-10-12 17:53:17 +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_dispenser.dm

…

syringe_gun.dm

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

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