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

@@ -4,6 +4,7 @@
icon: { sprite: /Textures/Objects/Misc/monkeycube.rsi, state: cube }
spawn: MaterialBiomass1
maxCount: 100
itemSize: 1
- type: stack
id: WoodPlank
@@ -11,6 +12,7 @@
icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: wood }
spawn: MaterialWoodPlank1
maxCount: 30
itemSize: 1
- type: stack
id: Cardboard
@@ -18,6 +20,7 @@
icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: cardboard }
spawn: MaterialCardboard1
maxCount: 30
itemSize: 1
- type: stack
id: Cloth
@@ -25,6 +28,7 @@
icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: cloth }
spawn: MaterialCloth1
maxCount: 30
itemSize: 1
- type: stack
id: Durathread
@@ -32,6 +36,7 @@
icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: durathread }
spawn: MaterialDurathread1
maxCount: 30
itemSize: 1
- type: stack
id: Diamond
@@ -39,6 +44,7 @@
icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: diamond }
spawn: MaterialDiamond1
maxCount: 30
itemSize: 2
- type: stack
id: Cotton
@@ -46,6 +52,7 @@
icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: cotton }
spawn: MaterialCotton1
maxCount: 30
itemSize: 1
- type: stack
id: Pyrotton
@@ -60,6 +67,7 @@
icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: bananium }
spawn: MaterialBananium1
maxCount: 10
itemSize: 2
- type: stack
id: MeatSheets
@@ -67,6 +75,7 @@
icon: { sprite: /Textures/Objects/Materials/Sheets/meaterial.rsi, state: meat }
spawn: MaterialSheetMeat1
maxCount: 30
itemSize: 1
- type: stack
id: WebSilk
@@ -74,6 +83,7 @@
icon: { sprite: /Textures/Objects/Materials/silk.rsi, state: icon }
spawn: MaterialWebSilk1
maxCount: 50
itemSize: 1
- type: stack
id: Bones
@@ -81,6 +91,7 @@
icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: bones}
spawn: MaterialBones1
maxCount: 30
itemSize: 1
- type: stack
id: RunicMetalSheets
@@ -95,3 +106,4 @@
icon: { sprite: /Textures/Objects/Misc/reagent_fillings.rsi, state: powderpile }
spawn: MaterialGunpowder
maxCount: 60
itemSize: 1

View File

@@ -51,6 +51,7 @@
icon: { sprite: /Textures/Objects/Specific/Hydroponics/rainbow_cannabis.rsi, state: powderpile_rainbow }
spawn: GroundCannabisRainbow
maxCount:
itemSize: 1
- type: stack
id: LeavesTobaccoDried
@@ -71,3 +72,5 @@
name: dried rainbow cannabis leaves
icon: { sprite: /Textures/Objects/Specific/Hydroponics/rainbow_cannabis.rsi, state: dried }
spawn: LeavesCannabisRainbowDried
maxCount: 5
itemSize: 5