diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml index 3efc70c04b..18054fb29d 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml @@ -4,6 +4,8 @@ animationDuration: 1.3 spriteName: seeds startingInventory: + AloeSeeds: 10 + AmbrosiaVulgarisSeeds: 10 AppleSeeds: 10 BananaSeeds: 10 CarrotSeeds: 10 @@ -12,10 +14,12 @@ CornSeeds: 10 EggplantSeeds: 10 LemonSeeds: 10 + LingzhiSeeds: 10 + PoppySeeds: 10 PotatoSeeds: 10 SugarcaneSeeds: 10 TomatoSeeds: 10 TowercapSeeds: 10 WheatSeeds: 10 - AloeSeeds: 10 - PoppySeeds: 10 + + diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 0eb2975e88..eba58394e1 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -587,10 +587,10 @@ - type: SolutionContainerManager solutions: food: - maxVol: 12 ##I'm pretty sure this has to match the total of 100 potency yields + maxVol: 20 ##I'm pretty sure this has to match the total of 100 potency yields reagents: - - ReagentId: Nutriment - Quantity: 2 + - ReagentId: Aloe + Quantity: 10 - ReagentId: Kelotane Quantity: 10 - type: Sprite @@ -621,3 +621,51 @@ seed: poppy - type: Extractable grindableSolutionName: food + +- type: entity + name: lingzhi + parent: FoodProduceBase + id: FoodLingzhi + description: A potent medicinal mushroom. Don't go overboard. + components: + - type: SolutionContainerManager + solutions: + food: + maxVol: 40 + reagents: + - ReagentId: Ultravasculine + Quantity: 20 + - ReagentId: Epinephrine + Quantity: 20 + - type: Sprite + sprite: Objects/Specific/Hydroponics/lingzhi.rsi + - type: Produce + seed: lingzhi + - type: Extractable + grindableSolutionName: food + +- type: entity + name: ambrosia vulgaris + parent: FoodProduceBase + id: FoodAmbrosiaVulgaris + description: A medicinal plant. May make you feel a little funny. + components: + - type: SolutionContainerManager + solutions: + food: + maxVol: 24 + reagents: + - ReagentId: Bicaridine + Quantity: 10 + - ReagentId: Kelotane + Quantity: 10 + - ReagentId: Nutriment + Quantity: 2 + - ReagentId: Desoxyephedrine + Quantity: 2 + - type: Sprite + sprite: Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi + - type: Produce + seed: lingzhi + - type: Extractable + grindableSolutionName: food diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml index a74d82b86f..2c06cd4ede 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml @@ -225,3 +225,25 @@ seed: poppy - type: Sprite sprite: Objects/Specific/Hydroponics/poppy.rsi + +- type: entity + parent: SeedBase + name: packet of lingzhi seeds + description: "Also known as reishi." + id: LingzhiSeeds + components: + - type: Seed + seed: lingzhi + - type: Sprite + sprite: Objects/Specific/Hydroponics/lingzhi.rsi + +- type: entity + parent: SeedBase + name: packet of ambrosia vulgaris seeds + description: "A medicinal plant for the common folk." + id: AmbrosiaVulgarisSeeds + components: + - type: Seed + seed: ambrosiaVulgaris + - type: Sprite + sprite: Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml index 894f9053a8..ab1f969fa4 100644 --- a/Resources/Prototypes/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Hydroponics/seeds.yml @@ -489,6 +489,7 @@ Nutriment: Min: 1 Max: 2 + Potencydivisor: 50 Bicaridine: Min: 1 Max: 10 @@ -509,11 +510,70 @@ potency: 10 growthStages: 5 waterConsumption: 6 + chemicals: + Aloe: + Min: 1 + Max: 10 + PotencyDivisor: 10 + Dermaline: + Min: 1 + Max: 10 + PotencyDivisor: 10 + +- type: seed + id: lingzhi + name: lingzhi + seedName: lingzhi + displayName: lingzhi + plantRsi: Objects/Specific/Hydroponics/lingzhi.rsi + productPrototypes: + - FoodLingzhi + lifespan: 25 + maturation: 10 + production: 1 + yield: 5 + potency: 10 + growthStages: 3 + waterConsumption: 6 + chemicals: + Ultravasculine: + Min: 1 + Max: 20 + PotencyDivisor: 5 + Epinephrine: + Min: 1 + Max: 20 + PotencyDivisor: 5 + +- type: seed + id: ambrosiaVulgaris + name: ambrosia vulgaris + seedName: ambrosiaVulgaris + displayName: ambrosia vulgaris + plantRsi: Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi + productPrototypes: + - FoodAmbrosiaVulgaris + lifespan: 25 + maturation: 10 + production: 1 + yield: 5 + potency: 10 + growthStages: 6 + waterConsumption: 6 chemicals: Nutriment: Min: 1 Max: 2 + PotencyDivisor: 10 + Bicaridine: + Min: 1 + Max: 10 + PotencyDivisor: 10 Kelotane: Min: 1 Max: 10 PotencyDivisor: 10 + Desoxyephedrine: #Needs a small touch of spice, replace this with something better when we have more fun drugs + Min: 1 + Max: 2 + PotencyDivisor: 50 diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml index aa216680b6..fb9d8e1497 100644 --- a/Resources/Prototypes/Reagents/medicine.yml +++ b/Resources/Prototypes/Reagents/medicine.yml @@ -521,7 +521,7 @@ - type: reagent id: Ultravasculine - name: Ultravasculine + name: ultravasculine group: Medicine desc: Rapidly flushes toxins from the body, but places some stress on the veins. Do not overdose. physicalDesc: thick and grainy diff --git a/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi/dead.png new file mode 100644 index 0000000000..bf926e4e3b Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi/dead.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi/harvest.png new file mode 100644 index 0000000000..47a35c2aea Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi/harvest.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi/meta.json new file mode 100644 index 0000000000..9345881060 --- /dev/null +++ b/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "stage-4" + }, + { + "name": "stage-5" + }, + { + "name": "stage-6" + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi/produce.png new file mode 100644 index 0000000000..834f53a643 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi/produce.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi/seed.png new file mode 100644 index 0000000000..baa8df7297 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi/seed.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi/stage-1.png new file mode 100644 index 0000000000..95241378d0 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi/stage-1.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi/stage-2.png new file mode 100644 index 0000000000..ee4342c562 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi/stage-2.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi/stage-3.png new file mode 100644 index 0000000000..3c0be64c25 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi/stage-3.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi/stage-4.png b/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi/stage-4.png new file mode 100644 index 0000000000..f6cdebe936 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi/stage-4.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi/stage-5.png b/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi/stage-5.png new file mode 100644 index 0000000000..bc2590fde3 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi/stage-5.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi/stage-6.png b/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi/stage-6.png new file mode 100644 index 0000000000..75f7eb22c2 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi/stage-6.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lingzhi.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/lingzhi.rsi/dead.png new file mode 100644 index 0000000000..b7cc263e85 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/lingzhi.rsi/dead.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lingzhi.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/lingzhi.rsi/harvest.png new file mode 100644 index 0000000000..a3749e110d Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/lingzhi.rsi/harvest.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lingzhi.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/lingzhi.rsi/meta.json new file mode 100644 index 0000000000..8b6952d030 --- /dev/null +++ b/Resources/Textures/Objects/Specific/Hydroponics/lingzhi.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lingzhi.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/lingzhi.rsi/produce.png new file mode 100644 index 0000000000..2ca5041fac Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/lingzhi.rsi/produce.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lingzhi.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/lingzhi.rsi/seed.png new file mode 100644 index 0000000000..488cbe2d78 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/lingzhi.rsi/seed.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lingzhi.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/lingzhi.rsi/stage-1.png new file mode 100644 index 0000000000..f561043d4c Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/lingzhi.rsi/stage-1.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lingzhi.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/lingzhi.rsi/stage-2.png new file mode 100644 index 0000000000..236f6562d4 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/lingzhi.rsi/stage-2.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lingzhi.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/lingzhi.rsi/stage-3.png new file mode 100644 index 0000000000..bd84727d48 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/lingzhi.rsi/stage-3.png differ