kingofkosmos 7a952b9310 Merge branch 'master' of https://github.com/tgstation/-tg-station into blendershake ...

Conflicts:
	code/modules/food&drinks/kitchen machinery/gibber.dm
	code/modules/food&drinks/kitchen machinery/processor.dm

2015-06-10 20:48:22 +03:00

..

Chemistry-Reagents

Merge pull request #9767 from Iamgoofball/patch-71

2015-06-07 12:38:33 +01:00

Chemistry-Recipes

Updates more paths, for example obj/stuff to /obj/stuff

2015-05-31 17:48:33 +02:00

reagent_containers

Adds trekchems to the Mediborgs.

2015-06-07 04:52:55 -07:00

Chemistry-Colours.dm

Ports /vg/ chem weighted colour averaging

2015-05-12 23:55:35 +01:00

Chemistry-Holder.dm

Updates more paths, for example obj/stuff to /obj/stuff

2015-05-31 17:48:33 +02:00

Chemistry-Machinery.dm

Combined the two offset-lines into one line.

2015-06-10 19:43:45 +03:00

Chemistry-Readme.dm

Reorganizing the reagents files. Goon chems are no longer in separate files.

2015-04-16 22:07:24 +02:00

Chemistry-Reagents.dm

Changes alot of datum/ to /datum/

2015-05-31 02:40:54 +02:00

Chemistry-Recipes.dm

Reorganizing the reagents files. Goon chems are no longer in separate files.

2015-04-16 22:07:24 +02:00

reagent_containers.dm

Remove SpeciesCanConsume() proc, replaced by iscarbon checks.

2015-04-11 22:16:42 +02:00

reagent_dispenser.dm

fixes autolathe making stacks, fuel > welding fuel, fixes some non-blue medical icons

2015-05-17 01:58:46 +10:00