From 918c7d1e3b998591a34f7ef49ce46e8c5cc7bbea Mon Sep 17 00:00:00 2001 From: Nim <128169402+Nimfar11@users.noreply.github.com> Date: Sat, 25 Jan 2025 13:40:16 +0200 Subject: [PATCH] Pies (#794) * pie * qwe * recipe * Solution * dough * some tweaks * fix crafting bugs --------- Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> Co-authored-by: Ed --- .../_CP14/Workbench/CP14WorkbenchSystem.cs | 45 ++-- .../Objects/Consumable/Food/dough.yml | 36 +-- .../Entities/Objects/Consumable/Food/pie.yml | 217 ++++++++++++++++++ .../Objects/Consumable/Food/plate.yml | 19 +- .../_CP14/Recipes/Workbench/Anvil/misc.yml | 9 + .../Recipes/Workbench/CookingTable/misc.yml | 35 +++ .../Recipes/Workbench/CookingTable/pies.yml | 21 ++ .../Recipes/Workbench/CookingTable/seeds.yml | 39 ++++ .../_CP14/Recipes/Workbench/cooking_table.yml | 76 ------ Resources/Prototypes/_CP14/tags.yml | 3 + .../Food/dough.rsi/dough_medium_flat.png | Bin 341 -> 502 bytes .../Consumable/Food/dough.rsi/meta.json | 4 +- .../Objects/Consumable/Food/pie.rsi/apple.png | Bin 0 -> 548 bytes .../Consumable/Food/pie.rsi/apple_raw.png | Bin 0 -> 532 bytes .../Objects/Consumable/Food/pie.rsi/fish.png | Bin 0 -> 538 bytes .../Consumable/Food/pie.rsi/fisht_raw.png | Bin 0 -> 537 bytes .../Objects/Consumable/Food/pie.rsi/meat.png | Bin 0 -> 509 bytes .../Consumable/Food/pie.rsi/meat_raw.png | Bin 0 -> 472 bytes .../Objects/Consumable/Food/pie.rsi/meta.json | 32 +++ .../Objects/Consumable/Food/pie.rsi/tin.png | Bin 0 -> 435 bytes 20 files changed, 420 insertions(+), 116 deletions(-) create mode 100644 Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/pie.yml create mode 100644 Resources/Prototypes/_CP14/Recipes/Workbench/CookingTable/misc.yml create mode 100644 Resources/Prototypes/_CP14/Recipes/Workbench/CookingTable/pies.yml create mode 100644 Resources/Prototypes/_CP14/Recipes/Workbench/CookingTable/seeds.yml delete mode 100644 Resources/Prototypes/_CP14/Recipes/Workbench/cooking_table.yml create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/pie.rsi/apple.png create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/pie.rsi/apple_raw.png create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/pie.rsi/fish.png create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/pie.rsi/fisht_raw.png create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/pie.rsi/meat.png create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/pie.rsi/meat_raw.png create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/pie.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/pie.rsi/tin.png diff --git a/Content.Server/_CP14/Workbench/CP14WorkbenchSystem.cs b/Content.Server/_CP14/Workbench/CP14WorkbenchSystem.cs index 2f2e27fd16..e6ec9ba3f2 100644 --- a/Content.Server/_CP14/Workbench/CP14WorkbenchSystem.cs +++ b/Content.Server/_CP14/Workbench/CP14WorkbenchSystem.cs @@ -94,9 +94,8 @@ public sealed partial class CP14WorkbenchSystem : SharedCP14WorkbenchSystem for (int i = 0; i < recipe.ResultCount; i++) { var resultEntity = Spawn(recipe.Result); + resultEntities.Add(resultEntity); - _transform.SetCoordinates(resultEntity, Transform(ent).Coordinates); - _stack.TryMergeToContacts(resultEntity); if (recipe.TryMergeSolutions) { @@ -116,7 +115,9 @@ public sealed partial class CP14WorkbenchSystem : SharedCP14WorkbenchSystem var requiredCount = requiredIngredient.Value; foreach (var placedEntity in placedEntities) { - var metaData = MetaData(placedEntity); + if (!TryComp(placedEntity, out var metaData)) + continue; + if (metaData.EntityPrototype is null) continue; @@ -131,24 +132,24 @@ public sealed partial class CP14WorkbenchSystem : SharedCP14WorkbenchSystem out var ingredientSoln, out var ingredientSolution); - if (ingredientSoln is null || - ingredientSolution is null) - continue; - - var splitted = _solutionContainer.SplitSolution(ingredientSoln.Value, - ingredientSolution.Volume / recipe.ResultCount); - - foreach (var resultEntity in resultEntities) + if (ingredientSoln is not null && + ingredientSolution is not null) { - _solutionContainer.TryGetSolution(resultEntity, - recipe.Solution, - out var resultSolution, - out _); - if (resultSolution is not null) + var splitted = _solutionContainer.SplitSolution(ingredientSoln.Value, + ingredientSolution.Volume / recipe.ResultCount); + + foreach (var resultEntity in resultEntities) { - resultSolution.Value.Comp.Solution.MaxVolume += - ingredientSoln.Value.Comp.Solution.MaxVolume / recipe.ResultCount; - _solutionContainer.TryAddSolution(resultSolution.Value, splitted); + _solutionContainer.TryGetSolution(resultEntity, + recipe.Solution, + out var resultSolution, + out _); + if (resultSolution is not null) + { + resultSolution.Value.Comp.Solution.MaxVolume += + ingredientSoln.Value.Comp.Solution.MaxVolume / recipe.ResultCount; + _solutionContainer.TryAddSolution(resultSolution.Value, splitted); + } } } } @@ -181,6 +182,12 @@ public sealed partial class CP14WorkbenchSystem : SharedCP14WorkbenchSystem } } + //We teleport result to workbench AFTER craft. + foreach (var resultEntity in resultEntities) + { + _transform.SetCoordinates(resultEntity, Transform(ent).Coordinates); + } + UpdateUIRecipes(ent, args.User); args.Handled = true; } diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/dough.yml b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/dough.yml index bde6eb6a0d..d326ff1ced 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/dough.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/dough.yml @@ -24,7 +24,7 @@ - ReagentId: UncookedAnimalProteins Quantity: 2 - type: SliceableFood - count: 5 + count: 4 slice: CP14FoodDoughMedium - type: CP14TemperatureTransformation entries: @@ -50,7 +50,7 @@ - ReagentId: Protein Quantity: 2 - type: SliceableFood - count: 5 + count: 4 slice: CP14FoodBreadSlice - type: CP14TemperatureTransformation entries: @@ -68,12 +68,12 @@ - type: SolutionContainerManager solutions: food: - maxVol: 6 # 1/5 bread + maxVol: 7 # 1/4 bread reagents: - ReagentId: Nutriment - Quantity: 4 + Quantity: 5 - ReagentId: Protein - Quantity: 0.4 + Quantity: 0.5 - type: CP14TemperatureTransformation entries: - temperatureRange: 400, 500 @@ -82,7 +82,7 @@ - type: entity parent: FoodInjectableBase id: CP14FoodDoughMedium - name: Medium piece of dough. + name: medium piece of dough categories: [ ForkFiltered ] components: - type: Item @@ -97,12 +97,12 @@ - type: SolutionContainerManager solutions: food: - maxVol: 6 # 1/5 large dough + maxVol: 7 # 1/4 large dough reagents: - ReagentId: Nutriment - Quantity: 4 + Quantity: 5.2 - ReagentId: UncookedAnimalProteins - Quantity: 0.4 + Quantity: 0.5 - type: CP14TemperatureTransformation entries: - temperatureRange: 400, 500 @@ -120,12 +120,12 @@ - type: SolutionContainerManager solutions: food: - maxVol: 6 # 1/5 large dough + maxVol: 6 # 1/4 large dough reagents: - ReagentId: Nutriment - Quantity: 4 + Quantity: 5.2 - ReagentId: Protein - Quantity: 0.4 + Quantity: 0.5 - type: SliceableFood count: 2 slice: CP14FoodBreadBunSlice @@ -146,12 +146,12 @@ - type: SolutionContainerManager solutions: food: - maxVol: 3 # 1/2 bun + maxVol: 4 # 1/2 bun reagents: - ReagentId: Nutriment - Quantity: 2 + Quantity: 2.6 - ReagentId: Protein - Quantity: 0.2 + Quantity: 0.25 - type: CP14TemperatureTransformation entries: - temperatureRange: 400, 500 @@ -169,12 +169,12 @@ - type: SolutionContainerManager solutions: food: - maxVol: 6 # 1/5 large dough + maxVol: 7 # 1/4 large dough reagents: - ReagentId: Nutriment - Quantity: 4 + Quantity: 5.2 - ReagentId: UncookedAnimalProteins - Quantity: 0.4 + Quantity: 0.5 - type: CP14TemperatureTransformation entries: - temperatureRange: 400, 500 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/pie.yml b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/pie.yml new file mode 100644 index 0000000000..dd0fedf36d --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/pie.yml @@ -0,0 +1,217 @@ +# base + +- type: entity + parent: FoodInjectableBase + id: CP14FoodPieBase + abstract: true + categories: [ ForkFiltered ] + components: + - type: Item + size: Normal + storedRotation: -90 + - type: Temperature + - type: FlavorProfile + flavors: + - sweet + - type: Sprite + sprite: _CP14/Objects/Consumable/Food/pie.rsi + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Nutriment + Quantity: 12 + - ReagentId: Protein + Quantity: 5 + - type: Food + trash: + - CP14PlatePie + - type: Tag + tags: + - Pie + +- type: entity + parent: FoodInjectableBase + id: CP14FoodPieBaseRaw + abstract: true + categories: [ ForkFiltered ] + components: + - type: Item + size: Normal + storedRotation: -90 + - type: Temperature + - type: FlavorProfile + flavors: + - raw dough + - type: Sprite + sprite: _CP14/Objects/Consumable/Food/pie.rsi + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Nutriment + Quantity: 12 + - ReagentId: UncookedAnimalProteins + Quantity: 5 + - type: Food + trash: + - CP14PlatePie + +# pie + +- type: entity + name: raw apple pie + parent: CP14FoodPieBaseRaw + id: CP14FoodPieAppleRaw + description: Raw dough with apples seems like a cnr you shouldn't be eating right now. + components: + - type: FlavorProfile + flavors: + - raw dough + - apple + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: UncookedAnimalProteins + Quantity: 2 + - ReagentId: Vitamin + Quantity: 5 + - type: Sprite + layers: + - state: tin + - state: apple_raw + - type: Tag + tags: + - Fruit + - type: CP14TemperatureTransformation + entries: + - temperatureRange: 400, 500 + transformTo: CP14FoodPieApple + +- type: entity + name: apple pie + parent: CP14FoodPieBase + id: CP14FoodPieApple + description: Apple pie beckons with its smells. + components: + - type: FlavorProfile + flavors: + - sweet + - apple + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: Protein + Quantity: 2 + - ReagentId: Vitamin + Quantity: 5 + - type: Sprite + layers: + - state: tin + - state: apple + - type: Tag + tags: + - Fruit + - Pie + - type: CP14TemperatureTransformation + entries: + - temperatureRange: 400, 500 + transformTo: CP14Ash1 + +- type: entity + name: raw meat pie + parent: CP14FoodPieBaseRaw + id: CP14FoodPieMeatRaw + description: Raw dough with raw meat, not the best dish at the moment. + components: + - type: FlavorProfile + flavors: + - raw dough + - meaty + - type: Sprite + layers: + - state: tin + - state: meat_raw + - type: Tag + tags: + - Meat + - type: CP14TemperatureTransformation + entries: + - temperatureRange: 400, 500 + transformTo: CP14FoodPieMeat + +- type: entity + name: meat pie + parent: CP14FoodPieBase + id: CP14FoodPieMeat + description: Oh that wonderful aroma of bread and meat, I could eat that right now. + components: + - type: FlavorProfile + flavors: + - meaty + - type: Sprite + layers: + - state: tin + - state: meat + - type: Tag + tags: + - Meat + - Pie + - type: CP14TemperatureTransformation + entries: + - temperatureRange: 400, 500 + transformTo: CP14Ash1 + +- type: entity + name: raw fish pie + parent: CP14FoodPieBaseRaw + id: CP14FoodPieFishRaw + description: Raw dough with raw fish..... Where did they get the fish?! + components: + - type: FlavorProfile + flavors: + - raw dough + - fishy + - type: Sprite + layers: + - state: tin + - state: fisht_raw + - type: Tag + tags: + - Meat + - type: CP14TemperatureTransformation + entries: + - temperatureRange: 400, 500 + transformTo: CP14FoodPieFish + +- type: entity + name: fish pie + parent: CP14FoodPieBase + id: CP14FoodPieFish + description: Fish pie, a good alternative among meat dishes. + components: + - type: FlavorProfile + flavors: + - fishy + - type: Sprite + layers: + - state: tin + - state: fish + - type: Tag + tags: + - Meat + - Pie + - type: CP14TemperatureTransformation + entries: + - temperatureRange: 400, 500 + transformTo: CP14Ash1 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/plate.yml b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/plate.yml index 976d4762ee..4df2c6f1a1 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/plate.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/plate.yml @@ -10,4 +10,21 @@ state: plate - type: Item shape: - - 0,0,1,0 \ No newline at end of file + - 0,0,1,0 + +- type: entity + id: CP14PlatePie + parent: BaseItem + name: pie plate + description: A mould for making a delicious pie. + categories: [ ForkFiltered ] + components: + - type: Sprite + sprite: _CP14/Objects/Consumable/Food/pie.rsi + state: tin + - type: Item + shape: + - 0,0,1,0 + - type: Tag + tags: + - CP14PlatePie diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml index a9deca924a..1139eedea0 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml @@ -26,6 +26,15 @@ result: CP14BaseWrench knowledgeRequired: MetallForging +- type: CP14Recipe + id: CP14PlatePie + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14IronBar: 1 + result: CP14PlatePie + knowledgeRequired: MetallForging + - type: CP14Recipe id: CP14ClothingOuterClothingCuirass tag: CP14RecipeAnvil diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/CookingTable/misc.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/CookingTable/misc.yml new file mode 100644 index 0000000000..c29cb6d8e4 --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/CookingTable/misc.yml @@ -0,0 +1,35 @@ +- type: CP14Recipe + id: CP14FoodMeatLamb + tag: CP14RecipeCooking + craftTime: 2 + entities: + CP14FoodMeatLambSlice: 2 + CP14FoodEgg: 1 + result: CP14FoodMeatLambCutlet + tryMergeSolutions: true + +- type: CP14Recipe + id: CP14FoodDoughLarge + tag: CP14RecipeCooking + craftTime: 2 + entities: + CP14FoodDoughMedium: 4 + result: CP14FoodDoughLarge + tryMergeSolutions: true + +- type: CP14Recipe + id: CP14FoodDoughMedium + tag: CP14RecipeCooking + craftTime: 2 + entities: + CP14Wheat: 2 + result: CP14FoodDoughMedium + +- type: CP14Recipe + id: CP14FoodDoughMediumFlat + tag: CP14RecipeCooking + craftTime: 2 + entities: + CP14FoodDoughMedium: 1 + result: CP14FoodDoughMediumFlat + tryMergeSolutions: true \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/CookingTable/pies.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/CookingTable/pies.yml new file mode 100644 index 0000000000..96ff92d288 --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/CookingTable/pies.yml @@ -0,0 +1,21 @@ +- type: CP14Recipe + id: CP14FoodPieAppleRaw + tag: CP14RecipeCooking + craftTime: 5 + entities: + CP14PlatePie: 1 + CP14FoodDoughMediumFlat: 1 + CP14FoodAppleSlice: 4 + result: CP14FoodPieAppleRaw + tryMergeSolutions: true + +- type: CP14Recipe + id: CP14FoodPieMeatRaw + tag: CP14RecipeCooking + craftTime: 5 + entities: + CP14PlatePie: 1 + CP14FoodDoughMediumFlat: 1 + CP14FoodMeatLambSlice: 3 + result: CP14FoodPieMeatRaw + tryMergeSolutions: true diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/CookingTable/seeds.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/CookingTable/seeds.yml new file mode 100644 index 0000000000..8a5b72e4a1 --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/CookingTable/seeds.yml @@ -0,0 +1,39 @@ +- type: CP14Recipe + id: CP14SeedWheat + tag: CP14RecipeCooking + craftTime: 1 + entities: + CP14Wheat: 1 + result: CP14SeedWheat + +- type: CP14Recipe + id: CP14SeedTomato + tag: CP14RecipeCooking + craftTime: 1 + entities: + CP14FoodTomatoesSlice: 1 + result: CP14SeedTomato + +- type: CP14Recipe + id: CP14SeedCabbage + tag: CP14RecipeCooking + craftTime: 1 + entities: + CP14FoodCabbageSlice: 1 + result: CP14SeedCabbage + +- type: CP14Recipe + id: CP14SeedPumpkin + tag: CP14RecipeCooking + craftTime: 1 + entities: + CP14FoodPumpkinSlice: 1 + result: CP14SeedPumpkin + +- type: CP14Recipe + id: CP14SeedCucumber + tag: CP14RecipeCooking + craftTime: 1 + entities: + CP14FoodCucumber: 1 + result: CP14SeedCucumber \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/cooking_table.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/cooking_table.yml deleted file mode 100644 index 9bb8aa1cdb..0000000000 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/cooking_table.yml +++ /dev/null @@ -1,76 +0,0 @@ -- type: CP14Recipe - id: CP14FoodMeatLamb - tag: CP14RecipeCooking - craftTime: 2 - entities: - CP14FoodMeatLambSlice: 2 - CP14FoodEgg: 1 - result: CP14FoodMeatLambCutlet - tryMergeSolutions: true - -- type: CP14Recipe - id: CP14FoodDoughLarge - tag: CP14RecipeCooking - craftTime: 3 - entities: - CP14FoodDoughMedium: 5 - result: CP14FoodDoughLarge - tryMergeSolutions: true - -- type: CP14Recipe - id: CP14FoodDoughMedium - tag: CP14RecipeCooking - craftTime: 3 - entities: - CP14FoodDoughMediumFlat: 1 - result: CP14FoodDoughMedium - tryMergeSolutions: true - -- type: CP14Recipe - id: CP14FoodDoughMediumFlat - tag: CP14RecipeCooking - craftTime: 3 - entities: - CP14FoodDoughMedium: 1 - result: CP14FoodDoughMediumFlat - tryMergeSolutions: true - -- type: CP14Recipe - id: CP14SeedPumpkin - tag: CP14RecipeCooking - craftTime: 1 - entities: - CP14FoodPumpkinSlice: 1 - result: CP14SeedPumpkin - -- type: CP14Recipe - id: CP14SeedCucumber - tag: CP14RecipeCooking - craftTime: 1 - entities: - CP14FoodCucumber: 1 - result: CP14SeedCucumber - -- type: CP14Recipe - id: CP14SeedWheat - tag: CP14RecipeCooking - craftTime: 1 - entities: - CP14Wheat: 1 - result: CP14SeedWheat - -- type: CP14Recipe - id: CP14SeedTomato - tag: CP14RecipeCooking - craftTime: 1 - entities: - CP14FoodTomatoesSlice: 1 - result: CP14SeedTomato - -- type: CP14Recipe - id: CP14SeedCabbage - tag: CP14RecipeCooking - craftTime: 1 - entities: - CP14FoodCabbageSlice: 1 - result: CP14SeedCabbage diff --git a/Resources/Prototypes/_CP14/tags.yml b/Resources/Prototypes/_CP14/tags.yml index 4284d5ebc9..0703c94707 100644 --- a/Resources/Prototypes/_CP14/tags.yml +++ b/Resources/Prototypes/_CP14/tags.yml @@ -81,3 +81,6 @@ - type: Tag id: CP14Arrow + +- type: Tag + id: CP14PlatePie diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/dough.rsi/dough_medium_flat.png b/Resources/Textures/_CP14/Objects/Consumable/Food/dough.rsi/dough_medium_flat.png index 082b08d60104207a6059f6855f5a9d7bfe07f10d..e217d6a5863f704e910fcd469a9a95638382dc01 100644 GIT binary patch delta 463 zcmV;=0Wkj60`>!tF@La0L_t(oh3%ESYQkU?h999&bx?3foJ5BT9YhczIO#2T1une{ z=iWt^&K){-)k#7{uoKeVt%JCd8d%`=6j!Wa!4Rkrc9YK{j+ju z9~h5@R#g4@^*z;@cWHwMibTCt1E5eWJN5JF$X43{wl672tbfTLZ0bg+w9-Rq19=Zsn^OJj0+VhAIIwf`TE?jSRNxGLJR(IfQpoN4iA%iLM2&>g$TSk z9u2L5A~}IkV;4bw2=~Me#)XM$1VV%^p?lo!00ASWV$0jL?Kga$V1)vR&Q0C$09>!V zQ@Ms2Hxr54oqte(La~hLbYb|yZ^te?!tdT2x$yw(k^|`LJ?eCh((eKr=Y59l!gcHf zhO5&#`g)%n;AJ+;0TzJL?;UEyfFGiizvoeD0igeE zoFI27*c}VsO4TqgzmegQ0B#7mS;f4}Js`00ctyt|cu284qObRn;gI5I^wjHFa&=905=GL+^l-;izQ1MoGDW#p+CkK-)QP~#V7y(002ovPDHLk FV1f$S+ExGn delta 301 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/pie.rsi/meat_raw.png b/Resources/Textures/_CP14/Objects/Consumable/Food/pie.rsi/meat_raw.png new file mode 100644 index 0000000000000000000000000000000000000000..5a80f7129e294eebdfd61e79ef1949ce1f90678f GIT binary patch literal 472 zcmV;}0Vn>6P)Px$l1W5CR9J=WlfO#>VH}5_qCg0dZtztUZAd||CP_$w;Ajb&n}PztXlQ6{h=$gN z2C2EJf1pJUf-p#&BCubJk=WZ{SO`wpV7{b7cSlRm`%HJdpZEKDc<(*XXf&Gt&XC&; zg?z5_)B3{3k*k@G!@c5@z?*`CO-0+_-K5AR>|((*&SoS;$8LfRP+i zB2FZ11BHC9b9VWHynCi`-9khpUXKqE4f1e%qn?d$NQoH9F+@DTeA;g-F=8hGsPd(? zB#@+1EF-IRbpnm28YRoZ>+vzUFix@X3OqyFZ#&yoU}7o)bdSGMEF+>p0N&e8RVt!E zB~vMu0nfL+zZ3uv@c^T57bG$!CCg&QG-*85`ZC?(uY5#e#Alt1X4ozeo7)~*&8F15 z*W**=MmU5K4k4>`L^MbulOmDnW>>Q*VsqQSzl1&R&-Xg}>j!<`T~_P7x0?Wcf5g_| zrlWFK0zCu@SWnr=a O0000Px$ZAnByR9J=Wl|M_vKp4iK+75MyqUh3m0J}&EihnwEZ$YHcZxHI{?%<%%p_@oH zr68Te4{+k*&_PH`AQzVuTvACUK|@B7xR?;M^zL-@e$xy0-1|It_mTh-iA3_>$%$_0 zbd7k{`ti}BP)}}gVoa$G0Py_)s#^L{Yg$Dp$Q-XZr8Wp5Of4Y