From 99f56b7899668725876218b04d78a25d50d444ca Mon Sep 17 00:00:00 2001 From: 5tickman <5tick@comcast.net> Date: Thu, 10 Jul 2025 19:16:13 -0500 Subject: [PATCH 01/12] Butter pat is now tiny --- .../Prototypes/Entities/Objects/Consumable/Food/ingredients.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml index 344827534b..6a7c779542 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml @@ -644,6 +644,8 @@ id: FoodButterSlice description: A pat of delicious, golden, fatty goodness. components: + - type: Item + size: Tiny - type: Sprite state: butter-slice - type: SolutionContainerManager From 0cb829807ba8cc7e843555f304a799435d4a9521 Mon Sep 17 00:00:00 2001 From: 5tickman <5tick@comcast.net> Date: Fri, 11 Jul 2025 21:56:46 -0500 Subject: [PATCH 02/12] Updated ingredients.yml --- .../Objects/Consumable/Food/ingredients.yml | 62 +++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml index 6a7c779542..74da2a1b6a 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml @@ -286,6 +286,8 @@ id: FoodDough description: A piece of dough. components: + - type: Item + size: Normal - type: FlavorProfile flavors: - dough @@ -304,6 +306,8 @@ id: FoodDoughSlice description: A slice of dough. Can be cooked into a bun. components: + - type: Item + size: Tiny - type: FlavorProfile flavors: - dough @@ -329,6 +333,8 @@ id: FoodDoughRope description: A thin noodle of dough. Can be cooked into a bagel. components: + - type: Item + storedRotation: -45 - type: FlavorProfile flavors: - dough @@ -351,6 +357,8 @@ id: FoodDoughCornmeal description: A piece of cornmeal dough. components: + - type: Item + size: Normal - type: FlavorProfile flavors: - chalky @@ -367,6 +375,8 @@ id: FoodDoughCornmealSlice description: A slice of cornmeal dough. components: + - type: Item + size: Tiny - type: FlavorProfile flavors: - chalky @@ -383,6 +393,8 @@ id: FoodDoughTortilla description: A piece of tortilla dough. components: + - type: Item + size: Normal - type: FlavorProfile flavors: - chalky @@ -399,6 +411,8 @@ id: FoodDoughTortillaSlice description: A slice of tortilla dough. components: + - type: Item + size: Tiny - type: FlavorProfile flavors: - chalky @@ -418,6 +432,8 @@ id: FoodDoughTortillaFlat description: A flattened slice of tortilla dough, cook this to get a taco shell. components: + - type: Item + size: Tiny - type: FlavorProfile flavors: - chalky @@ -434,6 +450,8 @@ id: FoodDoughCotton description: A piece of fabric dough. components: + - type: Item + size: Normal - type: FlavorProfile flavors: - dough @@ -466,6 +484,8 @@ id: FoodDoughCottonSlice description: A slice of cotton dough. components: + - type: Item + size: Tiny - type: FlavorProfile flavors: - dough @@ -495,6 +515,8 @@ id: FoodDoughCottonRope description: A thin noodle of cotton dough. Can be cooked into a cotton bagel. components: + - type: Item + storedRotation: -45 - type: FlavorProfile flavors: - dough @@ -542,6 +564,8 @@ id: FoodDoughPie description: Cook it to get a pie. components: + - type: Item + size: Normal - type: Sprite state: dough-pie @@ -551,6 +575,10 @@ id: FoodDoughFlat description: A flattened dough. components: + - type: Item + size: Normal + shape: + - 0,0,2,1 - type: Sprite state: dough-flat - type: Construction @@ -566,6 +594,10 @@ id: FoodDoughCottonFlat description: A flattened cotton dough. components: + - type: Item + size: Normal + shape: + - 0,0,2,1 - type: Sprite state: cotton-dough-flat - type: Construction @@ -581,6 +613,10 @@ id: FoodDoughPizzaBaked description: Add ingredients to make a pizza. components: + - type: Item + size: Normal + shape: + - 0,0,2,1 - type: Sprite state: pizzabread @@ -590,6 +626,8 @@ id: FoodCakeBatter description: Cook it to get a cake. components: + - type: Item + size: Normal - type: FlavorProfile flavors: - sweetdough @@ -602,6 +640,9 @@ id: FoodButter description: A stick of delicious, golden, fatty goodness. components: + - type: Item + shape: + - 0,0,1,0 - type: Sprite state: butter - type: Slippery @@ -723,6 +764,7 @@ Taco: CheeseTaco Burger: CheeseBurger - type: Item + size: Tiny inhandVisuals: left: - state: cheesewedge-inhand-left @@ -735,6 +777,10 @@ id: FoodChevre description: A soft log of creamy Chèvre. components: + - type: Item + shape: + - 0,0,1,0 + storedOffset: 0,-2 - type: FlavorProfile flavors: - nutty @@ -760,6 +806,8 @@ id: FoodChevreSlice description: A small disk of creamy Chèvre. An ideal adornment for French side dishes. components: + - type: Item + size: Tiny - type: FlavorProfile flavors: - nutty @@ -785,6 +833,8 @@ id: FoodTofu description: Solid white block with a subtle flavor. components: + - type: Item + size: Normal - type: FlavorProfile flavors: - tofu @@ -809,6 +859,8 @@ id: FoodTofuSlice description: A slice of tofu. Ingredient of various vegetarian dishes. components: + - type: Item + size: Tiny - type: FlavorProfile flavors: - tofu @@ -889,6 +941,11 @@ id: FoodCroissantRaw description: Buttery, flaky goodness waiting to happen. components: + - type: Item + shape: + - 0,0,1,0 + - 0,1,0,1 + storedOffset: -2,-4 - type: FlavorProfile flavors: - dough @@ -908,6 +965,11 @@ id: FoodCroissantRawCotton description: Buttery, flaky, fibery goodness waiting to happen. components: + - type: Item + shape: + - 0,0,1,0 + - 0,1,0,1 + storedOffset: -2,-4 - type: FlavorProfile flavors: - dough From 012ed0bafe9dda7034557155432a1b9b19d33767 Mon Sep 17 00:00:00 2001 From: 5tickman <5tick@comcast.net> Date: Sat, 12 Jul 2025 10:00:15 -0500 Subject: [PATCH 03/12] Updated baked food folder. --- .../Objects/Consumable/Food/Baked/bagel.yml | 2 ++ .../Objects/Consumable/Food/Baked/bread.yml | 8 +++++++ .../Objects/Consumable/Food/Baked/misc.yml | 21 +++++++++++++++++++ .../Objects/Consumable/Food/Baked/pie.yml | 3 ++- .../Objects/Consumable/Food/Baked/pizza.yml | 1 + 5 files changed, 34 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bagel.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bagel.yml index 114b3e01f2..c8f56aa100 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bagel.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bagel.yml @@ -7,6 +7,8 @@ abstract: true description: A delicious bagel. components: + - type: Item + size: Tiny - type: FlavorProfile flavors: - bread diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml index d817d53b18..a7d6654e59 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml @@ -6,6 +6,8 @@ id: FoodBreadBase abstract: true components: + - type: Item + size: Normal - type: FlavorProfile flavors: - bread @@ -690,6 +692,9 @@ equippedPrefix: baguette quickEquip: false - type: Item + shape: + - 0,0,0,3 + storedRotation: -45 inhandVisuals: left: - state: baguette-inhand-left @@ -721,6 +726,9 @@ - type: Clothing equippedPrefix: baguette-cotton - type: Item + shape: + - 0,0,0,3 + storedRotation: -45 inhandVisuals: left: - state: baguette-cotton-inhand-left diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml index c7a10d4212..80f28b0ec7 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml @@ -648,6 +648,9 @@ id: FoodBakedBrownieBatch description: A pan of brownies. components: + - type: Item + size: Normal + storedOffset: 0,-3 - type: FlavorProfile flavors: - sweet @@ -701,6 +704,9 @@ id: FoodBakedCannabisBrownieBatch description: A pan of "special" brownies. components: + - type: Item + size: Normal + storedOffset: 0,-3 - type: FlavorProfile flavors: - sweet @@ -783,6 +789,12 @@ id: FoodBakedCroissant description: Buttery, flaky goodness. components: + - type: Item + size: Small + shape: + - 0,0,1,0 + - 0,1,0,1 + storedOffset: -2,-4 - type: FlavorProfile flavors: - bread @@ -811,6 +823,11 @@ id: FoodBakedCroissantCotton description: Buttery, flaky, fibery goodness. components: + - type: Item + size: Small + shape: + - 0,0,1,0 + - 0,1,0,1 - type: FlavorProfile flavors: - bread @@ -843,6 +860,8 @@ id: FoodBakedGrilledCheeseSandwich description: Bread and cheese toasted with butter, perfect for a chilly day in space. components: + - type: Item + size: Small - type: FlavorProfile flavors: - cheesy @@ -868,6 +887,8 @@ name: cotton grilled cheese sandwich description: Cotton bread slightly burnt in butter, with melted cheese. Moths find it difficult to resist this combination. components: + - type: Item + size: Small - type: FlavorProfile flavors: - cheesy diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml index 2748462abc..8dfd626ea9 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml @@ -7,7 +7,8 @@ abstract: true components: - type: Item - storedRotation: -90 + shape: + - 0,0,1,0 - type: FlavorProfile flavors: - sweet diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml index 5d6b9f9316..1f628d57b8 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml @@ -28,6 +28,7 @@ size: Normal shape: - 0,0,2,1 + storedOffset: 0,-5 - type: Tag tags: - Pizza From c201135a174e22551e9f162f2c209a45dfc01c0a Mon Sep 17 00:00:00 2001 From: 5tickman <5tick@comcast.net> Date: Tue, 22 Jul 2025 18:44:02 -0500 Subject: [PATCH 04/12] Edited the rest of the chef's items --- .../Consumable/Food/Containers/bowl.yml | 8 +- .../Consumable/Food/Containers/box.yml | 17 ++- .../Consumable/Food/Containers/plate.yml | 10 +- .../Consumable/Food/Containers/tin.yml | 30 +++- .../Objects/Consumable/Food/breakfast.yml | 2 +- .../Objects/Consumable/Food/frozen.yml | 28 ++-- .../Objects/Consumable/Food/meals.yml | 62 +++++++- .../Entities/Objects/Consumable/Food/meat.yml | 142 +++++++++++++++++- .../Objects/Consumable/Food/noodles.yml | 17 ++- .../Objects/Consumable/Food/skewer.yml | 14 +- .../Objects/Consumable/Food/snacks.yml | 17 +++ .../Entities/Objects/Consumable/Food/soup.yml | 14 +- .../Entities/Objects/Consumable/Food/taco.yml | 8 +- .../Entities/Objects/Tools/tools.yml | 1 + .../Entities/Objects/Weapons/Melee/knife.yml | 2 + 15 files changed, 335 insertions(+), 37 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml index ffccf07ab6..25bf2905f7 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml @@ -7,7 +7,9 @@ description: A simple bowl, used for soups and salads. components: - type: Item - storedRotation: -90 + shape: + - 0,0,1,0 + storedOffset: 0,-3 - type: SolutionContainerManager solutions: food: @@ -70,6 +72,10 @@ id: FoodBowlBigTrash description: A simple bowl, broken and useless. components: + - type: Item + shape: + - 0,0,1,0 + storedOffset: 0,-3 - type: Sprite sprite: Objects/Consumable/Food/bowl.rsi state: bowl-trash diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml index a0cc580118..b6cd984907 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml @@ -46,7 +46,9 @@ - Donut - type: Item sprite: Objects/Consumable/Food/Baked/donut.rsi - size: Small + size: Normal + shape: + - 0,0,2,1 heldPrefix: box - type: StorageFill contents: @@ -128,7 +130,10 @@ - Egg - type: Item sprite: Objects/Consumable/Food/egg.rsi - size: Small + size: Normal + shape: + - 0,0,2,1 + storedOffset: 0,-6 - type: StorageFill contents: - id: FoodEgg @@ -223,6 +228,7 @@ heldPrefix: box shape: - 0,0,2,1 + storedOffset: 0,-6 - type: Appearance - type: EntityStorageVisuals stateDoorOpen: box-open @@ -367,7 +373,10 @@ - DonkPocket - type: Item sprite: Objects/Consumable/Food/Baked/donkpocket.rsi - size: Small + size: Normal + shape: + - 0,0,2,1 + storedOffset: -1,1 - type: StorageFill contents: - id: FoodDonkpocket @@ -880,6 +889,8 @@ - ClothMade - type: Item size: Normal + shape: + - 0,0,1,1 - type: StorageFill contents: - id: MaterialCloth10 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml index ac2cf22c59..a4e0239ab0 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml @@ -132,7 +132,7 @@ # Plastic Plate - type: entity - name: plastic plate + name: large plastic plate parent: BaseItem id: FoodPlatePlastic description: A large blue plastic plate, excellent for a birthday cake. @@ -154,7 +154,7 @@ - Trash - type: entity - name: plastic plate + name: small plastic plate parent: BaseItem id: FoodPlateSmallPlastic description: A blue plastic plate, excellent for slices of birthday cake. @@ -211,10 +211,10 @@ sprite: Objects/Consumable/Food/plates.rsi state: muffin-tin - type: Item - size: Small + size: Tiny shape: - - 0,0,1,0 - storedOffset: 0,-3 + - 0,0,0,0 + storedOffset: 0,-2 - type: Tag tags: - Trash diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml index 3fbf14a6d6..8deda57d47 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml @@ -37,7 +37,7 @@ - type: Item sprite: Objects/Consumable/Food/snacks.rsi heldPrefix: packet - size: Tiny + size: Small - type: DamageOnLand damage: types: @@ -63,7 +63,7 @@ - type: Item sprite: Objects/Consumable/Food/snacks.rsi heldPrefix: packet - size: Tiny + size: Small - type: PhysicalComposition materialComposition: Steel: 100 @@ -81,6 +81,8 @@ name: tinned peaches description: Just a nice can of ripe peaches swimming in their own juices. components: + - type: Item + storedOffset: 0,-3 - type: Sprite sprite: Objects/Consumable/Food/Tins/peaches.rsi - type: FlavorProfile @@ -88,7 +90,7 @@ - sweet - funny - type: Food - trash: + trash: - FoodTinPeachesTrash - type: Tag tags: @@ -99,6 +101,8 @@ id: FoodTinPeachesTrash name: tinned peaches components: + - type: Item + storedOffset: 0,-3 - type: Sprite sprite: Objects/Consumable/Food/Tins/peaches.rsi @@ -111,7 +115,7 @@ - type: Sprite sprite: Objects/Consumable/Food/Tins/maint_peaches.rsi - type: Food - trash: + trash: - FoodTinPeachesMaintTrash # only exists for backwards compatibility with a few maps, nothing else uses it @@ -132,6 +136,8 @@ id: FoodTinPeachesMaintTrash name: maintenance peaches components: + - type: Item + storedOffset: 0,-3 - type: Sprite sprite: Objects/Consumable/Food/Tins/maint_peaches.rsi @@ -141,6 +147,8 @@ name: tin of beans description: Musical fruit in a slightly less musical container. components: + - type: Item + storedOffset: 0,-3 - type: Sprite sprite: Objects/Consumable/Food/Tins/beans.rsi - type: FlavorProfile @@ -149,7 +157,7 @@ - salty - cheap - type: Food - trash: + trash: - FoodTinBeansTrash - type: entity @@ -157,6 +165,8 @@ id: FoodTinBeansTrash name: tin of beans components: + - type: Item + storedOffset: 0,-3 - type: Sprite sprite: Objects/Consumable/Food/Tins/beans.rsi @@ -168,6 +178,10 @@ name: tinned meat description: A standard issue tin of meat with a convenient pull tab. components: + - type: Item + size: Tiny + shape: + - 0,0,0,0 - type: Sprite sprite: Objects/Consumable/Food/Tins/meat.rsi # the convenient pull tab @@ -179,7 +193,7 @@ - salty - cheap - type: Food - trash: + trash: - FoodTinMRETrash - type: Tag tags: @@ -190,5 +204,9 @@ id: FoodTinMRETrash name: tinned meat components: + - type: Item + size: Tiny + shape: + - 0,0,0,0 - type: Sprite sprite: Objects/Consumable/Food/Tins/meat.rsi diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/breakfast.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/breakfast.yml index 01df50b5d5..2842485dbf 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/breakfast.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/breakfast.yml @@ -9,7 +9,7 @@ description: A full breakfast, rise and shine! components: - type: Item - storedRotation: -90 + size: Normal - type: Food - type: Sprite sprite: Objects/Consumable/Food/breakfast.rsi diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml index 5cbdbf7820..0f4ed35b6a 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml @@ -25,6 +25,9 @@ id: FoodFrozenSandwich description: Portable ice-cream in its own packaging. components: + - type: Item + shape: + - 0,0,1,0 - type: Sprite state: sandwich @@ -34,6 +37,9 @@ id: FoodFrozenSandwichStrawberry description: Portable ice-cream in its own packaging of the strawberry variety. components: + - type: Item + shape: + - 0,0,1,0 - type: Sprite state: sandwich-strawberry @@ -61,6 +67,8 @@ id: FoodFrozenCornuto description: A Neapolitan vanilla and chocolate ice-cream cone. It menaces with a sprinkling of caramelized nuts. components: + - type: Item + storedRotation: -45 - type: Sprite state: cornuto - type: SolutionContainerManager @@ -88,7 +96,7 @@ - state: popsicle color: orange - type: Food - trash: + trash: - FoodFrozenPopsicleTrash - type: Tag tags: @@ -108,7 +116,7 @@ - state: popsicle color: red - type: Food - trash: + trash: - FoodFrozenPopsicleTrash - type: Tag tags: @@ -126,7 +134,7 @@ - state: stick - state: jumbo - type: Food - trash: + trash: - FoodFrozenPopsicleTrash - type: SolutionContainerManager solutions: @@ -157,7 +165,7 @@ - state: alpha-filling # color: foo - type: Food - trash: + trash: - FoodFrozenSnowconeTrash - type: SolutionContainerManager solutions: @@ -196,7 +204,7 @@ - state: cone - state: berry - type: Food - trash: + trash: - FoodFrozenSnowconeTrash - type: Tag tags: @@ -213,7 +221,7 @@ - state: cone - state: fruitsalad - type: Food - trash: + trash: - FoodFrozenSnowconeTrash - type: Tag tags: @@ -230,7 +238,7 @@ - state: cone - state: clown - type: Food - trash: + trash: - FoodFrozenSnowconeTrash - type: entity @@ -244,7 +252,7 @@ - state: cone - state: mime - type: Food - trash: + trash: - FoodFrozenSnowconeTrash - type: entity @@ -258,7 +266,7 @@ - state: cone - state: rainbow - type: Food - trash: + trash: - FoodFrozenSnowconeTrash # Trash @@ -269,6 +277,8 @@ id: FoodFrozenSnowconeTrash description: A crumpled paper cone used for an icy treat. Worthless. components: + - type: Item + size: Tiny - type: Sprite sprite: Objects/Consumable/Food/frozen.rsi state: cone-trash diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml index 4be9b9f600..1d8b270405 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml @@ -11,7 +11,8 @@ description: A delicious meal, cooked with love. components: - type: Item - storedRotation: -90 + shape: + - 0,0,1,0 - type: Food - type: Sprite sprite: Objects/Consumable/Food/meals.rsi @@ -31,6 +32,8 @@ id: FoodMealPotatoLoaded description: Totally baked. components: + - type: Item + storedOffset: 0,-2 - type: FlavorProfile flavors: - cheesy @@ -45,6 +48,8 @@ id: FoodMealFries description: AKA, French Fries, Freedom Fries, etc. components: + - type: Item + storedOffset: 0,-3 - type: FlavorProfile flavors: - potatoes @@ -59,6 +64,8 @@ id: FoodMealFriesCheesy description: Fries. Covered in cheese. Duh. components: + - type: Item + storedOffset: 0,-3 - type: FlavorProfile flavors: - potatoes @@ -74,6 +81,8 @@ id: FoodMealFriesCarrot description: Tasty fries from fresh carrots. components: + - type: Item + storedOffset: 0,-3 - type: FlavorProfile flavors: - carrots @@ -98,6 +107,8 @@ id: FoodMealNachos description: Chips from Space Mexico. components: + - type: Item + storedOffset: 0,-2 - type: Food trash: - FoodPlateSmall @@ -123,6 +134,8 @@ id: FoodMealNachosCheesy description: The delicious combination of nachos and melting cheese. components: + - type: Item + storedOffset: 0,-2 - type: Food trash: - FoodPlateSmall @@ -149,6 +162,8 @@ id: FoodMealNachosCuban description: That's some dangerously spicy nachos. components: + - type: Item + storedOffset: 0,-2 - type: Food trash: - FoodPlateSmall @@ -178,6 +193,8 @@ id: FoodMealMint description: It's wafer thin. components: + - type: Item + storedOffset: 0,-1 - type: FlavorProfile flavors: - minty @@ -199,6 +216,8 @@ id: FoodMealEggplantParm description: The only good recipe for eggplant. components: + - type: Item + storedOffset: 0,-2 - type: FlavorProfile flavors: - eggplant @@ -225,6 +244,8 @@ id: FoodMealPotatoYaki description: Made with roasted sweet potatoes! components: + - type: Item + storedOffset: 0,-2 - type: FlavorProfile flavors: - sweet @@ -239,6 +260,8 @@ id: FoodMealCubancarp description: A grifftastic sandwich that burns your tongue and then leaves it numb! components: + - type: Item + storedOffset: 3,-7 - type: FlavorProfile flavors: - fishy @@ -271,6 +294,8 @@ id: FoodMealCornedbeef description: Now you can feel like a real tourist vacationing in Ireland. components: + - type: Item + storedOffset: 0,-1 - type: FlavorProfile flavors: - meaty @@ -297,6 +322,11 @@ id: FoodMealBearsteak description: Because eating bear wasn't manly enough. components: + - type: Item + size: Normal + shape: + - 0,0,1,1 + storedOffset: -1,4 - type: FlavorProfile flavors: - meaty @@ -323,6 +353,10 @@ id: FoodMealPigblanket description: A tiny sausage wrapped in a flakey, buttery roll. Free this pig from its blanket prison by eating it. components: + - type: Item + size: Tiny + shape: + - 0,0,0,0 - type: FlavorProfile flavors: - meaty @@ -349,6 +383,8 @@ id: FoodMealRibs description: BBQ ribs, slathered in a healthy coating of BBQ sauce. The least vegan thing to ever exist. components: + - type: Item + storedOffset: 0,-4 - type: Food trash: - FoodKebabSkewer @@ -407,6 +443,8 @@ id: FoodMealOmelette description: Cheesy. components: + - type: Item + storedOffset: 0,-1 - type: FlavorProfile flavors: - egg @@ -431,6 +469,8 @@ id: FoodMealFriedegg description: A fried egg, with a touch of salt and pepper. components: + - type: Item + storedOffset: 0,-1 - type: FlavorProfile flavors: - egg @@ -460,6 +500,10 @@ id: FoodMealMilkape description: The king of Jungle Thick. components: + - type: Item + size: Normal + shape: + - 0,0,1,1 - type: FlavorProfile flavors: - milk @@ -474,6 +518,9 @@ id: FoodMealMemoryleek description: This should refresh your memory. components: + - type: Item + shape: + - 0,0,0,1 - type: FlavorProfile flavors: - memoryleek @@ -496,6 +543,11 @@ id: DisgustingSweptSoup description: Jesus christ. components: + - type: Item + size: Normal + shape: + - 0,0,1,1 + storedOffset: 0,-2 - type: Sprite state: saltysweet - type: SolutionContainerManager @@ -517,6 +569,8 @@ id: FoodMealQueso description: A classic dipping sauce that you can't go wrong with. components: + - type: Item + storedOffset: 0,-6 - type: FlavorProfile flavors: - cheesy @@ -555,6 +609,8 @@ id: FoodMealEnchiladas description: Viva La Mexico! components: + - type: Item + storedOffset: -1,0 - type: FlavorProfile flavors: - meaty @@ -584,6 +640,8 @@ id: FoodSaladWatermelonFruitBowl description: The only salad where you can eat the bowl. components: + - type: Item + storedOffset: 0,-3 - type: FlavorProfile flavors: - fruity @@ -615,6 +673,8 @@ id: FoodMealCornInButter description: Buttery. components: + - type: Item + storedOffset: 0,-5 - type: Food trash: - FoodPlate diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml index b603ffe011..9d506407a3 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml @@ -24,7 +24,8 @@ - ReagentId: Fat Quantity: 5 - type: Item - size: Tiny + shape: + - 0,0,1,0 - type: Fixtures fixtures: fix1: @@ -110,6 +111,7 @@ tags: - Meat - type: Item + storedOffset: -2,1 inhandVisuals: left: - state: plain-inhand-left @@ -134,6 +136,7 @@ count: 3 slice: FoodMeatCutlet - type: Item + storedOffset: -2,1 inhandVisuals: left: - state: plain-inhand-left @@ -168,6 +171,7 @@ - ReagentId: CarpoToxin Quantity: 5 - type: Item + storedOffset: -1,1 inhandVisuals: left: - state: generic-pink-inhand-left @@ -204,6 +208,7 @@ node: start defaultTarget: bacon - type: Item + storedOffset: -1,0 inhandVisuals: left: - state: generic-pink-inhand-left @@ -234,6 +239,7 @@ node: start defaultTarget: filet migrawr - type: Item + storedOffset: -1,2 inhandVisuals: left: - state: generic-pink-inhand-left @@ -266,6 +272,7 @@ node: start defaultTarget: cooked penguin - type: Item + storedOffset: -1,1 inhandVisuals: left: - state: generic-pink-inhand-left @@ -298,6 +305,7 @@ node: start defaultTarget: cooked chicken - type: Item + storedOffset: -1,1 inhandVisuals: left: - state: generic-pink-inhand-left @@ -328,6 +336,7 @@ node: start defaultTarget: cooked duck - type: Item + storedOffset: -1,1 inhandVisuals: left: - state: generic-pink-inhand-left @@ -371,6 +380,8 @@ id: FoodMeatCrab description: A pile of raw crab meat. components: + - type: Item + storedOffset: -1,2 - type: FlavorProfile flavors: - crabby @@ -412,6 +423,7 @@ node: start defaultTarget: goliath steak - type: Item + storedOffset: -1,0 inhandVisuals: left: - state: plain-inhand-left @@ -452,6 +464,7 @@ node: start defaultTarget: dragon steak - type: Item + storedOffset: -2,1 inhandVisuals: left: - state: dragon-inhand-left @@ -478,6 +491,7 @@ count: 3 slice: FoodMeatCutlet - type: Item + storedOffset: -2,1 inhandVisuals: left: - state: plain-inhand-left @@ -508,6 +522,7 @@ node: start defaultTarget: lizard steak - type: Item + storedOffset: -1,1 inhandVisuals: left: - state: plain-inhand-left @@ -550,6 +565,7 @@ - ReagentId: Fat Quantity: 4 - type: Item + storedOffset: -2,1 inhandVisuals: left: - state: rotten-inhand-left @@ -576,6 +592,7 @@ count: 3 slice: FoodMeatSpiderCutlet - type: Item + storedOffset: 0,2 heldPrefix: spider - type: entity @@ -595,6 +612,9 @@ - ReagentId: Fat Quantity: 3 - type: Item + size: Normal + shape: + - 0,0,1,1 inhandVisuals: left: - state: snake-inhand-left @@ -621,6 +641,9 @@ - ReagentId: UncookedAnimalProteins Quantity: 1 - type: Item + size: Tiny + shape: + - 0,0,0,0 inhandVisuals: left: - state: generic-pink-inhand-left @@ -650,6 +673,7 @@ - ReagentId: Toxin Quantity: 2 - type: Item + storedOffset: -1,3 inhandVisuals: left: - state: snake-inhand-left @@ -683,6 +707,7 @@ count: 3 slice: FoodMeatXenoCutlet - type: Item + storedOffset: -2,1 inhandVisuals: left: - state: plain-inhand-left @@ -740,6 +765,7 @@ - type: StaticPrice price: 100 - type: Item + storedOffset: 0,-2 inhandVisuals: left: - state: tomato-inhand-left @@ -752,6 +778,8 @@ id: FoodMeatSalami description: A large tube of salami. Best not to ask what went into it. components: + - type: Item + storedOffset: 0,1 - type: Tag tags: - Raw @@ -778,6 +806,8 @@ id: FoodMeatClown description: A delicious, round piece of meat clown. How horrifying. components: + - type: Item + storedOffset: 0,3 - type: FlavorProfile flavors: - meaty @@ -797,6 +827,11 @@ id: FoodMeatMeatball description: A raw ball of meat. Meat ball. components: + - type: Item + size: Tiny + shape: + - 0,0,0,0 + storedOffset: -1,2 - type: Tag tags: - Raw @@ -828,6 +863,9 @@ node: start defaultTarget: cooked meat patty - type: Item + size: Tiny + shape: + - 0,0,0,0 heldPrefix: generic-pink - type: entity @@ -851,6 +889,7 @@ - type: Sprite state: slime - type: Item + storedOffset: -1,2 inhandVisuals: left: - state: slime-inhand-left @@ -877,6 +916,7 @@ - ReagentId: Water Quantity: 4 #It makes saline if you add salt! - type: Item + storedOffset: -1,-3 inhandVisuals: left: - state: generic-pink-inhand-left @@ -915,6 +955,9 @@ tags: - Meat - type: Item + size: Normal + shape: + - 0,0,1,1 inhandVisuals: left: - state: plain-inhand-left @@ -929,6 +972,8 @@ name: smile extract description: It's a real panacea. But at what cost? components: + - type: Item + size: Tiny - type: Extractable grindableSolutionName: food - type: FlavorProfile @@ -988,6 +1033,7 @@ Burger: MeatSteak Taco: MeatSteak - type: Item + storedOffset: -2,1 inhandVisuals: left: - state: plain-cooked-inhand-left @@ -1029,6 +1075,7 @@ Burger: MeatBacon Taco: MeatBacon - type: Item + storedOffset: -1,0 inhandVisuals: left: - state: generic-pink-inhand-left @@ -1070,6 +1117,7 @@ Burger: MeatBearBurger Taco: MeatBear - type: Item + storedOffset: -1,1 heldPrefix: meatball - type: entity @@ -1104,6 +1152,7 @@ Burger: MeatPenguinBurger Taco: MeatPenguin - type: Item + storedOffset: -1,1 inhandVisuals: left: - state: plain-cooked-inhand-left @@ -1144,6 +1193,7 @@ Burger: MeatChicken Taco: MeatChicken - type: Item + storedOffset: -1,1 inhandVisuals: left: - state: plain-cooked-inhand-left @@ -1224,6 +1274,7 @@ Burger: MeatDuck Taco: MeatDuck - type: Item + storedOffset: -1,1 inhandVisuals: left: - state: plain-cooked-inhand-left @@ -1264,6 +1315,7 @@ Burger: MeatCrabBurger Taco: MeatCrab - type: Item + storedOffset: -1,2 inhandVisuals: left: - state: plain-cooked-inhand-left @@ -1300,6 +1352,7 @@ Burger: MeatGoliathBurger Taco: MeatGoliath - type: Item + storedOffset: -1,0 inhandVisuals: left: - state: plain-cooked-inhand-left @@ -1379,6 +1432,7 @@ Burger: MeatLizardBurger Taco: MeatLizard - type: Item + storedOffset: -1,1 inhandVisuals: left: - state: plain-cooked-inhand-left @@ -1411,6 +1465,7 @@ Burger: MeatSpiderBurger Taco: MeatSpider - type: Item + storedOffset: -1,-1 inhandVisuals: left: - state: snake-inhand-left @@ -1447,6 +1502,10 @@ graph: MeatMeatballCooked node: meatball cooked - type: Item + size: Tiny + shape: + - 0,0,0,0 + storedOffset: -1,2 heldPrefix: meatball - type: entity @@ -1478,6 +1537,9 @@ Burger: MeatPatty Taco: MeatPatty - type: Item + size: Tiny + shape: + - 0,0,0,0 heldPrefix: meatball - type: entity @@ -1509,6 +1571,7 @@ Burger: MeatSnail Taco: MeatSnail - type: Item + storedOffset: -1,-3 inhandVisuals: left: - state: generic-pink-inhand-left @@ -1546,6 +1609,9 @@ graph: AnomalyMeatSteak node: anomaly steak - type: Item + size: Normal + shape: + - 0,0,1,1 inhandVisuals: left: - state: plain-cooked-inhand-left @@ -1587,6 +1653,7 @@ Burger: DragonSteak Taco: DragonSteak - type: Item + storedOffset: 0,-1 inhandVisuals: left: - state: dragon-cooked-inhand-left @@ -1623,6 +1690,9 @@ node: start defaultTarget: cutlet - type: Item + size: Tiny + shape: + - 0,0,0,0 inhandVisuals: left: - state: generic-pink-inhand-left @@ -1658,6 +1728,9 @@ node: start defaultTarget: bear cutlet - type: Item + size: Tiny + shape: + - 0,0,0,0 inhandVisuals: left: - state: generic-pink-inhand-left @@ -1693,6 +1766,9 @@ node: start defaultTarget: penguin cutlet - type: Item + size: Tiny + shape: + - 0,0,0,0 inhandVisuals: left: - state: generic-pink-inhand-left @@ -1728,6 +1804,9 @@ node: start defaultTarget: chicken cutlet - type: Item + size: Tiny + shape: + - 0,0,0,0 inhandVisuals: left: - state: generic-pink-inhand-left @@ -1761,6 +1840,9 @@ node: start defaultTarget: duck cutlet - type: Item + size: Tiny + shape: + - 0,0,0,0 inhandVisuals: left: - state: generic-pink-inhand-left @@ -1797,6 +1879,9 @@ node: start defaultTarget: lizard cutlet - type: Item + size: Tiny + shape: + - 0,0,0,0 inhandVisuals: left: - state: generic-pink-inhand-left @@ -1831,6 +1916,9 @@ node: start defaultTarget: spider cutlet - type: Item + size: Tiny + shape: + - 0,0,0,0 inhandVisuals: left: - state: generic-pink-inhand-left @@ -1867,6 +1955,9 @@ node: start defaultTarget: xeno cutlet - type: Item + size: Tiny + shape: + - 0,0,0,0 inhandVisuals: left: - state: generic-pink-inhand-left @@ -1881,6 +1972,11 @@ id: FoodMeatTomatoCutlet description: A cutlet from a slab of tomato. components: + - type: Item + size: Tiny + shape: + - 0,0,0,0 + storedOffset: -1,0 - type: Tag tags: - Cutlet @@ -1897,6 +1993,11 @@ id: FoodMeatSalamiSlice description: A slice of cured salami. components: + - type: Item + size: Tiny + shape: + - 0,0,0,0 + storedOffset: -1,0 - type: Tag tags: - Raw @@ -1940,6 +2041,9 @@ node: start defaultTarget: dragon cutlet - type: Item + size: Tiny + shape: + - 0,0,0,0 inhandVisuals: left: - state: generic-pink-inhand-left @@ -1979,6 +2083,10 @@ Burger: MeatCutlet Taco: MeatCutlet - type: Item + size: Tiny + shape: + - 0,0,0,0 + storedOffset: -1,1 inhandVisuals: left: - state: generic-pink-inhand-left @@ -2019,6 +2127,10 @@ Burger: BearCutletBurger Taco: BearCutlet - type: Item + size: Tiny + shape: + - 0,0,0,0 + storedOffset: -1,1 inhandVisuals: left: - state: generic-pink-inhand-left @@ -2057,6 +2169,10 @@ Burger: PenguinCutletBurger Taco: PenguinCutlet - type: Item + size: Tiny + shape: + - 0,0,0,0 + storedOffset: -1,1 inhandVisuals: left: - state: generic-pink-inhand-left @@ -2095,6 +2211,10 @@ Burger: ChickenCutlet Taco: ChickenCutlet - type: Item + size: Tiny + shape: + - 0,0,0,0 + storedOffset: -1,1 inhandVisuals: left: - state: generic-pink-inhand-left @@ -2133,6 +2253,10 @@ Burger: DuckCutlet Taco: DuckCutlet - type: Item + size: Tiny + shape: + - 0,0,0,0 + storedOffset: -1,1 inhandVisuals: left: - state: generic-pink-inhand-left @@ -2172,6 +2296,10 @@ Burger: LizardCutletBurger Taco: LizardCutlet - type: Item + size: Tiny + shape: + - 0,0,0,0 + storedOffset: -1,1 inhandVisuals: left: - state: generic-pink-inhand-left @@ -2209,6 +2337,10 @@ Burger: SpiderCutletBurger Taco: SpiderCutlet - type: Item + size: Tiny + shape: + - 0,0,0,0 + storedOffset: -1,0 inhandVisuals: left: - state: generic-pink-inhand-left @@ -2246,6 +2378,10 @@ Burger: XenoCutlet Taco: XenoCutlet - type: Item + size: Tiny + shape: + - 0,0,0,0 + storedOffset: -1,1 inhandVisuals: left: - state: generic-pink-inhand-left @@ -2285,6 +2421,10 @@ Burger: DragonCutlet Taco: DragonCutlet - type: Item + size: Tiny + shape: + - 0,0,0,0 + storedOffset: -1,1 inhandVisuals: left: - state: generic-pink-inhand-left diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml index 580038115f..b33a35e8fc 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml @@ -8,7 +8,8 @@ description: Now that's a nice pasta! components: - type: Item - storedRotation: -90 + shape: + - 0,0,1,0 - type: Sprite sprite: Objects/Consumable/Food/noodles.rsi - type: SolutionContainerManager @@ -27,6 +28,8 @@ id: FoodNoodlesBoiled description: A plain dish of noodles, this needs more ingredients. components: + - type: Item + storedOffset: 0,-4 - type: FlavorProfile flavors: - pasta @@ -40,6 +43,8 @@ id: FoodNoodles description: Spaghetti and crushed tomatoes. Just like your abusive father used to make! components: + - type: Item + storedOffset: 0,-4 - type: FlavorProfile flavors: - pasta @@ -64,6 +69,10 @@ id: FoodNoodlesCopy description: You probably shouldn't try this, you always hear people talking about how bad it is... components: + - type: Item + size: Normal + shape: + - 0,0,1,1 - type: Food trash: - FoodPlateSmall @@ -88,6 +97,8 @@ id: FoodNoodlesMeatball description: Now that's a nice-a meatball! components: + - type: Item + storedOffset: 0,-4 - type: FlavorProfile flavors: - pasta @@ -114,6 +125,8 @@ id: FoodNoodlesSpesslaw description: A lawyer's favourite. components: + - type: Item + storedOffset: 0,-4 - type: FlavorProfile flavors: - pasta @@ -164,6 +177,8 @@ id: FoodNoodlesButter description: Noodles covered in savory butter. Simple and slippery, but delicious. components: + - type: Item + storedOffset: 0,-4 - type: FlavorProfile flavors: - pasta diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml index 7b9db1f41f..2722881564 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml @@ -7,16 +7,20 @@ id: FoodKebabSkewer description: A thin rod of metal used to skewer just about anything and cook it. components: + - type: Item + shape: + - 0,0,1,0 + storedOffset: 0,-2 - type: Sprite sprite: Objects/Consumable/Food/skewer.rsi - state: + state: layers: - state: skewer - map: ["foodSequenceLayers"] - type: LandAtCursor - type: Fixtures fixtures: - fix1: + fix1: shape: !type:PolygonShape vertices: - -0.40,-0.20 @@ -50,7 +54,7 @@ - Trash - Skewer - type: Food - trash: + trash: - FoodKebabSkewer - type: SolutionContainerManager solutions: @@ -61,8 +65,8 @@ key: Skewer maxLayers: 4 startPosition: -0.27, -0.19 - inverseLayers: true + inverseLayers: true offset: 0.2, 0.1 nameGeneration: food-sequence-skewer-gen contentSeparator: ", " - allowHorizontalFlip: false \ No newline at end of file + allowHorizontalFlip: false diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml index c8b0e2d1f8..83a1c61dc9 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml @@ -111,6 +111,7 @@ - type: Item heldPrefix: chocolatebar size: Tiny + storedOffset: 1,-1 - type: Tag tags: - FoodSnack @@ -134,6 +135,7 @@ state: chocolatebar-open - type: Item heldPrefix: chocolatebar-open + storedOffset: 1,-2 - type: Tag tags: - FoodSnack @@ -160,6 +162,7 @@ state: energybar - type: Item heldPrefix: energybar + storedOffset: 0,-1 - type: SpawnItemsOnUse items: - id: FoodPacketEnergyTrash @@ -183,6 +186,7 @@ state: energybar-open - type: Item heldPrefix: energybar-open + storedOffset: 0,-2 - type: entity name: Sweetie's pistachios @@ -198,6 +202,7 @@ state: pistachio - type: Item heldPrefix: pistachio + storedOffset: 1,0 - type: Food trash: - FoodPacketPistachioTrash @@ -258,6 +263,7 @@ state: semki - type: Item heldPrefix: semki + storedOffset: 1,0 - type: Food trash: - FoodPacketSemkiTrash @@ -325,6 +331,7 @@ - FoodPacketCupRamenTrash - type: Item heldPrefix: ramen + storedOffset: 0,-1 - type: entity parent: DrinkRamen @@ -357,6 +364,7 @@ state: chinese1 - type: Item heldPrefix: chinese1 + storedOffset: 1,-2 - type: SolutionContainerManager solutions: food: @@ -385,6 +393,7 @@ state: chinese2 - type: Item heldPrefix: chinese2 + storedOffset: 0,-2 - type: SolutionContainerManager solutions: food: @@ -421,6 +430,7 @@ - type: Item sprite: Objects/Consumable/Food/snacks.rsi heldPrefix: cookie_fortune + storedOffset: 1,-1 size: Tiny - type: Food trash: @@ -434,6 +444,7 @@ components: - type: Item size: Small + storedOffset: -1,0 heldPrefix: nutribrick - type: Tag tags: @@ -459,6 +470,7 @@ - nutribrick - type: Item size: Small + storedOffset: -1,0 heldPrefix: nutribrick-open - type: Tag tags: @@ -485,6 +497,8 @@ state: mre-brownie - type: Item heldPrefix: mre-brownie + size: Tiny + storedOffset: -1,-1 - type: Tag tags: - FoodSnack @@ -509,6 +523,7 @@ state: mre-brownie-open - type: Item heldPrefix: mre-brownie-open + storedOffset: -1,-1 - type: Food - type: SolutionContainerManager solutions: @@ -533,6 +548,8 @@ sprite: Objects/Consumable/Food/candy.rsi heldPrefix: swirl_lollipop size: Small + storedRotation: -45 + storedOffset: 0,-1 - type: Tag tags: - FoodSnack diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml index ecc4b22894..c919aab528 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml @@ -6,7 +6,9 @@ abstract: true components: - type: Item - storedRotation: -90 + shape: + - 0,0,1,0 + storedOffset: 0,-3 - type: Food trash: - FoodBowlBig @@ -315,7 +317,7 @@ - ReagentId: Sugar Quantity: 8 - ReagentId: Vitamin - Quantity: 17 + Quantity: 17 - type: Tag tags: - Fruit @@ -562,6 +564,9 @@ id: FoodJellyAmanita description: It's evil, don't touch it! components: + - type: Item + size: Normal + storedOffset: 0,-3 - type: FlavorProfile flavors: - mushroom @@ -1188,6 +1193,11 @@ id: FoodSoupElectron description: A gastronomic curiosity of ethereal origin. components: + - type: Item + size: Normal + shape: + - 0,0,1,1 + storedOffset: 0,2 - type: FlavorProfile flavors: - mushrooms diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml index d715704770..651594c8ee 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml @@ -7,7 +7,7 @@ description: A taco shell, easy to hold, but falls on its side when put down. components: - type: Item - storedRotation: -90 + storedOffset: 0,-3 - type: Food transferAmount: 3 - type: Sprite @@ -61,7 +61,9 @@ Quantity: 4 - type: Item sprite: Objects/Consumable/Food/taco.rsi - storedRotation: -90 + shape: + - 0,0,1,0 + storedOffset: 0,1 - type: Tag tags: - Meat @@ -172,6 +174,8 @@ id: FoodTacoDragon description: A dragon taco, which is technically also a fish taco. components: + - type: Item + storedOffset: 0,3 - type: FlavorProfile flavors: - meaty diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml index 71c1e6bf4e..339ba9eeae 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml @@ -499,6 +499,7 @@ - type: Item sprite: Objects/Tools/rolling_pin.rsi size: Small + storedRotation: -45 - type: Clothing sprite: Objects/Tools/rolling_pin.rsi quickEquip: false diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml index edab0e8a94..940514971a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml @@ -43,6 +43,8 @@ state: icon - type: Item sprite: Objects/Weapons/Melee/kitchen_knife.rsi + storedOffset: -1,1 + storedRotation: -45 - type: GuideHelp guides: - Chef From f046fb47315eb0e33592ad436db0e03aff9aeca7 Mon Sep 17 00:00:00 2001 From: 5tickman <5tick@comcast.net> Date: Tue, 22 Jul 2025 20:22:34 -0500 Subject: [PATCH 05/12] oops, forgot to look at burgers. --- .../Objects/Consumable/Food/burger.yml | 67 +++++++++++++++++-- 1 file changed, 60 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml index b226620953..cadd94be58 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml @@ -31,10 +31,10 @@ id: FoodBreadBunBottom parent: FoodBreadSliceBase name: bottom bun - description: It's time to start building the burger tower. + description: It's time to start building the burger tower. components: - type: Item - size: Normal #patch until there is an adequate resizing system in place + size: Normal #patch until there is an adequate resizing system in place - type: Food - type: Sprite drawdepth: Mobs @@ -83,7 +83,7 @@ - type: FoodSequenceElement entries: Burger: BunTopBurger - + # Base - type: entity @@ -110,6 +110,8 @@ Quantity: 3 - type: Item sprite: Objects/Consumable/Food/burger.rsi + shape: + - 0,0,1,0 # Custom Burger Example @@ -219,6 +221,8 @@ id: FoodBurgerBear description: Best served rawr. components: + - type: Item + storedOffset: 0,1 - type: FlavorProfile flavors: - bun @@ -246,6 +250,11 @@ id: FoodBurgerBig description: Forget the Big Mac. THIS is the future! components: + - type: Item + size: Normal + shape: + - 0,0,1,1 + storedOffset: 0,3 - type: FlavorProfile flavors: # What bun? - meaty @@ -275,6 +284,8 @@ id: FoodBurgerBrain description: A strange looking burger. It looks almost sentient. components: + - type: Item + storedOffset: 0,1 - type: FlavorProfile flavors: - bun @@ -303,6 +314,8 @@ id: FoodBurgerCat description: Finally those cats and catpeople are worth something! components: + - type: Item + storedOffset: -1,1 - type: Sprite state: cat - type: FlavorProfile @@ -398,6 +411,8 @@ id: FoodBurgerClown description: This tastes funny... components: + - type: Item + storedOffset: 0,1 - type: FlavorProfile flavors: - bun @@ -477,6 +492,11 @@ id: FoodBurgerCrazy description: This looks like the sort of food that a demented clown in a trenchcoat would make. components: + - type: Item + size: Normal + shape: + - 0,0,1,1 + storedOffset: -2,0 - type: FlavorProfile flavors: - bun @@ -499,7 +519,7 @@ - ReagentId: Vitamin Quantity: 8 - ReagentId: Sulfur # What you get for eating something with a flare in it - Quantity: 5 + Quantity: 5 - type: Tag tags: - Meat @@ -510,6 +530,8 @@ id: FoodBurgerDuck description: A duck sandwich, only the criminally insane would dare to eat the meat of such an adorable creature. components: + - type: Item + storedOffset: 0,1 - type: FlavorProfile flavors: - bun @@ -536,6 +558,8 @@ id: FoodBurgerEmpowered description: It's shockingly good, if you live off of electricity that is. components: + - type: Item + storedOffset: -2,1 - type: Sprite state: empowered - type: FlavorProfile @@ -559,6 +583,8 @@ id: FoodBurgerCarp description: Almost like a carp is yelling somewhere... components: + - type: Item + storedOffset: 0,1 - type: FlavorProfile flavors: - bun @@ -576,6 +602,11 @@ id: FoodBurgerFive description: HOT! HOT! HOT! components: + - type: Item + size: Normal + shape: + - 0,0,1,1 + storedOffset: 0,1 - type: FlavorProfile flavors: - meaty @@ -609,6 +640,11 @@ id: FoodBurgerGhost description: Too spooky! components: + - type: Item + size: Normal + shape: + - 0,0,1,1 + storedOffset: 0,3 - type: FlavorProfile flavors: - bun @@ -663,6 +699,8 @@ id: FoodBurgerMcguffin description: A cheap and greasy imitation of an eggs Benedict. components: + - type: Item + storedOffset: 0,1 - type: FlavorProfile flavors: - muffin @@ -691,7 +729,7 @@ description: An elusive rib shaped burger with limited availability across the galaxy. Not as good as you remember it. components: - type: Food - trash: + trash: - FoodKebabSkewer - type: FlavorProfile flavors: @@ -702,7 +740,7 @@ - type: SolutionContainerManager solutions: food: - maxVol: 30 + maxVol: 30 reagents: - ReagentId: Nutriment Quantity: 11 @@ -832,6 +870,8 @@ id: FoodBurgerSoy description: After eating this you have the overwhelming urge to purchase overpriced figurines of superheroes. components: + - type: Item + storedOffset: 0,1 - type: FlavorProfile flavors: - bun @@ -855,6 +895,11 @@ id: FoodBurgerSpell description: This is absolutely Ei Nath. components: + - type: Item + size: Normal + shape: + - 0,0,1,1 + storedOffset: -1,2 - type: FlavorProfile flavors: - bun @@ -880,6 +925,11 @@ id: FoodBurgerSuper description: This is a mountain of a burger. FOOD! components: + - type: Item + size: Normal + shape: + - 0,0,1,1 + storedOffset: 0,4 - type: FlavorProfile flavors: # What bun? - meaty @@ -966,6 +1016,9 @@ id: FoodBurgerMothRoach description: The last lamp it saw was the one inside the microwave. components: + - type: Item + shape: + - 0,0,0,1 - type: FlavorProfile flavors: - bun @@ -987,4 +1040,4 @@ - type: Tag tags: - Meat - + From c72dcfce3f3ba55832315799557c722ad2e2b97e Mon Sep 17 00:00:00 2001 From: 5tickman <5tick@comcast.net> Date: Tue, 22 Jul 2025 21:48:31 -0500 Subject: [PATCH 06/12] Grilled cheese is now flat, not tall. --- .../Entities/Objects/Consumable/Food/Baked/misc.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml index 80f28b0ec7..f3ff09afc9 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml @@ -862,6 +862,8 @@ components: - type: Item size: Small + shape: + - 0,0,1,0 - type: FlavorProfile flavors: - cheesy @@ -889,6 +891,8 @@ components: - type: Item size: Small + shape: + - 0,0,1,0 - type: FlavorProfile flavors: - cheesy From 49de2feda1400e798a27b5be4476ee63c4f69f0d Mon Sep 17 00:00:00 2001 From: 5tickman <5tick@comcast.net> Date: Tue, 22 Jul 2025 22:29:23 -0500 Subject: [PATCH 07/12] Nudge the cheese wedge. --- .../Prototypes/Entities/Objects/Consumable/Food/ingredients.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml index 74da2a1b6a..cb1194d72b 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml @@ -765,6 +765,7 @@ Burger: CheeseBurger - type: Item size: Tiny + storedOffset: 0,-3 inhandVisuals: left: - state: cheesewedge-inhand-left From 3566c8c8c6bcf8ac4b289068b1fbe3d2e9df4d13 Mon Sep 17 00:00:00 2001 From: 5tickman <5tick@comcast.net> Date: Fri, 25 Jul 2025 21:24:53 -0500 Subject: [PATCH 08/12] Baguette-less mimes, and bigger combat bakery kit box. --- Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml | 6 +++--- Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml | 7 +++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml index 69433fa7c0..972eb5074b 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml @@ -212,7 +212,7 @@ - id: EmergencyOxygenTankFilled - id: EmergencyMedipen - id: Flare - - id: FoodBreadBaguette + - id: FoodSnackNutribrick - id: DrinkWaterBottleFull - type: entity @@ -226,7 +226,7 @@ - id: EmergencyNitrogenTankFilled - id: EmergencyMedipen - id: Flare - - id: FoodBreadBaguette + - id: FoodSnackNutribrick - id: DrinkWaterBottleFull - type: Sprite layers: @@ -246,7 +246,7 @@ - id: EmergencyOxygenTankFilled - id: EmergencyMedipen - id: Flare - - id: FoodBreadBaguetteCotton + - id: FoodSnackNutribrick - id: DrinkWaterBottleFull - type: entity diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml b/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml index 5e44c49c72..2f08b1eb75 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml @@ -74,6 +74,13 @@ name: combat bakery kit description: A kit of clandestine baked weapons. components: + - type: Storage + grid: + - 0,0,3,3 + maxItemSize: Normal + - type: Item + shape: + - 0,0,3,3 - type: Sprite layers: - state: box_of_doom From 7d61e5ff5c2caa9f1a54a30c7a023db536641a30 Mon Sep 17 00:00:00 2001 From: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com> Date: Thu, 7 Aug 2025 12:49:15 -0700 Subject: [PATCH 09/12] Half a commit --- .../Entities/Objects/Consumable/Food/Baked/bagel.yml | 12 ++++++------ .../Entities/Objects/Consumable/Food/Baked/bread.yml | 7 +++---- .../Entities/Objects/Consumable/Food/Baked/misc.yml | 10 +++------- .../Entities/Objects/Consumable/Food/Baked/pie.yml | 2 +- .../Entities/Objects/Consumable/Food/Baked/pizza.yml | 1 - .../Objects/Consumable/Food/Containers/bowl.yml | 6 +++--- .../Objects/Consumable/Food/Containers/tin.yml | 8 ++++---- .../Entities/Objects/Consumable/Food/breakfast.yml | 1 - .../Entities/Objects/Consumable/Food/burger.yml | 5 +---- .../Entities/Objects/Consumable/Food/frozen.yml | 8 ++++---- 10 files changed, 25 insertions(+), 35 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bagel.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bagel.yml index c8f56aa100..9a905db90a 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bagel.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bagel.yml @@ -2,9 +2,9 @@ # Base - type: entity - id: FoodBagelBase - parent: FoodInjectableBase abstract: true + parent: FoodInjectableBase + id: FoodBagelBase description: A delicious bagel. components: - type: Item @@ -24,13 +24,13 @@ Quantity: 5 - type: entity + parent: FoodBagelBase id: FoodBagel name: bagel - parent: FoodBagelBase - type: entity - id: FoodBagelPoppy parent: FoodBagelBase + id: FoodBagelPoppy name: poppy seed bagel description: A delicious bagel topped with bicaridine-infused poppy seeds. components: @@ -51,8 +51,8 @@ Quantity: 5 - type: entity - id: FoodBagelCotton parent: FoodBagelBase + id: FoodBagelCotton name: cotton bagel description: A delicious bagel made with cotton dough. components: @@ -62,7 +62,7 @@ - cotton - type: Sprite state: bagel-cottondough - - type: Food + - type: Edible requiresSpecialDigestion: true - type: Tag tags: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml index a7d6654e59..f11ece66e5 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml @@ -11,7 +11,6 @@ - type: FlavorProfile flavors: - bread - - type: Food - type: Sprite sprite: Objects/Consumable/Food/Baked/bread.rsi - type: Tag @@ -133,7 +132,7 @@ flavors: - cotton - bread - - type: Food + - type: Edible requiresSpecialDigestion: true - type: Sprite layers: @@ -717,7 +716,7 @@ state: baguette-cotton - type: SliceableFood slice: FoodBreadBaguetteCottonSlice - - type: Food + - type: Edible requiresSpecialDigestion: true - type: Tag tags: @@ -773,9 +772,9 @@ Quantity: 0.1 - type: entity - name: cotton crostini parent: FoodBreadBaguetteSlice id: FoodBreadBaguetteCottonSlice + name: cotton crostini description: Bon az-zetite! components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml index f3ff09afc9..7474fd3155 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml @@ -835,7 +835,7 @@ - cotton - type: Sprite state: croissant-cotton - - type: Food + - type: Edible requiresSpecialDigestion: true - type: Tag tags: @@ -884,15 +884,11 @@ Quantity: 3 - type: entity - parent: FoodBakedBase + parent: FoodBakedGrilledCheeseSandwich id: FoodBakedGrilledCheeseSandwichCotton name: cotton grilled cheese sandwich description: Cotton bread slightly burnt in butter, with melted cheese. Moths find it difficult to resist this combination. components: - - type: Item - size: Small - shape: - - 0,0,1,0 - type: FlavorProfile flavors: - cheesy @@ -901,7 +897,7 @@ - type: Sprite sprite: Objects/Consumable/Food/Baked/misc.rsi state: grilled-cheese-cotton - - type: Food + - type: Edible requiresSpecialDigestion: true - type: Tag tags: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml index 0147fe496a..e2633360bf 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml @@ -25,7 +25,7 @@ Quantity: 14 - ReagentId: Sugar Quantity: 5 - - type: Food #All pies here made with a pie tin; unless you're some kind of savage, you're probably not destroying this when you eat or slice the pie! + - type: Edible #It's actually possible now to have a pie stored in a tin rather than spawning trash when you finish eating it. But right now I'm just cleaning up. trash: - FoodPlateTin - type: SliceableFood diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml index 1f628d57b8..ef2f72deb3 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml @@ -10,7 +10,6 @@ flavors: - oily - bread - - type: Food - type: Sprite sprite: Objects/Consumable/Food/Baked/pizza.rsi - type: SolutionContainerManager diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml index 25bf2905f7..56d38afbb6 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml @@ -23,10 +23,10 @@ visible: false - type: MixableSolution solution: food - - type: Drink + - type: Edible + edible: Drink solution: food - useSound: - path: /Audio/Items/drink.ogg + destroyOnEmpty: false - type: DamageOnLand damage: types: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml index 8deda57d47..ff92ad0417 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml @@ -89,7 +89,7 @@ flavors: - sweet - funny - - type: Food + - type: Edible trash: - FoodTinPeachesTrash - type: Tag @@ -114,7 +114,7 @@ components: - type: Sprite sprite: Objects/Consumable/Food/Tins/maint_peaches.rsi - - type: Food + - type: Edible trash: - FoodTinPeachesMaintTrash @@ -156,7 +156,7 @@ - savory - salty - cheap - - type: Food + - type: Edible trash: - FoodTinBeansTrash @@ -192,7 +192,7 @@ - meaty - salty - cheap - - type: Food + - type: Edible trash: - FoodTinMRETrash - type: Tag diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/breakfast.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/breakfast.yml index 2842485dbf..c50f7d08be 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/breakfast.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/breakfast.yml @@ -10,7 +10,6 @@ components: - type: Item size: Normal - - type: Food - type: Sprite sprite: Objects/Consumable/Food/breakfast.rsi - type: SolutionContainerManager diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml index 3c55372ba8..64c829fb12 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml @@ -7,7 +7,6 @@ id: FoodBreadBun description: A hamburger bun. Round and convenient to hold. components: - - type: Food - type: Sprite sprite: Objects/Consumable/Food/burger.rsi layers: @@ -35,7 +34,6 @@ components: - type: Item size: Normal #patch until there is an adequate resizing system in place - - type: Food - type: Sprite drawdepth: Mobs noRot: true @@ -68,7 +66,6 @@ name: top bun description: The perfect finish for your burger tower. components: - - type: Food - type: Sprite sprite: Objects/Consumable/Food/burger_sequence.rsi layers: @@ -726,7 +723,7 @@ id: FoodBurgerMcrib description: An elusive rib shaped burger with limited availability across the galaxy. Not as good as you remember it. components: - - type: Food + - type: Edible trash: - FoodKebabSkewer - type: FlavorProfile diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml index 0f4ed35b6a..537043b33f 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml @@ -20,9 +20,9 @@ # Ice-cream - type: entity - name: ice-cream sandwich parent: FoodFrozenBase id: FoodFrozenSandwich + name: ice-cream sandwich description: Portable ice-cream in its own packaging. components: - type: Item @@ -32,8 +32,8 @@ state: sandwich - type: entity - name: strawberry ice-cream sandwich parent: FoodFrozenBase + name: strawberry ice-cream sandwich id: FoodFrozenSandwichStrawberry description: Portable ice-cream in its own packaging of the strawberry variety. components: @@ -62,9 +62,9 @@ state: spacefreezy - type: entity - name: cornuto parent: FoodFrozenBase id: FoodFrozenCornuto + name: strawberry ice-cream sandwich description: A Neapolitan vanilla and chocolate ice-cream cone. It menaces with a sprinkling of caramelized nuts. components: - type: Item @@ -272,9 +272,9 @@ # Trash - type: entity - name: paper cone parent: BaseItem id: FoodFrozenSnowconeTrash + name: paper cone description: A crumpled paper cone used for an icy treat. Worthless. components: - type: Item From 03326477a8690c8bb500a2fc7f1472c199248dae Mon Sep 17 00:00:00 2001 From: 5tickman <5tick@comcast.net> Date: Sun, 10 Aug 2025 10:31:19 -0500 Subject: [PATCH 10/12] Combat box now huge. Reorganize order of abstract, parent, id, and name. Replaced "type: Food" with "type: Edible". --- .../Catalog/Fills/Boxes/syndicate.yml | 1 + .../Objects/Consumable/Food/Baked/bread.yml | 56 ++++---- .../Objects/Consumable/Food/Baked/misc.yml | 18 +-- .../Objects/Consumable/Food/Baked/pie.yml | 2 +- .../Objects/Consumable/Food/Baked/pizza.yml | 6 +- .../Consumable/Food/Containers/bowl.yml | 4 +- .../Consumable/Food/Containers/plate.yml | 6 +- .../Objects/Consumable/Food/breakfast.yml | 6 +- .../Objects/Consumable/Food/burger.yml | 42 +++--- .../Objects/Consumable/Food/frozen.yml | 22 +-- .../Objects/Consumable/Food/ingredients.yml | 50 +++---- .../Objects/Consumable/Food/meals.yml | 64 ++++----- .../Entities/Objects/Consumable/Food/meat.yml | 126 +++++++++--------- .../Objects/Consumable/Food/noodles.yml | 16 +-- .../Objects/Consumable/Food/skewer.yml | 4 +- .../Objects/Consumable/Food/snacks.yml | 66 ++++----- .../Entities/Objects/Consumable/Food/soup.yml | 10 +- .../Entities/Objects/Consumable/Food/taco.yml | 24 ++-- .../Entities/Objects/Weapons/Melee/knife.yml | 2 +- 19 files changed, 263 insertions(+), 262 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml b/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml index 2f08b1eb75..98748799ff 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml @@ -79,6 +79,7 @@ - 0,0,3,3 maxItemSize: Normal - type: Item + size: Huge shape: - 0,0,3,3 - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml index f11ece66e5..67c442f191 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml @@ -2,9 +2,9 @@ # Base - type: entity + abstract: true parent: FoodInjectableBase id: FoodBreadBase - abstract: true components: - type: Item size: Normal @@ -54,7 +54,7 @@ id: FoodBreadVolcanic description: A dark loaf. Resembles pumice. components: - - type: Food + - type: Edible - type: Sprite layers: - state: alpha @@ -70,7 +70,7 @@ id: FoodBreadVolcanicSlice description: A slice of dark loaf. Resembles pumice. components: - - type: Food + - type: Edible - type: Sprite layers: - state: alpha-slice @@ -90,7 +90,7 @@ flavors: - banana - bread - - type: Food + - type: Edible - type: Sprite layers: - state: banana @@ -112,7 +112,7 @@ flavors: - banana - bread - - type: Food + - type: Edible - type: Sprite layers: - state: banana-slice @@ -123,9 +123,9 @@ - Slice - type: entity - name: cotton bread parent: FoodBreadBase id: FoodBreadCotton + name: cotton bread description: Bread, but for moff. components: - type: FlavorProfile @@ -163,7 +163,7 @@ flavors: - cotton - bread - - type: Food + - type: Edible requiresSpecialDigestion: true - type: Sprite layers: @@ -193,7 +193,7 @@ flavors: - bread - corn - - type: Food + - type: Edible - type: Sprite layers: - state: cornbread @@ -218,7 +218,7 @@ flavors: - bread - corn - - type: Food + - type: Edible - type: Sprite layers: - state: cornbread-slice @@ -241,7 +241,7 @@ - cheesy - creamy - bread - - type: Food + - type: Edible - type: Sprite layers: - state: creamcheese @@ -269,7 +269,7 @@ - cheesy - creamy - bread - - type: Food + - type: Edible - type: Sprite layers: - state: creamcheese-slice @@ -293,7 +293,7 @@ flavors: - meaty - bread - - type: Food + - type: Edible - type: Sprite layers: - state: meat @@ -324,7 +324,7 @@ flavors: - meaty - bread - - type: Food + - type: Edible - type: Sprite layers: - state: meat-slice @@ -353,7 +353,7 @@ flavors: - nothing - bread - - type: Food + - type: Edible - type: Sprite layers: - state: mimana @@ -384,7 +384,7 @@ flavors: - nothing - bread - - type: Food + - type: Edible - type: Sprite layers: - state: mimana-slice @@ -408,7 +408,7 @@ id: FoodBreadPlain description: Some plain old earthen bread. components: - - type: Food + - type: Edible - type: Sprite layers: - state: plain @@ -421,7 +421,7 @@ id: FoodBreadPlainSlice description: A slice of home. components: - - type: Food + - type: Edible - type: Sprite layers: - state: plain-slice @@ -436,7 +436,7 @@ flavors: - meaty - bread - - type: Food + - type: Edible - type: Sprite layers: - state: sausage @@ -468,7 +468,7 @@ flavors: - meaty - bread - - type: Food + - type: Edible - type: Sprite layers: - state: sausage-slice @@ -499,7 +499,7 @@ flavors: - cobwebs - bread - - type: Food + - type: Edible - type: Sprite layers: - state: spidermeat @@ -530,7 +530,7 @@ flavors: - cobwebs - bread - - type: Food + - type: Edible - type: Sprite layers: - state: spidermeat-slice @@ -559,7 +559,7 @@ flavors: - tofu - bread - - type: Food + - type: Edible - type: Sprite layers: - state: tofu @@ -586,7 +586,7 @@ flavors: - tofu - bread - - type: Food + - type: Edible - type: Sprite layers: - state: tofu-slice @@ -610,7 +610,7 @@ flavors: - acid - bread - - type: Food + - type: Edible - type: Sprite layers: - state: xenomeat @@ -641,7 +641,7 @@ flavors: - acid - bread - - type: Food + - type: Edible - type: Sprite layers: - state: xenomeat-slice @@ -663,9 +663,9 @@ # Other than bread/slices - type: entity - name: baguette parent: FoodBreadBase id: FoodBreadBaguette + name: baguette description: Bon appétit! components: - type: Sprite @@ -707,9 +707,9 @@ # Tastes like France. - type: entity - name: cotton baguette parent: FoodBreadBaguette id: FoodBreadBaguetteCotton + name: cotton baguette description: Bon azzétit! components: - type: Sprite @@ -779,7 +779,7 @@ components: - type: Sprite state: crostini-cotton - - type: Food + - type: Edible requiresSpecialDigestion: true - type: Tag tags: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml index 7474fd3155..faa9f45fde 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml @@ -6,7 +6,7 @@ id: FoodBakedBase abstract: true components: - - type: Food + - type: Edible - type: Sprite sprite: Objects/Consumable/Food/Baked/misc.rsi - type: SolutionContainerManager @@ -27,7 +27,7 @@ id: FoodBakedMuffin description: A delicious and spongy little cake. components: - - type: Food + - type: Edible trash: - FoodPlateMuffinTin - type: Sprite @@ -625,7 +625,7 @@ - cotton - type: Sprite state: chevrechaud-cotton - - type: Food + - type: Edible requiresSpecialDigestion: true - type: Tag tags: @@ -643,9 +643,9 @@ Quantity: 0.5 - type: entity - name: brownies parent: FoodBakedBase id: FoodBakedBrownieBatch + name: brownies description: A pan of brownies. components: - type: Item @@ -699,9 +699,9 @@ - Slice - type: entity - name: special brownies parent: FoodBakedBase id: FoodBakedCannabisBrownieBatch + name: special brownies description: A pan of "special" brownies. components: - type: Item @@ -731,9 +731,9 @@ slice: FoodBakedCannabisBrownie - type: entity - name: special brownie parent: FoodBakedBase id: FoodBakedCannabisBrownie + name: special brownie description: A "special" brownie. components: - type: FlavorProfile @@ -784,9 +784,9 @@ Quantity: 1 - type: entity - name: croissant parent: FoodBakedBase id: FoodBakedCroissant + name: croissant description: Buttery, flaky goodness. components: - type: Item @@ -818,9 +818,9 @@ Blunt: 0 # so the damage stats icon doesn't immediately give away the syndie ones - type: entity - name: cotton croissant parent: FoodBakedCroissant id: FoodBakedCroissantCotton + name: cotton croissant description: Buttery, flaky, fibery goodness. components: - type: Item @@ -855,9 +855,9 @@ Quantity: 1 - type: entity - name: grilled cheese sandwich parent: FoodBakedBase id: FoodBakedGrilledCheeseSandwich + name: grilled cheese sandwich description: Bread and cheese toasted with butter, perfect for a chilly day in space. components: - type: Item diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml index e2633360bf..b2dd9257b5 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml @@ -2,9 +2,9 @@ # Base - type: entity + abstract: true parent: FoodInjectableBase id: FoodPieBase - abstract: true components: - type: Item shape: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml index ef2f72deb3..99fb7c87b7 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml @@ -2,9 +2,9 @@ # Base - type: entity + abstract: true parent: FoodInjectableBase id: FoodPizzaBase - abstract: true components: - type: FlavorProfile flavors: @@ -42,7 +42,7 @@ flavors: - oily - bread - - type: Food + - type: Edible - type: Sprite sprite: Objects/Consumable/Food/Baked/pizza.rsi - type: SolutionContainerManager @@ -654,7 +654,7 @@ - type: Sprite layers: - state: cotton-pizza - - type: Food + - type: Edible requiresSpecialDigestion: true - type: SliceableFood slice: FoodPizzaCottonSlice diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml index 56d38afbb6..1ac5dce0e8 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml @@ -1,9 +1,9 @@ # Bowls - type: entity - name: bowl parent: ReagentContainerBase id: FoodBowlBig + name: bowl description: A simple bowl, used for soups and salads. components: - type: Item @@ -67,9 +67,9 @@ - Trash - type: entity - name: broken bowl parent: BaseItem id: FoodBowlBigTrash + name: broken bowl description: A simple bowl, broken and useless. components: - type: Item diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml index a4e0239ab0..55d22e3980 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml @@ -132,9 +132,9 @@ # Plastic Plate - type: entity - name: large plastic plate parent: BaseItem id: FoodPlatePlastic + name: large plastic plate description: A large blue plastic plate, excellent for a birthday cake. components: - type: Sprite @@ -154,9 +154,9 @@ - Trash - type: entity - name: small plastic plate parent: BaseItem id: FoodPlateSmallPlastic + name: small plastic plate description: A blue plastic plate, excellent for slices of birthday cake. components: - type: Sprite @@ -202,9 +202,9 @@ # Muffin Tin - type: entity - name: muffin tin parent: BaseItem id: FoodPlateMuffinTin + name: muffin tin description: A cheap foil tin for muffins. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/breakfast.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/breakfast.yml index c50f7d08be..c9b9cdcce1 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/breakfast.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/breakfast.yml @@ -3,9 +3,9 @@ # Base - type: entity + abstract: true parent: FoodInjectableBase id: FoodBreakfastBase - abstract: true description: A full breakfast, rise and shine! components: - type: Item @@ -25,9 +25,9 @@ # Breakfasts - type: entity - name: full american breakfast parent: FoodBreakfastBase id: FoodBreakfastAmerican + name: full american breakfast description: A huge plate of protein and carbs, more likely to put you back in bed than get you out of it. Oh, what fresh hell is this? components: - type: FlavorProfile @@ -37,9 +37,9 @@ state: fullamerican - type: entity - name: full english breakfast parent: FoodBreakfastBase id: FoodBreakfastEnglish + name: full english breakfast description: A huge plate of protein and carbs, more likely to put you back in bed than get you out of it. Don't mention the war! components: - type: FlavorProfile diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml index 64c829fb12..a20ce930f6 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml @@ -2,9 +2,9 @@ # Bun - type: entity - name: bun parent: FoodBreadSliceBase id: FoodBreadBun + name: bun description: A hamburger bun. Round and convenient to hold. components: - type: Sprite @@ -27,8 +27,8 @@ amount: 1 - type: entity - id: FoodBreadBunBottom parent: FoodBreadSliceBase + id: FoodBreadBunBottom name: bottom bun description: It's time to start building the burger tower. components: @@ -61,8 +61,8 @@ Quantity: 3.3 # 1/2 of a bun - type: entity - id: FoodBreadBunTop parent: FoodBreadSliceBase + id: FoodBreadBunTop name: top bun description: The perfect finish for your burger tower. components: @@ -84,9 +84,9 @@ # Base - type: entity + abstract: true parent: FoodInjectableBase id: FoodBurgerBase - abstract: true components: - type: FlavorProfile flavors: @@ -211,9 +211,9 @@ - Meat - type: entity - name: bearger parent: FoodBurgerBase id: FoodBurgerBear + name: bearger description: Best served rawr. components: - type: Item @@ -240,9 +240,9 @@ - Meat - type: entity - name: big bite burger parent: FoodBurgerBase id: FoodBurgerBig + name: big bite burger description: Forget the Big Mac. THIS is the future! components: - type: Item @@ -274,9 +274,9 @@ # Tastes like bun, silver, magic. - type: entity - name: brain burger parent: FoodBurgerBase id: FoodBurgerBrain + name: brain burger description: A strange looking burger. It looks almost sentient. components: - type: Item @@ -304,9 +304,9 @@ # Tastes like bun, brains. - type: entity - name: cat burger parent: FoodBurgerBase id: FoodBurgerCat + name: cat burger description: Finally those cats and catpeople are worth something! components: - type: Item @@ -401,9 +401,9 @@ # Tastes like bun, chicken. - type: entity - name: clown burger parent: FoodBurgerBase id: FoodBurgerClown + name: clown burger description: This tastes funny... components: - type: Item @@ -482,9 +482,9 @@ - Meat - type: entity - name: crazy hamburger # Burger for you euro-cucks parent: FoodBurgerBase id: FoodBurgerCrazy + name: crazy hamburger # Burger for you euro-cucks description: This looks like the sort of food that a demented clown in a trenchcoat would make. components: - type: Item @@ -520,9 +520,9 @@ - Meat - type: entity - name: duck sandwich # Burger for you sick bastards parent: FoodBurgerBase id: FoodBurgerDuck + name: duck sandwich # Burger for you sick bastards description: A duck sandwich, only the criminally insane would dare to eat the meat of such an adorable creature. components: - type: Item @@ -548,9 +548,9 @@ # Tastes like bun, duck. - type: entity - name: empowered burger parent: FoodBurgerBase id: FoodBurgerEmpowered + name: empowered burger description: It's shockingly good, if you live off of electricity that is. components: - type: Item @@ -573,9 +573,9 @@ # Tastes like bun, pure electricity. - type: entity - name: fillet-o-carp burger parent: FoodBurgerBase id: FoodBurgerCarp + name: fillet-o-carp burger description: Almost like a carp is yelling somewhere... components: - type: Item @@ -592,9 +592,9 @@ # Tastes like bun, fish. - type: entity - name: five alarm burger parent: FoodBurgerBase id: FoodBurgerFive + name: five alarm burger description: HOT! HOT! HOT! components: - type: Item @@ -630,9 +630,9 @@ # Tastes like bun, HEAT. - type: entity - name: ghost burger parent: FoodBurgerBase id: FoodBurgerGhost + name: ghost burger description: Too spooky! components: - type: Item @@ -689,9 +689,9 @@ - Meat - type: entity - name: McGuffin parent: FoodBurgerBase id: FoodBurgerMcguffin + name: McGuffin description: A cheap and greasy imitation of an eggs Benedict. components: - type: Item @@ -718,9 +718,9 @@ - Meat - type: entity - name: BBQ Rib Sandwich parent: FoodBurgerBase id: FoodBurgerMcrib + name: BBQ Rib Sandwich description: An elusive rib shaped burger with limited availability across the galaxy. Not as good as you remember it. components: - type: Edible @@ -860,9 +860,9 @@ # Tastes like bun, lettuce, sludge. - type: entity - name: soylent burger parent: FoodBurgerBase id: FoodBurgerSoy + name: soylent burger description: After eating this you have the overwhelming urge to purchase overpriced figurines of superheroes. components: - type: Item @@ -885,9 +885,9 @@ # Tastes like bun, redditors. - type: entity - name: spell burger parent: FoodBurgerBase id: FoodBurgerSpell + name: spell burger description: This is absolutely Ei Nath. components: - type: Item @@ -915,9 +915,9 @@ # Tastes like bun, silver. - type: entity - name: super bite burger parent: FoodBurgerBase id: FoodBurgerSuper + name: super bite burger description: This is a mountain of a burger. FOOD! components: - type: Item @@ -1006,9 +1006,9 @@ # I'd rather wait for a custom burger component. - type: entity - name: mothroachburger parent: FoodBurgerBase id: FoodBurgerMothRoach + name: mothroachburger description: The last lamp it saw was the one inside the microwave. components: - type: Item diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml index 537043b33f..b3aff8075f 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml @@ -6,7 +6,7 @@ id: FoodFrozenBase abstract: true components: - - type: Food + - type: Edible - type: Sprite sprite: Objects/Consumable/Food/frozen.rsi - type: SolutionContainerManager @@ -33,8 +33,8 @@ - type: entity parent: FoodFrozenBase - name: strawberry ice-cream sandwich id: FoodFrozenSandwichStrawberry + name: strawberry ice-cream sandwich description: Portable ice-cream in its own packaging of the strawberry variety. components: - type: Item @@ -95,7 +95,7 @@ - state: popsicle-base - state: popsicle color: orange - - type: Food + - type: Edible trash: - FoodFrozenPopsicleTrash - type: Tag @@ -115,7 +115,7 @@ - state: popsicle-base - state: popsicle color: red - - type: Food + - type: Edible trash: - FoodFrozenPopsicleTrash - type: Tag @@ -133,7 +133,7 @@ layers: - state: stick - state: jumbo - - type: Food + - type: Edible trash: - FoodFrozenPopsicleTrash - type: SolutionContainerManager @@ -164,7 +164,7 @@ - state: cone - state: alpha-filling # color: foo - - type: Food + - type: Edible trash: - FoodFrozenSnowconeTrash - type: SolutionContainerManager @@ -203,7 +203,7 @@ layers: - state: cone - state: berry - - type: Food + - type: Edible trash: - FoodFrozenSnowconeTrash - type: Tag @@ -220,7 +220,7 @@ layers: - state: cone - state: fruitsalad - - type: Food + - type: Edible trash: - FoodFrozenSnowconeTrash - type: Tag @@ -237,7 +237,7 @@ layers: - state: cone - state: clown - - type: Food + - type: Edible trash: - FoodFrozenSnowconeTrash @@ -251,7 +251,7 @@ layers: - state: cone - state: mime - - type: Food + - type: Edible trash: - FoodFrozenSnowconeTrash @@ -265,7 +265,7 @@ layers: - state: cone - state: rainbow - - type: Food + - type: Edible trash: - FoodFrozenSnowconeTrash diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml index cb1194d72b..76ea3073e5 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml @@ -281,9 +281,9 @@ - Ingredient - type: entity - name: dough parent: FoodBakingBase id: FoodDough + name: dough description: A piece of dough. components: - type: Item @@ -301,9 +301,9 @@ node: start - type: entity - name: dough slice parent: FoodBakingBase id: FoodDoughSlice + name: dough slice description: A slice of dough. Can be cooked into a bun. components: - type: Item @@ -328,9 +328,9 @@ Quantity: 5 - type: entity - name: dough rope parent: FoodBakingBase id: FoodDoughRope + name: dough rope description: A thin noodle of dough. Can be cooked into a bagel. components: - type: Item @@ -352,9 +352,9 @@ Quantity: 5 - type: entity - name: cornmeal dough parent: FoodBakingBase id: FoodDoughCornmeal + name: cornmeal dough description: A piece of cornmeal dough. components: - type: Item @@ -370,9 +370,9 @@ slice: FoodDoughCornmealSlice - type: entity - name: cornmeal dough slice parent: FoodBakingBase id: FoodDoughCornmealSlice + name: cornmeal dough slice description: A slice of cornmeal dough. components: - type: Item @@ -388,9 +388,9 @@ - Slice - type: entity - name: tortilla dough parent: FoodBakingBase id: FoodDoughTortilla + name: tortilla dough description: A piece of tortilla dough. components: - type: Item @@ -406,9 +406,9 @@ slice: FoodDoughTortillaSlice - type: entity - name: tortilla dough slice parent: FoodBakingBase id: FoodDoughTortillaSlice + name: tortilla dough slice description: A slice of tortilla dough. components: - type: Item @@ -427,9 +427,9 @@ - Slice - type: entity - name: flattened tortilla dough parent: FoodBakingBase id: FoodDoughTortillaFlat + name: flattened tortilla dough description: A flattened slice of tortilla dough, cook this to get a taco shell. components: - type: Item @@ -445,9 +445,9 @@ node: flat - type: entity - name: cotton dough parent: FoodBakingBase id: FoodDoughCotton + name: cotton dough description: A piece of fabric dough. components: - type: Item @@ -479,9 +479,9 @@ Quantity: 10 - type: entity - name: cotton dough slice parent: FoodBakingBase id: FoodDoughCottonSlice + name: cotton dough slice description: A slice of cotton dough. components: - type: Item @@ -510,9 +510,9 @@ Quantity: 3.5 - type: entity - name: cotton dough rope parent: FoodBakingBase id: FoodDoughCottonRope + name: cotton dough rope description: A thin noodle of cotton dough. Can be cooked into a cotton bagel. components: - type: Item @@ -559,9 +559,9 @@ state: dough-pastry-baked - type: entity - name: pie dough parent: FoodBakingBase id: FoodDoughPie + name: pie dough description: Cook it to get a pie. components: - type: Item @@ -570,9 +570,9 @@ state: dough-pie - type: entity - name: flat dough parent: FoodBakingBase id: FoodDoughFlat + name: flat dough description: A flattened dough. components: - type: Item @@ -589,9 +589,9 @@ slice: FoodCroissantRaw - type: entity - name: flat cotton dough parent: FoodBakingBase id: FoodDoughCottonFlat + name: flat cotton dough description: A flattened cotton dough. components: - type: Item @@ -608,9 +608,9 @@ slice: FoodCroissantRawCotton - type: entity - name: pizza bread parent: FoodBakingBase id: FoodDoughPizzaBaked + name: pizza bread description: Add ingredients to make a pizza. components: - type: Item @@ -621,9 +621,9 @@ state: pizzabread - type: entity - name: cake batter parent: FoodBakingBase id: FoodCakeBatter + name: cake batter description: Cook it to get a cake. components: - type: Item @@ -635,9 +635,9 @@ state: cakebatter - type: entity - name: stick of butter parent: FoodBakingBase id: FoodButter + name: stick of butter description: A stick of delicious, golden, fatty goodness. components: - type: Item @@ -680,9 +680,9 @@ slice: FoodButterSlice - type: entity - name: butter slice parent: FoodBakingBase id: FoodButterSlice + name: butter slice description: A pat of delicious, golden, fatty goodness. components: - type: Item @@ -739,9 +739,9 @@ slice: FoodCheeseSlice - type: entity - name: cheese wedge parent: FoodBakingBase id: FoodCheeseSlice + name: cheese wedge description: A wedge of delicious Cheddar. The cheese wheel it was cut from can't have gone far. components: - type: FlavorProfile @@ -773,9 +773,9 @@ - state: cheesewedge-inhand-right - type: entity - name: chèvre log parent: FoodBakingBase id: FoodChevre + name: chèvre log description: A soft log of creamy Chèvre. components: - type: Item @@ -802,9 +802,9 @@ Quantity: 0.6 - type: entity - name: chèvre disk parent: FoodBakingBase id: FoodChevreSlice + name: chèvre disk description: A small disk of creamy Chèvre. An ideal adornment for French side dishes. components: - type: Item @@ -829,9 +829,9 @@ - Slice - type: entity - name: tofu parent: FoodBakingBase id: FoodTofu + name: tofu description: Solid white block with a subtle flavor. components: - type: Item @@ -855,9 +855,9 @@ slice: FoodTofuSlice - type: entity - name: tofu slice parent: FoodBakingBase id: FoodTofuSlice + name: tofu slice description: A slice of tofu. Ingredient of various vegetarian dishes. components: - type: Item @@ -937,9 +937,9 @@ - Ingredient - type: entity - name: raw croissant parent: FoodBakingBase id: FoodCroissantRaw + name: raw croissant description: Buttery, flaky goodness waiting to happen. components: - type: Item @@ -961,9 +961,9 @@ Quantity: 3 - type: entity - name: raw cotton croissant parent: FoodCroissantRaw id: FoodCroissantRawCotton + name: raw cotton croissant description: Buttery, flaky, fibery goodness waiting to happen. components: - type: Item diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml index 1d8b270405..c0d1f0fd75 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml @@ -5,15 +5,15 @@ # Base - type: entity + abstract: true parent: FoodInjectableBase id: FoodMealBase - abstract: true description: A delicious meal, cooked with love. components: - type: Item shape: - 0,0,1,0 - - type: Food + - type: Edible - type: Sprite sprite: Objects/Consumable/Food/meals.rsi - type: SolutionContainerManager @@ -27,9 +27,9 @@ # Meals - type: entity - name: loaded baked potato parent: FoodMealBase id: FoodMealPotatoLoaded + name: loaded baked potato description: Totally baked. components: - type: Item @@ -43,9 +43,9 @@ # Tastes like potato. - type: entity - name: space fries parent: FoodMealBase id: FoodMealFries + name: space fries description: AKA, French Fries, Freedom Fries, etc. components: - type: Item @@ -59,9 +59,9 @@ # Tastes like fries, salt. - type: entity - name: cheesy fries parent: FoodMealBase id: FoodMealFriesCheesy + name: cheesy fries description: Fries. Covered in cheese. Duh. components: - type: Item @@ -76,9 +76,9 @@ # Tastes like fries, cheese. - type: entity - name: carrot fries parent: FoodMealBase id: FoodMealFriesCarrot + name: carrot fries description: Tasty fries from fresh carrots. components: - type: Item @@ -102,14 +102,14 @@ # Tastes like carrots, salt. - type: entity - name: nachos parent: FoodMealBase id: FoodMealNachos + name: nachos description: Chips from Space Mexico. components: - type: Item storedOffset: 0,-2 - - type: Food + - type: Edible trash: - FoodPlateSmall - type: FlavorProfile @@ -129,14 +129,14 @@ # Tastes like nachos. - type: entity - name: cheesy nachos parent: FoodMealBase id: FoodMealNachosCheesy + name: cheesy nachos description: The delicious combination of nachos and melting cheese. components: - type: Item storedOffset: 0,-2 - - type: Food + - type: Edible trash: - FoodPlateSmall - type: FlavorProfile @@ -157,14 +157,14 @@ # Tastes like nachos, cheese. - type: entity - name: Cuban nachos parent: FoodMealBase id: FoodMealNachosCuban + name: Cuban nachos description: That's some dangerously spicy nachos. components: - type: Item storedOffset: 0,-2 - - type: Food + - type: Edible trash: - FoodPlateSmall - type: FlavorProfile @@ -188,9 +188,9 @@ # Tastes like nachos, hot pepper. - type: entity - name: mint parent: FoodMealBase id: FoodMealMint + name: mint description: It's wafer thin. components: - type: Item @@ -211,9 +211,9 @@ # Tastes like parsnips, salt. - type: entity - name: eggplant parmigiana parent: FoodMealBase id: FoodMealEggplantParm + name: eggplant parmigiana description: The only good recipe for eggplant. components: - type: Item @@ -239,9 +239,9 @@ # Tastes like eggplant, cheese. - type: entity - name: yaki imo parent: FoodMealBase id: FoodMealPotatoYaki + name: yaki imo description: Made with roasted sweet potatoes! components: - type: Item @@ -255,9 +255,9 @@ # Tastes like sweet potato. - type: entity - name: Cuban carp parent: FoodMealBase id: FoodMealCubancarp + name: Cuban carp description: A grifftastic sandwich that burns your tongue and then leaves it numb! components: - type: Item @@ -289,9 +289,9 @@ # Tastes like fish, batter, hot peppers. - type: entity - name: corned beef and cabbage parent: FoodMealBase id: FoodMealCornedbeef + name: corned beef and cabbage description: Now you can feel like a real tourist vacationing in Ireland. components: - type: Item @@ -317,9 +317,9 @@ # Tastes like meat, cabbage. - type: entity - name: filet migrawr parent: FoodMealBase id: FoodMealBearsteak + name: filet migrawr description: Because eating bear wasn't manly enough. components: - type: Item @@ -348,9 +348,9 @@ # Tastes like meat, salmon. - type: entity - name: pig in a blanket parent: FoodMealBase id: FoodMealPigblanket + name: pig in a blanket description: A tiny sausage wrapped in a flakey, buttery roll. Free this pig from its blanket prison by eating it. components: - type: Item @@ -378,14 +378,14 @@ # Tastes like meat, butter. - type: entity - name: bbq ribs parent: FoodMealBase id: FoodMealRibs + name: bbq ribs description: BBQ ribs, slathered in a healthy coating of BBQ sauce. The least vegan thing to ever exist. components: - type: Item storedOffset: 0,-4 - - type: Food + - type: Edible trash: - FoodKebabSkewer - type: FlavorProfile @@ -411,9 +411,9 @@ # Tastes like meat, smokey sauce. - type: entity - name: eggs benedict parent: FoodMealBase id: FoodMealEggsbenedict + name: eggs benedict description: There is only one egg on this, how rude. components: - type: FlavorProfile @@ -438,9 +438,9 @@ # Tastes like eggs, bacon, bun. - type: entity - name: cheese omelette parent: FoodMealBase id: FoodMealOmelette + name: cheese omelette description: Cheesy. components: - type: Item @@ -464,9 +464,9 @@ # Tastes like egg, cheese. - type: entity - name: fried egg parent: FoodMealBase id: FoodMealFriedegg + name: fried egg description: A fried egg, with a touch of salt and pepper. components: - type: Item @@ -495,9 +495,9 @@ # Tastes like egg, salt, pepper. - type: entity - name: milk ape parent: FoodMealBase id: FoodMealMilkape + name: milk ape description: The king of Jungle Thick. components: - type: Item @@ -513,9 +513,9 @@ # Tastes like milk, chocolate, the jungle. - type: entity - name: memory leek parent: FoodMealBase id: FoodMealMemoryleek + name: memory leek description: This should refresh your memory. components: - type: Item @@ -538,9 +538,9 @@ # Tastes like pain. - type: entity - name: salty sweet miso cola soup parent: FoodMealBase id: DisgustingSweptSoup + name: salty sweet miso cola soup description: Jesus christ. components: - type: Item @@ -564,9 +564,9 @@ # Tastes awesome. - type: entity - name: queso parent: FoodMealBase id: FoodMealQueso + name: queso description: A classic dipping sauce that you can't go wrong with. components: - type: Item @@ -604,9 +604,9 @@ # tastes exotic - type: entity - name: enchiladas parent: FoodMealBase id: FoodMealEnchiladas + name: enchiladas description: Viva La Mexico! components: - type: Item @@ -635,9 +635,9 @@ # What do Europeans eat instead of enchiladas? 25.4 millimeter-iladas. - type: entity - name: melon fruit bowl parent: FoodMealBase id: FoodSaladWatermelonFruitBowl + name: melon fruit bowl description: The only salad where you can eat the bowl. components: - type: Item @@ -668,14 +668,14 @@ - Fruit - type: entity - name: corn in butter parent: FoodMealBase id: FoodMealCornInButter + name: corn in butter description: Buttery. components: - type: Item storedOffset: 0,-5 - - type: Food + - type: Edible trash: - FoodPlate - type: FlavorProfile diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml index 9d506407a3..642a068069 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml @@ -1,9 +1,9 @@ # Base - type: entity + abstract: true parent: FoodInjectableBase id: FoodMeatBase - abstract: true components: - type: FlavorProfile flavors: @@ -83,9 +83,9 @@ # Raw - type: entity - name: raw meat parent: FoodMeatRawBase id: FoodMeat + name: raw meat description: A slab of raw meat. components: - type: Sprite @@ -119,9 +119,9 @@ - state: plain-inhand-right - type: entity - name: raw human meat parent: FoodMeatRawBase id: FoodMeatHuman + name: raw human meat description: Gross. components: - type: Sprite @@ -144,10 +144,10 @@ - state: plain-inhand-right - type: entity - name: raw carp fillet parent: FoodMeatBase # MeatFish?... id: FoodMeatFish + name: raw carp fillet description: Your last words being "Wow, exotic!" are not worth it. The taste itself though? Maybe. components: - type: FlavorProfile @@ -179,10 +179,10 @@ - state: generic-pink-inhand-right - type: entity - name: raw bacon # bacon is cured so not raw = cant rot parent: FoodMeatBase id: FoodMeatBacon + name: raw bacon description: A raw piece of bacon. components: - type: Tag @@ -216,9 +216,9 @@ - state: generic-pink-inhand-right - type: entity - name: raw bear meat parent: FoodMeatRawBase id: FoodMeatBear + name: raw bear meat description: A very manly slab of raw bear meat. components: - type: Sprite @@ -249,9 +249,9 @@ color: "#934C64" - type: entity - name: raw penguin meat parent: FoodMeatRawBase id: FoodMeatPenguin + name: raw penguin meat description: A slab of raw penguin meat. Can be used as a substitute for fish in recipes. components: - type: Sprite @@ -280,9 +280,9 @@ - state: generic-pink-inhand-right - type: entity - name: raw chicken meat parent: FoodMeatRawBase id: FoodMeatChicken + name: raw chicken meat description: A slab of raw chicken. Remember to wash your hands! components: - type: Sprite @@ -313,9 +313,9 @@ - state: generic-pink-inhand-right - type: entity - name: raw duck meat parent: FoodMeatRawBase id: FoodMeatDuck + name: raw duck meat description: A slab of raw duck. Remember to wash your hands! components: - type: Sprite @@ -375,9 +375,9 @@ - state: corgi-inhand-right - type: entity - name: raw crab meat parent: FoodMeatRawBase id: FoodMeatCrab + name: raw crab meat description: A pile of raw crab meat. components: - type: Item @@ -401,9 +401,9 @@ defaultTarget: cooked crab - type: entity - name: raw goliath meat parent: FoodMeatRawBase id: FoodMeatGoliath + name: raw goliath meat description: A slab of goliath meat. It's not very edible now, but it cooks great in lava. components: - type: Sprite @@ -431,9 +431,9 @@ - state: plain-inhand-right - type: entity - name: dragon flesh parent: FoodMeatBase id: FoodMeatDragon + name: dragon flesh description: The dense meat of the space-era apex predator is oozing with its mythical ichor. Ironically, best eaten raw. components: - type: Tag @@ -472,9 +472,9 @@ - state: dragon-inhand-right - type: entity - name: raw rat meat parent: FoodMeatRawBase id: FoodMeatRat + name: raw rat meat description: Prime meat from maintenance! components: - type: Sprite @@ -499,9 +499,9 @@ - state: plain-inhand-right - type: entity - name: raw lizard meat parent: FoodMeatRawBase id: FoodMeatLizard + name: raw lizard meat description: Delicious dino damage. components: - type: Sprite @@ -541,9 +541,9 @@ state: plant - type: entity - name: rotten meat parent: FoodMeatBase id: FoodMeatRotten + name: rotten meat description: Halfway to becoming fertilizer for your garden. components: - type: Tag @@ -573,9 +573,9 @@ - state: rotten-inhand-right - type: entity - name: raw spider meat parent: FoodMeatRawBase id: FoodMeatSpider + name: raw spider meat description: A slab of spider meat. That's so Kafkaesque. components: - type: Sprite @@ -596,9 +596,9 @@ heldPrefix: spider - type: entity - name: raw spider leg parent: FoodMeatBase id: FoodMeatSpiderLeg + name: raw spider leg description: A still twitching leg of a giant spider... you don't really want to eat this, do you? components: - type: Sprite @@ -624,9 +624,9 @@ color: "#333333" - type: entity - name: meatwheat clump parent: FoodMeatBase id: FoodMeatWheat + name: meatwheat clump description: This doesn't look like meat, but your standards aren't that high to begin with. components: - type: FlavorProfile @@ -653,9 +653,9 @@ color: "#934C64" - type: entity - name: raw snake meat parent: FoodMeatBase id: FoodMeatSnake + name: raw snake meat description: A long piece of snake meat, hopefully not poisonous. components: - type: Tag @@ -681,10 +681,10 @@ - state: snake-inhand-right - type: entity - name: raw xeno meat # not raw since acid kills bacteria or something, same as xeno parent: FoodMeatBase id: FoodMeatXeno + name: raw xeno meat description: A slab of xeno meat, dripping with acid. components: - type: FlavorProfile @@ -752,9 +752,9 @@ - state: plain-inhand-right - type: entity - name: killer tomato meat parent: FoodMeatBase id: FoodMeatTomato + name: killer tomato meat description: A slice from a huge tomato. components: - type: Sprite @@ -773,9 +773,9 @@ - state: tomato-inhand-right - type: entity - name: salami parent: FoodMeatBase id: FoodMeatSalami + name: salami description: A large tube of salami. Best not to ask what went into it. components: - type: Item @@ -801,9 +801,9 @@ Blunt: 2 - type: entity - name: meat clown parent: FoodMeatBase id: FoodMeatClown + name: meat clown description: A delicious, round piece of meat clown. How horrifying. components: - type: Item @@ -822,9 +822,9 @@ slice: FoodMeatSalamiSlice - type: entity - name: meatball parent: FoodMeatBase id: FoodMeatMeatball + name: meatball description: A raw ball of meat. Meat ball. components: - type: Item @@ -845,9 +845,9 @@ # meat patty - grillin' time - type: entity - name: meat patty parent: FoodMeatBase id: FoodMeatPatty + name: meat patty description: A flat slab of ground meat. Ready for grillin'. components: - type: Tag @@ -869,9 +869,9 @@ heldPrefix: generic-pink - type: entity - name: slimeball parent: FoodMeatBase id: FoodMeatSlime + name: slimeball description: A gelatinous shaping of slime jelly. components: - type: FlavorProfile @@ -897,9 +897,9 @@ - state: slime-inhand-right - type: entity - name: raw snail meat parent: FoodMeatRawBase id: FoodMeatSnail + name: raw snail meat description: Improved with salt. components: - type: Sprite @@ -926,9 +926,9 @@ color: "#E2AE7C" - type: entity - name: anomalous meat mass parent: FoodMeatRawBase id: FoodMeatAnomaly + name: anomalous meat mass description: An impossibly dense slab of meat. Just looking at it makes you uncomfortable. components: - type: Sprite @@ -1001,9 +1001,9 @@ - Meat - type: entity - name: steak parent: FoodMeatBase id: FoodMeatCooked + name: steak description: A cooked slab of meat. Smells primal. components: - type: Tag @@ -1041,9 +1041,9 @@ - state: plain-cooked-inhand-right - type: entity - name: bacon parent: FoodMeatBase id: FoodMeatBaconCooked + name: bacon description: A delicious piece of cooked bacon. components: - type: Tag @@ -1085,9 +1085,9 @@ color: "#5B3E2A" - type: entity - name: cooked bear parent: FoodMeatBase id: FoodMeatBearCooked + name: cooked bear description: A well-cooked slab of bear meat. Tough, but tasty with the right sides. components: - type: Tag @@ -1121,9 +1121,9 @@ heldPrefix: meatball - type: entity - name: penguin filet parent: FoodMeatBase id: FoodMeatPenguinCooked + name: penguin filet description: A cooked filet of penguin. Can be used as a substitute for fish in recipes. components: - type: Tag @@ -1162,9 +1162,9 @@ color: "#F7E3A3" - type: entity - name: cooked chicken parent: FoodMeatBase id: FoodMeatChickenCooked + name: cooked chicken description: A cooked piece of chicken. Best used in other recipes. components: - type: Tag @@ -1243,9 +1243,9 @@ color: "#F7E3A3" - type: entity - name: cooked duck parent: FoodMeatBase id: FoodMeatDuckCooked + name: cooked duck description: A cooked piece of duck. Best used in other recipes. components: - type: Tag @@ -1284,9 +1284,9 @@ color: "#F7E3A3" - type: entity - name: cooked crab parent: FoodMeatBase id: FoodMeatCrabCooked + name: cooked crab description: Some deliciously cooked crab meat. components: - type: FlavorProfile @@ -1323,9 +1323,9 @@ - state: plain-cooked-inhand-right - type: entity - name: goliath steak parent: FoodMeatBase id: FoodMeatGoliathCooked + name: goliath steak description: A delicious, lava cooked steak. components: - type: Tag @@ -1400,9 +1400,9 @@ - state: plain-cooked-inhand-right - type: entity - name: lizard steak parent: FoodMeatBase id: FoodMeatLizardCooked + name: lizard steak description: Cooked, tough lizard meat. components: - type: Tag @@ -1440,9 +1440,9 @@ - state: plain-cooked-inhand-right - type: entity - name: boiled spider leg parent: FoodMeatBase id: FoodMeatSpiderlegCooked + name: boiled spider leg description: A giant spider's leg that's still twitching after being cooked. Gross! components: - type: Tag @@ -1475,9 +1475,9 @@ color: "#44201A" - type: entity - name: meatball parent: FoodMeatBase id: FoodMeatMeatballCooked + name: meatball description: A cooked meatball. Perfect to add to other dishes... except fruity ones. components: - type: Tag @@ -1509,9 +1509,9 @@ heldPrefix: meatball - type: entity - name: cooked meat patty parent: FoodMeatBase id: FoodMeatPattyCooked + name: cooked meat patty description: A cooked meat patty. components: - type: Tag @@ -1543,9 +1543,9 @@ heldPrefix: meatball - type: entity - name: boiled snail parent: FoodMeatBase id: FoodMeatSnailCooked + name: boiled snail description: Improved with salt. components: - type: Tag @@ -1581,9 +1581,9 @@ color: "#5B3E2A" - type: entity - name: anomalous steak parent: FoodMeatBase id: FoodMeatAnomalyCooked + name: anomalous steak description: A gigantic mass of cooked meat. A meal for a dinner party, or someone REALLY hungry. components: - type: Tag @@ -1619,9 +1619,9 @@ - state: plain-cooked-inhand-right - type: entity - name: dragon steak parent: FoodMeatBase id: FoodMeatDragonCooked + name: dragon steak description: Pouring ketchup on this is considered a capital crime on most stations. components: - type: Tag @@ -1665,9 +1665,9 @@ # Raw - type: entity - name: raw cutlet parent: FoodMeatBase id: FoodMeatCutlet + name: raw cutlet description: A raw meat cutlet. components: - type: Tag @@ -1700,9 +1700,9 @@ - state: generic-pink-inhand-right - type: entity - name: raw bear cutlet parent: FoodMeatBase id: FoodMeatBearCutlet + name: raw bear cutlet description: A very manly cutlet of raw bear meat. components: - type: Tag @@ -1740,9 +1740,9 @@ color: brown - type: entity - name: raw penguin cutlet parent: FoodMeatBase id: FoodMeatPenguinCutlet + name: raw penguin cutlet description: A cutlet of raw penguin meat. Can be used as a substitute for fish in recipes. components: - type: Tag @@ -1778,9 +1778,9 @@ color: white - type: entity - name: raw chicken cutlet parent: FoodMeatBase id: FoodMeatChickenCutlet + name: raw chicken cutlet description: A cutlet of raw chicken. Remember to wash your hands! components: - type: Tag @@ -1814,9 +1814,9 @@ - state: generic-pink-inhand-right - type: entity - name: raw duck cutlet parent: FoodMeatBase id: FoodMeatDuckCutlet + name: raw duck cutlet description: A cutlet of raw duck. Remember to wash your hands! components: - type: Tag @@ -1850,9 +1850,9 @@ - state: generic-pink-inhand-right - type: entity - name: raw lizard cutlet parent: FoodMeatBase id: FoodMeatLizardCutlet + name: raw lizard cutlet description: Delicious dino cutlet. components: - type: Tag @@ -1891,9 +1891,9 @@ color: green - type: entity - name: raw spider cutlet parent: FoodMeatBase id: FoodMeatSpiderCutlet + name: raw spider cutlet description: A cutlet of raw spider meat. So Kafkaesque. components: - type: Tag @@ -1928,9 +1928,9 @@ color: green - type: entity - name: raw xeno cutlet parent: FoodMeatBase id: FoodMeatXenoCutlet + name: raw xeno cutlet description: A slab of raw xeno meat, dripping with acid. components: - type: FlavorProfile @@ -1967,9 +1967,9 @@ color: green - type: entity - name: raw killer tomato cutlet parent: FoodMeatBase id: FoodMeatTomatoCutlet + name: raw killer tomato cutlet description: A cutlet from a slab of tomato. components: - type: Item @@ -1988,9 +1988,9 @@ price: 30 - type: entity - name: salami slice parent: FoodMeatBase id: FoodMeatSalamiSlice + name: salami slice description: A slice of cured salami. components: - type: Item @@ -2015,9 +2015,9 @@ Quantity: 1 - type: entity - name: raw dragon cutlet parent: FoodMeatBase id: FoodMeatDragonCutlet + name: raw dragon cutlet description: A raw dragon meat cutlet. components: - type: Tag @@ -2055,9 +2055,9 @@ # Cooked - type: entity - name: cutlet parent: FoodMeatBase id: FoodMeatCutletCooked + name: cutlet description: A cooked meat cutlet. Needs some seasoning. components: - type: Tag @@ -2096,9 +2096,9 @@ color: "#5B3614" - type: entity - name: bear cutlet parent: FoodMeatBase id: FoodMeatBearCutletCooked + name: bear cutlet description: A very manly cutlet of cooked bear meat. components: - type: Tag @@ -2140,9 +2140,9 @@ color: "#5B3614" - type: entity - name: penguin cutlet parent: FoodMeatBase id: FoodMeatPenguinCutletCooked + name: penguin cutlet description: A cutlet of cooked penguin meat. components: - type: Tag @@ -2182,9 +2182,9 @@ color: "#5B3614" - type: entity - name: chicken cutlet parent: FoodMeatBase id: FoodMeatChickenCutletCooked + name: chicken cutlet description: A cutlet of cooked chicken. Remember to wash your hands! components: - type: Tag @@ -2224,9 +2224,9 @@ color: "#5B3614" - type: entity - name: duck cutlet parent: FoodMeatBase id: FoodMeatDuckCutletCooked + name: duck cutlet description: A cutlet of cooked duck. Remember to wash your hands! components: - type: Tag @@ -2266,9 +2266,9 @@ color: "#5B3614" - type: entity - name: lizard cutlet parent: FoodMeatBase id: FoodMeatLizardCutletCooked + name: lizard cutlet description: Delicious cooked dino cutlet. components: - type: Tag @@ -2309,9 +2309,9 @@ color: "#153F06" - type: entity - name: spider cutlet parent: FoodMeatBase id: FoodMeatSpiderCutletCooked + name: spider cutlet description: A cutlet of cooked spider meat. Finally edible. components: - type: Tag @@ -2350,9 +2350,9 @@ color: "#153F06" - type: entity - name: xeno cutlet parent: FoodMeatBase id: FoodMeatXenoCutletCooked + name: xeno cutlet description: A cutlet of cooked xeno, dripping with... tastiness? components: - type: Tag @@ -2391,9 +2391,9 @@ color: "#153F06" - type: entity - name: dragon cutlet parent: FoodMeatBase id: FoodMeatDragonCutletCooked + name: dragon cutlet description: It's a meal for kings! components: - type: Tag diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml index b33a35e8fc..ce20fbb46c 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml @@ -2,9 +2,9 @@ # Base - type: entity + abstract: true parent: FoodInjectableBase id: FoodNoodlesBase - abstract: true description: Now that's a nice pasta! components: - type: Item @@ -23,9 +23,9 @@ # Noodles - type: entity - name: boiled spaghetti parent: FoodNoodlesBase id: FoodNoodlesBoiled + name: boiled spaghetti description: A plain dish of noodles, this needs more ingredients. components: - type: Item @@ -38,9 +38,9 @@ # Tastes like pasta. - type: entity - name: spaghetti parent: FoodNoodlesBase id: FoodNoodles + name: spaghetti description: Spaghetti and crushed tomatoes. Just like your abusive father used to make! components: - type: Item @@ -64,16 +64,16 @@ # Tastes like pasta, tomato. - type: entity - name: copypasta parent: FoodNoodlesBase id: FoodNoodlesCopy + name: copypasta description: You probably shouldn't try this, you always hear people talking about how bad it is... components: - type: Item size: Normal shape: - 0,0,1,1 - - type: Food + - type: Edible trash: - FoodPlateSmall - FoodPlateSmall @@ -92,9 +92,9 @@ # Tastes like pasta, bad humor. - type: entity - name: spaghetti and meatballs parent: FoodNoodlesBase id: FoodNoodlesMeatball + name: spaghetti and meatballs description: Now that's a nice-a meatball! components: - type: Item @@ -120,9 +120,9 @@ # Tastes like pasta, meat. - type: entity - name: spesslaw parent: FoodNoodlesBase id: FoodNoodlesSpesslaw + name: spesslaw description: A lawyer's favourite. components: - type: Item @@ -172,9 +172,9 @@ # Tastes like pasta, tomato. - type: entity - name: butter noodles parent: FoodNoodlesBase id: FoodNoodlesButter + name: butter noodles description: Noodles covered in savory butter. Simple and slippery, but delicious. components: - type: Item diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml index 2722881564..f49e3a1256 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml @@ -2,9 +2,9 @@ # Kebabs - type: entity - name: skewer parent: BaseItem id: FoodKebabSkewer + name: skewer description: A thin rod of metal used to skewer just about anything and cook it. components: - type: Item @@ -53,7 +53,7 @@ tags: - Trash - Skewer - - type: Food + - type: Edible trash: - FoodKebabSkewer - type: SolutionContainerManager diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml index 83a1c61dc9..f537da712b 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml @@ -6,7 +6,7 @@ id: FoodSnackBase abstract: true components: - - type: Food + - type: Edible - type: Tag tags: - FoodSnack @@ -41,7 +41,7 @@ state: boritos - type: Item heldPrefix: boritos - - type: Food + - type: Edible trash: - FoodPacketBoritosTrash @@ -58,7 +58,7 @@ state: cnds - type: Item heldPrefix: cnds - - type: Food + - type: Edible trash: - FoodPacketCnDsTrash @@ -76,7 +76,7 @@ state: cheesiehonkers - type: Item heldPrefix: cheesiehonkers - - type: Food + - type: Edible trash: - FoodPacketCheesieTrash @@ -95,14 +95,14 @@ state: chips - type: Item heldPrefix: chips - - type: Food + - type: Edible trash: - FoodPacketChipsTrash - type: entity - name: chocolate bar parent: BaseItem id: FoodSnackChocolate + name: chocolate bar description: Tastes like cardboard. components: - type: Sprite @@ -123,9 +123,9 @@ path: /Audio/Effects/unwrap.ogg - type: entity - name: chocolate bar parent: FoodSnackBase id: FoodSnackChocolateBar + name: chocolate bar description: Tastes like cardboard. components: - type: FlavorProfile @@ -153,9 +153,9 @@ Quantity: 1 - type: entity - name: energy bar parent: FoodSnackBase id: FoodSnackEnergy + name: energy bar description: An energy bar with a lot of punch. components: - type: Sprite @@ -171,9 +171,9 @@ path: /Audio/Effects/unwrap.ogg - type: entity - name: energy bar parent: FoodSnackBase id: FoodSnackEnergyBar + name: energy bar description: An energy bar with a lot of punch. components: - type: FlavorProfile @@ -189,9 +189,9 @@ storedOffset: 0,-2 - type: entity - name: Sweetie's pistachios parent: FoodSnackBase id: FoodSnackPistachios + name: Sweetie's pistachios description: Sweeties's name-brand pistachios. Probably won't give you diseases. Probably. components: - type: FlavorProfile @@ -203,7 +203,7 @@ - type: Item heldPrefix: pistachio storedOffset: 1,0 - - type: Food + - type: Edible trash: - FoodPacketPistachioTrash - type: Tag @@ -226,7 +226,7 @@ state: popcorn - type: Item heldPrefix: popcorn - - type: Food + - type: Edible trash: - FoodPacketPopcornTrash @@ -243,7 +243,7 @@ state: raisins - type: Item heldPrefix: raisins - - type: Food + - type: Edible trash: - FoodPacketRaisinsTrash - type: Tag @@ -251,9 +251,9 @@ - Fruit - type: entity - name: bob's semki sunflower seeds parent: FoodSnackBase id: FoodSnackSemki + name: bob's semki sunflower seeds description: Proudly produced by the Bob Bobson nutritional corporation. Perfect for spitting at people. components: - type: FlavorProfile @@ -264,7 +264,7 @@ - type: Item heldPrefix: semki storedOffset: 1,0 - - type: Food + - type: Edible trash: - FoodPacketSemkiTrash @@ -281,7 +281,7 @@ state: susjerky - type: Item heldPrefix: susjerky - - type: Food + - type: Edible trash: - FoodPacketSusTrash - type: Tag @@ -301,7 +301,7 @@ state: syndicakes - type: Item heldPrefix: syndicakes - - type: Food + - type: Edible trash: - FoodPacketSyndiTrash @@ -326,7 +326,7 @@ Quantity: 5 - type: Sprite state: ramen - - type: Food + - type: Edible trash: - FoodPacketCupRamenTrash - type: Item @@ -350,9 +350,9 @@ Quantity: 5 - type: entity - name: chow mein parent: FoodSnackBase id: FoodSnackChowMein + name: chow mein description: A salty fried noodle snack. Looks like they forgot the vegetables. components: - type: FlavorProfile @@ -374,14 +374,14 @@ Quantity: 10 - ReagentId: Soysauce Quantity: 2 - - type: Food + - type: Edible trash: - FoodPacketChowMeinTrash - type: entity - name: dan dan noodles parent: FoodSnackBase id: FoodSnackDanDanNoodles + name: dan dan noodles description: A spicy Sichuan noodle snack. The chili oil slick pools on top. components: - type: FlavorProfile @@ -405,14 +405,14 @@ Quantity: 2 - ReagentId: Soysauce Quantity: 2 - - type: Food + - type: Edible trash: - FoodPacketDanDanTrash - type: entity - name: fortune cookie parent: FoodSnackBase id: FoodSnackCookieFortune + name: fortune cookie description: A boring cardboard tasting snack with a fortune inside. Surprise! You're boring too. components: - type: FlavorProfile @@ -432,13 +432,13 @@ heldPrefix: cookie_fortune storedOffset: 1,-1 size: Tiny - - type: Food + - type: Edible trash: - FoodCookieFortune - type: entity - id: FoodSnackNutribrick parent: BaseItem + id: FoodSnackNutribrick name: nutribrick description: A carefully synthesized brick designed to contain the highest ratio of nutriment to volume. Tastes like shit. components: @@ -460,8 +460,8 @@ path: /Audio/Effects/unwrap.ogg - type: entity - id: FoodSnackNutribrickOpen parent: FoodSnackBase + id: FoodSnackNutribrickOpen name: nutribrick description: A carefully synthesized brick designed to contain the highest ratio of nutriment to volume. Tastes like shit. components: @@ -477,7 +477,7 @@ - ReptilianFood - type: Sprite state: nutribrick-open - - type: Food + - type: Edible - type: SolutionContainerManager solutions: food: @@ -487,8 +487,8 @@ Quantity: 20 - type: entity - id: FoodSnackMREBrownie parent: BaseItem + id: FoodSnackMREBrownie name: brownie description: A precisely mixed brownie, made to withstand blunt trauma and harsh conditions. Tastes like shit. components: @@ -510,8 +510,8 @@ path: /Audio/Effects/unwrap.ogg - type: entity - id: FoodSnackMREBrownieOpen parent: FoodSnackBase + id: FoodSnackMREBrownieOpen name: brownie suffix: MRE description: A precisely mixed brownie, made to withstand blunt trauma and harsh conditions. Tastes like shit. @@ -524,7 +524,7 @@ - type: Item heldPrefix: mre-brownie-open storedOffset: -1,-1 - - type: Food + - type: Edible - type: SolutionContainerManager solutions: food: @@ -536,9 +536,9 @@ Quantity: 3 - type: entity - name: swirl lollipop parent: FoodSnackBase id: FoodSnackSwirlLollipop + name: swirl lollipop description: A swirly circle of pure concentrated sugar. Who's the biggest kid on the playground now? components: - type: Sprite @@ -602,7 +602,7 @@ reagents: - ReagentId: ToxinTrash Quantity: 5 - - type: Food + - type: Edible requiresSpecialDigestion: true - type: entity @@ -862,7 +862,7 @@ name: MRE wrapper description: A general purpose wrapper for a variety of military food goods. components: - - type: Food + - type: Edible requiresSpecialDigestion: true - type: SolutionContainerManager solutions: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml index c919aab528..47db7366f7 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml @@ -1,15 +1,15 @@ # When adding new food also add to random spawner located in Resources\Prototypes\Entities\Markers\Spawners\Random\Food_Drinks\food_meal.yml - type: entity + abstract: true parent: FoodInjectableBase id: FoodBowlBase - abstract: true components: - type: Item shape: - 0,0,1,0 storedOffset: 0,-3 - - type: Food + - type: Edible trash: - FoodBowlBig utensil: Spoon @@ -559,9 +559,9 @@ - state: spacelibertyduff - type: entity - name: amanita jelly parent: FoodInjectableBase id: FoodJellyAmanita + name: amanita jelly description: It's evil, don't touch it! components: - type: Item @@ -983,7 +983,7 @@ - type: FlavorProfile flavors: - miso - - type: Food + - type: Edible trash: - FoodBowlFancy - type: Sprite @@ -1188,9 +1188,9 @@ # Tastes like crab. - type: entity - name: electron soup parent: FoodBowlBase id: FoodSoupElectron + name: electron soup description: A gastronomic curiosity of ethereal origin. components: - type: Item diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml index 651594c8ee..7597197590 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml @@ -1,14 +1,14 @@ # When adding new food also add to random spawner located in Resources\Prototypes\Entities\Markers\Spawners\Random\Food_Drinks\food_single.yml - type: entity - name: taco shell parent: FoodMealBase id: FoodTacoShell + name: taco shell description: A taco shell, easy to hold, but falls on its side when put down. components: - type: Item storedOffset: 0,-3 - - type: Food + - type: Edible transferAmount: 3 - type: Sprite sprite: Objects/Consumable/Food/taco_sequence.rsi @@ -38,15 +38,15 @@ # Old tacos - type: entity + abstract: true parent: FoodInjectableBase id: FoodTacoBase - abstract: true components: - type: FlavorProfile flavors: - meaty - cheesy - - type: Food + - type: Edible transferAmount: 3 - type: Sprite sprite: Objects/Consumable/Food/taco.rsi @@ -74,7 +74,7 @@ id: FoodTacoBeef description: A very basic and run of the mill beef taco, now with cheese! components: - - type: Food + - type: Edible - type: Sprite state: beeftaco @@ -84,7 +84,7 @@ id: FoodTacoChicken description: A very basic and run of the mill chicken taco, now with cheese! components: - - type: Food + - type: Edible - type: Sprite state: chickentaco @@ -98,7 +98,7 @@ flavors: - onion - fishy - - type: Food + - type: Edible - type: Sprite state: fishtaco - type: SolutionContainerManager @@ -117,7 +117,7 @@ id: FoodTacoRat description: Yeah, that looks about right... components: - - type: Food + - type: Edible - type: Sprite state: rattaco - type: SolutionContainerManager @@ -136,7 +136,7 @@ id: FoodTacoBeefSupreme description: It's like a regular beef taco, but surpeme! components: - - type: Food + - type: Edible - type: Sprite state: beeftacosupreme - type: SolutionContainerManager @@ -155,7 +155,7 @@ id: FoodTacoChickenSupreme description: It's like a regular chicken taco, but surpeme! components: - - type: Food + - type: Edible - type: Sprite state: chickentacosupreme - type: SolutionContainerManager @@ -169,9 +169,9 @@ Quantity: 6 - type: entity - name: draco parent: FoodTacoBase id: FoodTacoDragon + name: draco description: A dragon taco, which is technically also a fish taco. components: - type: Item @@ -180,7 +180,7 @@ flavors: - meaty - spicy - - type: Food + - type: Edible - type: Sprite state: dragontaco - type: SolutionContainerManager diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml index 880ec58302..aadf15153e 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml @@ -29,9 +29,9 @@ path: /Audio/Items/Culinary/chop.ogg - type: entity - name: kitchen knife parent: BaseKnife id: KitchenKnife + name: kitchen knife description: A general purpose Chef's Knife made by Asters Merchant Guild. Guaranteed to stay sharp for years to come.. components: - type: Tag From ac74740ec541965d01eb280a340f9eaea250adf2 Mon Sep 17 00:00:00 2001 From: 5tickman <5tick@comcast.net> Date: Mon, 11 Aug 2025 22:39:33 -0500 Subject: [PATCH 11/12] Removed redundant edible components. --- .../Objects/Consumable/Food/Baked/bread.yml | 22 ------------------- .../Objects/Consumable/Food/Baked/misc.yml | 1 - .../Objects/Consumable/Food/Baked/pizza.yml | 1 - .../Objects/Consumable/Food/frozen.yml | 1 - .../Objects/Consumable/Food/meals.yml | 1 - .../Objects/Consumable/Food/snacks.yml | 3 --- .../Entities/Objects/Consumable/Food/taco.yml | 7 ------ 7 files changed, 36 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml index 67c442f191..bce7ace58a 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml @@ -54,7 +54,6 @@ id: FoodBreadVolcanic description: A dark loaf. Resembles pumice. components: - - type: Edible - type: Sprite layers: - state: alpha @@ -70,7 +69,6 @@ id: FoodBreadVolcanicSlice description: A slice of dark loaf. Resembles pumice. components: - - type: Edible - type: Sprite layers: - state: alpha-slice @@ -90,7 +88,6 @@ flavors: - banana - bread - - type: Edible - type: Sprite layers: - state: banana @@ -112,7 +109,6 @@ flavors: - banana - bread - - type: Edible - type: Sprite layers: - state: banana-slice @@ -193,7 +189,6 @@ flavors: - bread - corn - - type: Edible - type: Sprite layers: - state: cornbread @@ -218,7 +213,6 @@ flavors: - bread - corn - - type: Edible - type: Sprite layers: - state: cornbread-slice @@ -241,7 +235,6 @@ - cheesy - creamy - bread - - type: Edible - type: Sprite layers: - state: creamcheese @@ -269,7 +262,6 @@ - cheesy - creamy - bread - - type: Edible - type: Sprite layers: - state: creamcheese-slice @@ -293,7 +285,6 @@ flavors: - meaty - bread - - type: Edible - type: Sprite layers: - state: meat @@ -324,7 +315,6 @@ flavors: - meaty - bread - - type: Edible - type: Sprite layers: - state: meat-slice @@ -353,7 +343,6 @@ flavors: - nothing - bread - - type: Edible - type: Sprite layers: - state: mimana @@ -384,7 +373,6 @@ flavors: - nothing - bread - - type: Edible - type: Sprite layers: - state: mimana-slice @@ -408,7 +396,6 @@ id: FoodBreadPlain description: Some plain old earthen bread. components: - - type: Edible - type: Sprite layers: - state: plain @@ -421,7 +408,6 @@ id: FoodBreadPlainSlice description: A slice of home. components: - - type: Edible - type: Sprite layers: - state: plain-slice @@ -436,7 +422,6 @@ flavors: - meaty - bread - - type: Edible - type: Sprite layers: - state: sausage @@ -468,7 +453,6 @@ flavors: - meaty - bread - - type: Edible - type: Sprite layers: - state: sausage-slice @@ -499,7 +483,6 @@ flavors: - cobwebs - bread - - type: Edible - type: Sprite layers: - state: spidermeat @@ -530,7 +513,6 @@ flavors: - cobwebs - bread - - type: Edible - type: Sprite layers: - state: spidermeat-slice @@ -559,7 +541,6 @@ flavors: - tofu - bread - - type: Edible - type: Sprite layers: - state: tofu @@ -586,7 +567,6 @@ flavors: - tofu - bread - - type: Edible - type: Sprite layers: - state: tofu-slice @@ -610,7 +590,6 @@ flavors: - acid - bread - - type: Edible - type: Sprite layers: - state: xenomeat @@ -641,7 +620,6 @@ flavors: - acid - bread - - type: Edible - type: Sprite layers: - state: xenomeat-slice diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml index faa9f45fde..ddfadb6fb6 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml @@ -6,7 +6,6 @@ id: FoodBakedBase abstract: true components: - - type: Edible - type: Sprite sprite: Objects/Consumable/Food/Baked/misc.rsi - type: SolutionContainerManager diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml index 99fb7c87b7..a288ad001c 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml @@ -42,7 +42,6 @@ flavors: - oily - bread - - type: Edible - type: Sprite sprite: Objects/Consumable/Food/Baked/pizza.rsi - type: SolutionContainerManager diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml index b3aff8075f..7f96d07850 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml @@ -6,7 +6,6 @@ id: FoodFrozenBase abstract: true components: - - type: Edible - type: Sprite sprite: Objects/Consumable/Food/frozen.rsi - type: SolutionContainerManager diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml index c0d1f0fd75..4561464d18 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml @@ -13,7 +13,6 @@ - type: Item shape: - 0,0,1,0 - - type: Edible - type: Sprite sprite: Objects/Consumable/Food/meals.rsi - type: SolutionContainerManager diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml index f537da712b..e53e99e9db 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml @@ -6,7 +6,6 @@ id: FoodSnackBase abstract: true components: - - type: Edible - type: Tag tags: - FoodSnack @@ -477,7 +476,6 @@ - ReptilianFood - type: Sprite state: nutribrick-open - - type: Edible - type: SolutionContainerManager solutions: food: @@ -524,7 +522,6 @@ - type: Item heldPrefix: mre-brownie-open storedOffset: -1,-1 - - type: Edible - type: SolutionContainerManager solutions: food: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml index 7597197590..8a795df167 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml @@ -74,7 +74,6 @@ id: FoodTacoBeef description: A very basic and run of the mill beef taco, now with cheese! components: - - type: Edible - type: Sprite state: beeftaco @@ -84,7 +83,6 @@ id: FoodTacoChicken description: A very basic and run of the mill chicken taco, now with cheese! components: - - type: Edible - type: Sprite state: chickentaco @@ -98,7 +96,6 @@ flavors: - onion - fishy - - type: Edible - type: Sprite state: fishtaco - type: SolutionContainerManager @@ -117,7 +114,6 @@ id: FoodTacoRat description: Yeah, that looks about right... components: - - type: Edible - type: Sprite state: rattaco - type: SolutionContainerManager @@ -136,7 +132,6 @@ id: FoodTacoBeefSupreme description: It's like a regular beef taco, but surpeme! components: - - type: Edible - type: Sprite state: beeftacosupreme - type: SolutionContainerManager @@ -155,7 +150,6 @@ id: FoodTacoChickenSupreme description: It's like a regular chicken taco, but surpeme! components: - - type: Edible - type: Sprite state: chickentacosupreme - type: SolutionContainerManager @@ -180,7 +174,6 @@ flavors: - meaty - spicy - - type: Edible - type: Sprite state: dragontaco - type: SolutionContainerManager From f4325c4235ca748ce199523938141802168e20a2 Mon Sep 17 00:00:00 2001 From: 5tickman <5tick@comcast.net> Date: Tue, 12 Aug 2025 00:24:28 -0500 Subject: [PATCH 12/12] Removed crazy burger from happyhonk fill table. --- .../Entities/Objects/Consumable/Food/Containers/box.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml index b6cd984907..5717a12462 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml @@ -723,8 +723,6 @@ components: - type: StorageFill contents: - - id: FoodBurgerCrazy - orGroup: Burgers - id: FoodBurgerCheese orGroup: Burgers - id: DrinkColaCan