Апстрим некоторого из ботаники (#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

@@ -169,6 +169,9 @@ flavor-complex-light = like a light gone out
flavor-complex-profits = like profits
flavor-complex-fishops = like the dreaded fishops
flavor-complex-violets = like violets
flavor-complex-pyrotton = like a burning mouth
flavor-complex-mothballs = like mothballs
flavor-complex-paint-thinner = like paint thinner
# Drink-specific flavors.

View File

@@ -7,6 +7,15 @@
}
}
reagent-effect-condition-guidebook-total-hunger =
{ $max ->
[2147483648] the target has at least {NATURALFIXED($min, 2)} total hunger
*[other] { $min ->
[0] the target has at most {NATURALFIXED($max, 2)} total hunger
*[other] the target has between {NATURALFIXED($min, 2)} and {NATURALFIXED($max, 2)} total hunger
}
}
reagent-effect-condition-guidebook-reagent-threshold =
{ $max ->
[2147483648] there's at least {NATURALFIXED($min, 2)}u of {$reagent}

View File

@@ -344,3 +344,33 @@ reagent-effect-guidebook-missing =
[1] Causes
*[other] cause
} an unknown effect as nobody has written this effect yet
reagent-effect-guidebook-plant-attribute =
{ $chance ->
[1] Adjusts
*[other] adjust
} {$attribute} by [color={$colorName}]{$amount}[/color]
reagent-effect-guidebook-plant-cryoxadone =
{ $chance ->
[1] Ages back
*[other] age back
} the plant, depending on the plant's age and time to grow
reagent-effect-guidebook-plant-phalanximine =
{ $chance ->
[1] Restores
*[other] restore
} viability to a plant rendered nonviable by a mutation
reagent-effect-guidebook-plant-diethylamine =
{ $chance ->
[1] Increases
*[other] increase
} the plant's lifespan and/or base health with 10% chance for each.
reagent-effect-guidebook-plant-robust-harvest =
{ $chance ->
[1] Increases
*[other] increase
} the plant's potency by {$increase} up to a maximum of {$limit}. Causes the plant to lose its seeds once the potency reaches {$seedlesstreshold}. Trying to add potency over {$limit} may cause decrease in yield at a 10% chance.

View File

@@ -0,0 +1 @@
mannitol-effect-enlightened = You feel ENLIGHTENED!

View File

@@ -11,7 +11,7 @@ reagent-name-plant-b-gone = plant-B-gone
reagent-desc-plant-b-gone = A harmful toxic mixture to kill plantlife. Very effective against kudzu.
reagent-name-robust-harvest = robust harvest
reagent-desc-robust-harvest = A highly effective fertilizer, with a limited potency-boosting effect on plants. Be careful with it's usage since using too much has a chance to reduce the plant yield. It has a positive effect on dionas.
reagent-desc-robust-harvest = A highly effective fertilizer with a limited potency-boosting effect on plants. Use it cautiously, as excessive application can reduce plant yield. It has a particularly beneficial effect on dionas.
reagent-name-weed-killer = weed killer
reagent-desc-weed-killer = A mixture that targets weeds. Very effective against kudzu. While useful it slowly poisons plants with toxins, be careful when using it.

View File

@@ -22,7 +22,7 @@ reagent-desc-razorium = A strange, non-newtonian chemical. It is produced when t
reagent-name-fresium = Fresium
reagent-desc-fresium = A mysterious compound that slows the vibration of atoms and molecules... somehow. In layman's terms, it makes things cold... REALLY cold. Can cause long-lasting movement issues if ingested.
reagent-name-laughter = Laughter
reagent-name-laughter = laughter
reagent-desc-laughter = Some say that this is the best medicine, but recent studies have proven that to be untrue.
reagent-name-weh = juice that makes you Weh

View File

@@ -142,3 +142,9 @@ reagent-desc-silversulfadiazine = This compound with antibacterial properties is
reagent-name-stypticpowder = styptic powder
reagent-desc-stypticpowder = Aluminum sulfate styptic powder aids in managing bleeding and promoting the healing of bodily injuries.
reagent-name-mannitol = mannitol
reagent-desc-mannitol = Efficiently restores brain damage.
reagent-name-psicodine = psicodine
reagent-desc-psicodine = Suppresses anxiety and other various forms of mental distress. Overdose causes hallucinations and minor toxin damage.

View File

@@ -39,3 +39,6 @@ reagent-desc-norepinephric-acid = A smooth chemical that blocks the optical rece
reagent-name-tear-gas = tear gas
reagent-desc-tear-gas = A chemical that causes severe irritation and crying, commonly used in riot control.
reagent-name-happiness = happiness
reagent-desc-happiness = Fills you with ecstatic numbness and causes minor brain damage. Highly addictive. If overdosed causes sudden mood swings.

View File

@@ -75,3 +75,6 @@ reagent-desc-vestine = Has an adverse reaction within the body causing major jit
reagent-name-tazinide = tazinide
reagent-desc-tazinide = A highly dangerous metallic mixture which can interfere with most movement through an electrifying current.
reagent-name-lipolicide = lipolicide
reagent-desc-lipolicide = A powerful toxin that will destroy fat cells, massively reducing body weight in a short time. Deadly to those without nutriment in their body.

View File

@@ -0,0 +1,3 @@
psicodine-effect-fearless = You feel totally fearless!
psicodine-effect-anxieties-wash-away = All of your anxieties wash away!
psicodine-effect-at-peace = You feel completely at peace.

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