phil235 78d28a6d64 Merge branch 'master' of https://github.com/tgstation/-tg-station into BigUserdanger ...

Conflicts:
	code/modules/events/ninja.dm

2015-03-15 12:30:27 +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

Fixes steel cap bug. Steel cap now growns steel logs similar to wooden logs, you use the hatchet to get rods.

2015-03-10 20:30:46 +01:00

growninedible.dm

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

2015-03-15 12:30:27 +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 pull request #8247 from Incoming5643/Welcome_to_ireland

2015-03-13 15:22:14 -05: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 pull request #8286 from phil235/SteelcapFix

2015-03-14 22:56:37 -05:00