diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl index 33d90a1a9076f9..bf7012e6a4929b 100644 --- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl @@ -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 diff --git a/Resources/Locale/en-US/reagents/meta/consumable/food/ingredients.ftl b/Resources/Locale/en-US/reagents/meta/consumable/food/ingredients.ftl index fcc83d18cfb970..445e0b311431d1 100644 --- a/Resources/Locale/en-US/reagents/meta/consumable/food/ingredients.ftl +++ b/Resources/Locale/en-US/reagents/meta/consumable/food/ingredients.ftl @@ -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. diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml index 02b657d4d6309c..aea084a0a15887 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml @@ -2,6 +2,7 @@ id: ChefvendInventory startingInventory: ReagentContainerFlour: 2 + ReagentContainerCornmeal: 2 ReagentContainerSugar: 2 ReagentContainerRice: 2 FoodCondimentPacketSalt: 4 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml index 4619e833d80c39..21a8c7f53a0ecc 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml @@ -19,7 +19,12 @@ - FoodBreadCreamcheeseSlice - FoodBreadMoldySlice - FoodBreadGarlicSlice + - FoodBreadCornSlice + - FoodBreadSausageSlice - FoodBreadButteredToast + - FoodBreadJellySlice + - FoodBreadFrenchToast + - FoodBreadTwoSlice - FoodCakeBlueberrySlice - FoodCakePlainSlice - FoodCakeCarrotSlice diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_whole.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_whole.yml index db5d77b21f4533..9091bd409d83d2 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_whole.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_whole.yml @@ -17,6 +17,8 @@ - FoodBreadVolcanic - FoodBreadPlain - FoodBreadMeat + - FoodBreadCorn + - FoodBreadSausage - FoodBreadBanana - FoodBreadTofu - FoodBreadCreamcheese diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml index db58917cafb565..7261ab976e9431 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml @@ -73,31 +73,140 @@ # 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. @@ -124,7 +233,7 @@ # Tastes like bread, meat. - type: entity - name: meatbread slice + name: meat bread slice parent: FoodBreadSliceBase id: FoodBreadMeatSlice description: A slice of delicious meatbread. @@ -148,137 +257,196 @@ 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 @@ -286,6 +454,10 @@ 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: @@ -309,6 +481,10 @@ id: FoodBreadTofuSlice description: A slice of delicious tofu bread. components: + - type: FlavorProfile + flavors: + - tofu + - bread - type: Food - type: Sprite layers: @@ -324,138 +500,143 @@ 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: @@ -464,54 +645,71 @@ - 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. diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml index b8794de4fd4ca7..1eccd36d18a54e 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml @@ -126,6 +126,37 @@ - !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 @@ -334,6 +365,35 @@ - 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 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml index 51ae9f5deb0706..4e8fa0bb2e0d9c 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml @@ -964,11 +964,7 @@ - Raw - Cutlet - type: Sprite - layers: - - state: cutlet - color: black - - state: cutlet-alpha - color: red + state: spidercutlet - type: SolutionContainerManager solutions: food: @@ -991,11 +987,7 @@ - Raw - Cutlet - type: Sprite - layers: - - state: cutlet - color: black - - state: cutlet-alpha - color: green + state: xenocutlet - type: SolutionContainerManager solutions: food: @@ -1184,11 +1176,7 @@ - Cooked - Cutlet - type: Sprite - layers: - - state: cutlet-cooked - color: black - - state: cutlet-alpha - color: red + state: spidercutlet-cooked - type: SolutionContainerManager solutions: food: @@ -1209,11 +1197,7 @@ - Cooked - Cutlet - type: Sprite - layers: - - state: cutlet-cooked - color: black - - state: cutlet-alpha - color: green + state: xenocutlet-cooked - type: SolutionContainerManager solutions: food: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 820b36f4bd920e..9fde289e9f9f69 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -583,12 +583,12 @@ - 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 @@ -616,6 +616,13 @@ - type: Tag tags: - Trash + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Cornmeal + Quantity: 10 - type: entity name: onion diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml index 1d1768235f4240..39060a47045a0f 100644 --- a/Resources/Prototypes/Flavors/flavors.yml +++ b/Resources/Prototypes/Flavors/flavors.yml @@ -159,6 +159,11 @@ flavorType: Base description: flavor-base-sharp +- type: flavor + id: syrupy + flavorType: Base + description: flavor-base-syrupy + - type: flavor id: nothing flavorType: Complex @@ -449,6 +454,11 @@ flavorType: Complex description: flavor-complex-validhunting +- type: flavor + id: cobwebs + flavorType: Complex + description: flavor-complex-cobwebs + - type: flavor id: alcohol flavorType: Complex diff --git a/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml b/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml index 9436490a5ed242..b525a3b248bac3 100644 --- a/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml +++ b/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml @@ -12,6 +12,25 @@ - !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 diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index d73c1fafd65b6b..e956b71aaa66ca 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -186,60 +186,136 @@ 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 @@ -248,6 +324,35 @@ 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 diff --git a/Resources/Prototypes/Recipes/Reactions/food.yml b/Resources/Prototypes/Recipes/Reactions/food.yml index 7c0d71caf83498..5e32ab08a95d58 100644 --- a/Resources/Prototypes/Recipes/Reactions/food.yml +++ b/Resources/Prototypes/Recipes/Reactions/food.yml @@ -25,6 +25,21 @@ - !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 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha-filling.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha-filling.png index 66dcb6019aa414..e47649d21c79cf 100644 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 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha-filling2.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha-filling2.png index 318668da8d6eda..8523dd1c1c4ecb 100644 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 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha-slice-filling.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha-slice-filling.png index ef6beb0f709cf8..c0aed8f7281457 100644 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 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha-slice.png index 842805c4091182..d6a11c0068e1ce 100644 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 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha-slice2-filling.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha-slice2-filling.png index 418ed990b36138..740ec1c530f933 100644 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 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha-slice2.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha-slice2.png index 00131ad1765074..d91f79097cf279 100644 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 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha.png index a8379ac4a1479f..78b352fff44091 100644 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 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha2.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha2.png index 53bb4fb8d6c750..50ea999f50b4d8 100644 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 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/banana-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/banana-slice.png index e0eb82d08259b6..b3869c19ac9f1c 100644 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 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/banana.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/banana.png index f5f78c46800c82..8d776d33824746 100644 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 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/buttered-toast.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/buttered-toast.png index ca7104c27fdb54..1339ba03039538 100644 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 index 00000000000000..2067897b2e70b2 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 index 00000000000000..4c0be3555b86ca Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/cornbread.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/creamcheese-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/creamcheese-slice.png index c9b809b2a3a835..984a7d81c06f21 100644 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 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/creamcheese.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/creamcheese.png index a7e3aaa94f441b..80c72d9ad0f70b 100644 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 index 00000000000000..671cb0f887dd98 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/french-toast.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/garlic-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/garlic-slice.png index c9fff6ad11b7c6..16fe63fac5b4fe 100644 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 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/jelly-toast.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/jelly-toast.png index ae5d718765302e..4c00b8dc2ed4de 100644 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 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meat-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meat-slice.png index a67b0d0540103e..629ca88d8ef542 100644 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 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meat.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meat.png index ec47c76d523273..6376332235c884 100644 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 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meta.json index 0b0c5c16889783..8a816d868b170a 100644 --- a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meta.json @@ -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 @@ -43,12 +43,21 @@ { "name": "buttered-toast" }, + { + "name": "cornbread" + }, + { + "name": "cornbread-slice" + }, { "name": "creamcheese" }, { "name": "creamcheese-slice" }, + { + "name": "french-toast" + }, { "name": "garlic-slice" }, @@ -79,6 +88,12 @@ { "name": "plate" }, + { + "name": "sausage" + }, + { + "name": "sausage-slice" + }, { "name": "spidermeat" }, diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/mimana-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/mimana-slice.png index e45c8a9c71ca9b..8fef6be6db6c83 100644 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 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/mimana.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/mimana.png index 7de8a3920ae168..a4eab7370f2944 100644 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 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/moldy-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/moldy-slice.png index e63a9f0b171849..bd811b0f643ebe 100644 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 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/plain-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/plain-slice.png index 855c8fb2301faa..7049dce349ddac 100644 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 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/plain.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/plain.png index d592e73c94a3ac..eec14af0213132 100644 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 index 00000000000000..7174c8eda766fb 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 index 00000000000000..b30460b1bd5cd3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/sausage.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/spidermeat-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/spidermeat-slice.png index d9af8868cfc7aa..2456b4ed779175 100644 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 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/spidermeat.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/spidermeat.png index 3945e48afc1c59..26e82265a89e18 100644 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 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/tofu-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/tofu-slice.png index f7feab6594ce7d..b7ff46e39985ca 100644 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 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/tofu.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/tofu.png index 90432f280fea0e..6c84e602a5c72c 100644 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 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/two-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/two-slice.png index fd4617092e3f94..06bd06ec701db7 100644 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 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/xenomeat-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/xenomeat-slice.png index 73c0e5447f5e6a..4b800b4473207a 100644 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 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/xenomeat.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/xenomeat.png index 47cdef15f8c3e5..71ff7853ac6d85 100644 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 diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cakebatter.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cakebatter.png index 688ced7b626af4..df978582d7c93e 100644 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 index 00000000000000..14b2901015352c 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 index 00000000000000..e19a0568932da3 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 index 00000000000000..3be04aeae68a99 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 index 00000000000000..20196a6a6fb39f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cornmealdough.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough-flat.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough-flat.png index 44aaef5444783c..abceb970a9deb8 100644 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 diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough-pastry-baked.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough-pastry-baked.png index 4bb7e80041b85a..e12cc4a7a5461e 100644 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 diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough-pastry.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough-pastry.png index 0cecdc5ce60064..cb470692c084cb 100644 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 diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough-pie.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough-pie.png index e11367809023da..852e3cdb237cc8 100644 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 diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough-slice.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough-slice.png index 30740321584960..86ff47a25e65d6 100644 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 diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough.png index 258a9e6c6ad48e..62150ea11c424d 100644 Binary files a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough.png and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json index 47df0c0a567c87..4752daf3ea5453 100644 --- a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json @@ -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 @@ -22,6 +22,18 @@ { "name": "cheesewheel" }, + { + "name": "cornmeal" + }, + { + "name": "cornmeal-big" + }, + { + "name": "cornmealdough" + }, + { + "name": "cornmealdough-slice" + }, { "name": "dough" }, diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/pizzabread.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/pizzabread.png index 6c31b751178099..28f8d68f7ced88 100644 Binary files a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/pizzabread.png and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/pizzabread.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/meat.rsi/meta.json index 79eb49da9f300d..2bbe89d1f9faea 100644 --- a/Resources/Textures/Objects/Consumable/Food/meat.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/meat.rsi/meta.json @@ -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 @@ -159,6 +159,12 @@ { "name": "spider" }, + { + "name": "spidercutlet" + }, + { + "name": "spidercutlet-cooked" + }, { "name": "spiderleg" }, @@ -170,6 +176,12 @@ }, { "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 index 00000000000000..6ef7762e97fe87 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 index 00000000000000..5d057a63eb4196 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 index 00000000000000..bc045ffcf8ab8d 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 index 00000000000000..45042f59ca5188 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meat.rsi/xenocutlet.png differ