diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl index 33d90a1a90..bf7012e6a4 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 fcc83d18cf..445e0b3114 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 02b657d4d6..aea084a0a1 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 4619e833d8..21a8c7f53a 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 db5d77b21f..9091bd409d 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 db58917caf..7261ab976e 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml @@ -73,180 +73,7 @@ # Bread - type: entity - name: bread - parent: FoodBreadBase - id: FoodBreadPlain - description: Some plain old earthen bread. - components: - - type: Food - - type: Sprite - layers: - - state: plain - - type: SliceableFood - 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: meatbread loaf - parent: FoodBreadBase - id: FoodBreadMeat - description: The culinary base of every self-respecting eloquen/tg/entleman. - components: - - type: FlavorProfile - flavors: - - meaty - - bread - - type: Food - - type: Sprite - layers: - - state: meat - - type: SliceableFood - slice: FoodBreadMeatSlice - - type: SolutionContainerManager - solutions: - food: - maxVol: 45 - reagents: - - ReagentId: Nutriment - Quantity: 30 - - ReagentId: Vitamin - Quantity: 5 -# Tastes like bread, meat. - -- type: entity - name: meatbread slice - parent: FoodBreadSliceBase - id: FoodBreadMeatSlice - description: A slice of delicious meatbread. - components: - - type: FlavorProfile - flavors: - - meaty - - bread - - type: Food - - type: Sprite - layers: - - state: meat-slice - - type: SolutionContainerManager - solutions: - food: - maxVol: 10 - reagents: - - ReagentId: Nutriment - Quantity: 6 - - ReagentId: Vitamin - Quantity: 1.2 - -- type: entity - name: xeno-meat bread - parent: FoodBreadBase - id: FoodBreadMeatXeno - description: Reassuringly green meatloaf made from xeno meat. Extra heretical. - components: - - type: FlavorProfile - flavors: - - acidic - - bread - - type: Food - - type: Sprite - layers: - - state: xenomeat - - type: SliceableFood - slice: FoodBreadMeatXenoSlice - - type: SolutionContainerManager - solutions: - food: - maxVol: 45 - reagents: - - ReagentId: Nutriment - Quantity: 30 - - ReagentId: Vitamin - Quantity: 5 -# Tastes like bread, acid. - -- type: entity - name: xeno-meatbread slice - parent: FoodBreadSliceBase - id: FoodBreadMeatXenoSlice - description: A slice of delicious meatbread. Extra heretical. - components: - - type: FlavorProfile - flavors: - - acidic - - bread - - type: Food - - type: Sprite - layers: - - state: xenomeat-slice - - type: SolutionContainerManager - solutions: - food: - maxVol: 10 - reagents: - - ReagentId: Nutriment - Quantity: 6 - - ReagentId: Vitamin - Quantity: 1.2 - -- type: entity - name: spider-meatbread - parent: FoodBreadBase - id: FoodBreadMeatSpider - description: Reassuringly green meatloaf made from spider meat. - components: - - type: Food - - type: Sprite - layers: - - state: spidermeat - - type: SliceableFood - 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: spider-meatbread slice - parent: FoodBreadSliceBase - id: FoodBreadMeatSpiderSlice - description: A slice of meatloaf made from an animal that most likely still wants you dead. - components: - - type: Food - - type: Sprite - layers: - - 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: banana-nut bread + name: banana bread parent: FoodBreadBase id: FoodBreadBanana description: A heavenly and filling treat. @@ -254,7 +81,6 @@ - type: FlavorProfile flavors: - banana - - nutty - bread - type: Food - type: Sprite @@ -265,7 +91,7 @@ # Tastes like bread, banana, nut. - type: entity - name: banana-nut bread slice + name: banana bread slice parent: FoodBreadSliceBase id: FoodBreadBananaSlice description: A slice of delicious banana bread. @@ -273,7 +99,6 @@ - type: FlavorProfile flavors: - banana - - nutty - bread - type: Food - type: Sprite @@ -281,47 +106,51 @@ - state: banana-slice - type: entity - name: tofu bread + name: cornbread parent: FoodBreadBase - id: FoodBreadTofu - description: Like meatbread but for vegetarians. Brag to your crewmates about how much better it is. + 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: tofu + - state: cornbread - type: SliceableFood - slice: FoodBreadTofuSlice + slice: FoodBreadCornSlice - type: SolutionContainerManager solutions: food: - maxVol: 48 + maxVol: 20 reagents: - ReagentId: Nutriment - Quantity: 30 - - ReagentId: Protein - Quantity: 12 -# Tastes like bread, tofu. + Quantity: 15 +# Tastes like bread, banana, nut. - type: entity - name: tofu bread slice + name: cornbread slice parent: FoodBreadSliceBase - id: FoodBreadTofuSlice - description: A slice of delicious tofu bread. + id: FoodBreadCornSlice + description: A slice of cornbread. components: + - type: FlavorProfile + flavors: + - bread + - corn - type: Food - type: Sprite layers: - - state: tofu-slice + - state: cornbread-slice - type: SolutionContainerManager solutions: food: - maxVol: 10 + maxVol: 5 reagents: - ReagentId: Nutriment - Quantity: 6 - - ReagentId: Vitamin - Quantity: 2.4 + Quantity: 3 - type: entity name: cream cheese bread @@ -376,12 +205,67 @@ - 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. + components: + - type: FlavorProfile + flavors: + - meaty + - bread + - type: Food + - type: Sprite + layers: + - state: meat + - type: SliceableFood + slice: FoodBreadMeatSlice + - type: SolutionContainerManager + solutions: + food: + maxVol: 45 + reagents: + - ReagentId: Nutriment + Quantity: 30 + - ReagentId: Vitamin + Quantity: 5 +# Tastes like bread, meat. + +- type: entity + name: meat bread slice + parent: FoodBreadSliceBase + id: FoodBreadMeatSlice + description: A slice of delicious meatbread. + components: + - type: FlavorProfile + flavors: + - meaty + - bread + - type: Food + - type: Sprite + layers: + - state: meat-slice + - type: SolutionContainerManager + solutions: + food: + maxVol: 10 + reagents: + - ReagentId: Nutriment + Quantity: 6 + - ReagentId: Vitamin + Quantity: 1.2 + - type: entity name: mimana bread parent: FoodBreadBase id: FoodBreadMimana description: Best eaten in silence. components: + - type: FlavorProfile + flavors: + - nothing + - bread - type: Food - type: Sprite layers: @@ -394,19 +278,25 @@ maxVol: 40 reagents: - ReagentId: Nutriment - Quantity: 20 + Quantity: 15 - ReagentId: Vitamin Quantity: 5 - ReagentId: Nothing Quantity: 5 + - ReagentId: MuteToxin + Quantity: 5 # Tastes like bread, cheese. - type: entity - name: Mimana bread slice + name: mimana bread slice parent: FoodBreadSliceBase id: FoodBreadMimanaSlice description: A slice of silence! components: + - type: FlavorProfile + flavors: + - nothing + - bread - type: Food - type: Sprite layers: @@ -417,33 +307,250 @@ maxVol: 10 reagents: - ReagentId: Nutriment - Quantity: 4 + Quantity: 3 - ReagentId: Vitamin - Quantity: 1.2 + Quantity: 1 - ReagentId: Nothing - Quantity: 1.2 - -# Other than bread/slices + Quantity: 1 + - ReagentId: MuteToxin + Quantity: 1 - type: entity - name: moldy slice - parent: FoodBreadSliceBase - id: FoodBreadMoldySlice - description: Entire stations have been ripped apart over arguing whether this is still good to eat. + name: bread + parent: FoodBreadBase + id: FoodBreadPlain + description: Some plain old earthen bread. components: + - type: Food - type: Sprite layers: - - state: moldy-slice + - state: plain + - type: SliceableFood + 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: 45 + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: Vitamin + Quantity: 5 + - ReagentId: Protein + Quantity: 5 + +- type: entity + name: sausage bread slice + parent: FoodBreadSliceBase + id: FoodBreadSausageSlice + description: Dont think too much about it. + components: + - type: FlavorProfile + flavors: + - meaty + - bread + - type: Food + - type: Sprite + layers: + - state: sausage-slice + - type: SolutionContainerManager + solutions: + food: + maxVol: 10 + reagents: + - ReagentId: Nutriment + Quantity: 2 + - ReagentId: Vitamin + Quantity: 1 + - ReagentId: Protein + Quantity: 1 + +- type: entity + name: spider meat bread + parent: FoodBreadBase + id: FoodBreadMeatSpider + description: Reassuringly green meatloaf made from spider meat. + components: + - type: FlavorProfile + flavors: + - cobwebs + - bread + - type: Food + - type: Sprite + layers: + - state: spidermeat + - type: SliceableFood + 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: spider meat bread slice + parent: FoodBreadSliceBase + id: FoodBreadMeatSpiderSlice + description: A slice of meatloaf made from an animal that most likely still wants you dead. + components: + - type: FlavorProfile + flavors: + - cobwebs + - bread + - type: Food + - type: Sprite + layers: + - state: spidermeat-slice - type: SolutionContainerManager solutions: food: maxVol: 15 reagents: - ReagentId: Nutriment - Quantity: 4 - - ReagentId: Mold - Quantity: 7 -# Tastes like decaying fungus. + Quantity: 6 + - ReagentId: Vitamin + Quantity: 1.2 + - ReagentId: Toxin + Quantity: 3 + +- type: entity + name: tofu bread + parent: FoodBreadBase + 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: + - state: tofu + - type: SliceableFood + slice: FoodBreadTofuSlice + - type: SolutionContainerManager + solutions: + food: + maxVol: 48 + reagents: + - ReagentId: Nutriment + Quantity: 30 + - ReagentId: Protein + Quantity: 12 +# Tastes like bread, tofu. + +- type: entity + name: tofu bread slice + parent: FoodBreadSliceBase + id: FoodBreadTofuSlice + description: A slice of delicious tofu bread. + components: + - type: FlavorProfile + flavors: + - tofu + - bread + - type: Food + - type: Sprite + layers: + - state: tofu-slice + - type: SolutionContainerManager + solutions: + food: + maxVol: 10 + reagents: + - ReagentId: Nutriment + Quantity: 6 + - ReagentId: Vitamin + Quantity: 2.4 + +- type: entity + name: xeno meat bread + parent: FoodBreadBase + id: FoodBreadMeatXeno + description: A fitting, and filling, end to xeno scum. + components: + - type: FlavorProfile + flavors: + - acid + - bread + - type: Food + - type: Sprite + layers: + - state: xenomeat + - type: SliceableFood + slice: FoodBreadMeatXenoSlice + - type: SolutionContainerManager + solutions: + food: + maxVol: 45 + reagents: + - ReagentId: Nutriment + Quantity: 30 + - ReagentId: Vitamin + Quantity: 5 +# Tastes like bread, acid. + +- type: entity + name: xeno meat bread slice + parent: FoodBreadSliceBase + id: FoodBreadMeatXenoSlice + description: A slice of xeno scum. + components: + - type: FlavorProfile + flavors: + - acid + - bread + - type: Food + - type: Sprite + layers: + - state: xenomeat-slice + - type: SolutionContainerManager + solutions: + food: + maxVol: 10 + reagents: + - ReagentId: Nutriment + Quantity: 6 + - ReagentId: Vitamin + Quantity: 1.2 + +# Other than bread/slices - type: entity name: baguette @@ -471,6 +578,52 @@ Quantity: 1 # Tastes like France. +- type: entity + name: buttered toast + parent: FoodBreadSliceBase + id: FoodBreadButteredToast + description: Crunchy. + components: + - type: FlavorProfile + flavors: + - butter + - bread + - type: Sprite + state: buttered-toast + - type: SolutionContainerManager + solutions: + food: + maxVol: 10 + reagents: + - ReagentId: Nutriment + Quantity: 5 + - ReagentId: Vitamin + Quantity: 1 +# Tastes like bread, butter. + +- type: entity + name: f toast + parent: FoodBreadSliceBase + id: FoodBreadFrenchToast + description: A slice of bread soaked in a beaten egg mixture. + components: + - type: FlavorProfile + flavors: + - syrupy + - bread + - type: Sprite + state: french-toast + - type: SolutionContainerManager + solutions: + food: + maxVol: 10 + reagents: + - ReagentId: Nutriment + Quantity: 4 + - ReagentId: Vitamin + Quantity: 2 +# Tastes like bread, butter. + - type: entity name: garlic bread parent: FoodBreadSliceBase @@ -490,28 +643,73 @@ maxVol: 15 reagents: - ReagentId: Nutriment - Quantity: 5 + Quantity: 6 - ReagentId: Vitamin - Quantity: 4 - - ReagentId: Allicin - Quantity: 2 + Quantity: 5 # Tastes like garlic, Italy. - type: entity - name: buttered toast + name: jelly toast parent: FoodBreadSliceBase - id: FoodBreadButteredToast - description: Crunchy. + id: FoodBreadJellySlice + description: As if science are gonna give up their slimes for toast! components: + - type: FlavorProfile + flavors: + - bread + - slimy - type: Sprite - state: buttered-toast + layers: + - state: jelly-toast - type: SolutionContainerManager solutions: food: maxVol: 10 reagents: - ReagentId: Nutriment - Quantity: 5 + Quantity: 4 - ReagentId: Vitamin - Quantity: 1 -# Tastes like bread, butter. + Quantity: 4 +# Tastes like garlic, Italy. + +- type: entity + name: moldy bread slice + parent: FoodBreadSliceBase + id: FoodBreadMoldySlice + description: Entire stations have been ripped apart over arguing whether this is still good to eat. + components: + - type: Sprite + layers: + - state: moldy-slice + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + 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: 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 b8794de4fd..1eccd36d18 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 51ae9f5deb..4e8fa0bb2e 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 820b36f4bd..9fde289e9f 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 1d1768235f..39060a4704 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 9436490a5e..b525a3b248 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 d73c1fafd6..e956b71aaa 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -186,42 +186,155 @@ FoodEgg: 2 #Breads & Sandwiches -- type: microwaveMealRecipe - id: RecipeBread - name: bread recipe - result: FoodBreadPlain - time: 15 - solids: - FoodDough: 1 - -- type: microwaveMealRecipe - id: RecipeBaguette - name: baguette recipe - result: FoodBreadBaguette - time: 10 - reagents: - TableSalt: 5 - solids: - FoodDough: 1 - -- type: microwaveMealRecipe - id: RecipeCreamCheeseBread - name: cream cheese bread recipe - result: FoodBreadCreamcheese - time: 20 - solids: - FoodDough: 1 - FoodCheeseSlice: 2 - type: microwaveMealRecipe id: RecipeBananaBread name: banana bread recipe result: FoodBreadBanana - time: 25 + time: 15 solids: FoodDough: 1 FoodBanana: 1 +- type: microwaveMealRecipe + id: RecipeCornbread + name: cornbread recipe + result: FoodBreadCorn + time: 10 + solids: + FoodDoughCornmeal: 1 + +- type: microwaveMealRecipe + id: RecipeCreamCheeseBread + name: cream cheese bread recipe + result: FoodBreadCreamcheese + time: 15 + reagents: + Milk: 5 + solids: + FoodDough: 1 + FoodCheeseSlice: 2 + +- type: microwaveMealRecipe + id: RecipeMeatBread + name: meat bread recipe + result: FoodBreadMeat + time: 15 + solids: + FoodDough: 1 + FoodMeatCutlet: 2 + FoodCheeseSlice: 2 + +- type: microwaveMealRecipe + id: RecipeMimanaBread + name: mimana bread recipe + result: FoodBreadMimana + time: 15 + reagents: + MilkSoy: 5 + Nothing: 5 #replace with mimana + solids: + 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: 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 + result: FoodBreadGarlicSlice + time: 5 + 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 @@ -232,22 +345,14 @@ FoodFlyAmanita: 1 - type: microwaveMealRecipe - id: RecipeTofuBread - name: tofu bread recipe - result: FoodBreadTofu - time: 20 - solids: - FoodDough: 1 - FoodTofu: 1 - -- type: microwaveMealRecipe - id: RecipeGarlicBread - name: garlic bread slice recipe - result: FoodBreadGarlicSlice + id: RecipeTwoBreadSlice + name: two slice recipe + result: FoodBreadTwoSlice time: 5 + reagents: + Wine: 5 solids: - FoodBreadPlainSlice: 1 - FoodGarlic: 1 + FoodBreadPlainSlice: 2 #Pizzas - type: microwaveMealRecipe diff --git a/Resources/Prototypes/Recipes/Reactions/food.yml b/Resources/Prototypes/Recipes/Reactions/food.yml index 7c0d71caf8..5e32ab08a9 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 66dcb6019a..e47649d21c 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 318668da8d..8523dd1c1c 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 ef6beb0f70..c0aed8f728 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 842805c409..d6a11c0068 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 418ed990b3..740ec1c530 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 00131ad176..d91f79097c 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 a8379ac4a1..78b352fff4 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 53bb4fb8d6..50ea999f50 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 e0eb82d082..b3869c19ac 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 f5f78c4680..8d776d3382 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 ca7104c27f..1339ba0303 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 0000000000..2067897b2e 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 0000000000..4c0be3555b 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 c9b809b2a3..984a7d81c0 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 a7e3aaa94f..80c72d9ad0 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 0000000000..671cb0f887 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 c9fff6ad11..16fe63fac5 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 ae5d718765..4c00b8dc2e 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 a67b0d0540..629ca88d8e 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 ec47c76d52..6376332235 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 0b0c5c1688..8a816d868b 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 e45c8a9c71..8fef6be6db 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 7de8a3920a..a4eab7370f 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 e63a9f0b17..bd811b0f64 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 855c8fb230..7049dce349 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 d592e73c94..eec14af021 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 0000000000..7174c8eda7 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 0000000000..b30460b1bd 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 d9af8868cf..2456b4ed77 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 3945e48afc..26e82265a8 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 f7feab6594..b7ff46e399 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 90432f280f..6c84e602a5 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 fd4617092e..06bd06ec70 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 73c0e5447f..4b800b4473 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 47cdef15f8..71ff7853ac 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 688ced7b62..df978582d7 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 0000000000..14b2901015 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 0000000000..e19a056893 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 0000000000..3be04aeae6 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 0000000000..20196a6a6f 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 44aaef5444..abceb970a9 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 4bb7e80041..e12cc4a7a5 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 0cecdc5ce6..cb470692c0 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 e113678090..852e3cdb23 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 3074032158..86ff47a25e 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 258a9e6c6a..62150ea11c 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 47df0c0a56..4752daf3ea 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 6c31b75117..28f8d68f7c 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 79eb49da9f..2bbe89d1f9 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 0000000000..6ef7762e97 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 0000000000..5d057a63eb 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 0000000000..bc045ffcf8 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 0000000000..45042f59ca Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meat.rsi/xenocutlet.png differ