Commit Graph

40 Commits

Author SHA1 Message Date
potato1234_x
33153aaa2e Spaceman's Trumpet and Lily (#25090)
* trumpet + lily +polypy

* trumbet
2024-02-20 23:49:39 -07:00
MjrLandWhale
114f2aa543 Resprite & hand position correction of Nettle & Death Nettle (#25421)
Resprite of Nettle & Death Nettle. Corrected R & L hand locations for all orientations of both plants.
2024-02-20 18:58:08 -05:00
potato1234_x
667cebef52 Laughin' Peas (#25089)
* laughter

* make clownmobs bleed laughter

* laughin syrup and laughter recipe

* add laughin peas
2024-02-10 00:21:44 -08:00
Alekshhh
937df9fe3b Seed Bag Resprite (#23210)
* seed

* meta

* tweak
2023-12-30 16:35:45 -07:00
lzk
e6b52cc294 Fix nettle seeds inhand sprite (#22891)
fix
2023-12-23 22:25:50 -07:00
DoubleRiceEddiedd
33fb768791 New mutation species plant, Lemoon Tree (#22023)
* Adding Lemoon as lemon's mutation

* Adding lemoon cake

* remove tag that forget to delete
2023-11-30 16:44:23 -05:00
Feluk6174
0da68ddc6c Added Bananadine (#21759)
* added bananadine and its functionallity (and backed banana peel)

* added baked banana peals sprites

* fixed typos and changed the sprite used by backed banan peel to the right one

* Changed the cooktime and now grinded baked banana leaves have carbon

* Updated bananadine description

* Ficed typo in ragent-desc-bananadine

* Reverted actidental change to nocturine
2023-11-21 20:08:53 -05:00
DoubleRiceEddiedd
2ef29fb222 New crop: Cotton (#21536)
* Add cotton plant

* Adddescription and tag to cotton bal allow moth eat it

* Fix typo. Add cotton seed into MegaSeed

* Fix typo

* Fix typo

* Fix cottonbol component typo

* Fix the amount of cotton that bol gives

* Adding correct component to make cotton bol edible

* Change cotton bol parent to see if it is edible

* Adding flavor to cotton bol, and fix typo

* Replace image

* fixing plant image position

* Increase the Megaseed restock crate price to avoid money farming loop hole
2023-11-08 18:54:07 -07:00
ZeroDayDaemon
a302775ac0 Pea Plants (#20504)
* Add Pea Plants

* Pea soup

* Update flavor-profiles.ftl

* Update seeds.yml

* Add seeds to vendors

* Make things more expensive to fix free money exploit

* Update textures

* Revert "Update textures"

This reverts commit b1b7046504afc7468742b0722f601d98684a1c89.

Vines dont grow straight into the air.

* Shift up 4 pixels

* Fuck autofix conflitcs

* Shift up 3 more pizels

* I finally got byond working so I made sure they were EXACTLY the same

* Address Reviews? I think?

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2023-10-31 00:09:13 -04:00
Doru991
e1440cb493 Pumpkins, jack o' lanterns and pumpkin hat resprite (#21176)
* Pumpkin textures

* Pumpkin prototypes

* Jack o lantern prototypes and pumpkin cake

* Finishing touches

* Arbitrageloose

* Restore old pumpkin helmet sprites (God I hope it works)
2023-10-30 23:12:23 -04:00
Doru991
fcfe75a308 New crops: Berries and Bungo (#19800)
* Add berries

* Berry recipes

* Add bungo fruit

* yml tweaks

* yummy poisonous pits

* Technically it's a seed

* Revert "Technically it's a seed"

This reverts commit be892cf119c1e733ac2922b878aaa476f435152a.

Slapping the seed component onto it led to unforeseen consequences, and I don't want to mess with the seed system for a mostly useless gimmick.

* Revert 2 Electric Boogaloo

This reverts commit 2c4fb34250e9369085d49e730de3dab0e077b687.

* Small rewording

* Cocoa balancing

* Oops
2023-09-18 23:29:27 -04:00
Doru991
3f51795cc7 Add plant species mutations (#19960) 2023-09-13 20:56:24 -08:00
Nemanja
595d42659d Revert "Add peeled state for bananas (#19393)" (#19588)
Using "spawn item on use" blatantly breaks botany mutations for bananas.
2023-08-28 10:30:16 -08:00
potato1234_x
77711dea5d Add peeled state for bananas (#19393)
Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
2023-08-26 09:31:13 -07:00
Vladislav Kadira
229df7c5ec Add cocoa cultivation (#18366)
* Add cocoa cultivation

* fix

* Fix 2

* fix 3

Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>

---------

Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2023-08-13 10:35:58 -04:00
Slava0135
7f76dd11b3 more visible explosive banana peel (#18105)
* more visible explosive banana peel

* i am idiot
2023-07-17 13:35:58 -06:00
lzk228
7181a095ad [Sprite] inhand sprites for bags (#16005) 2023-05-02 18:24:37 +10:00
lapatison
ccbf8b5748 Watermelon and grapes (#14587) 2023-03-25 08:15:21 -04:00
Slava0135
620c40e087 Add explosive banana peel 2 (#14491) 2023-03-23 11:54:14 -04:00
lapatison
5c43253d67 Lime and orange plants, citrus salad recipe (#14298) 2023-03-06 14:45:39 -04:00
lapatison
71393c5d19 Soybean and rice plants, tofu, tofu bread recipe (#13989) 2023-03-05 22:52:03 -04:00
Fluffiest Floofers
ddfb813693 Garlic and vinaigrette (#14221) 2023-03-05 21:50:08 -04:00
Fluffiest Floofers
adf9ccbe8a Cabbage, Red Onion and related salads. (#14161)
* Cabbage

That's it, just cabbage.

* Up RestockSeed Cargo price.

2000 -> 2100

* Coleslawn, Caesar and Kimchi.

Requires red onions so I also added it to the list.

* Update Resources/Prototypes/Recipes/Cooking/meal_recipes.yml

Fix kimchi's incorrect name.

Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com>

---------

Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com>
2023-02-18 17:52:58 -06:00
Rane
4d595a665b Plant Bags (#6685) 2022-02-13 15:36:01 -07:00
Rane
7bea452f7e Added Gatfruit (#6569) 2022-02-08 17:47:06 -07:00
Rane
5a1e4807cf Added Fly Amanita and Galaxythistle (#6538) 2022-02-08 14:54:28 -07:00
Rane
aeb1df98b9 Added Lingzhi and Ambrosia Vulgaris (#6464) 2022-02-07 12:43:21 -07:00
Rane
be867fc3a0 Added Poppies and Aloe (#6456) 2022-02-04 16:17:05 -07:00
Michael Phillips
b36c9395d6 Additional Hydroponics vegetables - Chili + Recipes (#5966) 2022-01-05 00:51:22 +11:00
Elijahrane
2f130e5586 Nettles (#5641) 2021-12-04 11:55:04 -07:00
Ygg01
14b401f9b3 Puddle refactor 2: Spillastic boogaloo (#4784)
* Refactor PuddleComponent

* Move puddle effects into separate RSIs

Basically egg/tomato/powder puddle will be moved into separate
/Textures/Fluids RSIs

* Fix YAML for puddles

* Fix issues sloth pointed out.

* Ensure Puddle Component are properly added when spawned

* Remove unnecessary method init puddle with starting maxVolume

* Addressed ElectroSr comments

* Add Resolves

* Try fix error in ensureSolution

* Puddle unanchoring

* Address some issues with puddles

* Fix continue -> return
2021-10-27 19:24:18 +11:00
Swept
9d22869e58 Adds a ton more inhands (#4488)
* Removed useless loc and added inhands for some lamps

* Adds a ton of inhands to the game

* Actually adds the pill inhand

* Update Resources/Textures/Objects/Misc/utensils.rsi/meta.json

Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>

* Update Resources/Textures/Objects/Tools/rcd.rsi/meta.json

Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>

Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
2021-08-20 05:36:32 +00:00
Swept
74d044a4a9 Adds more splat and tweaks PuddleComponent.cs (#3942)
Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
2021-05-21 00:19:18 +00:00
Swept
55a04bfc30 Cleaned up all produce meta.jsons (#3943) 2021-05-08 09:09:35 +00:00
Swept
6376e60b78 Massive Food PR (#3436)
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2021-05-03 13:17:22 +02:00
Elijahrane
590453a57f Removed most redundant delays in meta.json (#3549) 2021-03-07 20:26:25 +01:00
Swept
4a67fc1d22 Fleshes out smoking content (#3295)
* RSIs sorted out

* Bookmark

* Updated packet RSIs for Stacks

* Cigs Packs done

* Cigarette Cartons

* fucking MANUALLY fixed the cigarette inhands, fuck you tgstation

* Pipes work

* Cigars/Cases

* Updates vending machine inventory

* tweaks count

* Adds a cigarette crate

* Fixes RSIs, working on rolling paper

* Adds Tobacco and Cannabis plants

* Cigarettes and Rollies are now craftable

* There

* Fixed crafting recipes

* Reset RobustToolbox

* Netsync'd

* Ready

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2021-02-22 15:08:17 +11:00
Swept
0d21192712 Replaces banana and peel sprites. (#2994)
* Initial

* Ignore first commit

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2021-01-14 14:16:32 +11:00
Swept
a57db85208 Swept commits JSON genocide. (#2991)
* Clothing Folder Complete

* All Textures 1st Pass

* All Textures 2nd Pass

* All Textures 3rd Pass PLUS Manual Tweaking

* 5th Pass MORE MANUAL

* Fixes flares

* 4th Pass (I skipped over)

* The 6th Pass (Finality) - With Manual Fixes
2021-01-13 23:04:38 +11:00
Víctor Aguilera Puerto
484eb0bba4 Botany (#2357)
* plants and seeds go brrrr

* update plants

* P L A N T

* brrrr

* Hydroponics actually work! How about that?

* Reuse resource path in visualizer

* They lied to us.

* Several stuffs

* more werk

* Add a bunch of plants

* Logs go brr.

* Brrr moment.

* Remove unused method

* Important comment.

* Seed inventory, yo!

* tomato moment

* Balance consumption

* Makes hydroponics pourable

* Adds plant metabolism effect for sugar, the same as glucose.

* Eggplant moment

* Apple moment

* Corn moment

* Chanterelle mushroom moment

* prototype tweaks

* Seed extractor moment

* typo

* IPlantMetabolizable doc improvement

* I should trust my gut instinct more often.

* egg-plant.....

* localization

* Make WaterLevel and NutritionLevel setters private

* Less code repetition! Wooo!
2020-10-26 23:19:46 +01:00