diff --git a/Resources/Locale/en-US/deltav/seeds.ftl b/Resources/Locale/en-US/deltav/seeds.ftl index 976bcd9fbff..d083a2cf398 100644 --- a/Resources/Locale/en-US/deltav/seeds.ftl +++ b/Resources/Locale/en-US/deltav/seeds.ftl @@ -1,3 +1,7 @@ # Seeds seeds-CrystalThistle-name = CrystalThistle seeds-CrystalThistle-display-name = CrystalThistle +seeds-GhostPepper-name = Ghost Pepper +seeds-GhostPepper-display-name = Ghost Pepper +seeds-CosmicRevenant-name = Cosmic Revenant +seeds-CosmicRevenant-display-name = Cosmic Revenant Pepper diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/produce.yml index ab69087d2bf..816144fe434 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/produce.yml @@ -22,3 +22,69 @@ seedId: CrystalThistle - type: Extractable grindableSolutionName: food + +- type: entity + name: Ghost Pepper + parent: FoodProduceBase + id: FoodGhostPepper + description: So hot, you'll have one foot in the grave. + components: + - type: FlavorProfile + flavors: + - spicy + - sweet + - type: SolutionContainerManager + solutions: + food: + maxVol: 39 + reagents: + - ReagentId: Nutriment + Quantity: 6 + - ReagentId: CapsaicinOil + Quantity: 15 + - ReagentId: Vitamin + Quantity: 6 + - ReagentId: Thermite + Quantity: 10 + - type: TileFrictionModifier + modifier: 0.05 + - type: Sprite + sprite: DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi + - type: Produce + seedId: GhostPepper + - type: Tag + tags: + - Vegetable + +- type: entity + name: Cosmic Revenant + parent: FoodProduceBase + id: FoodCosmicRevenant + description: Is this even a pepper? Looks... Haunted. + components: + - type: FlavorProfile + flavors: + - spicy + - spooky + - type: SolutionContainerManager + solutions: + food: + maxVol: 41 + reagents: + - ReagentId: Nutriment + Quantity: 8 + - ReagentId: CapsaicinOil + Quantity: 20 + - ReagentId: Vitamin + Quantity: 8 + - ReagentId: Ectoplasm + Quantity: 5 + - type: TileFrictionModifier + modifier: 0.0001 + - type: Sprite + sprite: DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi + - type: Produce + seedId: CosmicRevenant + - type: Tag + tags: + - Vegetable diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Hydroponics/seeds.yml index 4611d5d6201..c1060c84834 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Hydroponics/seeds.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Hydroponics/seeds.yml @@ -8,3 +8,25 @@ seedId: CrystalThistle - type: Sprite sprite: DeltaV/Objects/Specific/Hydroponics/Crystal_Thistle.rsi + +- type: entity + parent: SeedBase + name: packet of Ghost Pepper seeds + description: "Be sure to plant these six feet under." + id: GhostPepperSeeds + components: + - type: Seed + seedId: GhostPepper + - type: Sprite + sprite: DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi + +- type: entity + parent: SeedBase + name: packet of Cosmic Revenant Pepper seeds + description: "Harvest dark spirits for the good of the station." + id: CosmicRevenantSeeds + components: + - type: Seed + seedId: CosmicRevenant + - type: Sprite + sprite: DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi diff --git a/Resources/Prototypes/DeltaV/Hydroponics/seeds.yml b/Resources/Prototypes/DeltaV/Hydroponics/seeds.yml index 1983efb05b2..3ea381e515d 100644 --- a/Resources/Prototypes/DeltaV/Hydroponics/seeds.yml +++ b/Resources/Prototypes/DeltaV/Hydroponics/seeds.yml @@ -23,3 +23,75 @@ Min: 1 Max: 25 PotencyDivisor: 4 + +- type: seed + id: GhostPepper + name: seeds-GhostPepper-name + noun: seeds-noun-seeds + displayName: seeds-GhostPepper-display-name + plantRsi: DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi + packetPrototype: GhostPepperSeeds + productPrototypes: + - FoodGhostPepper + mutationPrototypes: + - CosmicRevenant + harvestRepeat: Repeat + lifespan: 25 + maturation: 6 + production: 6 + yield: 2 + potency: 20 + idealLight: 9 + idealHeat: 298 + chemicals: + CapsaicinOil: + Min: 2 + Max: 20 + PotencyDivisor: 10 + Nutriment: + Min: 2 + Max: 8 + PotencyDivisor: 25 + Vitamin: + Min: 2 + Max: 8 + PotencyDivisor: 25 + Thermite: + Min: 5 + Max: 20 + PotencyDivisor: 10 + +- type: seed + id: CosmicRevenant + name: seeds-CosmicRevenant-name + noun: seeds-noun-seeds + displayName: seeds-CosmicRevenant-display-name + plantRsi: DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi + packetPrototype: CosmicRevenantSeeds + productPrototypes: + - FoodCosmicRevenant + harvestRepeat: Repeat + lifespan: 25 + maturation: 6 + production: 6 + yield: 2 + potency: 20 + idealLight: 9 + idealHeat: 298 + chemicals: + CapsaicinOil: + Min: 3 + Max: 30 + PotencyDivisor: 10 + Nutriment: + Min: 4 + Max: 10 + PotencyDivisor: 25 + Vitamin: + Min: 4 + Max: 10 + PotencyDivisor: 25 + Ectoplasm: + Min: 1 + Max: 5 + PotencyDivisor: 10 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml index 0f440b01062..66a52c0a3fc 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml @@ -61,4 +61,6 @@ - FoodFlyAmanita - DeathNettle - FoodCrystalThistle #Delta-V + - FoodGhostPepper #Delta-V + - FoodCosmicRevenant #Delta-V rareChance: 0.01 diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml index 351240d3674..0fd2b966c3a 100644 --- a/Resources/Prototypes/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Hydroponics/seeds.yml @@ -1038,6 +1038,7 @@ - FoodChiliPepper mutationPrototypes: - chilly + - GhostPepper #Delta-V harvestRepeat: Repeat lifespan: 25 maturation: 6 diff --git a/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/dead.png b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/dead.png new file mode 100644 index 00000000000..9fc0d4ef783 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/dead.png differ diff --git a/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/harvest.png b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/harvest.png new file mode 100644 index 00000000000..4f02a4e51fb Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/harvest.png differ diff --git a/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/meta.json new file mode 100644 index 00000000000..f1a41a5346e --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/meta.json @@ -0,0 +1,87 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13, edited by Alchebun", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead", + "delays": + [ + [ + 0.5, + 0.5, + 0.5, + 0.5 + ] + ] + }, + { + "name": "harvest", + "delays": + [ + [ + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08 + ] + ] + }, + { + "name": "produce", + "delays": + [ + [ + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08 + ] + ] + }, + { + "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/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/produce.png b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/produce.png new file mode 100644 index 00000000000..1aee6ad7562 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/produce.png differ diff --git a/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/seed.png b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/seed.png new file mode 100644 index 00000000000..3b7a097e0ec Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/seed.png differ diff --git a/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/stage-1.png b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/stage-1.png new file mode 100644 index 00000000000..46b840ee334 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/stage-1.png differ diff --git a/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/stage-2.png b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/stage-2.png new file mode 100644 index 00000000000..0751851e8ac Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/stage-2.png differ diff --git a/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/stage-3.png b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/stage-3.png new file mode 100644 index 00000000000..e6bb55c147d Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/stage-3.png differ diff --git a/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/stage-4.png b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/stage-4.png new file mode 100644 index 00000000000..76aa0ce193b Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/stage-4.png differ diff --git a/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/stage-5.png b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/stage-5.png new file mode 100644 index 00000000000..c62b84e41b1 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/stage-5.png differ diff --git a/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/stage-6.png b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/stage-6.png new file mode 100644 index 00000000000..939f9560c8f Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi/stage-6.png differ diff --git a/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/dead.png b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/dead.png new file mode 100644 index 00000000000..058f5f1b458 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/dead.png differ diff --git a/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/harvest.png b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/harvest.png new file mode 100644 index 00000000000..36a03bf240c Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/harvest.png differ diff --git a/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/meta.json new file mode 100644 index 00000000000..bf2a086caa0 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13", + "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/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/produce.png b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/produce.png new file mode 100644 index 00000000000..9abec5c0dd4 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/produce.png differ diff --git a/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/seed.png b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/seed.png new file mode 100644 index 00000000000..b8719b0fcfd Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/seed.png differ diff --git a/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/stage-1.png b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/stage-1.png new file mode 100644 index 00000000000..321d26da630 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/stage-1.png differ diff --git a/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/stage-2.png b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/stage-2.png new file mode 100644 index 00000000000..d194979d085 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/stage-2.png differ diff --git a/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/stage-3.png b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/stage-3.png new file mode 100644 index 00000000000..bb07c766686 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/stage-3.png differ diff --git a/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/stage-4.png b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/stage-4.png new file mode 100644 index 00000000000..9a952ade71c Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/stage-4.png differ diff --git a/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/stage-5.png b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/stage-5.png new file mode 100644 index 00000000000..253b707dd85 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/stage-5.png differ diff --git a/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/stage-6.png b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/stage-6.png new file mode 100644 index 00000000000..793e3ed8d50 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi/stage-6.png differ