Cherry

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

@@ -123,6 +123,7 @@ flavor-complex-meatballs = like meatballs
 flavor-complex-nettles = like nettles
 flavor-complex-jungle = like jungle
 flavor-complex-vegetables = like vegetables
+flavor-complex-cherry = like cherries
 # use it when there multiple types of veggies
 
 ## Complex foodstuffs (cooked foods, joke flavors, etc)

Resources/Locale/en-US/nutrition/components/food-sequence.ftl

@@ -72,6 +72,7 @@ food-sequence-content-suppermatter = suppermatter
 food-sequence-content-capfruit = capfruit
 food-sequence-content-berries = berries
 food-sequence-content-spacemans-trumpet = spacemans trupmet
+food-sequence-content-cherry = cherry
 
 # BURGERS
 
@@ -117,4 +118,4 @@ food-sequence-taco-gen = taco with {$content}
 
 # SKEWER
 
-food-sequence-skewer-gen = {$content} kebab
+food-sequence-skewer-gen = {$content} kebab

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

@@ -42,3 +42,6 @@ reagent-desc-juice-tomato = Tomatoes made into juice. What a waste of good tomat
 
 reagent-name-juice-watermelon = water melon juice
 reagent-desc-juice-watermelon = The delicious juice of a watermelon.
+
+reagent-name-juice-cherry = cherry juice
+reagent-desc-juice-cherry = Tasty cherry juice, sweet and tangy.

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

@@ -130,3 +130,5 @@ seeds-pyrotton-name = pyrotton
 seeds-pyrotton-display-name = pyrotton plant
 seeds-capfruit-name = capfruit
 seeds-capfruit-display-name = capfruit tree
+seeds-cherry-name = cherry
+seeds-cherry-display-name = cherry tree

Resources/Prototypes/Catalog/Cargo/cargo_botany.yml

@@ -34,7 +34,7 @@
     sprite: Objects/Specific/Hydroponics/apple.rsi
     state: seed
   product: CrateHydroponicsSeeds
-  cost: 550
+  cost: 600
   category: cargoproduct-category-name-hydroponics
   group: market
 

Resources/Prototypes/Catalog/Fills/Crates/botany.yml

@@ -91,3 +91,4 @@
       - id: GrapeSeeds
       - id: WatermelonSeeds
       - id: PeaSeeds
+      - id: CherrySeeds

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

@@ -9,6 +9,7 @@
     CarrotSeeds: 5
     CabbageSeeds: 5
     ChanterelleSeeds: 5
+    CherrySeeds: 5
     ChiliSeeds: 5
     CocoaSeeds: 3
     CornSeeds: 5

Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml

@@ -139,6 +139,9 @@
       - id: FoodCocoaBeans
         amount: !type:RangeNumberSelector
           range: 1, 5
+      - id: FoodCherry
+        amount: !type:RangeNumberSelector
+          range: 1, 5
     #rare
     - !type:GroupSelector
       children:

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

@@ -2573,3 +2573,75 @@
     - CottonBoll
   - type: Extractable
     grindableSolutionName: food
+
+- type: entity
+  name: cherry
+  parent: FoodProduceBase
+  id: FoodCherry
+  description: Juicy red cherry with a pit inside.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - cherry
+  - type: Food
+    trash:
+    - TrashCherryPit
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 8
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 3
+        - ReagentId: Vitamin
+          Quantity: 3
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/cherry.rsi
+  - type: Produce
+    seedId: cherry
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: JuiceCherry
+        Quantity: 5
+  - type: Tag
+    tags:
+    - Fruit
+  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Specific/Hydroponics/cherry.rsi
+      state: produce
+    entries:
+      burger:
+        name: food-sequence-content-cherry
+      taco:
+        name: food-sequence-content-cherry
+
+- type: entity
+  name: cherry pit
+  parent: FoodInjectableBase
+  id: TrashCherryPit
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/cherry.rsi
+    state: pit
+  - type: Item
+    sprite: Objects/Specific/Hydroponics/cherry.rsi
+    heldPrefix: pit
+  - type: Tag
+    tags:
+    - Recyclable
+    - Trash
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 1
+        reagents:
+        - ReagentId: Toxin
+          Quantity: 1
+  - type: Extractable
+    grindableSolutionName: food
+  - type: Seed
+    seedId: cherry
+  - type: SpaceGarbage
+  - type: BadFood

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

@@ -672,3 +672,13 @@
   components:
     - type: Seed
       seedId: fakeCapfruit
+
+- type: entity
+  parent: SeedBase
+  name: packet of cherry seeds
+  id: CherrySeeds
+  components:
+    - type: Seed
+      seedId: cherry
+    - type: Sprite
+      sprite: Objects/Specific/Hydroponics/cherry.rsi

Resources/Prototypes/Flavors/flavors.yml

@@ -1108,3 +1108,8 @@
   id: paintthinner
   flavorType: Complex
   description: flavor-complex-paint-thinner
+
+- type: flavor
+  id: cherry
+  flavorType: Complex
+  description: flavor-complex-cherry

Resources/Prototypes/Hydroponics/seeds.yml

@@ -1799,3 +1799,29 @@
       Min: 4
       Max: 8
       PotencyDivisor: 30
+
+- type: seed
+  id: cherry
+  name: seeds-cherry-name
+  noun: seeds-noun-seeds
+  displayName: seeds-cherry-display-name
+  plantRsi: Objects/Specific/Hydroponics/cherry.rsi
+  packetPrototype: CherrySeeds
+  productPrototypes:
+    - FoodCherry
+  harvestRepeat: Repeat
+  lifespan: 55
+  maturation: 6
+  production: 6
+  yield: 5
+  potency: 10
+  idealLight: 6
+  chemicals:
+    Nutriment:
+      Min: 1
+      Max: 3
+      PotencyDivisor: 30
+    Vitamin:
+      Min: 1
+      Max: 3
+      PotencyDivisor: 40

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

@@ -161,3 +161,12 @@
   metamorphicMaxFillLevels: 4
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
+
+- type: reagent
+  id: JuiceCherry
+  name: reagent-name-juice-cherry
+  parent: BaseJuice
+  desc: reagent-desc-juice-cherry
+  physicalDesc: reagent-physical-desc-sweet
+  flavor: cherry
+  color: "#84031a"

Resources/Prototypes/Recipes/Cooking/meal_recipes.yml

@@ -996,15 +996,15 @@
     FoodBerries: 3
     FoodPlateTin: 1
 
-#- type: microwaveMealRecipe
-#  id: RecipeCherryPie
-#  name: cherry pie recipe
-#  result: FoodPieCherry
-#  time: 15
-#  solids:
-#    FoodDoughPie: 1
-#    FoodCherry: 3 #cherries don't exist yet
-#    FoodPlateTin: 1
+- type: microwaveMealRecipe
+  id: RecipeCherryPie
+  name: cherry pie recipe
+  result: FoodPieCherry
+  time: 15
+  solids:
+    FoodDoughPie: 1
+    FoodCherry: 5
+    FoodPlateTin: 1
 
 - type: microwaveMealRecipe
   id: RecipeFrostyPie

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

@@ -0,0 +1,44 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068 and remade by RumiTiger",
+  "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"
+    },
+    {
+        "name": "pit"
+    }
+  ]
+}