GinjaNinja32 d4eb42b38b Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/projectiles/targeting.dm

2015-04-13 12:49:07 +01:00

..

spreading

Adds weedkiller smoke checks to hydro trays and spreading plants.

2015-04-01 07:25:09 -07:00

trays

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

2015-04-03 09:33:05 +02:00

_hydro_setup.dm

Adding more plant genes to play with.

2015-02-11 15:04:59 +10:30

grown_inedible.dm

Generalized fruit products properly.

2015-02-13 03:52:46 +10:30

grown_predefined.dm

Readds predefined ambrosia items.

2015-02-13 05:53:45 +10:30

grown.dm

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

2015-04-13 12:49:07 +01:00

seed_controller.dm

Should fix issues with invisible seeds/products/plants.

2015-03-24 13:51:44 +10:30

seed_datums.dm

Rebalanced xenoflora sprites, fixed numerous issues.

2015-03-22 16:13:15 +10:30

seed_machines.dm

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

2015-03-31 01:37:55 -04: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

Fixes #8696

2015-03-31 20:30:06 -04:00

seed.dm

Replaced display_name with name, worked on severing limbs and damage propagation.

2015-03-25 19:07:22 +10:30