Ccomp5950 c028db481e Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze ...

Conflicts:
	code/modules/mob/living/carbon/monkey/diona.dm
	code/modules/reagents/Chemistry-Machinery.dm

2014-01-23 00:05:53 -06:00

..

reagent_containers

Colour fix for bread slices.

2014-01-11 02:50:49 +10:30

Chemistry-Colours.dm

…

Chemistry-Holder.dm

Added some limited support for alien reagent reactions.

2014-01-08 10:26:39 +10:30

Chemistry-Machinery.dm

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze

2014-01-23 00:05:53 -06:00

Chemistry-Readme.dm

…

Chemistry-Reagents-Antidepressants.dm

Mining fixes as it was annoying as fuck. Also a random object with nothing in it removed.

2014-01-08 21:33:17 -07:00

Chemistry-Reagents.dm

Indentation fix.

2014-01-08 11:13:36 +10:30

Chemistry-Recipes.dm

Small fixes, again

2014-01-04 21:26:28 +01:00

dartgun.dm

Smallfix.

2013-10-17 04:00:33 +03:00

grenade_launcher.dm

…

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

Fuel tanks uses explode() proc.

2013-09-02 16:10:43 +01:00

syringe_gun.dm

Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs.

2013-08-28 03:33:04 +01:00