Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[UPSTREAM] Hydroponics Overhaul (#1181) #300

Merged
merged 1 commit into from
Jan 29, 2025

Conversation

MisterGrimm
Copy link
Collaborator

  • minor cleanup

  • progress

  • progress

  • progress

  • cherries and chilli

  • citrus

  • corn

  • abstract plant datum handling

  • Flowers

  • another batch

  • MORE

  • whoops

  • cleanup

  • untick

  • finish more

  • gorwn item code

  • cabbage/replicapod

  • fixes and hedges

  • plant gene pt1

  • trait -> product_trait

  • plant gene pt2

  • proggers

  • proggers 2

  • random shit

  • grass

  • work

  • grind/juice refactor sidequest

  • whoops

  • almost

  • Lily and Spacemans Trumpet

  • potency scalar

  • horrrryyy fuck it compiles

  • updatepaths

  • unused var

  • fixes

  • more fixes

  • rename vars

  • var renames

  • i dont even know what to title this

  • unit test fixes

  • small tweaks

  • fixes / temp stuff

  • fixes

  • harddel fix

  • plant icon fixes

  • fuck

  • fixes

  • fix

  • fix

  • qdel gene holder

  • fuck you

  • fix mutations

  • ambrosia/vulgaris -> ambrosia

  • restore novaflower properties

  • maybe fix this runtime

  • reagent genes are unsplicable

  • i change my mind

  • fix seed extractor, jsx -> tsx

  • fix not passing plant_datum

  • fix test

  • FRICK

  • FRICK. AGAIN.

  • AM I DUMB?

  • fix + improve test accuracy

  • i need t osleep

  • fix these

  • fix all icons hopefuly

  • unit test name fix

  • tweak seed extractor ui

  • flex conv

  • good enough for now

  • unused gene flags

  • add some goon genes

  • tincture base

  • bananrries

  • probably need this

  • analyzer

  • should be unit tested but i need a break

  • fix seeds

  • parsnip fix

  • infusion UI

  • remove unneeded folder

  • delete

  • delete

  • move

  • remove seed_damage todo

  • delta time growth

  • a TON of new toys

  • fixes

  • seedextractor is now sortable

  • fix unit test

  • fuck me im dumb

  • cleanup

  • FUCK

  • remove a couple todos

  • infusion tweaks

  • codex stuffs

  • remove the cultivator and references to weeds

  • impl honey

  • somatoray

  • stub quality for now

  • spit out seed

  • rename + pass linters

  • fixes

  • fixes, impl reagent potency

  • mushroom stats

  • codex fixes/additions

  • fix juicing

  • fix killer tomatos

  • tinctures

  • hook up infusion

  • FUCK


Co-authored-by: Francinum [email protected]

* minor cleanup

* progress

* progress

* progress

* cherries and chilli

* citrus

* corn

* abstract plant datum handling

* Flowers

* another batch

* MORE

* whoops

* cleanup

* untick

* finish more

* gorwn item code

* cabbage/replicapod

* fixes and hedges

* plant gene pt1

* trait -> product_trait

* plant gene pt2

* proggers

* proggers 2

* random shit

* grass

* work

* grind/juice refactor sidequest

* whoops

* almost

* Lily and Spacemans Trumpet

* potency scalar

* horrrryyy fuck it compiles

* updatepaths

* unused var

* fixes

* more fixes

* rename vars

* var renames

* i dont even know what to title this

* unit test fixes

* small tweaks

* fixes / temp stuff

* fixes

* harddel fix

* plant icon fixes

* fuck

* fixes

* fix

* fix

* qdel gene holder

* fuck you

* fix mutations

* ambrosia/vulgaris -> ambrosia

* restore novaflower properties

* maybe fix this runtime

* reagent genes are unsplicable

* i change my mind

* fix seed extractor, jsx -> tsx

* fix not passing plant_datum

* fix test

* FRICK

* FRICK. AGAIN.

* AM I DUMB?

* fix + improve test accuracy

* i need t osleep

* fix these

* fix all icons hopefuly

* unit test name fix

* tweak seed extractor ui

* flex conv

* good enough for now

* unused gene flags

* add some goon genes

* tincture base

* bananrries

* probably need this

* analyzer

* should be unit tested but i need a break

* fix seeds

* parsnip fix

* infusion UI

* remove unneeded folder

* delete

* delete

* move

* remove seed_damage todo

* delta time growth

* a TON of new toys

* fixes

* seedextractor is now sortable

* fix unit test

* fuck me im dumb

* cleanup

* FUCK

* remove a couple todos

* infusion tweaks

* codex stuffs

* remove the cultivator and references to weeds

* impl honey

* somatoray

* stub quality for now

* spit out seed

* rename + pass linters

* fixes

* fixes, impl reagent potency

* mushroom stats

* codex fixes/additions

* fix juicing

* fix killer tomatos

* tinctures

* hook up infusion

* FUCK

---------

Co-authored-by: Francinum <[email protected]>
@MisterGrimm MisterGrimm merged commit e83dbc5 into DS-13-Dev-Team:master Jan 29, 2025
6 of 14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants