413 Commits

Author	SHA1	Message	Date
Zuhayr	15e666150e	Readded pumpkin carving and poultice making. Added a description generator and cache.	2015-02-13 05:02:21 +10:30
Zuhayr	8fb5836e4f	Generalized fruit products properly.	2015-02-13 03:52:46 +10:30
Zuhayr	a9d55a17b8	Readded mob products.	2015-02-12 23:24:44 +10:30
Zuhayr	c953e279a4	Update from dev.	2015-02-12 23:15:47 +10:30
Zuhayr	a8089d4437	Merge master into dev.	2015-02-12 23:01:08 +10:30
mwerezak	5b5e16916f	Replaces text expressions with macros	2015-02-12 01:55:12 -05:00
mwerezak	28f3bf739d	Fixes randomized seed nutrient_consumption ... Centers the range of possible values evenly between small amount and heavy supply.	2015-02-11 23:06:29 -05:00
Zuhayr	e6eab3fabf	Adding more plant genes to play with.	2015-02-11 15:04:59 +10:30
Kelenius	e6dc9d36fd	Update for machine upgrades and some science ... Also adds RPED and makes biogenerator and borg charger constructible .	2015-02-08 15:39:11 +03:00
Zuhayr	43d576dcc5	Merge pull request #8054 from mwerezak/chembottles ... Replaces chem bottles with their overlay equivalents	2015-02-05 23:05:45 +10:30
Zuhayr	c5e2feb5f1	Merge with dev.	2015-02-05 20:24:06 +10:30
mwerezak	9caf76d069	Glass bottles are now dispensed with the lid on ... It seemed kind of silly that vendors, for example, would dispense bottles with their lids off.	2015-02-05 00:41:59 -05:00
mwerezak	8da0fb7f43	Merge remote-tracking branch 'upstream/dev' into chembottles ... Conflicts: code/modules/hydroponics/hydro_tools.dm - flags var	2015-02-05 00:37:19 -05:00
mwerezak	59bbf3a883	Replaces chem bottles with their overlay equivalents	2015-02-05 00:31:56 -05:00
Zuhayr	5890fa3c4b	Added plant controller.	2015-02-05 15:53:20 +10:30
Zuhayr	5a1980aabd	Updated seed storage to use trait procs.	2015-02-04 22:19:37 +10:30
Zuhayr	09b9500486	Compile fixes. Seed storage is still broken.	2015-02-04 22:00:07 +10:30
Zuhayr	fdf0360a69	Collapsing all fruit into one object type. Refactoring reagent grinder and removing juicer. WIP.	2015-02-04 10:55:33 +10:30
Zuhayr	e323bbf6db	Integrated xenoarch plants into regular system again. WIP.	2015-02-04 10:54:27 +10:30
Zuhayr	3b60a5959e	Added labelling for hydro trays.	2015-02-04 10:54:18 +10:30
Zuhayr	61f4699da2	Added printouts to plant analyzers.	2015-02-04 10:54:08 +10:30
Zuhayr	2d1fd2dd2f	Added report printing for plant scanners.	2015-02-04 10:53:09 +10:30
Zuhayr	93cf4f73c5	More work on the vine system, fixing multiple bugs.	2015-02-04 10:52:48 +10:30
Zuhayr	09e4be2b1b	Collapsed space vines, glowshrooms and biomass into one spreading-plant system.	2015-02-04 10:49:41 +10:30
Zuhayr	43802dceb7	Removed TRAIT_LIFESPAN.	2015-02-04 10:49:30 +10:30
Zuhayr	8790bfd014	Mature mob-plants have a chance of self-harvesting if the tray lid is not closed.	2015-02-04 10:49:21 +10:30
Zuhayr	0e93c1cf7b	Rewriting the /obj/effect/glowshroom into a more general system.	2015-02-04 10:49:09 +10:30
Zuhayr	d616040e8c	Renamed some files, did some path replacements	2015-02-04 10:48:18 +10:30
Zuhayr	5359d62735	All mobs produced from hydroponics will look for a player.	2015-02-04 10:47:48 +10:30
Zuhayr	d6b99b7995	Spread 1 plants can be planted outside of trays.	2015-02-04 10:47:35 +10:30
Zuhayr	c789f58b3c	Converted seed genetics over to a macro-based list of traits	2015-02-04 10:47:24 +10:30
Zuhayr	3ff956da69	Moved grown.dm to hydro folder for traits.	2015-02-04 10:46:24 +10:30
Zuhayr	d08861e25b	Moved gas/light/pressure from hydro tray to seed datum	2015-02-04 10:46:10 +10:30
Zuhayr	0c0e197657	Seed packets are now generated via masks	2015-02-04 10:44:59 +10:30
Zuhayr	92d00eb87d	Tweaks and fixes for growth and icon generation.	2015-02-04 10:44:16 +10:30
Zuhayr	f978e782f1	Tweaks. Trays now display their status when examined rather than attacked with an empty hand.	2015-02-04 10:44:00 +10:30
Zuhayr	06f26604d1	Xenoflora is now a sub-department of Xenobio rather than Science.	2015-02-04 10:43:50 +10:30
Zuhayr	983ca55c9d	Autopopulates the plant and product icon lists at roundstart. Should make missing plant icons obnoxiously easy to spot due to a world output in bright red.	2015-02-04 10:43:33 +10:30
Zuhayr	b3e31bfa14	Reduced darkness of hydro icons.	2015-02-04 10:43:25 +10:30
Zuhayr	e5935e01f1	Span classes.	2015-02-04 10:43:01 +10:30
Zuhayr	78e61d9ccd	Tweaks to xenoflora, added plant icons and colours to all plants.	2015-02-04 10:42:39 +10:30
Zuhayr	3c9bfbc751	Merge branch 'xenohydro_repair' into xenohydro	2015-02-04 10:40:37 +10:30
Zuhayr	26fe1a11a4	Adds exploding fruits.	2015-02-04 10:39:14 +10:30
Zuhayr	5538ce5589	Refactored nettles and sunflowers into regular plants.	2015-02-04 10:38:56 +10:30
Zuhayr	7bc70f46b0	Tweaks/fixes for fruit effects.	2015-02-04 10:37:54 +10:30
Zuhayr	b791c92c6e	Added a fruit spawning debug proc.	2015-02-04 10:37:40 +10:30
Zuhayr	4791ef2b74	First pass on xenoflora expansion.	2015-02-04 10:37:37 +10:30
Kelenius	9edb5751fb	Adds tobacco and maps in drying racks	2015-02-03 22:24:49 +03:00
Kelenius	536388978f	Conflict fix	2015-02-03 20:57:16 +03:00
Kelenius	0e7ed6aef4	Merge branch 'dev' into ofDryingAndRacks	2015-02-03 20:51:27 +03:00