3 Commits

Author	SHA1	Message	Date
Chinsky	be95e54e43	Merge branch 'master' into dev ... Conflicts: code/defines/obj/weapon.dm code/modules/mob/living/carbon/species.dm code/modules/mob/living/silicon/say.dm icons/mob/uniform.dmi maps/tgstation2.dmm	2014-06-17 16:16:44 +04:00
Zuhayr	4244479e43	Reapplying some changes.	2014-06-12 01:23:32 +09:30
igalan	7d08d4701c	Hydroponics refactor, part 1: Files. ... No code actually modified, just moved from all over the place to a module folder. defines/obj/hydro.dm split: -Seeds into seeds.dm -Tools like the analyzer, pest and weedkillers into hydro_tools.dm. Hatches and scythe from defines/obj/weapon.dm moved there too. -Non-edible plants like nettles into grown_inedible.dm. Special procs in items/weapons/hydroponics.dm moved there. -Biogenerator and hydroponics tray files moved.	2014-06-11 03:44:29 +01:00