diff --git a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml index 6c93859f04..617a6148dc 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml @@ -18,6 +18,8 @@ amount: 2 - id: NettleSeeds amount: 2 + - id: FlyAmanitaSeeds + amount: 2 # - id: RainbowBunchSeeds # amount: 2 # - id: StrangeSeeds diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml index 18054fb29d..f3f8f9a0e5 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml @@ -13,6 +13,7 @@ ChiliSeeds: 10 CornSeeds: 10 EggplantSeeds: 10 + GalaxythistleSeeds: 10 LemonSeeds: 10 LingzhiSeeds: 10 PoppySeeds: 10 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index eba58394e1..ba6c2f4e3c 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -666,6 +666,52 @@ - type: Sprite sprite: Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi - type: Produce - seed: lingzhi + seed: ambrosiaVulgaris + - type: Extractable + grindableSolutionName: food + - type: Clothing + sprite: Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi + Slots: + - HEAD + +- type: entity + name: galaxythistle + parent: FoodProduceBase + id: FoodGalaxythistle + description: A medicinal plant used for its antitoxin. + components: + - type: SolutionContainerManager + solutions: + food: + maxVol: 25 + reagents: + - ReagentId: Stellibinin + Quantity: 25 + - type: Sprite + sprite: Objects/Specific/Hydroponics/galaxythistle.rsi + - type: Produce + seed: galaxythistle + - type: Extractable + grindableSolutionName: food + +- type: entity + name: fly amanita + parent: FoodProduceBase + id: FoodFlyAmanita + description: A delicious-looking mushroom like you see in those cartoons. + components: + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: Amatoxin + Quantity: 25 + - ReagentId: Nutriment + Quantity: 5 + - type: Sprite + sprite: Objects/Specific/Hydroponics/fly_amanita.rsi + - type: Produce + seed: flyAmanita - 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 2c06cd4ede..43538038cd 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml @@ -247,3 +247,25 @@ seed: ambrosiaVulgaris - type: Sprite sprite: Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi + +- type: entity + parent: SeedBase + name: packet of galaxythistle seeds + description: "Brushes of starry nights." + id: GalaxythistleSeeds + components: + - type: Seed + seed: galaxythistle + - type: Sprite + sprite: Objects/Specific/Hydroponics/galaxythistle.rsi + +- type: entity + parent: SeedBase + name: packet of fly amanita seeds + description: "The iconic, extremely deadly mushroom to be used for purely ornamental purposes." + id: FlyAmanitaSeeds + components: + - type: Seed + seed: flyAmanita + - type: Sprite + sprite: Objects/Specific/Hydroponics/fly_amanita.rsi diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml index ab1f969fa4..c4a5dd6645 100644 --- a/Resources/Prototypes/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Hydroponics/seeds.yml @@ -577,3 +577,49 @@ Min: 1 Max: 2 PotencyDivisor: 50 + +- type: seed + id: galaxythistle + name: galaxythistle + seedName: galaxythistle + displayName: galaxythistle + plantRsi: Objects/Specific/Hydroponics/galaxythistle.rsi + productPrototypes: + - FoodGalaxythistle + lifespan: 25 + maturation: 10 + production: 1 + yield: 5 + potency: 10 + growthStages: 3 + waterConsumption: 6 + chemicals: + Stellibinin: + Min: 1 + Max: 25 + PotencyDivisor: 4 + +- type: seed + id: flyAmanita + name: fly amanita + seedname: flyAmanita + displayName: fly amanita + plantRsi: Objects/Specific/Hydroponics/fly_amanita.rsi + productPrototypes: + - FoodFlyAmanita + lifespan: 25 + maturation: 10 + production: 1 + yield: 5 + potency: 10 + growthStages: 2 + waterConsumption: 6 + chemicals: + Amatoxin: + Min: 1 + Max: 25 + PotencyDivisor: 4 + Nutriment: ## yumby :) + Min: 1 + Max: 5 + PotencyDivisor: 20 diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml index fb9d8e1497..e228ca6f8c 100644 --- a/Resources/Prototypes/Reagents/medicine.yml +++ b/Resources/Prototypes/Reagents/medicine.yml @@ -560,3 +560,40 @@ min: 1 reagent: Ultravasculine amount: 0.5 + +- type: reagent + id: Stellibinin + name: stellibinin + group: Medicine + desc: A natual antitoxin with particular effectiveness against amatoxin. + physicalDesc: starry + color: "#2b2f77" + metabolisms: + Medicine: + effects: + - !type:HealthChange + damage: + types: + Poison: -1 + - !type:AdjustReagent + conditions: + - !type:ReagentThreshold + reagent: Amatoxin + min: 1 + reagent: Amatoxin + amount: -3 + +- type: reagent + id: Siderlac + name: siderlac + group: Medicine + desc: A powerful anti-caustic medicine derived from plants. + physicalDesc: milky + color: "#f4dab8" + metabolisms: + Medicine: + effects: + - !type:HealthChange + damage: + groups: + Caustic: -5 diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml index 5f517a79a5..ef3a3fe7c9 100644 --- a/Resources/Prototypes/Reagents/toxins.yml +++ b/Resources/Prototypes/Reagents/toxins.yml @@ -295,3 +295,18 @@ damage: types: Poison: 4 + +- type: reagent + id: Amatoxin + name: amatoxin + group: Toxins + desc: A potent toxin found in some mushrooms. + physicalDesc: nondescript + color: "#D6CE7B" + metabolisms: + Poison: + effects: + - !type:HealthChange + damage: + types: + Poison: 6 diff --git a/Resources/Prototypes/Recipes/Reactions/medicine.yml b/Resources/Prototypes/Recipes/Reactions/medicine.yml index 9c00c7b5be..0ab9f3582a 100644 --- a/Resources/Prototypes/Recipes/Reactions/medicine.yml +++ b/Resources/Prototypes/Recipes/Reactions/medicine.yml @@ -454,7 +454,7 @@ amount: 1 products: SpaceDrugs: 3 - + - type: reaction id: Ultravasculine reactants: @@ -465,3 +465,13 @@ catalyst: true products: Ultravasculine: 2 + +- type: reaction + id: Siderlac + reactants: + Aloe: + amount: 1 + Stellibinin: + amount: 1 + products: + Siderlac: 2 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi/equipped-HELMET.png b/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..894b71c8d9 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi/equipped-HELMET.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 index 9345881060..8160725332 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi/meta.json @@ -36,6 +36,10 @@ }, { "name": "stage-6" + }, + { + "name": "equipped-HELMET", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/dead.png new file mode 100644 index 0000000000..619a057e98 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/dead.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/harvest.png new file mode 100644 index 0000000000..4572597035 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/harvest.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/meta.json new file mode 100644 index 0000000000..72b9a92f7e --- /dev/null +++ b/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "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" + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/produce.png new file mode 100644 index 0000000000..96d1e506be Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/produce.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/seed.png new file mode 100644 index 0000000000..deb81bb1f8 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/seed.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/stage-1.png new file mode 100644 index 0000000000..d4d7e4eab5 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/stage-1.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/stage-2.png new file mode 100644 index 0000000000..eba962c66c Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/stage-2.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/dead.png new file mode 100644 index 0000000000..24d9d41a4f Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/dead.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/harvest.png new file mode 100644 index 0000000000..835416fb68 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/harvest.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/meta.json new file mode 100644 index 0000000000..8b6952d030 --- /dev/null +++ b/Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.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/galaxythistle.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/produce.png new file mode 100644 index 0000000000..7a4af79626 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/produce.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/seed.png new file mode 100644 index 0000000000..a3ae4316d1 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/seed.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/stage-1.png new file mode 100644 index 0000000000..41b16f0069 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/stage-1.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/stage-2.png new file mode 100644 index 0000000000..82de1b5dcc Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/stage-2.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/stage-3.png new file mode 100644 index 0000000000..6981d73ebe Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/stage-3.png differ