Апстрим некоторого из ботаники (#415)

* Rainbow Weed (#25759)

* rainbow weed

* Lipolicide

* psicodine + mannitol

* happiness

* ground + dried + smokables

* damn you notepad++

* fix

WHY NOT TELL ME ALL THE PROBLEMS AT THE SAME TIME!!!

* work

* work i beg you

* recipe good

* possibly fix merge conflict

* remove reagents

* Psicodine, Mannitol, Lipolicide and Happiness (#27134)

* reagents

* Update Resources/Locale/en-US/reagents/meta/narcotics.ftl

---------

Co-authored-by: Kara <lunarautomaton6@gmail.com>

* fix cannabis

* Killer tomatoes (#26053)

* make tomatoes

* many friends! many mommies

* finish

* renaming system

* fix

* Update miscellaneous.yml

* Update Content.Server/NPC/Systems/NPCImpritingBehaviourSystem.cs

Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>

* N

* deleete exception?

* merge conflict fix

* fix?

* fuck you

* sloth fixes

* fixess?

* fix

---------

Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>

* Small tomato killer tweak (#27265)

* Update miscellaneous.yml

* Update mobspawn.yml

* Update miscellaneous.yml

* Update miscellaneous.yml

* Spaceman's Trumpet and Lily (#25090)

* trumpet + lily +polypy

* trumbet

* Change plant clipping mechanics (#25326)

Make seeds from clipped plants inherit the decreased health from parents.
Also require one growth stage before clipping.

* fixes

* 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.

* Remake hairflowers (#25475)

* Add more lily usage (orange hairflower and flowercrown)

* comit 2

* ee

* more fixes

* w

* im stupid

* bring poppy in authodrobe

* weh

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* Revert "Remake hairflowers (#25475)"

This reverts commit 6b2a9b96b18a6c854c3aea149611d7dd496518c0.

* Make Holy Water more like Water (#27068)

holy water can now be used to satiate thirst, water plants, and extinguish fires.

* New plant mutation: Pyrotton (#27200)

* WIP

* sprites n stuff

* flavour

* maybe fix

* add stack

* fix parent

* Rewords plant/effect descriptions for clarity (#28156) (#28169)

* Rewords plant/effect descriptions for clarity (#28156)

* Forgot Robust Harvest.

* Update Resources/Locale/en-US/guidebook/chemistry/effects.ftl

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

---------

Co-authored-by: potato1234_x <79580518+potato1234x@users.noreply.github.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: Flesh <62557990+PolterTzi@users.noreply.github.com>
Co-authored-by: MjrLandWhale <brandonemitch@gmail.com>
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Ghagliiarghii <68826635+Ghagliiarghii@users.noreply.github.com>
Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com>
Co-authored-by: alex-georgeff <54858069+taurie@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
This commit is contained in:
ThereDrD0
2024-07-02 23:23:12 +03:00
committed by GitHub
parent d63d3521ee
commit d8ffea1ee8
72 changed files with 1335 additions and 16 deletions

View File

@@ -41,6 +41,8 @@ seeds-bluetomato-name = blue tomato
seeds-bluetomato-display-name = blue tomato plant
seeds-bloodtomato-name = blood tomato
seeds-bloodtomato-display-name = blood tomato plant
seeds-killertomato-name = tomato killer
seeds-killertomato-display-name = tomato killer plant
seeds-eggplant-name = eggplant
seeds-eggplant-display-name = eggplants
seeds-apple-name = apple
@@ -57,6 +59,8 @@ seeds-eggy-name = egg-plant
seeds-eggy-display-name = egg-plants
seeds-cannabis-name = cannabis
seeds-cannabis-display-name = cannabis
seeds-rainbow-cannabis-name = rainbow cannabis
seeds-rainbow-cannabis-display-name = rainbow cannabis
seeds-tobacco-name = tobacco
seeds-tobacco-display-name = tobacco plant
seeds-nettle-name = nettle
@@ -64,7 +68,7 @@ seeds-nettle-display-name = nettles
seeds-deathnettle-name = death nettle
seeds-deathnettle-display-name = death nettles
seeds-chili-name = chili
seeds-chili-display-name = chilis
seeds-chili-display-name = chili peppers
seeds-chilly-name = chilly
seeds-chilly-display-name = chilly peppers
seeds-poppy-name = poppy
@@ -113,3 +117,5 @@ seeds-cotton-name = cotton
seeds-cotton-display-name = cotton plant
seeds-gome-name = gnome
seeds-gnome-display-name = gnome plant
seeds-pyrotton-name = pyrotton
seeds-pyrotton-display-name = pyrotton plant