New mutation species plant, Lemoon Tree (#22023)

* Adding Lemoon as lemon's mutation

* Adding lemoon cake

* remove tag that forget to delete

diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl
index db4629d64e7e37e7c351056b92d135fadc61c1a9..d1954ababf0a4aced1dcfd4b90da0e518316be0f 100644 (file)
--- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl
+++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl
@@ -86,6 +86,7 @@ flavor-complex-dough = like dough
 flavor-complex-sweet-dough = like sweet dough
 flavor-complex-tofu = like tofu
 flavor-complex-miso = like miso
+flavor-complex-lemoon = like laurel
 flavor-complex-muffin = like a muffin
 flavor-complex-peas = like peas
 flavor-complex-pineapple = like pineapple

diff --git a/Resources/Locale/en-US/seeds/seeds.ftl b/Resources/Locale/en-US/seeds/seeds.ftl
index 64b5e0d4f724990cce7550e41b51bdb49efe30ef..f4c136e2952092393868d4a9cde9061aa60fdba6 100644 (file)
--- a/Resources/Locale/en-US/seeds/seeds.ftl
+++ b/Resources/Locale/en-US/seeds/seeds.ftl
@@ -19,6 +19,8 @@ seeds-garlic-name = garlic head
 seeds-garlic-display-name = garlic heads
 seeds-lemon-name = lemon
 seeds-lemon-display-name = lemon trees
+seeds-lemoon-name = lemoon
+seeds-lemoon-display-name = lemoon trees
 seeds-lime-name = lime
 seeds-lime-display-name = lime trees
 seeds-orange-name = orange
@@ -102,4 +104,4 @@ seeds-pea-display-name = pea vines
 seeds-pumpkin-name = pumpkin
 seeds-pumpkin-display-name = pumpkins
 seeds-cotton-name = cotton
-seeds-cotton-display-name = cotton plant
\ No newline at end of file
+seeds-cotton-display-name = cotton plant

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
index bc09d958055984f6fde9433ad8e5425204d6aabb..dfa3be29ec353c5371308285141bae8932a9822c 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
@@ -245,6 +245,62 @@
     state: lemon-slice
 # Tastes like sweetness, cake, lemons.
 
+- type: entity
+  name: lemoon cake
+  parent: FoodCakeBase
+  id: FoodCakeLemoon
+  description: A cake that represents the moon of earth
+  components:
+  - type: Sprite
+    state: lemoon
+  - type: FlavorProfile
+    flavors:
+      - lemoon
+      - berry
+  - type: SliceableFood
+    slice: FoodCakeLemoonSlice
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 30
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 15
+        - ReagentId: Vitamin
+          Quantity: 5
+        - ReagentId: Milk
+          Quantity: 5
+  - type: Tag
+    tags:
+    - Fruit
+
+- type: entity
+  name: shard of lemoon cake
+  parent: FoodCakeSliceBase
+  id: FoodCakeLemoonSlice
+  description: A shard of moon, has the smell of milk.
+  components:
+  - type: Sprite
+    state: lemoon-slice
+  - type: FlavorProfile
+    flavors:
+      - lemoon
+      - berry
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 15
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 3
+        - ReagentId: Vitamin
+          Quantity: 1
+        - ReagentId: Milk
+          Quantity: 1
+  - type: Tag
+    tags:
+    - Fruit
+
 - type: entity
   name: chocolate cake
   parent: FoodCakeBase

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
index de837c4c10721ecb94b8fe4cbe40f3dcb41bffc6..52c654b17c2d17fe266671592599153deaf63eab 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -471,6 +471,37 @@
     - Lemon
     - Fruit
 
+- type: entity
+  name: lemoon
+  parent: FoodProduceBase
+  id: FoodLemoon
+  description: People says Moon is made out of cheese, but Moon is actually made out of milk and laurel!
+  components:
+  - type: FlavorProfile
+    flavors:
+      - lemoon
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 18
+        reagents:
+        - ReagentId: Vitamin
+          Quantity: 4
+        - ReagentId: Milk
+          Quantity: 16
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/lemoon.rsi
+  - type: Produce
+    seedId: lemoon
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Sake #the best drink while watching moon
+        Quantity: 10
+  - type: Tag
+    tags:
+    - Fruit
+
 - type: entity
   name: lime
   parent: FoodLemon

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
index b225d3afdd8c4cb43e88f1ad4b3da3377ba09da0..2bbb720259d2c4ad180d93f152d80f8cc5283ef4 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
@@ -92,6 +92,16 @@
     - type: Sprite
       sprite: Objects/Specific/Hydroponics/lemon.rsi
 
+- type: entity
+  parent: SeedBase
+  name: packet of lemoon seeds
+  id: LemoonSeeds
+  components:
+    - type: Seed
+      seedId: lemoon
+    - type: Sprite
+      sprite: Objects/Specific/Hydroponics/lemoon.rsi
+
 - type: entity
   parent: SeedBase
   name: packet of lime seeds

diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml
index 5202c94498ac741f21cc38bca1a2ccc0ecb1ead0..07ec78cca0330c74c80bc91a30a9999bfd3638bd 100644 (file)
--- a/Resources/Prototypes/Flavors/flavors.yml
+++ b/Resources/Prototypes/Flavors/flavors.yml
@@ -309,6 +309,11 @@
   flavorType: Complex
   description: flavor-complex-peas
 
+- type: flavor
+  id: lemoon
+  flavorType: Complex
+  description: flavor-complex-lemoon
+
 - type: flavor
   id: pineapple
   flavorType: Complex

diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml
index 3f57bcc3de34d1a333f27ec142dff21b7aa04578..eec238d1d4a4779dc8018724265411631d3dd6f4 100644 (file)
--- a/Resources/Prototypes/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Hydroponics/seeds.yml
@@ -141,6 +141,8 @@
   packetPrototype: LemonSeeds
   productPrototypes:
     - FoodLemon
+  mutationPrototypes:
+    - lemoon
   harvestRepeat: Repeat
   lifespan: 55
   maturation: 6
@@ -158,6 +160,32 @@
       Max: 4
       PotencyDivisor: 25
 
+- type: seed
+  id: lemoon
+  name: seeds-lemoon-name
+  noun: seeds-noun-seeds
+  displayName: seeds-lemoon-display-name
+  plantRsi: Objects/Specific/Hydroponics/lemoon.rsi
+  packetPrototype: LemoonSeeds
+  productPrototypes:
+    - FoodLemoon
+  harvestRepeat: Repeat
+  lifespan: 90
+  maturation: 8
+  production: 6
+  yield: 4
+  potency: 1
+  idealLight: 8
+  chemicals:
+    Vitamin:
+      Min: 1
+      Max: 4
+      PotencyDivisor: 25
+    Milk:
+      Min: 8
+      Max: 20
+      PotencyDivisor: 5
+
 - type: seed
   id: lime
   name: seeds-lime-name

diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
index 8bc8c1a15b82cf1acae5fc3ccf20777cec7e1645..0472a2c42fe740b5a1896c5d907eced2b038b7f9 100644 (file)
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -1137,6 +1137,16 @@
     FoodCakePlain: 1
     FoodLemon: 3
 
+- type: microwaveMealRecipe
+  id: RecipeLemoonCake
+  name: lemoon cake recipe
+  result: FoodCakeLemoon
+  time: 5
+  solids:
+    FoodCakePlain: 1
+    FoodLemoon: 2
+    FoodBerries: 1 #dark colouring
+
 - type: microwaveMealRecipe
   id: RecipeOrangeCake
   name: orange cake recipe

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/lemoon-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/lemoon-slice.png
new file mode 100644 (file)
index 0000000..c877313
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/lemoon-slice.png differ

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/lemoon.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/lemoon.png
new file mode 100644 (file)
index 0000000..b186366
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/lemoon.png differ

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/meta.json
index ae32c43a0576fbcd5288a075f73ecc42c671d287..43a54b0fe57270b4639fbb0b27a3175f806c00e5 100644 (file)
--- a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/meta.json
@@ -1 +1 @@
-{"version": 1, "license": "CC-BY-SA-3.0", "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa", "size": {"x": 32, "y": 32}, "states": [{"name": "alpha"}, {"name": "alpha-filling"}, {"name": "alpha-slice"}, {"name": "alpha-slice-filling"}, {"name": "apple"}, {"name": "apple-slice"}, {"name": "birthday"}, {"name": "birthday-slice"}, {"name": "brain"}, {"name": "brain-large"}, {"name": "brain-slice"}, {"name": "carrot"}, {"name": "carrot-slice"}, {"name": "cheese"}, {"name": "cheese-slice"}, {"name": "chocolate"}, {"name": "chocolate-slice"}, {"name": "lemon"}, {"name": "lemon-slice"}, {"name": "lime"}, {"name": "lime-slice"}, {"name": "orange"}, {"name": "orange-slice"}, {"name": "plain"}, {"name": "plain-slice"}, {"name": "clown"}, {"name": "clown-slice"}, {"name": "plate"}, {"name": "plate-small"}, {"name": "plate-plastic"}, {"name": "plate-small-plastic"}, {"name": "plate-slice-shading"}, {"name": "pumpkinspice"}, {"name": "pumpkinspice-slice"}, {"name": "slime"}, {"name": "slime-slice"}, {"name": "christmas"}, {"name": "christmas-slice"}, {"name": "vanilla"}, {"name": "vanilla-slice"}, {"name": "trumpet"}, {"name": "trumpet-slice"}, {"name": "suppermatter", "directions": 1, "delays": [[1.0]]}, {"name": "suppermatter-shard", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
+{"version": 1, "license": "CC-BY-SA-3.0", "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa", "size": {"x": 32, "y": 32}, "states": [{"name": "alpha"}, {"name": "alpha-filling"}, {"name": "alpha-slice"}, {"name": "alpha-slice-filling"}, {"name": "apple"}, {"name": "apple-slice"}, {"name": "birthday"}, {"name": "birthday-slice"}, {"name": "brain"}, {"name": "brain-large"}, {"name": "brain-slice"}, {"name": "carrot"}, {"name": "carrot-slice"}, {"name": "cheese"}, {"name": "cheese-slice"}, {"name": "chocolate"}, {"name": "chocolate-slice"}, {"name": "lemon"}, {"name": "lemon-slice"}, {"name": "lime"}, {"name": "lime-slice"}, {"name": "orange"}, {"name": "orange-slice"}, {"name": "plain"}, {"name": "plain-slice"}, {"name": "clown"}, {"name": "clown-slice"}, {"name": "plate"}, {"name": "plate-small"}, {"name": "plate-plastic"}, {"name": "plate-small-plastic"}, {"name": "plate-slice-shading"}, {"name": "pumpkinspice"}, {"name": "pumpkinspice-slice"}, {"name": "slime"}, {"name": "slime-slice"}, {"name": "christmas"}, {"name": "christmas-slice"}, {"name": "vanilla"}, {"name": "vanilla-slice"}, {"name": "trumpet"}, {"name": "trumpet-slice"}, {"name": "suppermatter", "directions": 1, "delays": [[1.0]]}, {"name": "suppermatter-shard", "directions": 1, "delays": [[1.0]]},{"name": "lemoon","delays": [ [ 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15 ] ]},{"name": "lemoon-slice"}]}

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lemoon.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/lemoon.rsi/dead.png
new file mode 100644 (file)
index 0000000..00d15de
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/lemoon.rsi/dead.png differ

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lemoon.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/lemoon.rsi/harvest.png
new file mode 100644 (file)
index 0000000..eb8e9be
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/lemoon.rsi/harvest.png differ

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lemoon.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/lemoon.rsi/meta.json
new file mode 100644 (file)
index 0000000..7d9b435
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Hydroponics/lemoon.rsi/meta.json
@@ -0,0 +1,41 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken and resprite from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068",
+    "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/Objects/Specific/Hydroponics/lemoon.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/lemoon.rsi/produce.png
new file mode 100644 (file)
index 0000000..8ccdaff
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/lemoon.rsi/produce.png differ

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lemoon.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/lemoon.rsi/seed.png
new file mode 100644 (file)
index 0000000..a1de9a7
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/lemoon.rsi/seed.png differ

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lemoon.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/lemoon.rsi/stage-1.png
new file mode 100644 (file)
index 0000000..b6caf9b
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/lemoon.rsi/stage-1.png differ

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lemoon.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/lemoon.rsi/stage-2.png
new file mode 100644 (file)
index 0000000..23eb583
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/lemoon.rsi/stage-2.png differ

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lemoon.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/lemoon.rsi/stage-3.png
new file mode 100644 (file)
index 0000000..2f3eb17
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/lemoon.rsi/stage-3.png differ

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lemoon.rsi/stage-4.png b/Resources/Textures/Objects/Specific/Hydroponics/lemoon.rsi/stage-4.png
new file mode 100644 (file)
index 0000000..e09ce8d
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/lemoon.rsi/stage-4.png differ

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lemoon.rsi/stage-5.png b/Resources/Textures/Objects/Specific/Hydroponics/lemoon.rsi/stage-5.png
new file mode 100644 (file)
index 0000000..5125a62
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/lemoon.rsi/stage-5.png differ

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lemoon.rsi/stage-6.png b/Resources/Textures/Objects/Specific/Hydroponics/lemoon.rsi/stage-6.png
new file mode 100644 (file)
index 0000000..3f5bb97
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/lemoon.rsi/stage-6.png differ