Spaceman's Trumpet and Lily (#25090)

* trumpet + lily +polypy

* trumbet

Resources/Locale/en-US/flavors/flavor-profiles.ftl

@@ -167,6 +167,7 @@ flavor-complex-lost-friendship = like lost friendship
 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
 
 # Drink-specific flavors.
 

Resources/Locale/en-US/reagents/meta/medicine.ftl

@@ -52,6 +52,9 @@ reagent-desc-barozine = A potent chemical that prevents pressure damage. Causes
 reagent-name-phalanximine = phalanximine
 reagent-desc-phalanximine = An advanced chemical used in the treatment of cancer. Causes moderate radiation poisoning on organics and vomiting. Can potentially remove the death gene on plants.
 
+reagent-name-polypyrylium-oligomers = Polypyrylium Oligomers
+reagent-desc-polypyrylium-oligomers = A purple mixture of short polyelectrolyte chains not easily synthesized in the laboratory. Heals asphyxiation and brute damage. Stops bleeding over time.
+
 reagent-name-ambuzol = ambuzol
 reagent-desc-ambuzol = A highly engineered substance able to halt the progression of a zombie infection.
 

Resources/Locale/en-US/seeds/seeds.ftl

@@ -73,6 +73,8 @@ seeds-aloe-name = aloe
 seeds-aloe-display-name = aloe
 seeds-laughin-pea-name = laughin' peas
 seeds-laughin-pea-display-name = laughin' peas
+seeds-lily-name = lily
+seeds-lily-display-name = lily
 seeds-lingzhi-name = lingzhi
 seeds-lingzhi-display-name = lingzhi
 seeds-ambrosiavulgaris-name = ambrosia vulgaris
@@ -89,6 +91,8 @@ seeds-rice-name = rice
 seeds-rice-display-name = rice stalks
 seeds-soybeans-name = soybeans
 seeds-soybeans-display-name = soy plant
+seeds-spacemans-trumpet-name = spaceman's trumpet
+seeds-spacemans-trumpet-display-name = spaceman's trumpet plant
 seeds-koibean-name = koibeans
 seeds-koibean-display-name = koibean plant
 seeds-watermelon-name = watermelon

Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml

@@ -1209,6 +1209,34 @@
     tags:
     - Flower # TODO add "RedFlower" or "Poppy" tag, when other color flowers will be
 
+- type: entity
+  name: lily
+  parent: FoodPoppy
+  id: FoodLily
+  description: A beautiful orange flower.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - medicine
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 22
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 2
+        - ReagentId: Bicaridine
+          Quantity: 20
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/lily.rsi
+  - type: Produce
+    seedId: lily
+  - type: Extractable
+    grindableSolutionName: food
+  - type: Tag
+    tags:
+    - Flower
+
 - type: entity
   name: lingzhi
   parent: FoodProduceBase
@@ -1432,6 +1460,34 @@
       - ReagentId: MilkSoy
         Quantity: 5
 
+- type: entity
+  name: spaceman's trumpet
+  description: A vivid flower that smells faintly of freshly cut grass. Touching the flower seems to stain the skin some time after contact, yet most other surfaces seem to be unaffected by this phenomenon.
+  id: FoodSpacemansTrumpet
+  parent: FoodProduceBase
+  components:
+  - type: FlavorProfile
+    flavors:
+      - violets
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/spacemans_trumpet.rsi
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 4
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 1
+        - ReagentId: PolypyryliumOligomers
+          Quantity: 3
+  - type: Produce
+    seedId: spacemansTrumpet
+  - type: Tag
+    tags:
+    - Flower
+  - type: Instrument #hehe trumpet
+    program: 56
+
 - type: entity
   name: koibean
   description: These beans seem a little bit fishy.

Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml

@@ -351,6 +351,17 @@
     - type: Sprite
       sprite: Objects/Specific/Hydroponics/poppy.rsi
 
+- type: entity
+  parent: SeedBase
+  name: packet of lily seeds
+  description: "These seeds grow into lilies."
+  id: LilySeeds
+  components:
+    - type: Seed
+      seedId: lily
+    - type: Sprite
+      sprite: Objects/Specific/Hydroponics/lily.rsi
+
 - type: entity
   parent: SeedBase
   name: packet of lingzhi spores
@@ -448,6 +459,16 @@
     - type: Sprite
       sprite: Objects/Specific/Hydroponics/soybeans.rsi
 
+- type: entity
+  parent: SeedBase
+  name: packet of spaceman's trumpet seeds
+  id: SpacemansTrumpetSeeds
+  components:
+    - type: Seed
+      seedId: spacemansTrumpet
+    - type: Sprite
+      sprite: Objects/Specific/Hydroponics/spacemans_trumpet.rsi
+
 - type: entity
   parent: SeedBase
   name: packet of koibean seeds

Resources/Prototypes/Flavors/flavors.yml

@@ -1008,3 +1008,8 @@
   id: fishops
   flavorType: Complex
   description: flavor-complex-fishops
+
+- type: flavor
+  id: violets
+  flavorType: Complex
+  description: flavor-complex-violets

Resources/Prototypes/Hydroponics/seeds.yml

@@ -933,6 +933,8 @@
   packetPrototype: PoppySeeds
   productPrototypes:
     - FoodPoppy
+  mutationPrototypes:
+    - lily
   lifespan: 25
   maturation: 10
   production: 3
@@ -976,6 +978,34 @@
       Max: 10
       PotencyDivisor: 10
 
+- type: seed
+  id: lily
+  name: seeds-lily-name
+  noun: seeds-noun-seeds
+  displayName: seeds-lily-display-name
+  plantRsi: Objects/Specific/Hydroponics/lily.rsi
+  packetPrototype: LilySeeds
+  productPrototypes:
+    - FoodLily
+  mutationPrototypes:
+    - spacemansTrumpet
+  lifespan: 25
+  maturation: 10
+  production: 3
+  yield: 3
+  potency: 10
+  growthStages: 3
+  waterConsumption: 0.60
+  chemicals:
+    Nutriment:
+      Min: 1
+      Max: 2
+      Potencydivisor: 50
+    Bicaridine:
+      Min: 1
+      Max: 20
+      PotencyDivisor: 5
+
 - type: seed
   id: lingzhi
   name: seeds-lingzhi-name
@@ -1204,6 +1234,32 @@
       Max: 2
       PotencyDivisor: 50
 
+- type: seed
+  id: spacemansTrumpet
+  name: seeds-spacemans-trumpet-name
+  noun: seeds-noun-seeds
+  displayName: seeds-spacemans-trumpet-display-name
+  plantRsi: Objects/Specific/Hydroponics/spacemans_trumpet.rsi
+  packetPrototype: SpacemansTrumpetSeeds
+  productPrototypes:
+    - FoodSpacemansTrumpet
+  growthStages: 4
+  lifespan: 20
+  maturation: 14
+  production: 3
+  yield: 2
+  potency: 10
+  waterConsumption: 0.60
+  chemicals:
+    Nutriment:
+      Min: 1
+      Max: 5
+      Potencydivisor: 50
+    PolypyryliumOligomers:
+      Min: 1
+      Max: 15
+      PotencyDivisor: 5
+
 - type: seed
   id: koibean
   name: seeds-koibean-name

Resources/Prototypes/Reagents/medicine.yml

@@ -565,6 +565,33 @@
       - !type:ChemVomit
         probability: 0.05
 
+- type: reagent
+  id: PolypyryliumOligomers
+  name: reagent-name-polypyrylium-oligomers
+  group: Medicine
+  desc: reagent-desc-polypyrylium-oligomers
+  physicalDesc: reagent-physical-desc-pungent
+  flavor: violets
+  color: "#9423FF"
+  metabolisms:
+    Medicine:
+      effects:
+      - !type:HealthChange
+        damage:
+          groups:
+            Brute: -3.5
+          types:
+            Asphyxiation: -2.5
+      - !type:HealthChange
+        conditions:
+        - !type:ReagentThreshold
+          min: 30
+        damage:
+          types:
+            Asphyxiation: 3.5
+      - !type:ModifyBleedAmount
+        amount: -0.25
+
 - type: reagent
   id: Ambuzol
   name: reagent-name-ambuzol

Resources/Textures/Objects/Specific/Hydroponics/lily.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 seed modified by potato1234_X (github) for ss14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "dead"
+    },
+    {
+      "name": "harvest"
+    },
+    {
+      "name": "produce"
+    },
+    {
+      "name": "seed"
+    },
+    {
+      "name": "stage-1"
+    },
+    {
+      "name": "stage-2"
+    },
+    {
+      "name": "stage-3"
+    }
+  ]
+}

Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/meta.json

@@ -0,0 +1,35 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a seed modified by potato1234_X (github) for ss14",
+  "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"
+    }
+  ]
+}