Tea Plant and Blue Pumpkin (#25092)

* tea plant, blumpkin

* fix linter

* fix tests pls

* bloompkin

* forgor rsi

* work please

* WORK PLEASE

* migration of the blumpkins

* it is now glumpkin

* lowercase

* uppercase

* adjust values and fix blorbo

wtf when did blumpkin donut turn into blorbo donut what

* fix test

* update

* fix stupid mistake

* Update meta.json

* totally not a webedit

* not a webedit 2

* nitpicks

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

@@ -112,7 +112,7 @@ flavor-complex-corn = like corn
 flavor-complex-banana = like bananas
 flavor-complex-apple = like apples
 flavor-complex-cotton = like cottons
-flavor-complex-bungo = like bungo
+flavor-complex-bungo = like tropical sweetness
 flavor-complex-raisins = like dried grapes
 flavor-complex-orange = like oranges
 flavor-complex-watermelon = like watermelon
@@ -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-blue-pumpkin = like a mouthful of pool water
 flavor-complex-violets = like violets
 flavor-complex-pyrotton = like a burning mouth
 flavor-complex-mothballs = like mothballs

Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl

@@ -13,6 +13,9 @@ reagent-desc-cream-of-coconut = Sweet, syrupy version of coconut cream with adde
 reagent-name-cafe-latte = cafe latte
 reagent-desc-cafe-latte = A nice, strong and tasty beverage while you are reading.
 
+reagent-name-tea-powder = tea powder
+reagent-desc-tea-powder = Finely ground tea leaves, used for making tea.
+
 reagent-name-green-tea = green tea
 reagent-desc-green-tea = Tasty green tea.
 

Resources/Locale/en-US/reagents/meta/consumable/drink/juice.ftl

@@ -7,6 +7,12 @@ reagent-desc-juice-banana = The raw essence of a banana. HONK.
 reagent-name-juice-berry = berry juice
 reagent-desc-juice-berry = A delicious blend of several different kinds of berries.
 
+reagent-name-juice-blue-pumpkin = blue pumpkin juice
+reagent-desc-juice-blue-pumpkin = The juice of a blue pumpkin. Smells like pool water.
+
+reagent-name-juice-bungo = bungo juice
+reagent-desc-juice-bungo = The juice of a bungo fruit. Exotic!
+
 reagent-name-juice-berry-poison = poison berry juice
 reagent-desc-juice-berry-poison = A surprisingly tasty juice blended from various kinds of very deadly and toxic berries.
 

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

@@ -32,6 +32,8 @@ seeds-potato-name = potato
 seeds-potato-display-name = potatoes
 seeds-sugarcane-name = sugarcane
 seeds-sugarcane-display-name = sugarcanes
+seeds-teaplant-name = tea plant
+seeds-teaplant-display-name = tea plants
 seeds-papercane-name = papercane
 seeds-papercane-display-name = papercanes
 seeds-towercap-name = tower cap
@@ -120,6 +122,8 @@ seeds-pea-name = pea
 seeds-pea-display-name = pea vines
 seeds-pumpkin-name = pumpkin
 seeds-pumpkin-display-name = pumpkins
+seeds-blue-pumpkin-name = blue pumpkin
+seeds-blue-pumpkin-display-name = blue pumpkins
 seeds-cotton-name = cotton
 seeds-cotton-display-name = cotton plant
 seeds-pyrotton-name = pyrotton

Resources/Prototypes/Catalog/Cargo/cargo_vending.yml

@@ -174,7 +174,7 @@
     sprite: Objects/Specific/Service/vending_machine_restock.rsi
     state: base
   product: CrateVendingMachineRestockSeedsFilled
-  cost: 3375
+  cost: 3470
   category: cargoproduct-category-name-hydroponics
   group: market
 

Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml

@@ -5,11 +5,14 @@
     AmbrosiaVulgarisSeeds: 3
     AppleSeeds: 5
     BananaSeeds: 5
+    BerrySeeds: 5
     CarrotSeeds: 5
     CabbageSeeds: 5
     ChanterelleSeeds: 5
     ChiliSeeds: 5
+    CocoaSeeds: 3
     CornSeeds: 5
+    CottonSeeds: 5
     EggplantSeeds: 5
     EggySeeds: 5
     GalaxythistleSeeds: 3
@@ -17,25 +20,23 @@
     GrapeSeeds: 5
     LemonSeeds: 5
     LimeSeeds: 5
-    PineappleSeeds: 4
+    PineappleSeeds: 5
     LingzhiSeeds: 3
     OatSeeds: 5
     OnionSeeds: 5
     OnionRedSeeds: 5
     OrangeSeeds: 5
+    PeaSeeds: 5
     PoppySeeds: 3
     PotatoSeeds: 5
     PumpkinSeeds: 5
     RiceSeeds: 5
     SoybeanSeeds: 5
     SugarcaneSeeds: 5
+    TeaPlantSeeds: 5
     TomatoSeeds: 5
     TowercapSeeds: 5
     WheatSeeds: 5
     WatermelonSeeds: 5
-    CocoaSeeds: 3
-    BerrySeeds: 5
-    PeaSeeds: 5
-    CottonSeeds: 5
   emaggedInventory:
     FlyAmanitaSeeds: 1

Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml

@@ -182,14 +182,18 @@
 # Tastes like donut, bitterness.
 
 - type: entity
-  name: blorbo donut
+  name: blue pumpkin donut
   parent: FoodDonutBase
-  id: FoodDonutBlumpkin
-  description: Goes great with a mug of BLORBO.
+  id: FoodDonutBluePumpkin
+  description: Goes great with a mug of soothing drunken blue pumpkin.
   components:
+  - type: FlavorProfile
+    flavors:
+      - sweet
+      - bluepumpkin
   - type: Sprite
     state: blue
-# Tastes like donut, blorbo.
+# Tastes like donut, blue pumpkin.
 
 - type: entity
   name: bungo donut
@@ -352,11 +356,15 @@
 # Tastes like jelly-donut, bitterness.
 
 - type: entity
-  name: blumpkin jelly-donut
+  name: blue pumpkin jelly-donut
   parent: FoodDonutBase
-  id: FoodDonutJellyBlumpkin
-  description: Goes great with a mug of soothing drunken blumpkin.
+  id: FoodDonutJellyBluePumpkin
+  description: Goes great with a mug of soothing drunken blue pumpkin.
   components:
+  - type: FlavorProfile
+    flavors:
+      - sweet
+      - bluepumpkin
   - type: Sprite
     state: jelly-blue
   - type: SolutionContainerManager
@@ -371,7 +379,7 @@
   - type: Tag
     tags:
     - Fruit
-# Tastes like jelly-donut, blumpkin.
+# Tastes like jelly-donut, blue pumpkin.
 
 - type: entity
   name: bungo jelly-donut

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

@@ -2332,6 +2332,11 @@
     sprite: Objects/Specific/Hydroponics/bungo.rsi
   - type: Produce
     seedId: bungo
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: JuiceBungo
+        Quantity: 10
   - type: Tag
     tags:
     - Fruit
@@ -2457,6 +2462,56 @@
     - Fruit
     - Vegetable
 
+- type: entity
+  name: blue pumpkin
+  parent: FoodProduceBase
+  id: FoodBluePumpkin
+  description: A large, blue... berry. Seriously.
+  components:
+  - type: Item
+    size: Small
+  - type: FlavorProfile
+    flavors:
+      - bluepumpkin
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 25
+        reagents:
+        - ReagentId: Ammonia
+          Quantity: 10
+        - ReagentId: Chlorine
+          Quantity: 5
+        - ReagentId: Vitamin
+          Quantity: 10
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: JuiceBluePumpkin
+        Quantity: 10
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/blue_pumpkin.rsi
+  - type: Produce
+    seedId: bluePumpkin
+  - type: Damageable
+    damageContainer: Biological
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 16
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: desecration
+      - !type:SpillBehavior
+        solution: food
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: Tag
+    tags:
+    - Fruit
+
 - type: entity
   name: cotton boll
   description: Moth people's favorite snack, and just as fluffy as them.

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

@@ -179,6 +179,39 @@
     graph: smokeableGroundCannabisRainbow
     node: groundRainbow
 
+- type: entity
+  name: tea leaves
+  parent: ProduceBase
+  id: LeavesTea
+  description: "Can be dried out to make tea."
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/tea_plant.rsi
+  - type: Produce
+    seedId: teaPlant
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        reagents:
+        - ReagentId: Vitamin
+          Quantity: 2
+
+- type: entity
+  name: dried tea leaves
+  parent: ProduceBase
+  id: LeavesTeaDried
+  description: "Dried tea leaves, ready to be ground."
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        reagents:
+        - ReagentId: TeaPowder
+          Quantity: 5
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/tea_plant.rsi
+    state: dried
+
 - type: entity
   name: tobacco leaves
   parent: ProduceBase

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

@@ -163,6 +163,16 @@
     - type: Sprite
       sprite: Objects/Specific/Hydroponics/sugarcane.rsi
 
+- type: entity
+  parent: SeedBase
+  name: packet of tea plant seeds
+  id: TeaPlantSeeds
+  components:
+    - type: Seed
+      seedId: teaPlant
+    - type: Sprite
+      sprite: Objects/Specific/Hydroponics/tea_plant.rsi
+
 - type: entity
   parent: SeedBase
   name: packet of papercane seeds
@@ -614,6 +624,16 @@
     - type: Sprite
       sprite: Objects/Specific/Hydroponics/pumpkin.rsi
 
+- type: entity
+  parent: SeedBase
+  name: packet of blue pumpkin seeds
+  id: BluePumpkinSeeds
+  components:
+    - type: Seed
+      seedId: bluePumpkin
+    - type: Sprite
+      sprite: Objects/Specific/Hydroponics/blue_pumpkin.rsi
+
 - type: entity
   parent: SeedBase
   name: packet of cotton seeds

Resources/Prototypes/Flavors/flavors.yml

@@ -1084,6 +1084,11 @@
   flavorType: Complex
   description: flavor-complex-fishops
 
+- type: flavor
+  id: bluepumpkin
+  flavorType: Complex
+  description: flavor-complex-blue-pumpkin
+  
 - type: flavor
   id: violets
   flavorType: Complex

Resources/Prototypes/Hydroponics/seeds.yml

@@ -357,6 +357,31 @@
       Max: 5
       PotencyDivisor: 5
 
+- type: seed
+  id: teaPlant
+  name: seeds-teaplant-name
+  noun: seeds-noun-seeds
+  displayName: seeds-teaplant-display-name
+  plantRsi: Objects/Specific/Hydroponics/tea_plant.rsi
+  packetPrototype: TeaPlantSeeds
+  productPrototypes:
+    - LeavesTea
+  harvestRepeat: Repeat
+  lifespan: 75
+  maturation: 5
+  production: 3
+  yield: 2
+  potency: 20
+  growthStages: 5
+  waterConsumption: 0.6
+  idealLight: 9
+  idealHeat: 298
+  chemicals:
+    Vitamin:
+      Min: 1
+      Max: 5
+      PotencyDivisor: 20
+
 - type: seed
   id: papercane
   name: seeds-papercane-name
@@ -1674,6 +1699,8 @@
   packetPrototype: PumpkinSeeds
   productPrototypes:
     - FoodPumpkin
+  mutationPrototypes:
+    - bluePumpkin
   lifespan: 55
   maturation: 10
   production: 4
@@ -1691,6 +1718,36 @@
       Max: 5
       PotencyDivisor: 20
 
+- type: seed
+  id: bluePumpkin
+  name: seeds-blue-pumpkin-name
+  noun: seeds-noun-seeds
+  displayName: seeds-blue-pumpkin-display-name
+  plantRsi: Objects/Specific/Hydroponics/blue_pumpkin.rsi
+  packetPrototype: BluePumpkinSeeds
+  productPrototypes:
+    - FoodBluePumpkin
+  lifespan: 55
+  maturation: 10
+  production: 4
+  yield: 2
+  potency: 10
+  idealHeat: 288
+  growthStages: 3
+  chemicals:
+    Ammonia:
+      Min: 1
+      Max: 15
+      PotencyDivisor: 3
+    Chlorine:
+      Min: 1
+      Max: 5
+      PotencyDivisor: 5
+    Vitamin:
+      Min: 1
+      Max: 10
+      PotencyDivisor: 3
+
 - type: seed
   id: cotton
   name: seeds-cotton-name

Resources/Prototypes/Reagents/Consumable/Drink/juice.yml

@@ -26,6 +26,24 @@
   flavor: berry
   color: "#660099"
 
+- type: reagent
+  id: JuiceBluePumpkin
+  name: reagent-name-juice-blue-pumpkin
+  parent: BaseJuice
+  desc: reagent-desc-juice-blue-pumpkin
+  physicalDesc: reagent-physical-desc-strong-smelling
+  flavor: bluepumpkin
+  color: "#00BFFF"
+
+- type: reagent
+  id: JuiceBungo
+  name: reagent-name-juice-bungo
+  parent: BaseJuice
+  desc: reagent-desc-juice-bungo
+  physicalDesc: reagent-physical-desc-tart
+  flavor: bungo
+  color: "#F9E43D"
+
 - type: reagent
   id: JuiceCarrot
   name: reagent-name-juice-carrot

Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml

@@ -257,3 +257,20 @@
       - !type:AdjustReagent
         reagent: Nutriment
         amount: 0.75
+
+- type: reagent
+  id: TeaPowder
+  name: reagent-name-tea-powder
+  desc: reagent-desc-tea-powder
+  physicalDesc: reagent-physical-desc-powdery
+  flavor: tea
+  color: "#7F8400"
+  group: Foods
+  metabolisms:
+    Food:
+      effects:
+      - !type:SatiateThirst
+        factor: -0.2
+      - !type:AdjustReagent
+        reagent: Nutriment
+        amount: 0.1

Resources/Prototypes/Recipes/Cooking/meal_recipes.yml

@@ -1718,6 +1718,14 @@
 
 # NOT ACTUAL FOOD
 
+- type: microwaveMealRecipe
+  id: RecipeDriedTeaLeaves
+  name: dried tea leaves recipe
+  result: LeavesTeaDried
+  time: 10
+  solids:
+    LeavesTea: 1
+
 - type: microwaveMealRecipe
   id: RecipeDriedTobacco
   name: dried tobacco leaves recipe

Resources/Prototypes/Recipes/Reactions/drinks.yml

@@ -983,6 +983,16 @@
   products:
     SyndicateBomb: 2
 
+- type: reaction
+  id: Tea
+  reactants:
+    TeaPowder:
+      amount: 1
+    Water:
+      amount: 5
+  products:
+    Tea: 6
+
 - type: reaction
   id: TequilaSunrise
   reactants:

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

@@ -0,0 +1,32 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/tgstation/tgstation/commit/5d507cfbad6f73d1beaba66d93f31f893adb3a84, modified by potato1234_x (github)",
+  "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/tea_plant.rsi/meta.json

@@ -0,0 +1,41 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/da3da71e29400c8c2879037ae8d74e690a6fe604, produce modified by potato1234x (github) for ss14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "dead"
+    },
+    {
+      "name": "harvest"
+    },
+    {
+      "name": "produce"
+    },
+    {
+      "name": "dried"
+    },
+    {
+      "name": "seed"
+    },
+    {
+      "name": "stage-1"
+    },
+    {
+      "name": "stage-2"
+    },
+    {
+      "name": "stage-3"
+    },
+    {
+      "name": "stage-4"
+    },
+    {
+      "name": "stage-5"
+    }
+  ]
+}

Resources/migration.yml

@@ -212,6 +212,10 @@ VehicleJanicartDestroyed: null
 YellowOxygenTank: OxygenTank
 YellowOxygenTankFilled: OxygenTankFilled
 
+# 2024-02-12
+FoodDonutBlumpkin: FoodDonutBluePumpkin
+FoodDonutJellyBlumpkin: FoodDonutJellyBluePumpkin
+
 # 2024-02-19
 Drone: null
 SpawnMobDrone: null