PsiOmega f760d44127 Merge remote-tracking branch 'upstream/master' into dev ...

Conflicts:
	code/game/objects/items/weapons/candle.dm
	code/modules/paperwork/paper.dm

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

..

spreading

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

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

trays

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

2015-04-24 09:59:05 +02: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

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

2015-04-24 09:59:05 +02: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

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

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

seed_mobs.dm

sanitize() refactor: fourth pass

2015-04-03 00:40:57 +03: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

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

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