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

..

admin.dm

Antibodies rework.

2015-01-26 05:32:00 +00:00

analyser.dm

Virology rebalance

2015-01-20 09:57:47 +00:00

antibodies.dm

Chemistry commit

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

biohazard destroyer.dm

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

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

centrifuge.dm

Corrects return values for the Topic procs of several computers and some other machines as well.

2015-02-25 21:32:35 -05:00

curer.dm

Corrects return values for the Topic procs of several computers and some other machines as well.

2015-02-25 21:32:35 -05:00

disease2.dm

Merge pull request #8029 from GinjaNinja32/viro

2015-02-06 00:18:13 +03:00

diseasesplicer.dm

Corrects return values for the Topic procs of several computers and some other machines as well.

2015-02-25 21:32:35 -05:00

dishincubator.dm

Chemistry commit

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

effect.dm

Merge branch 'dev' into ofChemistryAndStuff

2015-03-31 17:44:42 +03:00

helpers.dm

Collapsed all organs into one object type. Added more interesting amputation. Added dislocation. WIP.

2015-03-11 21:17:51 +10:30

isolator.dm

Corrects return values for the Topic procs of several computers and some other machines as well.

2015-02-25 21:32:35 -05:00

items_devices.dm

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

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