Commit Graph

68 Commits

Author SHA1 Message Date
Atermonera
a78cdc85cc Merge pull request #6308 from Heroman3003/kitchenfixes
Fixes some kitchen screwery
2019-07-22 00:43:05 -04:00
Heroman3003
864704565c Returns logs from plants (#6274)
* Returns logs from plants

* Returns production of planks from fruit with wood pulp
2019-07-08 17:33:01 -04:00
Atermonera
1472642b88 Merge pull request #6262 from Mechoid/CivilianExpansion1
Civilian Expansion 1: The Plantening
2019-07-07 17:29:32 -04:00
Atermonera
2df5e9fe0e Merges AI Branch into Master 2018-12-01 00:06:38 -05:00
Anewbe
978fdd2842 Merge pull request #5309 from Heroman3003/melon-fix
Fixed fruit salad not being make-able
2018-05-29 14:35:57 -04:00
Cerebulon
818ff82c4d Fixes pumpkins and watermelon sprites 2018-04-21 06:08:20 +01:00
SunnyDaise
1f80c3336d Onions, Food and Plant Tweaks (#4629)
* Onyonyon

* Fixes Potato's and adds Changelog.
2018-01-27 16:53:54 -08:00
Cyantime
3b71498ddc Fixes potato reagentID (#4637)
* Vodka can be produced again
2018-01-27 16:52:40 -08:00
SunnyDaise
a0bd8f6915 Adds Apple Juice. 2018-01-17 07:29:40 +00:00
Mechoid
5d390ca67b Brings back the aliens as they were when removed, minus huggers (until we can get a suitable replacement), for admins to use. 2017-09-03 01:46:08 -07:00
Arokha Sieyes
9660186dfd Not So Simple Animals (#3103)
* Merge two not-really conflicts

Thanks git, that whitespace conflict was super important?

* DME merge

* Added defines for mobs used by simple animals.

* Lost a slime along the way

* Disable debug settings

* HONK!!!

* Remove redundant hostile decls

* Replace loc= with forceMove in old SA code

I guess I should think of the children.
2017-03-22 14:30:07 -05:00
Anewbe
0cb1f8c27a Cleans up the code to match recent Tajaran rewrite 2016-08-13 23:07:00 -05:00
Zuhayr
764c78b25f Ported and rewrote several cooking machines from Apollo by request.
# Conflicts:
#	maps/exodus/exodus-1.dmm
2016-06-29 13:59:24 -04:00
Serithi
74f72c8e25 Adds in lavender. Doesn't need much nutrient or water (assuming i did the numbers right, feel free to fix them if i did a dumb), contains a small amount of bicard, and is purple. What more could one want from a flower? 2016-05-25 13:08:33 -07:00
Zuhayr
cbc506fd51 Removed xenomorphs. 2016-02-20 11:50:18 +10:30
Jon
706d720757 Fight me etc. 2016-01-24 00:35:23 +00:00
Datraen
6660b6f61c Tweaks plants to create a more diverse selection, different environment constants. 2015-11-05 18:43:05 -05:00
Zuhayr
f9134028b6 Fixes #9777 2015-06-10 23:14:34 +09:30
Zuhayr
48b063a96e Fixes #9620 2015-06-10 23:14:33 +09:30
Yoshax
e68f9cec70 Adjusts fruits and stuff to have more juice and stuff. 2015-04-22 15:05:38 +01:00
Zuhayr
bf8ad6d585 Rebalanced xenoflora sprites, fixed numerous issues. 2015-03-22 16:13:15 +10:30
Zuhayr
fb52e095d0 Fixes #8543 2015-03-20 12:37:55 +10:30
Zuhayr
033f758abd Fixes #8477 2015-03-17 20:04:07 +10:30
Zuhayr
145b4442e5 Fixes #8388 2015-03-17 19:49:18 +10:30
Zuhayr
227fda7b4c Fixes #8245 2015-02-28 16:59:37 +10:30
Zuhayr
d0451eaa2d Fixes #8249 2015-02-28 16:30:34 +10:30
Zuhayr
728cb3cffa Working on vines. 2015-02-18 23:37:27 +10:30
Zuhayr
15e666150e Readded pumpkin carving and poultice making. Added a description generator and cache. 2015-02-13 05:02:21 +10:30
Zuhayr
a9d55a17b8 Readded mob products. 2015-02-12 23:24:44 +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
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
c789f58b3c Converted seed genetics over to a macro-based list of traits 2015-02-04 10:47:24 +10:30
Zuhayr
d08861e25b Moved gas/light/pressure from hydro tray to seed datum 2015-02-04 10:46:10 +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
78e61d9ccd Tweaks to xenoflora, added plant icons and colours to all plants. 2015-02-04 10:42:39 +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