Kelenius 10915eae24 Merge branch 'dev' into ofChemistryAndStuff ...

Conflicts:
	code/game/objects/effects/chem/chemsmoke.dm
	code/modules/customitems/item_defines.dm
	code/modules/projectiles/guns/launcher/syringe_gun.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
	code/modules/reagents/reagent_containers/food/drinks.dm
	code/modules/reagents/reagent_containers/pill.dm
	maps/exodus-1.dmm

2015-05-15 11:28:05 +03:00

..

spreading

Fixes #9226

2015-05-15 13:43:28 +09:30

trays

Merge branch 'dev' into ofChemistryAndStuff

2015-05-15 11:28:05 +03:00

_hydro_setup.dm

…

grown_inedible.dm

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

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

grown_predefined.dm

…

grown.dm

new object-based lighting system

2015-05-10 20:54:25 +01:00

seed_controller.dm

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

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

seed_datums.dm

Adjusts fruits and stuff to have more juice and stuff.

2015-04-22 15:05:38 +01:00

seed_machines.dm

Fixes #9234

2015-05-15 13:53:01 +09:30

seed_mobs.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-05-11 09:28:59 +02:00

seed_packets.dm

Hackfix for #8588

2015-03-24 12:46:07 +10:30

seed_storage.dm

Merge remote-tracking branch 'upstream/master' into dev

2015-04-28 08:43:31 +02:00

seed.dm

new object-based lighting system

2015-05-10 20:54:25 +01:00