Razgriz
3dabdca3f3
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull2-2
2020-05-21 03:20:13 -07:00
Mechoid
7066d04df5
Explorer Expansion: New Horizons
2020-05-01 14:20:29 -04:00
Erik
eb9c3cd387
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into UpstreamMergeApril2020
2020-04-11 16:53:35 -07:00
Schnayy
7bee18a2d7
Let them finally eat cake
2020-03-03 15:57:10 -05:00
Shadowfire
8cf7d72641
Plant port
...
Ported Sapbeans and Hardlight seeds (not the mobs) Dragonshark has made
Ported Tea plant, matcha recipes and tea recipes still not finished
Ported Meatwheat, Milkdew, Sweet breeze, Solarflower and Voltato
Ported self falling poisonous apple
Wont port mutation system changes, already chances in new code for random reagents, decided to wait with decision making plants randomly produce reagents or not, might have specific plants and/or random ones do it.
2020-02-24 17:47:35 +01:00
Atermonera
66b7793d25
Merge pull request #6661 from LeighKnapenberger/patch-1
...
Fixes killer tomato mutation
2020-02-01 18:08:47 -05:00
Razgriz
de24521619
First merge from upstream
2020-01-13 17:23:01 -07:00
Razgriz
2b38acc2c6
Add files via upload
2020-01-11 03:50:46 -07:00
Sharkmare
f568be89d9
The cake, Serg event. ( #120 )
...
Adds items for an event, Made by Shadowfire117 and Ketrai
2020-01-11 00:20:57 +01:00
Novacat
09e10e2901
Merge pull request #6406 from VOREStation/upstream-merge-6592
...
[MIRROR] Xenoflora expansion take2
2020-01-08 17:18:49 -05:00
Ketrai
85667c2a9b
adds gnomes. ( #6595 )
...
* adds gnomes
* Makes the house nice and bright.
* copypasta error
* Odd
* makes gnomes adminspawn only.
Co-authored-by: KitKetKetrai <49008286+KitKetKetrai@users.noreply.github.com >
2020-01-08 13:47:41 -05:00
Mechoid
ec5e851399
Xenoflora expansion take2
2020-01-08 13:46:25 -05:00
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
