Kelenius 317abc6b79 Merge branch 'dev' into ofChemistryAndStuff ...

Conflicts:
	code/datums/recipe.dm
	code/game/machinery/bots/farmbot.dm
	code/game/machinery/bots/medbot.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/objects/effects/chem/chemsmoke.dm
	code/game/objects/effects/effect_system.dm
	code/game/objects/items/toys.dm
	code/game/objects/items/weapons/extinguisher.dm
	code/game/objects/items/weapons/mop.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/organs/organ_internal.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/Chemistry-Recipes.dm
	code/modules/reagents/reagent_containers/food/snacks.dm
	code/modules/reagents/reagent_containers/pill.dm
	code/modules/reagents/reagent_containers/spray.dm
	maps/exodus-1.dmm

2015-04-28 10:49:26 +03:00

..

evidence.dm

Merge pull request #7964 from Baystation12/dev-freeze

2015-02-02 02:14:08 +10:30

footprints_and_rag.dm

Chemistry commit

2015-03-25 19:09:10 +03:00

forensics.dm

Added update_prints helper

2015-01-28 00:36:22 +03:00

scanner.dm

Merge pull request #7964 from Baystation12/dev-freeze

2015-02-02 02:14:08 +10:30

scanning_console.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00