]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
TG Station Bread (#15234)
authorpotato1234_x <79580518+potato1234x@users.noreply.github.com>
Sat, 6 May 2023 07:41:32 +0000 (17:41 +1000)
committerGitHub <noreply@github.com>
Sat, 6 May 2023 07:41:32 +0000 (17:41 +1000)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
66 files changed:
Resources/Locale/en-US/flavors/flavor-profiles.ftl
Resources/Locale/en-US/reagents/meta/consumable/food/ingredients.ftl
Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml
Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml
Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_whole.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
Resources/Prototypes/Flavors/flavors.yml
Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml
Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
Resources/Prototypes/Recipes/Reactions/food.yml
Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha-filling.png
Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha-filling2.png
Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha-slice-filling.png
Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha-slice.png
Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha-slice2-filling.png
Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha-slice2.png
Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha.png
Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha2.png
Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/banana-slice.png
Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/banana.png
Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/buttered-toast.png
Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/cornbread-slice.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/cornbread.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/creamcheese-slice.png
Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/creamcheese.png
Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/french-toast.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/garlic-slice.png
Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/jelly-toast.png
Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meat-slice.png
Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meat.png
Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meta.json
Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/mimana-slice.png
Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/mimana.png
Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/moldy-slice.png
Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/plain-slice.png
Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/plain.png
Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/sausage-slice.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/sausage.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/spidermeat-slice.png
Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/spidermeat.png
Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/tofu-slice.png
Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/tofu.png
Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/two-slice.png
Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/xenomeat-slice.png
Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/xenomeat.png
Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cakebatter.png
Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cornmeal-big.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cornmeal.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cornmealdough-slice.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cornmealdough.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough-flat.png
Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough-pastry-baked.png
Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough-pastry.png
Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough-pie.png
Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough-slice.png
Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough.png
Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json
Resources/Textures/Objects/Consumable/Food/ingredients.rsi/pizzabread.png
Resources/Textures/Objects/Consumable/Food/meat.rsi/meta.json
Resources/Textures/Objects/Consumable/Food/meat.rsi/spidercutlet-cooked.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Food/meat.rsi/spidercutlet.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Food/meat.rsi/xenocutlet-cooked.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Food/meat.rsi/xenocutlet.png [new file with mode: 0644]

index 33d90a1a9076f9f34045681b2d799808e64c5695..bf7012e6a4929b375d0bf5f952dd36f4e7ed2a8a 100644 (file)
@@ -40,6 +40,7 @@ flavor-base-shocking = shocking
 flavor-base-cheap = cheap
 flavor-base-piquant = piquant
 flavor-base-sharp = sharp
+flavor-base-syrupy = syrupy
 
 # lmao
 flavor-base-terrible = terrible
@@ -127,6 +128,7 @@ flavor-complex-bad-joke = like a bad joke
 flavor-complex-memory-leek = like a fork bomb
 flavor-complex-gunpowder = like gunpowder
 flavor-complex-validhunting = like validhunting
+flavor-complex-cobwebs = like cobwebs
 flavor-complex-sadness = like sadness
 flavor-complex-hope = like hope
 flavor-complex-chaos = like chaos
index fcc83d18cfb970bdb662a933710a338236cecadd..445e0b311431d1a3fdc1c0ed2379b1e65f958489 100644 (file)
@@ -1,6 +1,9 @@
 reagent-name-flour = flour
 reagent-desc-flour = Used for baking.
 
+reagent-name-cornmeal = cornmeal
+reagent-desc-cornmeal = Used for baking.
+
 reagent-name-oats = oats
 reagent-desc-oats = Used for a variety of tasty purposes.
 
index 02b657d4d6309c52e64fb35e94253d1709f78b7f..aea084a0a15887d7f8fb10dc2e73443327fe57b3 100644 (file)
@@ -2,6 +2,7 @@
   id: ChefvendInventory
   startingInventory:
     ReagentContainerFlour: 2
+    ReagentContainerCornmeal: 2
     ReagentContainerSugar: 2
     ReagentContainerRice: 2
     FoodCondimentPacketSalt: 4
index 4619e833d80c396b632b5483eeb7762298a6f765..21a8c7f53a0ecc2ef51fba6ed497f3550374e497 100644 (file)
       - FoodBreadCreamcheeseSlice
       - FoodBreadMoldySlice
       - FoodBreadGarlicSlice
+      - FoodBreadCornSlice
+      - FoodBreadSausageSlice
       - FoodBreadButteredToast
+      - FoodBreadJellySlice
+      - FoodBreadFrenchToast
+      - FoodBreadTwoSlice
       - FoodCakeBlueberrySlice
       - FoodCakePlainSlice
       - FoodCakeCarrotSlice
index db5d77b21f45330e9663b92eb4dc499fbf4ddec3..9091bd409d83d2d322baf017d7d5bcc2ffe0edda 100644 (file)
@@ -17,6 +17,8 @@
       - FoodBreadVolcanic
       - FoodBreadPlain
       - FoodBreadMeat
+      - FoodBreadCorn
+      - FoodBreadSausage
       - FoodBreadBanana
       - FoodBreadTofu
       - FoodBreadCreamcheese
index db58917cafb5659de72e7a2293addafd66b7e62c..7261ab976e9431db23f46f5ef8007b27af6a91ce 100644 (file)
 # Bread
 
 - type: entity
-  name: bread
+  name: banana bread
   parent: FoodBreadBase
-  id: FoodBreadPlain
-  description: Some plain old earthen bread.
+  id: FoodBreadBanana
+  description: A heavenly and filling treat.
   components:
+  - type: FlavorProfile
+    flavors:
+      - banana
+      - bread
   - type: Food
   - type: Sprite
     layers:
-    - state: plain
+    - state: banana
   - type: SliceableFood
-    slice: FoodBreadPlainSlice
+    slice: FoodBreadBananaSlice
+# Tastes like bread, banana, nut.
 
 - type: entity
-  name: bread slice
+  name: banana bread slice
   parent: FoodBreadSliceBase
-  id: FoodBreadPlainSlice
-  description: A slice of home.
+  id: FoodBreadBananaSlice
+  description: A slice of delicious banana bread.
   components:
+  - type: FlavorProfile
+    flavors:
+      - banana
+      - bread
   - type: Food
   - type: Sprite
     layers:
-    - state: plain-slice
+    - state: banana-slice
+
+- type: entity
+  name: cornbread
+  parent: FoodBreadBase
+  id: FoodBreadCorn
+  description: Some good down-home country-style, rootin'-tootin', revolver-shootin', dad-gum yeehaw cornbread.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - bread
+      - corn
+  - type: Food
+  - type: Sprite
+    layers:
+    - state: cornbread
+  - type: SliceableFood
+    slice: FoodBreadCornSlice
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 20
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 15
+# Tastes like bread, banana, nut.
+
+- type: entity
+  name: cornbread slice
+  parent: FoodBreadSliceBase
+  id: FoodBreadCornSlice
+  description: A slice of cornbread.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - bread
+      - corn
+  - type: Food
+  - type: Sprite
+    layers:
+    - state: cornbread-slice
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 3
 
 - type: entity
-  name: meatbread loaf
+  name: cream cheese bread
+  parent: FoodBreadBase
+  id: FoodBreadCreamcheese
+  description: Yum yum yum!
+  components:
+  - type: FlavorProfile
+    flavors:
+      - cheesy
+      - creamy
+      - bread
+  - type: Food
+  - type: Sprite
+    layers:
+    - state: creamcheese
+  - type: SliceableFood
+    slice: FoodBreadCreamcheeseSlice
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 35
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 20
+        - ReagentId: Vitamin
+          Quantity: 5
+# Tastes like bread, cheese.
+
+- type: entity
+  name: cream cheese bread slice
+  parent: FoodBreadSliceBase
+  id: FoodBreadCreamcheeseSlice
+  description: A slice of yum!
+  components:
+  - type: FlavorProfile
+    flavors:
+      - cheesy
+      - creamy
+      - bread
+  - type: Food
+  - type: Sprite
+    layers:
+    - state: creamcheese-slice
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 10
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 4
+        - ReagentId: Vitamin
+          Quantity: 1.2
+
+- type: entity
+  name: meat bread
   parent: FoodBreadBase
   id: FoodBreadMeat
   description: The culinary base of every self-respecting eloquen/tg/entleman.
 # Tastes like bread, meat.
 
 - type: entity
-  name: meatbread slice
+  name: meat bread slice
   parent: FoodBreadSliceBase
   id: FoodBreadMeatSlice
   description: A slice of delicious meatbread.
           Quantity: 1.2
 
 - type: entity
-  name: xeno-meat bread
+  name: mimana bread
   parent: FoodBreadBase
-  id: FoodBreadMeatXeno
-  description: Reassuringly green meatloaf made from xeno meat. Extra heretical.
+  id: FoodBreadMimana
+  description: Best eaten in silence.
   components:
   - type: FlavorProfile
     flavors:
-      - acidic
+      - nothing
       - bread
   - type: Food
   - type: Sprite
     layers:
-    - state: xenomeat
+    - state: mimana
   - type: SliceableFood
-    slice: FoodBreadMeatXenoSlice
+    slice: FoodBreadMimanaSlice
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 45
+        maxVol: 40
         reagents:
         - ReagentId: Nutriment
-          Quantity: 30
+          Quantity: 15
         - ReagentId: Vitamin
           Quantity: 5
-# Tastes like bread, acid.
+        - ReagentId: Nothing
+          Quantity: 5
+        - ReagentId: MuteToxin
+          Quantity: 5
+# Tastes like bread, cheese.
 
 - type: entity
-  name: xeno-meatbread slice
+  name: mimana bread slice
   parent: FoodBreadSliceBase
-  id: FoodBreadMeatXenoSlice
-  description: A slice of delicious meatbread. Extra heretical.
+  id: FoodBreadMimanaSlice
+  description: A slice of silence!
   components:
   - type: FlavorProfile
     flavors:
-      - acidic
+      - nothing
       - bread
   - type: Food
   - type: Sprite
     layers:
-    - state: xenomeat-slice
+    - state: mimana-slice
   - type: SolutionContainerManager
     solutions:
       food:
         maxVol: 10
         reagents:
         - ReagentId: Nutriment
-          Quantity: 6
+          Quantity: 3
         - ReagentId: Vitamin
-          Quantity: 1.2
+          Quantity: 1
+        - ReagentId: Nothing
+          Quantity: 1
+        - ReagentId: MuteToxin
+          Quantity: 1
 
 - type: entity
-  name: spider-meatbread
+  name: bread
   parent: FoodBreadBase
-  id: FoodBreadMeatSpider
-  description: Reassuringly green meatloaf made from spider meat.
+  id: FoodBreadPlain
+  description: Some plain old earthen bread.
   components:
   - type: Food
   - type: Sprite
     layers:
-    - state: spidermeat
+    - state: plain
   - type: SliceableFood
-    slice: FoodBreadMeatSpiderSlice
+    slice: FoodBreadPlainSlice
+
+- type: entity
+  name: bread slice
+  parent: FoodBreadSliceBase
+  id: FoodBreadPlainSlice
+  description: A slice of home.
+  components:
+  - type: Food
+  - type: Sprite
+    layers:
+    - state: plain-slice
+
+- type: entity
+  name: sausage bread
+  parent: FoodBreadBase
+  id: FoodBreadSausage
+  description: Dont think too much about it.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - meaty
+      - bread
+  - type: Food
+  - type: Sprite
+    layers:
+    - state: sausage
+  - type: SliceableFood
+    slice: FoodBreadSausageSlice
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 60
+        maxVol: 45
         reagents:
         - ReagentId: Nutriment
-          Quantity: 30
+          Quantity: 10
         - ReagentId: Vitamin
           Quantity: 5
-        - ReagentId: Toxin
-          Quantity: 15
-# Tastes like bread, cobwebs.
+        - ReagentId: Protein
+          Quantity: 5
 
 - type: entity
-  name: spider-meatbread slice
+  name: sausage bread slice
   parent: FoodBreadSliceBase
-  id: FoodBreadMeatSpiderSlice
-  description: A slice of meatloaf made from an animal that most likely still wants you dead.
+  id: FoodBreadSausageSlice
+  description: Dont think too much about it.
   components:
+  - type: FlavorProfile
+    flavors:
+      - meaty
+      - bread
   - type: Food
   - type: Sprite
     layers:
-    - state: spidermeat-slice
+    - state: sausage-slice
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 15
+        maxVol: 10
         reagents:
         - ReagentId: Nutriment
-          Quantity: 6
+          Quantity: 2
         - ReagentId: Vitamin
-          Quantity: 1.2
-        - ReagentId: Toxin
-          Quantity: 3
+          Quantity: 1
+        - ReagentId: Protein
+          Quantity: 1
 
 - type: entity
-  name: banana-nut bread
+  name: spider meat bread
   parent: FoodBreadBase
-  id: FoodBreadBanana
-  description: A heavenly and filling treat.
+  id: FoodBreadMeatSpider
+  description: Reassuringly green meatloaf made from spider meat.
   components:
   - type: FlavorProfile
     flavors:
-      - banana
-      - nutty
+      - cobwebs
       - bread
   - type: Food
   - type: Sprite
     layers:
-    - state: banana
+    - state: spidermeat
   - type: SliceableFood
-    slice: FoodBreadBananaSlice
-# Tastes like bread, banana, nut.
+    slice: FoodBreadMeatSpiderSlice
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 60
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 30
+        - ReagentId: Vitamin
+          Quantity: 5
+        - ReagentId: Toxin
+          Quantity: 15
+# Tastes like bread, cobwebs.
 
 - type: entity
-  name: banana-nut bread slice
+  name: spider meat bread slice
   parent: FoodBreadSliceBase
-  id: FoodBreadBananaSlice
-  description: A slice of delicious banana bread.
+  id: FoodBreadMeatSpiderSlice
+  description: A slice of meatloaf made from an animal that most likely still wants you dead.
   components:
   - type: FlavorProfile
     flavors:
-      - banana
-      - nutty
+      - cobwebs
       - bread
   - type: Food
   - type: Sprite
     layers:
-    - state: banana-slice
+    - state: spidermeat-slice
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 15
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 6
+        - ReagentId: Vitamin
+          Quantity: 1.2
+        - ReagentId: Toxin
+          Quantity: 3
 
 - type: entity
   name: tofu bread
   id: FoodBreadTofu
   description: Like meatbread but for vegetarians. Brag to your crewmates about how much better it is.
   components:
+  - type: FlavorProfile
+    flavors:
+      - tofu
+      - bread
   - type: Food
   - type: Sprite
     layers:
   id: FoodBreadTofuSlice
   description: A slice of delicious tofu bread.
   components:
+  - type: FlavorProfile
+    flavors:
+      - tofu
+      - bread
   - type: Food
   - type: Sprite
     layers:
           Quantity: 2.4
 
 - type: entity
-  name: cream cheese bread
+  name: xeno meat bread
   parent: FoodBreadBase
-  id: FoodBreadCreamcheese
-  description: Yum yum yum!
+  id: FoodBreadMeatXeno
+  description: A fitting, and filling, end to xeno scum.
   components:
   - type: FlavorProfile
     flavors:
-      - cheesy
-      - creamy
+      - acid
       - bread
   - type: Food
   - type: Sprite
     layers:
-    - state: creamcheese
+    - state: xenomeat
   - type: SliceableFood
-    slice: FoodBreadCreamcheeseSlice
+    slice: FoodBreadMeatXenoSlice
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 35
+        maxVol: 45
         reagents:
         - ReagentId: Nutriment
-          Quantity: 20
+          Quantity: 30
         - ReagentId: Vitamin
           Quantity: 5
-# Tastes like bread, cheese.
+# Tastes like bread, acid.
 
 - type: entity
-  name: cream cheese bread slice
+  name: xeno meat bread slice
   parent: FoodBreadSliceBase
-  id: FoodBreadCreamcheeseSlice
-  description: A slice of yum!
+  id: FoodBreadMeatXenoSlice
+  description: A slice of xeno scum.
   components:
   - type: FlavorProfile
     flavors:
-      - cheesy
-      - creamy
+      - acid
       - bread
   - type: Food
   - type: Sprite
     layers:
-    - state: creamcheese-slice
+    - state: xenomeat-slice
   - type: SolutionContainerManager
     solutions:
       food:
         maxVol: 10
         reagents:
         - ReagentId: Nutriment
-          Quantity: 4
+          Quantity: 6
         - ReagentId: Vitamin
           Quantity: 1.2
 
+# Other than bread/slices
+
 - type: entity
-  name: mimana bread
+  name: baguette
   parent: FoodBreadBase
-  id: FoodBreadMimana
-  description: Best eaten in silence.
+  id: FoodBreadBaguette
+  description: Bon appétit!
   components:
-  - type: Food
+  - type: Tag
+    tags:
+    - Baguette
   - type: Sprite
-    layers:
-    - state: mimana
-  - type: SliceableFood
-    slice: FoodBreadMimanaSlice
+    state: baguette
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 40
+        maxVol: 15
         reagents:
         - ReagentId: Nutriment
-          Quantity: 20
+          Quantity: 6
         - ReagentId: Vitamin
-          Quantity: 5
-        - ReagentId: Nothing
-          Quantity: 5
-# Tastes like bread, cheese.
+          Quantity: 1
+        - ReagentId: TableSalt
+          Quantity: 1
+        - ReagentId: Blackpepper
+          Quantity: 1
+# Tastes like France.
 
 - type: entity
-  name: Mimana bread slice
+  name: buttered toast
   parent: FoodBreadSliceBase
-  id: FoodBreadMimanaSlice
-  description: A slice of silence!
+  id: FoodBreadButteredToast
+  description: Crunchy.
   components:
-  - type: Food
+  - type: FlavorProfile
+    flavors:
+      - butter
+      - bread
   - type: Sprite
-    layers:
-    - state: mimana-slice
+    state: buttered-toast
   - type: SolutionContainerManager
     solutions:
       food:
         maxVol: 10
         reagents:
         - ReagentId: Nutriment
-          Quantity: 4
+          Quantity: 5
         - ReagentId: Vitamin
-          Quantity: 1.2
-        - ReagentId: Nothing
-          Quantity: 1.2
-
-# Other than bread/slices
+          Quantity: 1
+# Tastes like bread, butter.
 
 - type: entity
-  name: moldy slice
+  name: f toast
   parent: FoodBreadSliceBase
-  id: FoodBreadMoldySlice
-  description: Entire stations have been ripped apart over arguing whether this is still good to eat.
+  id: FoodBreadFrenchToast
+  description: A slice of bread soaked in a beaten egg mixture.
   components:
+  - type: FlavorProfile
+    flavors:
+      - syrupy
+      - bread
   - type: Sprite
-    layers:
-    - state: moldy-slice
+    state: french-toast
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 15
+        maxVol: 10
         reagents:
         - ReagentId: Nutriment
           Quantity: 4
-        - ReagentId: Mold
-          Quantity: 7
-# Tastes like decaying fungus.
+        - ReagentId: Vitamin
+          Quantity: 2
+# Tastes like bread, butter.
 
 - type: entity
-  name: baguette
-  parent: FoodBreadBase
-  id: FoodBreadBaguette
-  description: Bon appétit!
+  name: garlic bread
+  parent: FoodBreadSliceBase
+  id: FoodBreadGarlicSlice
+  description: Alas, it is limited.
   components:
-  - type: Tag
-    tags:
-    - Baguette
+  - type: FlavorProfile
+    flavors:
+      - bread
+      - garlic
   - type: Sprite
-    state: baguette
+    layers:
+    - state: garlic-slice
   - type: SolutionContainerManager
     solutions:
       food:
         - ReagentId: Nutriment
           Quantity: 6
         - ReagentId: Vitamin
-          Quantity: 1
-        - ReagentId: TableSalt
-          Quantity: 1
-        - ReagentId: Blackpepper
-          Quantity: 1
-# Tastes like France.
+          Quantity: 5
+# Tastes like garlic, Italy.
 
 - type: entity
-  name: garlic bread
+  name: jelly toast
   parent: FoodBreadSliceBase
-  id: FoodBreadGarlicSlice
-  description: Alas, it is limited.
+  id: FoodBreadJellySlice
+  description: As if science are gonna give up their slimes for toast!
   components:
   - type: FlavorProfile
     flavors:
       - bread
-      - garlic
+      - slimy
   - type: Sprite
     layers:
-    - state: garlic-slice
+    - state: jelly-toast
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 15
+        maxVol: 10
         reagents:
         - ReagentId: Nutriment
-          Quantity: 5
+          Quantity: 4
         - ReagentId: Vitamin
           Quantity: 4
-        - ReagentId: Allicin
-          Quantity: 2
 # Tastes like garlic, Italy.
 
 - type: entity
-  name: buttered toast
+  name: moldy bread slice
   parent: FoodBreadSliceBase
-  id: FoodBreadButteredToast
-  description: Crunchy.
+  id: FoodBreadMoldySlice
+  description: Entire stations have been ripped apart over arguing whether this is still good to eat.
   components:
   - type: Sprite
-    state: buttered-toast
+    layers:
+    - state: moldy-slice
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 10
+        maxVol: 15
         reagents:
         - ReagentId: Nutriment
-          Quantity: 5
+          Quantity: 4
+        - ReagentId: Mold
+          Quantity: 7
+# Tastes like decaying fungus.
+
+- type: entity
+  name: two slice
+  parent: FoodBreadSliceBase
+  id: FoodBreadTwoSlice
+  description: Classy.
+  components:
+  - type: Sprite
+    layers:
+    - state: two-slice
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 15
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 3
         - ReagentId: Vitamin
-          Quantity: 1
-# Tastes like bread, butter.
+          Quantity: 2
+        - ReagentId: Wine
+          Quantity: 5
+# Tastes like decaying fungus.
index b8794de4fd4ca75075dd24373874d704ca5b7368..1eccd36d18a54ec636d5d75b3f3bd86ba2131b3f 100644 (file)
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
 
+- type: entity
+  parent: ReagentContainerBase
+  id: ReagentContainerCornmeal
+  name: cornmeal bag
+  description: A big bag of cornmeal. Good for cooking!
+  components:
+  - type: Sprite
+    state: cornmeal-big
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        reagents:
+        - ReagentId: Cornmeal
+          Quantity: 50
+
+- type: entity
+  parent: ReagentContainerBase
+  id: ReagentContainerCornmealSmall
+  name: cornmeal pack
+  description: A pack of cornmeal. Good for cooking!
+  components:
+  - type: Sprite
+    state: cornmeal
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 20
+        reagents:
+        - ReagentId: Cornmeal
+          Quantity: 20
+
 - type: entity
   parent: ReagentContainerBase
   id: ReagentContainerRice
   - type: Sprite
     state: dough-slice
 
+- type: entity
+  name: cornmeal dough
+  parent: FoodBakingBase
+  id: FoodDoughCornmeal
+  description: A piece of cornmeal dough.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - chalky
+      - dough
+  - type: Sprite
+    state: cornmealdough
+  - type: SliceableFood
+    count: 3
+    slice: FoodDoughCornmealSlice
+
+- type: entity
+  name: cornmeal dough slice
+  parent: FoodBakingBase
+  id: FoodDoughCornmealSlice
+  description: A slice of cornmeal dough.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - chalky
+      - dough
+  - type: Sprite
+    state: cornmealdough-slice
+
 - type: entity
   name: bun
   parent: FoodBakingBase
index 51ae9f5deb07069ce0d0f190670e836e0f8115de..4e8fa0bb2e0d9c1092ec6c66a262b15904e8786d 100644 (file)
     - Raw
     - Cutlet
   - type: Sprite
-    layers:
-    - state: cutlet
-      color: black
-    - state: cutlet-alpha
-      color: red
+    state: spidercutlet
   - type: SolutionContainerManager
     solutions:
       food:
     - Raw
     - Cutlet
   - type: Sprite
-    layers:
-    - state: cutlet
-      color: black
-    - state: cutlet-alpha
-      color: green
+    state: xenocutlet
   - type: SolutionContainerManager
     solutions:
       food:
     - Cooked
     - Cutlet
   - type: Sprite
-    layers:
-    - state: cutlet-cooked
-      color: black
-    - state: cutlet-alpha
-      color: red
+    state: spidercutlet-cooked
   - type: SolutionContainerManager
     solutions:
       food:
     - Cooked
     - Cutlet
   - type: Sprite
-    layers:
-    - state: cutlet-cooked
-      color: black
-    - state: cutlet-alpha
-      color: green
+    state: xenocutlet-cooked
   - type: SolutionContainerManager
     solutions:
       food:
index 820b36f4bd920ef55323f7d329caac1421aed344..9fde289e9f9f69a0ae3e505e9dda35c24462a1a7 100644 (file)
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 14
+        maxVol: 20
         reagents:
+        - ReagentId: Cornmeal
+          Quantity: 15
         - ReagentId: Nutriment
-          Quantity: 10
-        - ReagentId: Vitamin
-          Quantity: 4
+          Quantity: 5
   - type: Sprite
     sprite: Objects/Specific/Hydroponics/corn.rsi
   - type: Produce
   - type: Tag
     tags:
       - Trash
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 20
+        reagents:
+        - ReagentId: Cornmeal
+          Quantity: 10
 
 - type: entity
   name: onion
index 1d1768235f4240231a8d1ab1ad9ceabc727a8ea6..39060a47045a0f0d2e9f396a792a41215443a1ac 100644 (file)
   flavorType: Base
   description: flavor-base-sharp
 
+- type: flavor
+  id: syrupy
+  flavorType: Base
+  description: flavor-base-syrupy
+
 - type: flavor
   id: nothing
   flavorType: Complex
   flavorType: Complex
   description: flavor-complex-validhunting
 
+- type: flavor
+  id: cobwebs
+  flavorType: Complex
+  description: flavor-complex-cobwebs
+
 - type: flavor
   id: alcohol
   flavorType: Complex
index 9436490a5ed242cfddaeb562ae0f3c60464d68df..b525a3b248bac35df5c5def3fe82311de0c958eb 100644 (file)
       - !type:AdjustReagent
         reagent: Sugar
         amount: 0.4
+      - !type:SatiateThirst
+        factor: -0.2 #its flour
+      - !type:AdjustReagent
+        reagent: Nutriment
+        amount: 0.1
+
+- type: reagent
+  id: Cornmeal
+  name: reagent-name-cornmeal
+  group: Foods
+  desc: reagent-desc-cornmeal
+  physicalDesc: reagent-physical-desc-powdery
+  flavor: corn #so corn doesnt taste chalky
+  color: tan
+  metabolisms:
+    Food:
+      effects:
+      - !type:SatiateThirst
+        factor: -0.2 #its cornflour
       - !type:AdjustReagent
         reagent: Nutriment
         amount: 0.1
index d73c1fafd65b6b78de2c297043ee245d6e024705..e956b71aaa66ca0e4d87a228ef19b91789e190e1 100644 (file)
     FoodEgg: 2
 
 #Breads & Sandwiches
+
 - type: microwaveMealRecipe
-  id: RecipeBread
-  name: bread recipe
-  result: FoodBreadPlain
+  id: RecipeBananaBread
+  name: banana bread recipe
+  result: FoodBreadBanana
   time: 15
   solids:
     FoodDough: 1
+    FoodBanana: 1
 
 - type: microwaveMealRecipe
-  id: RecipeBaguette
-  name: baguette recipe
-  result: FoodBreadBaguette
+  id: RecipeCornbread
+  name: cornbread recipe
+  result: FoodBreadCorn
   time: 10
-  reagents:
-    TableSalt: 5
   solids:
-    FoodDough: 1
+    FoodDoughCornmeal: 1
 
 - type: microwaveMealRecipe
   id: RecipeCreamCheeseBread
   name: cream cheese bread recipe
   result: FoodBreadCreamcheese
-  time: 20
+  time: 15
+  reagents:
+    Milk: 5
   solids:
     FoodDough: 1
     FoodCheeseSlice: 2
 
 - type: microwaveMealRecipe
-  id: RecipeBananaBread
-  name: banana bread recipe
-  result: FoodBreadBanana
-  time: 25
+  id: RecipeMeatBread
+  name: meat bread recipe
+  result: FoodBreadMeat
+  time: 15
   solids:
     FoodDough: 1
-    FoodBanana: 1
+    FoodMeatCutlet: 2
+    FoodCheeseSlice: 2
 
 - type: microwaveMealRecipe
-  id: RecipeMoldyBreadSlice
-  name: moldy bread slice recipe
-  result: FoodBreadMoldySlice
-  time: 5
+  id: RecipeMimanaBread
+  name: mimana bread recipe
+  result: FoodBreadMimana
+  time: 15
+  reagents:
+    MilkSoy: 5
+    Nothing: 5 #replace with mimana
   solids:
-    FoodBreadPlainSlice: 1
-    FoodFlyAmanita: 1
+    FoodDough: 1
+    FoodTofu: 1
+
+- type: microwaveMealRecipe
+  id: RecipeBread
+  name: bread recipe
+  result: FoodBreadPlain
+  time: 10
+  solids:
+    FoodDough: 1
+
+- type: microwaveMealRecipe
+  id: RecipeSausageBread
+  name: sausage bread recipe
+  result: FoodBreadSausage
+  time: 15
+  solids:
+    FoodDough: 1
+    FoodMeat: 1 #replace with sausage
+
+- type: microwaveMealRecipe
+  id: RecipeSpiderMeatBread
+  name: spider meat bread recipe
+  result: FoodBreadMeatSpider
+  time: 15
+  solids:
+    FoodDough: 1
+    FoodMeatSpiderCutlet: 2
+    FoodCheeseSlice: 2
 
 - type: microwaveMealRecipe
   id: RecipeTofuBread
   name: tofu bread recipe
   result: FoodBreadTofu
-  time: 20
+  time: 15
   solids:
     FoodDough: 1
     FoodTofu: 1
 
+- type: microwaveMealRecipe
+  id: RecipeXenoMeatBread
+  name: xeno meat bread recipe
+  result: FoodBreadMeatXeno
+  time: 15
+  solids:
+    FoodDough: 1
+    FoodMeatXenoCutlet: 2
+    FoodCheeseSlice: 2
+
+#Slices Only
+
+- type: microwaveMealRecipe
+  id: RecipeBaguette
+  name: baguette recipe
+  result: FoodBreadBaguette
+  time: 15
+  reagents:
+    TableSalt: 5
+    Blackpepper: 5
+  solids:
+    FoodDough: 1
+
+- type: microwaveMealRecipe
+  id: RecipeButteredToast
+  name: buttered toast recipe
+  result: FoodBreadButteredToast
+  time: 5
+  solids:
+    FoodBreadPlainSlice: 1
+    FoodButter: 1
+
+- type: microwaveMealRecipe
+  id: RecipeFrenchToast
+  name: french toast recipe
+  result: FoodBreadFrenchToast
+  time: 5
+  reagents:
+    Milk: 5
+    Egg: 12
+  solids:
+    FoodBreadPlainSlice: 1
+
 - type: microwaveMealRecipe
   id: RecipeGarlicBread
   name: garlic bread slice recipe
   solids:
     FoodBreadPlainSlice: 1
     FoodGarlic: 1
+    FoodButter: 1
+
+- type: microwaveMealRecipe
+  id: RecipeJellyToast
+  name: jelly toast recipe
+  result: FoodBreadJellySlice
+  time: 5
+  solids:
+    FoodBreadPlainSlice: 1
+    FoodJellyAmanita: 1 #replace with jelly
+
+- type: microwaveMealRecipe
+  id: RecipeMoldyBreadSlice
+  name: moldy bread slice recipe
+  result: FoodBreadMoldySlice
+  time: 5
+  solids:
+    FoodBreadPlainSlice: 1
+    FoodFlyAmanita: 1
+
+- type: microwaveMealRecipe
+  id: RecipeTwoBreadSlice
+  name: two slice recipe
+  result: FoodBreadTwoSlice
+  time: 5
+  reagents:
+    Wine: 5
+  solids:
+    FoodBreadPlainSlice: 2
 
 #Pizzas
 - type: microwaveMealRecipe
index 7c0d71caf834987ca7256977103b5cea335ca08a..5e32ab08a95d58d7416a3b5b89c34c6ce975b831 100644 (file)
     - !type:CreateEntityReactionEffect
       entity: FoodDough
 
+- type: reaction
+  id: CreateCornmealDough
+  impact: Low
+  quantized: true
+  reactants:
+    Cornmeal:
+      amount: 15
+    Milk: #replace with yoghurt when added
+      amount: 10
+    Egg:
+      amount: 6
+  effects:
+    - !type:CreateEntityReactionEffect
+      entity: FoodDoughCornmeal
+
 - type: reaction
   id: CreateCakeBatter
   impact: Low
index 66dcb6019aa414c8dd582c338b9cfb29db48f74b..e47649d21c79cf7c2a60b2b8b628045e1afe1b4e 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha-filling.png and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha-filling.png differ
index 318668da8d6eda6e8679769253e3df3103364e37..8523dd1c1c4ecb5b1dbf3f6327d40d34f7283578 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha-filling2.png and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha-filling2.png differ
index ef6beb0f709cf835c1d8d9c71c4b7bf52e3c9521..c0aed8f7281457a0d1f6d08486900fe179d22c2e 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha-slice-filling.png and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha-slice-filling.png differ
index 842805c4091182dba322c555f7aa728036db662e..d6a11c0068e1cebec0858f43ad2d21e2a99987e6 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha-slice.png and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha-slice.png differ
index 418ed990b361385009c3ffe17c633e2165309792..740ec1c530f933bddd20a9044129735494723b30 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha-slice2-filling.png and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha-slice2-filling.png differ
index 00131ad176507450888aea1df9bfd82d45275df3..d91f79097cf279eb970277c5b97d11da16db6eeb 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha-slice2.png and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha-slice2.png differ
index a8379ac4a1479fc850a88eaa69e424caf1aba9f7..78b352fff4409124a0910f5a45c61e54beee3749 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha.png and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha.png differ
index 53bb4fb8d6c75008654a8c02693aa302a36e7aac..50ea999f50b4d8243e155b83e72ee891f44dac31 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha2.png and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha2.png differ
index e0eb82d08259b6f4a76391fabe8d891f213b2db3..b3869c19ac9f1cc44f740f393b3850035b498692 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/banana-slice.png and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/banana-slice.png differ
index f5f78c46800c824aaf64dbc3c01126c1cdbe904f..8d776d33824746667341905a73f9f1ed629dffb9 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/banana.png and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/banana.png differ
index ca7104c27fdb546cbcccc4ab7f81b50385b0b73e..1339ba03039538dde9d6e17046f8519869692574 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/buttered-toast.png and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/buttered-toast.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/cornbread-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/cornbread-slice.png
new file mode 100644 (file)
index 0000000..2067897
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/cornbread-slice.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/cornbread.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/cornbread.png
new file mode 100644 (file)
index 0000000..4c0be35
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/cornbread.png differ
index c9b809b2a3a835d4e5fa2c519417b881aa7e3124..984a7d81c06f21eb3769054aef28e3b788aa7c49 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/creamcheese-slice.png and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/creamcheese-slice.png differ
index a7e3aaa94f441b27210364ce6b48af2948dc06bb..80c72d9ad0f70b893ffdd13c9dcf456a9b6f7d73 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/creamcheese.png and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/creamcheese.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/french-toast.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/french-toast.png
new file mode 100644 (file)
index 0000000..671cb0f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/french-toast.png differ
index c9fff6ad11b7c67a068ac701c3f1ab79c9dfc748..16fe63fac5b4fe5b88ab540c230a86264a34f264 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/garlic-slice.png and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/garlic-slice.png differ
index ae5d718765302ed8e188478c10b4499eaea5e2f1..4c00b8dc2ed4de0e98e9ab86fe94b4a02504a8a0 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/jelly-toast.png and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/jelly-toast.png differ
index a67b0d0540103ea124b5aaa74d5a1c6094b2ef9e..629ca88d8ef54299720db1cc51d54f2a64c6750d 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meat-slice.png and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meat-slice.png differ
index ec47c76d52327325c76bf80eb4b4c2d1548458ba..6376332235c8846d0a6993e1f579547caf2655dc 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meat.png and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meat.png differ
index 0b0c5c16889783556a51d0a887956daad5325000..8a816d868b170a631da82b060835f8a1816b7a0e 100644 (file)
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa",
+  "copyright": "Taken from tgstation and modified by potato1234x at https://github.com/tgstation/tgstation/commit/0631fe5bde73a68b4c12bdfa633c30b2cee442d5",
   "size": {
     "x": 32,
     "y": 32
     {
       "name": "buttered-toast"
     },
+    {
+      "name": "cornbread"
+    },
+    {
+      "name": "cornbread-slice"
+    },
     {
       "name": "creamcheese"
     },
     {
       "name": "creamcheese-slice"
     },
+    {
+      "name": "french-toast"
+    },
     {
       "name": "garlic-slice"
     },
     {
       "name": "plate"
     },
+    {
+      "name": "sausage"
+    },
+    {
+      "name": "sausage-slice"
+    },
     {
       "name": "spidermeat"
     },
index e45c8a9c71ca9b735b363d8c831743d6c145d30c..8fef6be6db6c8388f29951c4d29b94d3e0829f3c 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/mimana-slice.png and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/mimana-slice.png differ
index 7de8a3920ae1688275dfab3fda56383265df0336..a4eab7370f29443aa96c7b0f4647f5ab8d34269e 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/mimana.png and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/mimana.png differ
index e63a9f0b1718496853271ad6e6663de659c389fd..bd811b0f643ebe41bd8ec7f53cd23adc4b6fb61e 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/moldy-slice.png and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/moldy-slice.png differ
index 855c8fb2301faabfcd6096f0aad25c5390f4bf04..7049dce349ddac4b4b902f9d5c91cbfc9028e1c8 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/plain-slice.png and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/plain-slice.png differ
index d592e73c94a3acef78e76a965d474fbc6519b866..eec14af0213132d1061482ca2c460c95ec877717 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/plain.png and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/plain.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/sausage-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/sausage-slice.png
new file mode 100644 (file)
index 0000000..7174c8e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/sausage-slice.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/sausage.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/sausage.png
new file mode 100644 (file)
index 0000000..b30460b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/sausage.png differ
index d9af8868cfc7aa7fa4168823d996d030a3c15547..2456b4ed779175c5d7edb4c9425ebe6a92f03d72 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/spidermeat-slice.png and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/spidermeat-slice.png differ
index 3945e48afc1c59b497e9e54595eba014f64d921c..26e82265a89e18245d3c58fe1b72ed66de71f317 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/spidermeat.png and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/spidermeat.png differ
index f7feab6594ce7db7adad3324ec87b4d3f59fd6c2..b7ff46e39985ca84b587f20fb3d677e0bf95a94b 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/tofu-slice.png and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/tofu-slice.png differ
index 90432f280fea0ef2b4fde17a8ab60180e811d676..6c84e602a5c72cd60b35fabbd13257893bc65bba 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/tofu.png and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/tofu.png differ
index fd4617092e3f94c96791d7defa6d6f4d24297314..06bd06ec701db7fdd7dd517e4762b15a74c5c360 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/two-slice.png and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/two-slice.png differ
index 73c0e5447f5e6a82d64351cf3f402fa658e6f606..4b800b4473207afc2974137f9417f0bb6c7b99c2 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/xenomeat-slice.png and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/xenomeat-slice.png differ
index 47cdef15f8c3e5e6550ceed77a411d8eab2f71ff..71ff7853ac6d85a130449b5d112a627a0903976d 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/xenomeat.png and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/xenomeat.png differ
index 688ced7b626af4df2090e91b20f0275ec32d6235..df978582d7c93eb6d8d7162a2b2de9a6924a38f1 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cakebatter.png and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cakebatter.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cornmeal-big.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cornmeal-big.png
new file mode 100644 (file)
index 0000000..14b2901
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cornmeal-big.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cornmeal.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cornmeal.png
new file mode 100644 (file)
index 0000000..e19a056
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cornmeal.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cornmealdough-slice.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cornmealdough-slice.png
new file mode 100644 (file)
index 0000000..3be04ae
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cornmealdough-slice.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cornmealdough.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cornmealdough.png
new file mode 100644 (file)
index 0000000..20196a6
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cornmealdough.png differ
index 44aaef5444783c98ede599410c463fb600f7b3e7..abceb970a9deb8c51f6a884bbfda9476d27b7572 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough-flat.png and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough-flat.png differ
index 4bb7e80041b85a72aae7260d0e9abceb9b3e6bfa..e12cc4a7a5461edb7d9c1abc3889344e6cd080c9 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough-pastry-baked.png and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough-pastry-baked.png differ
index 0cecdc5ce6006412e0379934766466a74a5c27f7..cb470692c084cbd0b8c1469a1013599c2b8d378d 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough-pastry.png and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough-pastry.png differ
index e11367809023da78e08b65d0c238167527aa562f..852e3cdb237cc82a7aec2d360961ed91df7ff10d 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough-pie.png and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough-pie.png differ
index 307403215849602efb57f84884850c281cedc49f..86ff47a25e65d6eff6ae34b6c8ea4b17facf3091 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough-slice.png and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough-slice.png differ
index 258a9e6c6ad48e0d7df06e0d8fe12754251a045a..62150ea11c424da99b7a8e4a9deaa0bae0b5fc72 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough.png and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough.png differ
index 47df0c0a567c8739318fb24e29ced1fb484a1477..4752daf3ea54536bfd40939f683533803358e250 100644 (file)
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation and baystation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and https://github.com/Baystation12/Baystation12/commit/a6067826de7fd8f698793f6d84e6c2f1f9b1f188. Tofu and tofu-slice were created by Discord user rosysyntax#6514",
+  "copyright": "Taken from tgstation and baystation and modified by potato1234x at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and https://github.com/Baystation12/Baystation12/commit/a6067826de7fd8f698793f6d84e6c2f1f9b1f188. Tofu and tofu-slice were created by Discord user rosysyntax#6514",
   "size": {
     "x": 32,
     "y": 32
     {
       "name": "cheesewheel"
     },
+    {
+      "name": "cornmeal"
+    },
+    {
+      "name": "cornmeal-big"
+    },
+    {
+      "name": "cornmealdough"
+    },
+    {
+      "name": "cornmealdough-slice"
+    },
     {
       "name": "dough"
     },
index 6c31b751178099ca2ed4868833ac24051fd4f576..28f8d68f7ced88913958fcdf1c195454e354ef4d 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/pizzabread.png and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/pizzabread.png differ
index 79eb49da9f300de498520c8b192747004da601ae..2bbe89d1f9faea4a7456ef5cfc1cc5026c4849fa 100644 (file)
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa",
+  "copyright": "Taken from tgstation and modified by Swept and potato1234x at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa",
   "size": {
     "x": 32,
     "y": 32
     {
       "name": "spider"
     },
+    {
+      "name": "spidercutlet"
+    },
+    {
+      "name": "spidercutlet-cooked"
+    },
     {
       "name": "spiderleg"
     },
     },
     {
       "name": "xeno"
+    },
+    {
+      "name": "xenocutlet"
+    },
+    {
+      "name": "xenocutlet-cooked"
     },
        {
       "name": "dragon"
diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/spidercutlet-cooked.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/spidercutlet-cooked.png
new file mode 100644 (file)
index 0000000..6ef7762
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meat.rsi/spidercutlet-cooked.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/spidercutlet.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/spidercutlet.png
new file mode 100644 (file)
index 0000000..5d057a6
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meat.rsi/spidercutlet.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/xenocutlet-cooked.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/xenocutlet-cooked.png
new file mode 100644 (file)
index 0000000..bc045ff
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meat.rsi/xenocutlet-cooked.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/xenocutlet.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/xenocutlet.png
new file mode 100644 (file)
index 0000000..45042f5
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meat.rsi/xenocutlet.png differ