Razharas 4ba5161394 Merge branch 'master' of https://github.com/tgstation/-tg-station into FUCKGIT ...

Conflicts:
	code/modules/hydroponics/seeds.dm

Resolving dem conflicts

2015-02-25 15:17:14 +03: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 FUCKGIT

2015-02-25 15:17:14 +03:00

growninedible.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

hydroitemdefines.dm

Biogenerator stuff.

2015-01-11 16:53:41 +02:00

hydroponics.dm

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

2015-02-25 15:17:14 +03:00

seed_extractor.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

seeds.dm

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

2015-02-25 15:17:14 +03:00