Custom Taco & Kebabs - FoodSequence 2 (#30905)

* control layer ordering * sprite update * taco! * taco naming gen * fix separator naming * some proto fixes * default naming separation * fix taco naming * rat update * hamsterburger * organs taco * remove from spawners * fixes * fix separators and lemons * Update food-sequence.ftl * randomization offset * fix * kebabs refactor * fix * skewer weapon * Update food_single.yml * Update migration.yml * suppermatter * hamlet centered * hamsburger * Update dead-0.png * 20 -> 4 burger layers max * Update burger.yml * canReact: false * capfruit update * Update burger.yml * Update burger.yml * Update produce.yml * some fixes * Update Resources/Textures/Objects/Consumable/Food/taco.rsi/meta.json Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Update Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Update Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * chicken * Update food-sequence.ftl * documentation * fixes * Update meat.yml * Update meat.yml --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-08-14 16:04:00 +03:00
parent 8ac0246998
commit e659eb992f
74 changed files with 1138 additions and 1127 deletions
--- a/Resources/Prototypes/Body/Organs/human.yml
+++ b/Resources/Prototypes/Body/Organs/human.yml
@@ -68,12 +68,14 @@
    flavors:
      - people
  - type: FoodSequenceElement
+    sprite:
+      sprite: Mobs/Species/Human/organs.rsi
+      state: brain
    entries:
      burger:
-        name: food-sequence-burger-content-brain
-        sprite:
-          sprite: Mobs/Species/Human/organs.rsi
-          state: brain
+        name: food-sequence-content-brain
+      taco:
+        name: food-sequence-content-brain
  
 - type: entity
  id: OrganHumanEyes
@@ -95,12 +97,14 @@
  - type: Sprite
    state: tongue
  - type: FoodSequenceElement
+    sprite:
+      sprite: Mobs/Species/Human/organs.rsi
+      state: tongue
    entries:
      burger:
-        name: food-sequence-burger-content-tongue
-        sprite:
-          sprite: Mobs/Species/Human/organs.rsi
-          state: tongue
+        name: food-sequence-content-tongue
+      taco:
+        name: food-sequence-content-tongue

 - type: entity
  id: OrganHumanAppendix
@@ -112,13 +116,6 @@
    - state: appendix
    - state: appendix-inflamed
      visible: false
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-appendix
-        sprite:
-          sprite: Mobs/Species/Human/organs.rsi
-          state: appendix

 - type: entity
  id: OrganHumanEars
@@ -129,12 +126,14 @@
  - type: Sprite
    state: ears
  - type: FoodSequenceElement
+    sprite:
+      sprite: Mobs/Species/Human/organs.rsi
+      state: ears
    entries:
      burger:
-        name: food-sequence-burger-content-ears
-        sprite:
-          sprite: Mobs/Species/Human/organs.rsi
-          state: ears
+        name: food-sequence-content-ears
+      taco:
+        name: food-sequence-content-ears

 - type: entity
  id: OrganHumanLungs
@@ -218,12 +217,14 @@
    - id: Food
    - id: Drink
  - type: FoodSequenceElement
+    sprite:
+      sprite: Mobs/Species/Human/organs.rsi
+      state: stomach
    entries:
      burger:
-        name: food-sequence-burger-content-stomach
-        sprite:
-          sprite: Mobs/Species/Human/organs.rsi
-          state: stomach
+        name: food-sequence-content-stomach
+      taco:
+        name: food-sequence-content-stomach

 - type: entity
  id: OrganHumanLiver
@@ -240,12 +241,14 @@
    - id: Alcohol
      rateModifier: 0.1 # removes alcohol very slowly along with the stomach removing it as a drink
  - type: FoodSequenceElement
+    sprite:
+      sprite: Mobs/Species/Human/organs.rsi
+      state: liver
    entries:
      burger:
-        name: food-sequence-burger-content-liver
-        sprite:
-          sprite: Mobs/Species/Human/organs.rsi
-          state: liver
+        name: food-sequence-content-liver
+      taco:
+        name: food-sequence-content-liver

 - type: entity
  id: OrganHumanKidneys
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_meal.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_meal.yml
@@ -69,7 +69,6 @@
      - FoodSoupOnion
      - FoodSoupBisque
      - FoodSoupBungo
-      - FoodMealSoftTaco
      - FoodMealCornInButter
      - FoodSoupStew
    chance: 0.8
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_single.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_single.yml
@@ -32,9 +32,6 @@
      - FoodBurgerChicken
      - FoodBurgerDuck
      - FoodBurgerCheese
-      - FoodMeatHawaiianKebab
-      - FoodMeatKebab
-      - FoodMeatFiestaKebab
      - FoodNoodlesBoiled
      - FoodNoodles
      - FoodNoodlesCopy
@@ -51,11 +48,7 @@
      - FoodBakedDumplings
      - FoodBakedChevreChaud
      - FoodBakedNugget
-      - FoodTacoBeef
-      - FoodTacoChicken
-      - FoodTacoFish
-      - FoodTacoBeefSupreme
-      - FoodTacoChickenSupreme
+      - FoodTacoShell
    chance: 0.8
    offset: 0.0
    #rare
@@ -72,12 +65,6 @@
      - FoodBurgerSpell
      - FoodBurgerSuper
      - FoodBurgerCrazy
-      - FoodMeatHumanKebab
-      - FoodMeatLizardtailKebab
-      - FoodMeatRatKebab
-      - FoodMeatRatdoubleKebab
-      - FoodMeatSnakeKebab
      - FoodPizzaArnoldSlice
      - FoodPizzaUraniumSlice
-      - FoodTacoRat
    rareChance: 0.05
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -1675,6 +1675,21 @@
  - type: FireVisuals
    sprite: Mobs/Effects/onfire.rsi
    normalState: Mouse_burning
+  - type: FoodSequenceElement
+    sprite:
+      sprite: Mobs/Animals/mouse.rsi
+      state: dead-0
+    entries:
+      burger:
+        name: food-sequence-burger-content-rat
+      taco:
+        name: food-sequence-content-rat
+      skewer:
+        name: food-sequence-content-rat
+        sprite: 
+          sprite: Objects/Consumable/Food/skewer.rsi
+          state: skewer-rat
+

 - type: entity
  parent: MobMouse
@@ -1731,6 +1746,10 @@
  - type: Item
    size: Tiny
    heldPrefix: 1
+  - type: FoodSequenceElement
+    sprite:
+      sprite: Mobs/Animals/mouse.rsi
+      state: dead-1

 - type: entity
  parent: MobMouse
@@ -1760,6 +1779,10 @@
  - type: Item
    size: Tiny
    heldPrefix: 2
+  - type: FoodSequenceElement
+    sprite:
+      sprite: Mobs/Animals/mouse.rsi
+      state: dead-2

 - type: entity
  name: cancer mouse
@@ -3183,6 +3206,15 @@
  - type: FireVisuals
    sprite: Mobs/Effects/onfire.rsi
    normalState: Mouse_burning
+  - type: FoodSequenceElement
+    sprite:
+      sprite: Mobs/Animals/hamster.rsi
+      state: dead-0
+    entries:
+      burger:
+        name: food-sequence-burger-content-hamster
+      taco:
+        name: food-sequence-content-hamster

 - type: entity
  name: pig
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
@@ -784,3 +784,12 @@
  - type: Tag
    tags:
    - Slice
+  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Consumable/Food/Baked/cake.rsi
+      state: suppermatter-shard
+    entries:
+      burger:
+        name: food-sequence-burger-content-suppermatter
+      taco:
+        name: food-sequence-content-suppermatter
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml
@@ -33,6 +33,8 @@
  name: bottom bun
  description: It's time to start building the burger tower. 
  components:
+  - type: Item
+    size: Normal #patch until there is an adequate resizing system in place 
  - type: Food
  - type: Sprite
    drawdepth: Mobs
@@ -40,18 +42,21 @@
    sprite: Objects/Consumable/Food/burger.rsi
    layers:
    - state: bun_bottom
+    - map: ["foodSequenceLayers"]
  - type: FoodSequenceStartPoint
    key: burger
-    maxLayers: 20
+    maxLayers: 10
    startPosition: 0, 0
    offset: 0, 0.1
-    nameGeneration: food-sequence-standart-gen
-    nameSuffix: food-sequence-burger-suffix
+    minLayerOffset: -0.05, 0
+    maxLayerOffset: 0.05, 0
+    nameGeneration: food-sequence-burger-gen
  - type: Appearance
  - type: SolutionContainerManager
    solutions:
      food:
        maxVol: 5
+        canReact: false # Dont want cause reactions inside burgers after merging ingredients
        reagents:
        - ReagentId: Nutriment
          Quantity: 3.3 # 1/2 of a bun
@@ -75,12 +80,12 @@
        - ReagentId: Nutriment
          Quantity: 3.3 # 1/2 of a bun
  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Consumable/Food/burger.rsi
+      state: bun_top
    entries:
      burger:
        final: true
-        sprite:
-          sprite: Objects/Consumable/Food/burger.rsi
-          state: bun_top
  
 # Base

@@ -982,4 +987,4 @@
  - type: Tag
    tags:
    - Meat
-    
+    
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
@@ -570,13 +570,6 @@
  - type: SliceableFood
    count: 3
    slice: FoodCheeseSlice
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-cheese
-        sprite:
-          sprite: Objects/Consumable/Food/ingredients.rsi
-          state: cheesewheel

 - type: entity
  name: cheese wedge
@@ -600,12 +593,14 @@
    tags:
    - Slice
  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Consumable/Food/ingredients.rsi
+      state: cheesewedge
    entries:
      burger:
-        name: food-sequence-burger-content-cheese
-        sprite:
-          sprite: Objects/Consumable/Food/ingredients.rsi
-          state: cheesewedge
+        name: food-sequence-content-cheese
+      taco: 
+        name: food-sequence-content-cheese

 - type: entity
  name: chèvre log
@@ -656,6 +651,15 @@
  - type: Tag
    tags:
    - Slice
+  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Consumable/Food/ingredients.rsi
+      state: chevredisk
+    entries:
+      burger:
+        name: food-sequence-content-chevre
+      taco: 
+        name: food-sequence-content-chevre

 - type: entity
  name: tofu
@@ -704,6 +708,15 @@
  - type: Tag
    tags:
    - Slice
+  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Consumable/Food/ingredients.rsi
+      state: tofu
+    entries:
+      burger:
+        name: food-sequence-content-tofu
+      taco: 
+        name: food-sequence-content-tofu

 - type: entity
  name: burned mess
@@ -760,3 +773,12 @@
  - type: Tag
    tags:
      - Ingredient
+  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Specific/Hydroponics/cocoa.rsi
+      state: produce-beans
+    entries:
+      burger:
+        name: food-sequence-content-cocoa
+      taco: 
+        name: food-sequence-content-cocoa
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -143,12 +143,14 @@
    tags:
    - Vegetable
  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Specific/Hydroponics/laughin_pea.rsi
+      state: produce
    entries:
      burger:
-        name: food-sequence-burger-content-pea
-        sprite:
-          sprite: Objects/Specific/Hydroponics/laughin_pea.rsi
-          state: produce
+        name: food-sequence-content-pea
+      taco:
+        name: food-sequence-content-pea

 - type: entity
  name: tower-cap log
@@ -286,12 +288,14 @@
    - Fruit
    - Banana
  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Specific/Hydroponics/banana.rsi
+      state: produce
    entries:
      burger:
-        name: food-sequence-burger-content-banana
-        sprite:
-          sprite: Objects/Specific/Hydroponics/banana.rsi
-          state: produce
+        name: food-sequence-content-banana
+      taco:
+        name: food-sequence-content-banana

 - type: entity
  name: mimana
@@ -330,12 +334,14 @@
    tags:
    - Fruit
  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Specific/Hydroponics/mimana.rsi
+      state: produce
    entries:
      burger:
-        name: food-sequence-burger-content-mimana
-        sprite:
-          sprite: Objects/Specific/Hydroponics/mimana.rsi
-          state: produce
+        name: food-sequence-content-mimana
+      taco:
+        name: food-sequence-content-mimana

 - type: entity
  name: banana peel
@@ -475,12 +481,14 @@
      - ReagentId: Oculine
        Quantity: 2
  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Specific/Hydroponics/carrot.rsi
+      state: produce
    entries:
      burger:
        name: food-sequence-burger-content-carrot
-        sprite:
-          sprite: Objects/Specific/Hydroponics/carrot.rsi
-          state: produce
+      taco:
+        name: food-sequence-content-carrot

 - type: entity
  name: cabbage
@@ -508,12 +516,14 @@
    tags:
    - Vegetable
  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Specific/Hydroponics/cabbage.rsi
+      state: produce
    entries:
      burger:
        name: food-sequence-burger-content-cabbage
-        sprite:
-          sprite: Objects/Specific/Hydroponics/cabbage.rsi
-          state: produce
+      taco:
+        name: food-sequence-content-cabbage

 - type: entity
  name: garlic
@@ -543,12 +553,14 @@
    tags:
    - Vegetable
  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Specific/Hydroponics/garlic.rsi
+      state: produce
    entries:
      burger:
        name: food-sequence-burger-content-garlic
-        sprite:
-          sprite: Objects/Specific/Hydroponics/garlic.rsi
-          state: produce
+      taco:
+        name: food-sequence-content-garlic

 - type: entity
  name: lemon
@@ -582,12 +594,14 @@
    - Lemon
    - Fruit
  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Specific/Hydroponics/lemon.rsi
+      state: produce
    entries:
      burger:
-        name: food-sequence-burger-content-lemon
-        sprite:
-          sprite: Objects/Specific/Hydroponics/lemon.rsi
-          state: produce
+        name: food-sequence-content-lemon
+      taco:
+        name: food-sequence-content-lemon

 - type: entity
  name: lemoon
@@ -620,12 +634,14 @@
    tags:
    - Fruit
  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Specific/Hydroponics/lemoon.rsi
+      state: produce
    entries:
      burger:
-        name: food-sequence-burger-content-lemon
-        sprite:
-          sprite: Objects/Specific/Hydroponics/lemoon.rsi
-          state: produce
+        name: food-sequence-content-lemoon
+      taco:
+        name: food-sequence-content-lemoon

 - type: entity
  name: lime
@@ -650,12 +666,14 @@
    - Lime
    - Fruit
  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Specific/Hydroponics/lime.rsi
+      state: produce
    entries:
      burger:
-        name: food-sequence-burger-content-lemon
-        sprite:
-          sprite: Objects/Specific/Hydroponics/lime.rsi
-          state: produce
+        name: food-sequence-content-lime
+      taco:
+        name: food-sequence-content-lime

 - type: entity
  name: orange
@@ -679,12 +697,14 @@
    tags:
    - Fruit
  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Specific/Hydroponics/orange.rsi
+      state: produce
    entries:
      burger:
-        name: food-sequence-burger-content-orange
-        sprite:
-          sprite: Objects/Specific/Hydroponics/orange.rsi
-          state: produce
+        name: food-sequence-content-orange
+      taco:
+        name: food-sequence-content-orange

 - type: entity
  name: pineapple
@@ -721,13 +741,6 @@
  - type: Tag
    tags:
    - Fruit
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-pineapple
-        sprite:
-          sprite: Objects/Specific/Hydroponics/pineapple.rsi
-          state: produce

 - type: entity
  name: potato
@@ -761,12 +774,14 @@
    - Potato
    - Vegetable
  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Specific/Hydroponics/potato.rsi
+      state: produce
    entries:
      burger:
-        name: food-sequence-burger-content-potato
-        sprite:
-          sprite: Objects/Specific/Hydroponics/potato.rsi
-          state: produce
+        name: food-sequence-content-potato
+      taco:
+        name: food-sequence-content-potato


 - type: entity
@@ -824,12 +839,19 @@
    - Fruit
    - Vegetable
  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Specific/Hydroponics/tomato.rsi
+      state: produce
    entries:
      burger:
-        name: food-sequence-burger-content-tomato
-        sprite:
-          sprite: Objects/Specific/Hydroponics/tomato.rsi
-          state: produce
+        name: food-sequence-content-tomato
+      taco:
+        name: food-sequence-content-tomato
+      skewer:
+        name: food-sequence-content-tomato
+        sprite: 
+          sprite: Objects/Consumable/Food/skewer.rsi
+          state: skewer-tomato

 - type: entity
  name: blue tomato
@@ -876,12 +898,14 @@
    - Fruit
    - Vegetable
  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Specific/Hydroponics/blue_tomato.rsi
+      state: produce
    entries:
      burger:
-        name: food-sequence-burger-content-tomato
-        sprite:
-          sprite: Objects/Specific/Hydroponics/blue_tomato.rsi
-          state: produce
+        name: food-sequence-content-tomato
+      taco:
+        name: food-sequence-content-tomato

 - type: entity
  name: blood tomato
@@ -926,12 +950,19 @@
    - Fruit # Fuck you they're a fruit
    - Vegetable
  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Specific/Hydroponics/blood_tomato.rsi
+      state: produce
    entries:
      burger:
-        name: food-sequence-burger-content-tomato
-        sprite:
-          sprite: Objects/Specific/Hydroponics/blood_tomato.rsi
-          state: produce
+        name: food-sequence-content-tomato
+      taco:
+        name: food-sequence-content-tomato
+      skewer:
+        name: food-sequence-content-tomato
+        sprite: 
+          sprite: Objects/Consumable/Food/skewer.rsi
+          state: skewer-tomato

 - type: entity
  name: eggplant
@@ -991,12 +1022,14 @@
    tags:
    - Fruit
  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Specific/Hydroponics/apple.rsi
+      state: produce
    entries:
      burger:
-        name: food-sequence-burger-content-apple
-        sprite:
-          sprite: Objects/Specific/Hydroponics/apple.rsi
-          state: produce
+        name: food-sequence-content-apple
+      taco:
+        name: food-sequence-content-apple

 - type: entity
  name: golden apple
@@ -1034,12 +1067,14 @@
    tags:
    - Fruit
  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Specific/Hydroponics/golden_apple.rsi
+      state: produce
    entries:
      burger:
-        name: food-sequence-burger-content-apple
-        sprite:
-          sprite: Objects/Specific/Hydroponics/golden_apple.rsi
-          state: produce
+        name: food-sequence-content-apple
+      taco:
+        name: food-sequence-content-apple

 - type: entity
  name: cocoa pod
@@ -1074,12 +1109,14 @@
    tags:
    - Fruit
  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Specific/Hydroponics/cocoa.rsi
+      state: produce
    entries:
      burger:
-        name: food-sequence-burger-content-cocoa
-        sprite:
-          sprite: Objects/Specific/Hydroponics/cocoa.rsi
-          state: produce
+        name: food-sequence-content-cocoa
+      taco:
+        name: food-sequence-content-cocoa

 - type: entity
  name: ear of corn
@@ -1119,12 +1156,19 @@
      - ReagentId: Enzyme
        Quantity: 2
  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Specific/Hydroponics/corn.rsi
+      state: produce
    entries:
      burger:
-        name: food-sequence-burger-content-corn
-        sprite:
-          sprite: Objects/Specific/Hydroponics/corn.rsi
-          state: produce
+        name: food-sequence-content-corn
+      taco:
+        name: food-sequence-content-corn
+      skewer:
+        name: food-sequence-content-corn
+        sprite: 
+          sprite: Objects/Consumable/Food/skewer.rsi
+          state: skewer-corn

 - type: entity
  name: corn cob
@@ -1148,12 +1192,14 @@
        - ReagentId: Cornmeal
          Quantity: 10
  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Specific/Hydroponics/corn.rsi
+      state: produce
    entries:
      burger:
-        name: food-sequence-burger-content-corn
-        sprite:
-          sprite: Objects/Specific/Hydroponics/corn.rsi
-          state: produce
+        name: food-sequence-content-corn
+      taco:
+        name: food-sequence-content-corn

 - type: entity
  name: onion
@@ -1186,12 +1232,14 @@
    tags:
    - Vegetable
  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Specific/Hydroponics/onion.rsi
+      state: produce
    entries:
      burger:
        name: food-sequence-burger-content-onion
-        sprite:
-          sprite: Objects/Specific/Hydroponics/onion.rsi
-          state: produce
+      taco:
+        name: food-sequence-content-onion

 - type: entity
  name: red onion
@@ -1224,12 +1272,14 @@
    tags:
    - Vegetable
  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Specific/Hydroponics/onion_red.rsi
+      state: produce
    entries:
      burger:
        name: food-sequence-burger-content-onion
-        sprite:
-          sprite: Objects/Specific/Hydroponics/onion_red.rsi
-          state: produce
+      taco:
+        name: food-sequence-content-onion

 - type: entity
  name: chanterelle cluster
@@ -1251,12 +1301,19 @@
    tags:
    - Vegetable
  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Specific/Hydroponics/chanterelle.rsi
+      state: produce
    entries:
      burger:
-        name: food-sequence-burger-content-mushroom
-        sprite:
-          sprite: Objects/Specific/Hydroponics/chanterelle.rsi
-          state: produce
+        name: food-sequence-content-mushroom
+      taco:
+        name: food-sequence-content-mushroom
+      skewer:
+        name: food-sequence-content-mushroom
+        sprite: 
+          sprite: Objects/Consumable/Food/skewer.rsi
+          state: skewer-mushroom

 # Slices

@@ -1301,12 +1358,14 @@
    - Fruit
    - Slice
  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Specific/Hydroponics/pineapple.rsi
+      state: slice
    entries:
      burger:
        name: food-sequence-burger-content-pineapple
-        sprite:
-          sprite: Objects/Specific/Hydroponics/pineapple.rsi
-          state: slice
+      taco:
+        name: food-sequence-content-pineapple

 - type: entity
  name: onion slice
@@ -1335,12 +1394,14 @@
    - Vegetable
    - Slice
  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Specific/Hydroponics/onion.rsi
+      state: slice
    entries:
      burger:
        name: food-sequence-burger-content-onion
-        sprite:
-          sprite: Objects/Specific/Hydroponics/onion.rsi
-          state: slice
+      taco:
+        name: food-sequence-content-onion

 - type: entity
  name: red onion slice
@@ -1369,12 +1430,14 @@
    - Vegetable
    - Slice
  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Specific/Hydroponics/onion_red.rsi
+      state: slice
    entries:
      burger:
        name: food-sequence-burger-content-onion
-        sprite:
-          sprite: Objects/Specific/Hydroponics/onion_red.rsi
-          state: slice
+      taco:
+        name: food-sequence-content-onion

 - type: entity
  name: chili pepper
@@ -1382,34 +1445,41 @@
  id: FoodChiliPepper
  description: Spicy, best not touch your eyes.
  components:
-    - type: FlavorProfile
-      flavors:
-        - spicy
-    - type: SolutionContainerManager
-      solutions:
-        food:
-          maxVol: 18
-          reagents:
-            - ReagentId: Nutriment
-              Quantity: 4
-            - ReagentId: CapsaicinOil
-              Quantity: 10
-            - ReagentId: Vitamin
-              Quantity: 4
-    - type: Sprite
+  - type: FlavorProfile
+    flavors:
+      - spicy
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 18
+        reagents:
+          - ReagentId: Nutriment
+            Quantity: 4
+          - ReagentId: CapsaicinOil
+            Quantity: 10
+          - ReagentId: Vitamin
+            Quantity: 4
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/chili.rsi
+  - type: Produce
+    seedId: chili
+  - type: Tag
+    tags:
+    - Vegetable
+  - type: FoodSequenceElement
+    sprite:
      sprite: Objects/Specific/Hydroponics/chili.rsi
-    - type: Produce
-      seedId: chili
-    - type: Tag
-      tags:
-      - Vegetable
-    - type: FoodSequenceElement
-      entries:
-        burger:
-          name: food-sequence-burger-content-chili
-          sprite:
-            sprite: Objects/Specific/Hydroponics/chili.rsi
-            state: produce
+      state: produce
+    entries:
+      burger:
+        name: food-sequence-content-chili
+      taco:
+        name: food-sequence-content-chili
+      skewer:
+        name: food-sequence-content-chili
+        sprite: 
+          sprite: Objects/Consumable/Food/skewer.rsi
+          state: skewer-pepper

 - type: entity
  name: chilly pepper
@@ -1417,32 +1487,39 @@
  id: FoodChillyPepper
  description: Icy hot.
  components:
-    - type: FlavorProfile
-      flavors:
-        - spicy
-        - cold
-    - type: SolutionContainerManager
-      solutions:
-        food:
-          maxVol: 18
-          reagents:
-            - ReagentId: Nutriment
-              Quantity: 4
-            - ReagentId: Frostoil
-              Quantity: 10
-            - ReagentId: Vitamin
-              Quantity: 4
-    - type: Sprite
+  - type: FlavorProfile
+    flavors:
+      - spicy
+      - cold
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 18
+        reagents:
+          - ReagentId: Nutriment
+            Quantity: 4
+          - ReagentId: Frostoil
+            Quantity: 10
+          - ReagentId: Vitamin
+            Quantity: 4
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/chilly.rsi
+  - type: Produce
+    seedId: chilly
+  - type: FoodSequenceElement
+    sprite:
      sprite: Objects/Specific/Hydroponics/chilly.rsi
-    - type: Produce
-      seedId: chilly
-    - type: FoodSequenceElement
-      entries:
-        burger:
-          name: food-sequence-burger-content-chilly
-          sprite:
-            sprite: Objects/Specific/Hydroponics/chilly.rsi
-            state: produce
+      state: produce
+    entries:
+      burger:
+        name: food-sequence-content-chilly
+      taco:
+        name: food-sequence-content-chilly
+      skewer:
+        name: food-sequence-content-chilly
+        sprite: 
+          sprite: Objects/Consumable/Food/skewer.rsi
+          state: skewer-bluepepper

 - type: entity
  name: aloe
@@ -1472,12 +1549,14 @@
    tags:
    - Vegetable
  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Specific/Hydroponics/aloe.rsi
+      state: produce
    entries:
      burger:
-        name: food-sequence-burger-content-aloe
-        sprite:
-          sprite: Objects/Specific/Hydroponics/aloe.rsi
-          state: produce
+        name: food-sequence-content-aloe
+      taco:
+        name: food-sequence-content-aloe

 - type: entity
  name: poppy
@@ -1511,12 +1590,14 @@
    tags:
    - Flower # TODO add "RedFlower" or "Poppy" tag, when other color flowers will be
  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Specific/Hydroponics/poppy.rsi
+      state: produce
    entries:
      burger:
-        name: food-sequence-burger-content-poppy
-        sprite:
-          sprite: Objects/Specific/Hydroponics/poppy.rsi
-          state: produce
+        name: food-sequence-content-poppy
+      taco:
+        name: food-sequence-content-poppy

 - type: entity
  name: lily
@@ -1546,12 +1627,14 @@
    tags:
    - Flower
  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Specific/Hydroponics/lily.rsi
+      state: produce
    entries:
      burger:
-        name: food-sequence-burger-content-lily
-        sprite:
-          sprite: Objects/Specific/Hydroponics/lily.rsi
-          state: produce
+        name: food-sequence-content-lily
+      taco:
+        name: food-sequence-content-lily

 - type: entity
  name: lingzhi
@@ -1579,12 +1662,19 @@
  - type: Extractable
    grindableSolutionName: food
  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Specific/Hydroponics/lingzhi.rsi
+      state: produce
    entries:
      burger:
-        name: food-sequence-burger-content-mushroom
-        sprite:
-          sprite: Objects/Specific/Hydroponics/lingzhi.rsi
-          state: produce
+        name: food-sequence-content-mushroom
+      taco:
+        name: food-sequence-content-mushroom
+      skewer:
+        name: food-sequence-content-mushroom
+        sprite: 
+          sprite: Objects/Consumable/Food/skewer.rsi
+          state: skewer-mushroom

 - type: entity
  name: ambrosia vulgaris
@@ -1669,12 +1759,14 @@
    tags:
    - Ambrosia
  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Specific/Hydroponics/ambrosia_deus.rsi
+      state: produce
    entries:
      burger:
        name: food-sequence-burger-content-ambrosia
-        sprite:
-          sprite: Objects/Specific/Hydroponics/ambrosia_deus.rsi
-          state: produce
+      taco:
+        name: food-sequence-content-ambrosia

 - type: entity
  name: galaxythistle
@@ -1703,12 +1795,14 @@
    - Galaxythistle
    - Fruit # Probably?
  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Specific/Hydroponics/galaxythistle.rsi
+      state: produce
    entries:
      burger:
        name: food-sequence-burger-content-galaxy
-        sprite:
-          sprite: Objects/Specific/Hydroponics/galaxythistle.rsi
-          state: produce
+      taco:
+        name: food-sequence-content-galaxy

 - type: entity
  name: glasstle
@@ -1774,12 +1868,14 @@
    tags:
    - Galaxythistle
  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Specific/Hydroponics/glasstle.rsi
+      state: produce
    entries:
      burger:
        name: food-sequence-burger-content-glasstle
-        sprite:
-          sprite: Objects/Specific/Hydroponics/glasstle.rsi
-          state: produce
+      taco:
+        name: food-sequence-content-glasstle

 - type: entity
  name: fly amanita
@@ -1807,12 +1903,19 @@
    grindableSolutionName: food
  - type: BadFood
  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Specific/Hydroponics/fly_amanita.rsi
+      state: produce
    entries:
      burger:
-        name: food-sequence-burger-content-mushroom
-        sprite:
-          sprite: Objects/Specific/Hydroponics/fly_amanita.rsi
-          state: produce
+        name: food-sequence-content-mushroom
+      taco:
+        name: food-sequence-content-mushroom
+      skewer:
+        name: food-sequence-content-mushroom
+        sprite: 
+          sprite: Objects/Consumable/Food/skewer.rsi
+          state: skewer-mushroom

 - type: entity
  name: gatfruit
@@ -1843,12 +1946,14 @@
    tags:
    - Fruit # It's in the name
  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Specific/Hydroponics/gatfruit.rsi
+      state: produce
    entries:
      burger:
        name: food-sequence-burger-content-gatfruit
-        sprite:
-          sprite: Objects/Specific/Hydroponics/gatfruit.rsi
-          state: produce
+      taco:
+        name: food-sequence-content-gatfruit

 - type: entity
  name: capfruit
@@ -1879,12 +1984,14 @@
    tags:
    - Fruit
  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Specific/Hydroponics/capfruit.rsi
+      state: produce
    entries:
      burger:
        name: food-sequence-burger-content-capfruit
-        sprite:
-          sprite: Objects/Specific/Hydroponics/capfruit.rsi
-          state: produce
+      taco:
+        name: food-sequence-content-capfruit

 - type: entity
  name: capfruit
@@ -1914,13 +2021,6 @@
          Quantity: 10
  - type: Produce
    seedId: rice
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-rice
-        sprite:
-          sprite: Objects/Specific/Hydroponics/rice.rsi
-          state: produce

 - type: entity
  name: soybeans
@@ -1948,12 +2048,14 @@
    tags:
    - Vegetable
  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Specific/Hydroponics/soybeans.rsi
+      state: produce
    entries:
      burger:
-        name: food-sequence-burger-content-soy
-        sprite:
-          sprite: Objects/Specific/Hydroponics/soybeans.rsi
-          state: produce
+        name: food-sequence-content-soy
+      taco:
+        name: food-sequence-content-soy

 - type: entity
  name: spaceman's trumpet
@@ -1983,12 +2085,14 @@
  - type: Instrument #hehe trumpet
    program: 56
  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Specific/Hydroponics/spacemans_trumpet.rsi
+      state: produce
    entries:
      burger:
-        name: food-sequence-burger-content-soy
-        sprite:
-          sprite: Objects/Specific/Hydroponics/soybeans.rsi
-          state: produce
+        name: food-sequence-burger-content-spacemans-trumpet
+      taco:
+        name: food-sequence-content-spacemans-trumpet

 - type: entity
  name: koibean
@@ -2018,12 +2122,14 @@
    tags:
    - Vegetable
  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Specific/Hydroponics/koibean.rsi
+      state: produce
    entries:
      burger:
        name: food-sequence-burger-content-koibean
-        sprite:
-          sprite: Objects/Specific/Hydroponics/koibean.rsi
-          state: produce
+      taco:
+        name: food-sequence-content-koibean

 - type: entity
  name: watermelon
@@ -2121,12 +2227,14 @@
    - Fruit
    - Slice
  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Specific/Hydroponics/watermelon.rsi
+      state: slice
    entries:
      burger:
        name: food-sequence-burger-content-watermelon
-        sprite:
-          sprite: Objects/Specific/Hydroponics/watermelon.rsi
-          state: slice
+      taco:
+        name: food-sequence-content-watermelon

 - type: entity
  name: grapes
@@ -2189,6 +2297,15 @@
  - type: Tag
    tags:
    - Fruit
+  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Specific/Hydroponics/berries.rsi
+      state: produce
+    entries:
+      burger:
+        name: food-sequence-burger-content-berries
+      taco:
+        name: food-sequence-content-berries

 - type: entity
  name: bungo fruit
@@ -2218,6 +2335,15 @@
  - type: Tag
    tags:
    - Fruit
+  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Specific/Hydroponics/bungo.rsi
+      state: produce
+    entries:
+      burger:
+        name: food-sequence-content-bungo
+      taco:
+        name: food-sequence-content-bungo

 - type: entity
  name: bungo pit
@@ -2272,6 +2398,15 @@
  - type: Tag
    tags:
    - Vegetable
+  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Specific/Hydroponics/pea.rsi
+      state: produce
+    entries:
+      burger:
+        name: food-sequence-content-pea
+      taco:
+        name: food-sequence-content-pea

 - type: entity
  name: pumpkin
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml
@@ -1,40 +1,6 @@
 # When adding new food also add to random spawner located in Resources\Prototypes\Entities\Markers\Spawners\Random\Food_Drinks\food_single.yml
-# Base
-
- type: entity
-  parent: FoodInjectableBase
-  id: FoodSkewerBase
-  abstract: true
-  components:
-  - type: Food
-    trash: 
-    - FoodKebabSkewer
-  - type: Sprite
-    sprite: Objects/Consumable/Food/skewer.rsi
-  - type: SolutionContainerManager
-    solutions:
-      food:
-        maxVol: 10
-        reagents:
-        - ReagentId: Nutriment
-          Quantity: 8
-  - type: Item
-    size: Small
-    storedRotation: -90
-
 # Kebabs

-# Thoughts on custom kebab system. Kebab items are separated into layers. Only
-# cutlets and specific items should be put on skewers, which is why i've tagged the cutlets
-# among other reasons. The system would specify between large and small skewer items, since
-# there is only so much space the sprite can hold. There are four "spots" on the skewer for
-# items, which means only 2 large items at a time can be on one. For examplehe thought it
-# you can put two lizard tails on a skewer with two cutlets inbetween.
-# This system of layers and spots also means that skewers can be progressively "eaten", meaning
-# that layers are made invisible as it gets eaten.
-
-# NOTE: Rats take up spots 2 and 4 and tails take up 1 and 3. This is important for sprite layering.
-
 - type: entity
  name: skewer
  parent: BaseItem
@@ -43,137 +9,36 @@
  components:
  - type: Sprite
    sprite: Objects/Consumable/Food/skewer.rsi
-    state: skewer
+    state: 
+    layers:
+    - state: skewer
+    - map: ["foodSequenceLayers"]
+  - type: MeleeWeapon
+    wideAnimationRotation: -120
+    damage:
+      types:
+        Piercing: 4
+    angle: 0
+    animation: WeaponArcThrust
+    soundHit:
+      path: /Audio/Weapons/bladeslice.ogg
  - type: Tag
    tags:
    - Trash
    - Skewer
-
-# Custom Kebab Example
-
- type: entity
-  name: Hawaiian kebab
-  parent: FoodSkewerBase
-  id: FoodMeatHawaiianKebab
-  description: A delicious kebab made of pineapple, ham and green peppers.
-  components:
-  - type: Sprite
-    layers:
-      - state: skewer
-      - state: skewer-meat-alpha1
-        color: yellow
-      - state: skewer-meat-alpha2
-        color: brown
-      - state: skewer-meat-alpha3
-        color: green
-      - state: skewer-meat-alpha4
-        color: brown
-  - type: Tag
-    tags:
-    - Meat
-    - Fruit
-
- type: entity
-  name: meat kebab
-  parent: FoodSkewerBase
-  id: FoodMeatKebab
-  description: Delicious meat, on a stick.
-  components:
-  - type: Sprite
-    layers:
-      - state: skewer
-      - state: skewer-meat1
-      - state: skewer-meat2
-      - state: skewer-meat3
-      - state: skewer-meat4
-  - type: Tag
-    tags:
-    - Meat
-
- type: entity
-  name: human kebab
-  parent: FoodMeatKebab
-  id: FoodMeatHumanKebab
-  description: Human meat. On a stick!
-
- type: entity
-  name: lizard-tail kebab
-  parent: FoodMeatKebab
-  id: FoodMeatLizardtailKebab
-  description: Severed lizard tail on a stick.
-  components:
-  - type: Sprite
-    layers:
-      - state: skewer
-      - state: skewer-tail1
-
- type: entity
-  name: rat kebab
-  parent: FoodMeatKebab
-  id: FoodMeatRatKebab
-  description: Not so delicious rat meat, on a stick.
-  components:
-  - type: Sprite
-    layers:
-      - state: skewer
-      - state: skewer-rat1
+  - type: Food
+    trash: 
+    - FoodKebabSkewer
  - type: SolutionContainerManager
    solutions:
      food:
-        reagents:
-        - ReagentId: Nutriment
-          Quantity: 6
-        - ReagentId: Vitamin
-          Quantity: 2
-
- type: entity
-  name: double rat kebab
-  parent: FoodMeatKebab
-  id: FoodMeatRatdoubleKebab
-  description: A double serving of not so delicious rat meat, on a stick.
-  components:
-  - type: Sprite
-    layers:
-      - state: skewer
-      - state: skewer-rat1
-      - state: skewer-rat2
-  - type: SolutionContainerManager
-    solutions:
-      food:
-        reagents:
-        - ReagentId: Nutriment
-          Quantity: 12
-        - ReagentId: Vitamin
-          Quantity: 6
-
- type: entity
-  name: fiesta kebab
-  parent: FoodSkewerBase
-  id: FoodMeatFiestaKebab
-  description: Always a cruise ship party somewhere in the world, right?
-  components:
-  - type: Sprite
-    layers:
-      - state: skewer
-      - state: skewer-pepper4
-      - state: skewer-corn2
-      - state: skewer-mushroom2
-      - state: skewer-tomato1
-
- type: entity
-  name: snake kebab
-  parent: FoodSkewerBase
-  id: FoodMeatSnakeKebab
-  description: Snake meat on a stick. It's a little tough.
-  components:
-  - type: Sprite
-    layers:
-      - state: skewer
-      - state: skewer-snake1
-      - state: skewer-snake2
-  - type: SolutionContainerManager
-    solutions:
-      food:
-        reagents:
-        - ReagentId: Nutriment
-          Quantity: 12
+        canReact: false # Dont want cause reactions inside skewers after merging ingredients
+        maxVol: 0
+  - type: FoodSequenceStartPoint
+    key: skewer
+    maxLayers: 4
+    startPosition: -0.27, -0.19
+    inverseLayers: true 
+    offset: 0.2, 0.1
+    nameGeneration: food-sequence-skewer-gen
+    contentSeparator: ", "
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml
@@ -8,163 +8,29 @@
  components:
  - type: Item
    storedRotation: -90
-  - type: Food
-  - type: Sprite
-    sprite: Objects/Consumable/Food/taco.rsi
-    layers:
-    - state: tacoshell
-  - type: SolutionContainerManager
-    solutions:
-      food:
-        maxVol: 10
-        reagents:
-        - ReagentId: Nutriment
-          Quantity: 6.66 # Just using the same values as the bun values, since the recipe for taco shells is roughly the same as buns.
-# Base
-
- type: entity
-  parent: FoodInjectableBase
-  id: FoodTacoBase
-  abstract: true
-  components:
-  - type: FlavorProfile
-    flavors:
-      - meaty
-      - cheesy
  - type: Food
    transferAmount: 3
  - type: Sprite
    sprite: Objects/Consumable/Food/taco.rsi
+    layers:
+    - state: tacoshell_back
+    - map: ["foodSequenceLayers"]
+    - state: tacoshell_forward
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 15
+        canReact: false # Dont want cause reactions inside tacos after merging ingredients
+        maxVol: 10
        reagents:
        - ReagentId: Nutriment
-          Quantity: 6
-        - ReagentId: Vitamin
-          Quantity: 4
-  - type: Item
-    sprite: Objects/Consumable/Food/taco.rsi
-    storedRotation: -90
-  - type: Tag
-    tags:
-      - Meat
-
- type: entity
-  name: beef taco
-  parent: FoodTacoBase
-  id: FoodTacoBeef
-  description: A very basic and run of the mill beef taco, now with cheese!
-  components:
-  - type: Food
-  - type: Sprite
-    state: beeftaco
-
- type: entity
-  name: chicken taco
-  parent: FoodTacoBase
-  id: FoodTacoChicken
-  description: A very basic and run of the mill chicken taco, now with cheese!
-  components:
-  - type: Food
-  - type: Sprite
-    state: chickentaco
-
- type: entity
-  name: fish taco
-  parent: FoodTacoBase
-  id: FoodTacoFish
-  description: Sounds kinda gross, but it's actually not that bad.
-  components:
-  - type: FlavorProfile
-    flavors:
-      - onion
-      - fishy
-  - type: Food
-  - type: Sprite
-    state: fishtaco
-  - type: SolutionContainerManager
-    solutions:
-      food:
-        maxVol: 20
-        reagents:
-        - ReagentId: Nutriment
-          Quantity: 10
-        - ReagentId: Vitamin
-          Quantity: 6
-
- type: entity
-  name: rat taco
-  parent: FoodTacoBase
-  id: FoodTacoRat
-  description: Yeah, that looks about right...
-  components:
-  - type: Food
-  - type: Sprite
-    state: rattaco
-  - type: SolutionContainerManager
-    solutions:
-      food:
-        maxVol: 15
-        reagents:
-        - ReagentId: Nutriment
-          Quantity: 6
-        - ReagentId: Vitamin
-          Quantity: 4
-
- type: entity
-  name: beef taco supreme
-  parent: FoodTacoBase
-  id: FoodTacoBeefSupreme
-  description: It's like a regular beef taco, but surpeme!
-  components:
-  - type: Food
-  - type: Sprite
-    state: beeftacosupreme
-  - type: SolutionContainerManager
-    solutions:
-      food:
-        maxVol: 26
-        reagents:
-        - ReagentId: Nutriment
-          Quantity: 14
-        - ReagentId: Vitamin
-          Quantity: 6
-
- type: entity
-  name: chicken taco supreme
-  parent: FoodTacoBase
-  id: FoodTacoChickenSupreme
-  description: It's like a regular chicken taco, but surpeme!
-  components:
-  - type: Food
-  - type: Sprite
-    state: chickentacosupreme
-  - type: SolutionContainerManager
-    solutions:
-      food:
-        maxVol: 26
-        reagents:
-        - ReagentId: Nutriment
-          Quantity: 14
-        - ReagentId: Vitamin
-          Quantity: 6
-
- type: entity
-  name: soft taco
-  parent: FoodMealBase
-  id: FoodMealSoftTaco
-  description: Take a bite!
-  components:
-  - type: FlavorProfile
-    flavors:
-      - cheesy
-      - tomato
-      - meaty
-      - onion
-  - type: Sprite
-    state: softtaco
-  - type: Tag
-    tags:
-      - Meat
+          Quantity: 6.66
+  - type: FoodSequenceStartPoint
+    key: taco
+    maxLayers: 3
+    startPosition: -0.2, 0
+    offset: 0.1, 0
+    minLayerOffset: 0, 0
+    maxLayerOffset: 0, 0.05
+    nameGeneration: food-sequence-taco-gen
+    contentSeparator: ", "
+  - type: Appearance
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml
@@ -18,12 +18,14 @@
        - ReagentId: THC
          Quantity: 15
  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Specific/Hydroponics/cannabis.rsi
+      state: produce
    entries:
      burger:
        name: food-sequence-burger-content-cannabis
-        sprite:
-          sprite: Objects/Specific/Hydroponics/cannabis.rsi
-          state: produce
+      taco:
+        name: food-sequence-content-cannabis


 - type: entity
@@ -44,13 +46,6 @@
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/tobacco.rsi
    state: dried
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-cannabis
-        sprite:
-          sprite: Objects/Specific/Hydroponics/tobacco.rsi
-          state: dried

 - type: entity
  name: ground cannabis
@@ -79,13 +74,6 @@
      - Smokable
  - type: Item
    size: Tiny
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-cannabis
-        sprite:
-          sprite: Objects/Misc/reagent_fillings.rsi
-          state: powderpile
    
 - type: entity
  name: rainbow cannabis leaves
@@ -119,12 +107,14 @@
        - ReagentId: Psicodine
          Quantity: 0.6
  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Specific/Hydroponics/rainbow_cannabis.rsi
+      state: produce
    entries:
      burger:
        name: food-sequence-burger-content-rainbow-cannabis
-        sprite:
-          sprite: Objects/Specific/Hydroponics/rainbow_cannabis.rsi
-          state: produce
+      taco:
+        name: food-sequence-content-rainbow-cannabis

 - type: entity
  name: dried rainbow cannabis leaves
@@ -155,13 +145,6 @@
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/rainbow_cannabis.rsi
    state: dried
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-rainbow-cannabis
-        sprite:
-          sprite: Objects/Specific/Hydroponics/rainbow_cannabis.rsi
-          state: dried

 - type: entity
  name: ground rainbow cannabis
@@ -195,13 +178,6 @@
  - type: Construction
    graph: smokeableGroundCannabisRainbow
    node: groundRainbow
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-rainbow-cannabis
-        sprite:
-          sprite: Objects/Specific/Hydroponics/rainbow_cannabis.rsi
-          state: powderpile_rainbow

 - type: entity
  name: tobacco leaves
@@ -259,11 +235,4 @@
    tags:
      - Smokable
  - type: Item
-    size: Tiny
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-tobacco
-        sprite:
-          sprite: Objects/Misc/reagent_fillings.rsi
-          state: powderpile
+    size: Tiny
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -1763,98 +1763,6 @@
    Nitrogen: 10
    Plasma: 10

-# Kebabs
- type: microwaveMealRecipe
-  id: RecipeMeatKebab
-  name: meat kebab recipe
-  result: FoodMeatKebab
-  time: 5
-  solids:
-    FoodMeatCutlet: 3
-    FoodKebabSkewer: 1
-
- type: microwaveMealRecipe
-  id: RecipeHawaiianKebab
-  name: Hawaiian kebab recipe
-  result: FoodMeatHawaiianKebab
-  time: 5
-  solids:
-    FoodChiliPepper: 1
-    FoodMeatCutlet: 1
-    FoodPineappleSlice: 1
-    FoodKebabSkewer: 1
-
- type: microwaveMealRecipe
-  id: RecipeFiestaKebab
-  name: fiesta kebab recipe
-  result: FoodMeatFiestaKebab
-  time: 5
-  solids:
-    FoodChiliPepper: 1
-    FoodCorn: 1
-    FoodMeatCutlet: 1
-    FoodTomato: 1
-    FoodKebabSkewer: 1
-
- type: microwaveMealRecipe
-  id: RecipeRatKebab
-  name: rat kebab recipe
-  result: FoodMeatRatKebab
-  time: 10
-  solids:
-    FoodMeatRat: 1
-    FoodKebabSkewer: 1
-
- type: microwaveMealRecipe
-  id: RecipeDoubleRatKebab
-  name: double rat kebab recipe
-  result: FoodMeatRatdoubleKebab
-  time: 20
-  solids:
-    FoodMeatRat: 2
-    FoodKebabSkewer: 1
-
- type: microwaveMealRecipe
-  id: RecipeHumanKebab
-  name: human kebab recipe
-  result: FoodMeatHumanKebab
-  time: 15
-  solids:
-    TorsoHuman: 1
-    FoodKebabSkewer: 1
-
- type: microwaveMealRecipe
-  id: RecipeLizardKebab
-  name: lizard kebab recipe
-  result: FoodMeatLizardtailKebab
-  time: 15
-  solids:
-    FoodMeatLizard: 1
-    FoodKebabSkewer: 1
-
- type: microwaveMealRecipe
-  id: RecipeSnakeKebab
-  name: snake kebab recipe
-  result: FoodMeatSnakeKebab
-  time: 15
-  reagents:
-    Wine: 5
-  solids:
-    FoodMeatSnake: 1
-    FoodKebabSkewer: 1
-
- type: microwaveMealRecipe
-  id: RecipeFoodMealSoftTaco
-  name: soft taco recipe
-  result: FoodMealSoftTaco
-  time: 10
-  solids:
-    FoodDoughSlice: 1
-    FoodTomato: 1
-    FoodOnionSlice: 2
-    FoodCheeseSlice: 1
-    FoodMeatCutlet: 1
-
 - type: microwaveMealRecipe
  id: RecipeFoodBakedChevreChaud
  name: chevre chaud recipe
@@ -1921,72 +1829,4 @@
  result: FoodTacoShell
  time: 5
  solids:
-    FoodDoughTortillaFlat: 1 # one third of a standard bread dough recipe
-
- type: microwaveMealRecipe
-  id: RecipeTacoBeef
-  name: beef taco recipe
-  result: FoodTacoBeef
-  time: 10
-  solids:
-    FoodTacoShell: 1
-    FoodMeatCutlet: 1
-    FoodCheeseSlice: 1
-
- type: microwaveMealRecipe
-  id: RecipeTacoChicken
-  name: chicken taco recipe
-  result: FoodTacoChicken
-  time: 10
-  solids:
-    FoodTacoShell: 1
-    FoodMeatChickenCutlet: 1
-    FoodCheeseSlice: 1
-
- type: microwaveMealRecipe
-  id: RecipeTacoFish
-  name: fish taco recipe
-  result: FoodTacoFish
-  time: 10
-  solids:
-    FoodTacoShell: 1
-    FoodMeatFish: 1
-    FoodOnionSlice: 2
-    FoodTomato: 1
-    FoodCabbage: 1
-
- type: microwaveMealRecipe
-  id: RecipeTacoRat
-  name: rat taco recipe
-  result: FoodTacoRat
-  time: 10
-  solids:
-    FoodTacoShell: 1
-    FoodCheeseSlice: 1
-    FoodMeatRat: 1
-
- type: microwaveMealRecipe
-  id: RecipeTacoBeefSupreme
-  name: beef taco supreme recipe
-  result: FoodTacoBeefSupreme
-  time: 10
-  solids:
-    FoodTacoShell: 1
-    FoodCheeseSlice: 1
-    FoodMeatCutlet: 1
-    FoodTomato: 1
-    FoodCabbage: 1
-    FoodOnionSlice: 2
-
- type: microwaveMealRecipe
-  id: RecipeTacoChickenSupreme
-  name: beef taco supreme recipe
-  result: FoodTacoChickenSupreme
-  time: 10
-  solids:
-    FoodTacoShell: 1
-    FoodCheeseSlice: 1
-    FoodMeatChickenCutlet: 1
-    FoodTomato: 1
-    FoodCabbage: 1
-    FoodOnionSlice: 2
+    FoodDoughTortillaFlat: 1 # one third of a standard bread dough recipe