Miauw 9e40407906 Merge branch 'master' of https://github.com/tgstation/-tg-station into condimentpacks ...

Conflicts:
	code/modules/reagents/reagent_containers/food/condiment.dm

2013-12-22 15:19:23 +01:00

..

reagent_containers

Merge branch 'master' of https://github.com/tgstation/-tg-station into condimentpacks

2013-12-22 15:19:23 +01:00

Chemistry-Colours.dm

Returned /proc/mix_color_from_reagents(var/list/reagent_list) to normal, so crayons mix like normal reagents.

2013-10-09 05:45:00 +11:00

Chemistry-Holder.dm

Tons of typo fixes and renames Centcomm to Centcom. Manual merge of #1950.

2013-12-13 21:14:23 +00:00

Chemistry-Machinery.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into condimentpacks

2013-12-22 15:19:23 +01:00

Chemistry-Readme.dm

…

Chemistry-Reagents.dm

Replaces 'aluminum' with 'aluminium'.

2013-12-07 14:42:25 +01:00

Chemistry-Recipes.dm

* Set the cooldown, for creating virus culture bottles, from 100 to 5 seconds.

2013-12-18 17:33:03 +00:00

grenade_launcher.dm

Update grenade_launcher.dm

2013-12-03 09:35:32 +01:00

reagent_containers.dm

Replaced most reagent initialisations with the helper proc create_reagents().

2013-04-15 15:40:33 +01:00

reagent_dispenser.dm

Removed flame_range from meteor explosions, reduced flame_range on syndie minibomb, added flame_range to all welderbomb explosions, made args prettier

2013-10-16 22:10:26 -07:00

syringe_gun.dm

Syringe gun wants to be real gun!

2013-12-09 21:40:51 +12:00