phil235 d856e240c2 Merge branch 'master' of https://github.com/tgstation/-tg-station into NewPlants ...

Conflicts:
	icons/mob/head.dmi

2015-03-02 13:45:15 +01:00

..

biogenerator.dm

attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.

2015-02-19 13:02:43 +00:00

grown.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into NewPlants

2015-03-02 13:45:15 +01:00

growninedible.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into NewPlants

2015-02-25 18:50:42 +01:00

hydroitemdefines.dm

Adds new plants to botany (rice, oat, blue cherries, holy melon, parsnip, geranium, lily, snap corn, blumpkin, mimana, sweet potato, vanilla, red beet) and adding two new reagents (vanilla and rice).

2015-02-22 22:10:25 +01:00

hydroponics.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into NewPlants

2015-03-02 13:45:15 +01:00

seed_extractor.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into NewPlants

2015-02-25 18:50:42 +01:00

seeds.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into NewPlants

2015-02-25 18:50:42 +01:00