From e659eb992f119fcdf3cf5a4d88f47dd10134ff07 Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Wed, 14 Aug 2024 16:04:00 +0300 Subject: [PATCH] Custom Taco & Kebabs - FoodSequence 2 (#30905) * control layer ordering * sprite update * taco! * taco naming gen * fix separator naming * some proto fixes * default naming separation * fix taco naming * rat update * hamsterburger * organs taco * remove from spawners * fixes * fix separators and lemons * Update food-sequence.ftl * randomization offset * fix * kebabs refactor * fix * skewer weapon * Update food_single.yml * Update migration.yml * suppermatter * hamlet centered * hamsburger * Update dead-0.png * 20 -> 4 burger layers max * Update burger.yml * canReact: false * capfruit update * Update burger.yml * Update burger.yml * Update produce.yml * some fixes * Update Resources/Textures/Objects/Consumable/Food/taco.rsi/meta.json Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Update Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Update Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * chicken * Update food-sequence.ftl * documentation * fixes * Update meat.yml * Update meat.yml --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --- .../EntitySystems/ClientFoodSequenceSystem.cs | 15 +- .../EntitySystems/FoodSequenceSystem.cs | 43 +- .../FoodSequenceElementComponent.cs | 16 +- .../FoodSequenceStartPointComponent.cs | 42 +- .../nutrition/components/food-sequence.ftl | 123 ++-- Resources/Prototypes/Body/Organs/human.yml | 57 +- .../Spawners/Random/Food_Drinks/food_meal.yml | 1 - .../Random/Food_Drinks/food_single.yml | 15 +- .../Prototypes/Entities/Mobs/NPCs/animals.yml | 32 + .../Objects/Consumable/Food/Baked/cake.yml | 9 + .../Objects/Consumable/Food/burger.yml | 19 +- .../Objects/Consumable/Food/ingredients.yml | 44 +- .../Entities/Objects/Consumable/Food/meat.yml | 612 ++++++++++++------ .../Objects/Consumable/Food/produce.yml | 549 ++++++++++------ .../Objects/Consumable/Food/skewer.yml | 187 +----- .../Entities/Objects/Consumable/Food/taco.yml | 168 +---- .../Objects/Specific/Hydroponics/leaves.yml | 53 +- .../Recipes/Cooking/meal_recipes.yml | 162 +---- .../Guidebook/Service/FoodRecipes.xml | 1 - .../Textures/Mobs/Pets/hamlet.rsi/dead-0.png | Bin 19319 -> 393 bytes .../Textures/Mobs/Pets/hamlet.rsi/splat-0.png | Bin 19333 -> 507 bytes .../Consumable/Food/skewer.rsi/meta.json | 79 +-- .../Food/skewer.rsi/skewer-bluepepper.png | Bin 0 -> 274 bytes .../Food/skewer.rsi/skewer-corn.png | Bin 0 -> 346 bytes .../Food/skewer.rsi/skewer-corn1.png | Bin 292 -> 0 bytes .../Food/skewer.rsi/skewer-corn2.png | Bin 315 -> 0 bytes .../Food/skewer.rsi/skewer-meat-alpha.png | Bin 0 -> 243 bytes .../Food/skewer.rsi/skewer-meat-alpha1.png | Bin 228 -> 0 bytes .../Food/skewer.rsi/skewer-meat-alpha2.png | Bin 285 -> 0 bytes .../Food/skewer.rsi/skewer-meat-alpha3.png | Bin 218 -> 0 bytes .../Food/skewer.rsi/skewer-meat-alpha4.png | Bin 222 -> 0 bytes .../Food/skewer.rsi/skewer-meat.png | Bin 0 -> 268 bytes .../Food/skewer.rsi/skewer-meat1.png | Bin 250 -> 0 bytes .../Food/skewer.rsi/skewer-meat2.png | Bin 276 -> 0 bytes .../Food/skewer.rsi/skewer-meat3.png | Bin 210 -> 0 bytes .../Food/skewer.rsi/skewer-meat4.png | Bin 241 -> 0 bytes .../Food/skewer.rsi/skewer-mushroom.png | Bin 0 -> 247 bytes .../Food/skewer.rsi/skewer-mushroom1.png | Bin 218 -> 0 bytes .../Food/skewer.rsi/skewer-mushroom2.png | Bin 220 -> 0 bytes .../Food/skewer.rsi/skewer-mushroom3.png | Bin 221 -> 0 bytes .../Food/skewer.rsi/skewer-mushroom4.png | Bin 220 -> 0 bytes .../Food/skewer.rsi/skewer-pepper.png | Bin 0 -> 267 bytes .../Food/skewer.rsi/skewer-pepper1.png | Bin 241 -> 0 bytes .../Food/skewer.rsi/skewer-pepper2.png | Bin 249 -> 0 bytes .../Food/skewer.rsi/skewer-pepper3.png | Bin 249 -> 0 bytes .../Food/skewer.rsi/skewer-pepper4.png | Bin 250 -> 0 bytes .../Consumable/Food/skewer.rsi/skewer-rat.png | Bin 0 -> 433 bytes .../Food/skewer.rsi/skewer-rat1.png | Bin 394 -> 0 bytes .../Food/skewer.rsi/skewer-rat2.png | Bin 400 -> 0 bytes .../Food/skewer.rsi/skewer-snake.png | Bin 0 -> 383 bytes .../Food/skewer.rsi/skewer-snake1.png | Bin 382 -> 0 bytes .../Food/skewer.rsi/skewer-snake2.png | Bin 412 -> 0 bytes .../Food/skewer.rsi/skewer-tail-cooked.png | Bin 0 -> 512 bytes .../Food/skewer.rsi/skewer-tail-cooked1.png | Bin 449 -> 0 bytes .../Food/skewer.rsi/skewer-tail-cooked2.png | Bin 445 -> 0 bytes .../Food/skewer.rsi/skewer-tail.png | Bin 0 -> 519 bytes .../Food/skewer.rsi/skewer-tail1.png | Bin 459 -> 0 bytes .../Food/skewer.rsi/skewer-tail2.png | Bin 452 -> 0 bytes .../Food/skewer.rsi/skewer-tomato.png | Bin 0 -> 186 bytes .../Food/skewer.rsi/skewer-tomato1.png | Bin 189 -> 0 bytes .../Food/skewer.rsi/skewer-tomato2.png | Bin 190 -> 0 bytes .../Food/skewer.rsi/skewer-tomato3.png | Bin 190 -> 0 bytes .../Food/skewer.rsi/skewer-tomato4.png | Bin 189 -> 0 bytes .../Consumable/Food/taco.rsi/beeftaco.png | Bin 303 -> 0 bytes .../Food/taco.rsi/beeftacosupreme.png | Bin 307 -> 0 bytes .../Consumable/Food/taco.rsi/chickentaco.png | Bin 308 -> 0 bytes .../Food/taco.rsi/chickentacosupreme.png | Bin 309 -> 0 bytes .../Consumable/Food/taco.rsi/fishtaco.png | Bin 286 -> 0 bytes .../Consumable/Food/taco.rsi/meta.json | 21 +- .../Consumable/Food/taco.rsi/rattaco.png | Bin 329 -> 0 bytes .../Consumable/Food/taco.rsi/tacoshell.png | Bin 283 -> 0 bytes .../Food/taco.rsi/tacoshell_back.png | Bin 0 -> 171 bytes .../Food/taco.rsi/tacoshell_forward.png | Bin 0 -> 294 bytes Resources/migration.yml | 17 + 74 files changed, 1138 insertions(+), 1127 deletions(-) create mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-bluepepper.png create mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-corn.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-corn1.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-corn2.png create mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha1.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha2.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha3.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha4.png create mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat1.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat2.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat3.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat4.png create mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom1.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom2.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom3.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom4.png create mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-pepper.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-pepper1.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-pepper2.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-pepper3.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-pepper4.png create mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-rat.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-rat1.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-rat2.png create mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-snake.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-snake1.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-snake2.png create mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail-cooked.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail-cooked1.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail-cooked2.png create mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail1.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail2.png create mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tomato.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tomato1.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tomato2.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tomato3.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tomato4.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/taco.rsi/beeftaco.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/taco.rsi/beeftacosupreme.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/taco.rsi/chickentaco.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/taco.rsi/chickentacosupreme.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/taco.rsi/fishtaco.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/taco.rsi/rattaco.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/taco.rsi/tacoshell.png create mode 100644 Resources/Textures/Objects/Consumable/Food/taco.rsi/tacoshell_back.png create mode 100644 Resources/Textures/Objects/Consumable/Food/taco.rsi/tacoshell_forward.png diff --git a/Content.Client/Nutrition/EntitySystems/ClientFoodSequenceSystem.cs b/Content.Client/Nutrition/EntitySystems/ClientFoodSequenceSystem.cs index 452bb552de..e571c5a856 100644 --- a/Content.Client/Nutrition/EntitySystems/ClientFoodSequenceSystem.cs +++ b/Content.Client/Nutrition/EntitySystems/ClientFoodSequenceSystem.cs @@ -1,6 +1,7 @@ using Content.Shared.Nutrition.Components; using Content.Shared.Nutrition.EntitySystems; using Robust.Client.GameObjects; +using Robust.Shared.Utility; namespace Content.Client.Nutrition.EntitySystems; @@ -38,20 +39,24 @@ public sealed class ClientFoodSequenceSystem : SharedFoodSequenceSystem if (state.Sprite is null) continue; - counter++; - var keyCode = $"food-layer-{counter}"; start.Comp.RevealedLayers.Add(keyCode); - var index = sprite.LayerMapReserveBlank(keyCode); + sprite.LayerMapTryGet(start.Comp.TargetLayerMap, out var index); - //Set image + if (start.Comp.InverseLayers) + index++; + + sprite.AddBlankLayer(index); + sprite.LayerMapSet(keyCode, index); sprite.LayerSetSprite(index, state.Sprite); //Offset the layer var layerPos = start.Comp.StartPosition; - layerPos += start.Comp.Offset * counter; + layerPos += (start.Comp.Offset * counter) + state.LocalOffset; sprite.LayerSetOffset(index, layerPos); + + counter++; } } } diff --git a/Content.Server/Nutrition/EntitySystems/FoodSequenceSystem.cs b/Content.Server/Nutrition/EntitySystems/FoodSequenceSystem.cs index 6970f11b6e..ee0138ae94 100644 --- a/Content.Server/Nutrition/EntitySystems/FoodSequenceSystem.cs +++ b/Content.Server/Nutrition/EntitySystems/FoodSequenceSystem.cs @@ -1,10 +1,13 @@ +using System.Numerics; using System.Text; using Content.Server.Nutrition.Components; using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Interaction; +using Content.Shared.Mobs.Systems; using Content.Shared.Nutrition.Components; using Content.Shared.Nutrition.EntitySystems; using Content.Shared.Popups; +using Robust.Shared.Random; namespace Content.Server.Nutrition.EntitySystems; @@ -13,6 +16,8 @@ public sealed class FoodSequenceSystem : SharedFoodSequenceSystem [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!; [Dependency] private readonly SharedPopupSystem _popup = default!; [Dependency] private readonly MetaDataSystem _metaData = default!; + [Dependency] private readonly MobStateSystem _mobState = default!; + [Dependency] private readonly IRobustRandom _random = default!; public override void Initialize() { @@ -42,21 +47,32 @@ public sealed class FoodSequenceSystem : SharedFoodSequenceSystem if (elementData is null) return false; + if (TryComp(element, out var elementFood) && elementFood.RequireDead) + { + if (_mobState.IsAlive(element)) + return false; + } + //if we run out of space, we can still put in one last, final finishing element. - if (start.Comp.FoodLayers.Count >= start.Comp.MaxLayers && !elementData.Value.Final || start.Comp.Finished) + if (start.Comp.FoodLayers.Count >= start.Comp.MaxLayers && !elementData.Final || start.Comp.Finished) { if (user is not null) _popup.PopupEntity(Loc.GetString("food-sequence-no-space"), start, user.Value); return false; } - if (elementData.Value.Sprite is not null) - { - start.Comp.FoodLayers.Add(elementData.Value); - Dirty(start); - } + //If no specific sprites are specified, standard sprites will be used. + if (elementData.Sprite is null && element.Comp.Sprite is not null) + elementData.Sprite = element.Comp.Sprite; - if (elementData.Value.Final) + elementData.LocalOffset = new Vector2( + _random.NextFloat(start.Comp.MinLayerOffset.X,start.Comp.MaxLayerOffset.X), + _random.NextFloat(start.Comp.MinLayerOffset.Y,start.Comp.MaxLayerOffset.Y)); + + start.Comp.FoodLayers.Add(elementData); + Dirty(start); + + if (elementData.Final) start.Comp.Finished = true; UpdateFoodName(start); @@ -81,12 +97,17 @@ public sealed class FoodSequenceSystem : SharedFoodSequenceSystem foreach (var layer in start.Comp.FoodLayers) { if (layer.Name is not null && !existedContentNames.Contains(layer.Name.Value)) - { - content.Append(Loc.GetString(layer.Name.Value)); existedContentNames.Add(layer.Name.Value); - } + } - content.Append(separator); + var nameCounter = 1; + foreach (var name in existedContentNames) + { + content.Append(Loc.GetString(name)); + + if (nameCounter < existedContentNames.Count) + content.Append(separator); + nameCounter++; } var newName = Loc.GetString(start.Comp.NameGeneration.Value, diff --git a/Content.Shared/Nutrition/Components/FoodSequenceElementComponent.cs b/Content.Shared/Nutrition/Components/FoodSequenceElementComponent.cs index 1fc8aeec0a..386aa937be 100644 --- a/Content.Shared/Nutrition/Components/FoodSequenceElementComponent.cs +++ b/Content.Shared/Nutrition/Components/FoodSequenceElementComponent.cs @@ -1,3 +1,4 @@ +using System.Numerics; using Content.Shared.Nutrition.EntitySystems; using Robust.Shared.Serialization; using Robust.Shared.Utility; @@ -21,10 +22,16 @@ public sealed partial class FoodSequenceElementComponent : Component /// [DataField] public string Solution = "food"; + + /// + /// state used to generate the appearance of the added layer + /// + [DataField] + public SpriteSpecifier? Sprite; } [DataRecord, Serializable, NetSerializable] -public partial record struct FoodSequenceElementEntry() +public sealed class FoodSequenceElementEntry { /// /// A localized name piece to build into the item name generator. @@ -32,7 +39,7 @@ public partial record struct FoodSequenceElementEntry() public LocId? Name { get; set; } = null; /// - /// state used to generate the appearance of the added layer + /// overriding default sprite /// public SpriteSpecifier? Sprite { get; set; } = null; @@ -40,4 +47,9 @@ public partial record struct FoodSequenceElementEntry() /// If the layer is the final one, it can be added over the limit, but no other layers can be added after it. /// public bool Final { get; set; } = false; + + /// + /// the shear of a particular layer. Allows a little "randomization" of each layer. + /// + public Vector2 LocalOffset { get; set; } = Vector2.Zero; } diff --git a/Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs b/Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs index b8186fdaf0..613ca3cfef 100644 --- a/Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs +++ b/Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs @@ -1,7 +1,6 @@ using System.Numerics; using Content.Shared.Nutrition.EntitySystems; using Robust.Shared.GameStates; -using Robust.Shared.Serialization; namespace Content.Shared.Nutrition.Components; @@ -49,18 +48,57 @@ public sealed partial class FoodSequenceStartPointComponent : Component public HashSet RevealedLayers = new(); + /// + /// target layer, where new layers will be added. This allows you to control the order of generative layers and static layers. + /// + [DataField] + public string TargetLayerMap = "foodSequenceLayers"; + + /// + /// If true, the generative layers will be placed in reverse order. + /// + [DataField] + public bool InverseLayers; + + /// + /// each layer will get a random offset in the specified range + /// + [DataField] + public Vector2 MaxLayerOffset = Vector2.Zero; + + /// + /// each layer will get a random offset in the specified range + /// + [DataField] + public Vector2 MinLayerOffset = Vector2.Zero; + + /// + /// solution where reagents will be added from newly added ingredients + /// [DataField] public string Solution = "food"; + /// + /// LocId with a name generation pattern. + /// [DataField] public LocId? NameGeneration; + /// + /// the part of the name generation used in the pattern + /// [DataField] public LocId? NamePrefix; + /// + /// content in the form of all added ingredients will be separated by these symbols + /// [DataField] - public LocId? ContentSeparator; + public string? ContentSeparator; + /// + /// the part of the name generation used in the pattern + /// [DataField] public LocId? NameSuffix; } diff --git a/Resources/Locale/en-US/nutrition/components/food-sequence.ftl b/Resources/Locale/en-US/nutrition/components/food-sequence.ftl index 442534bdcb..0da77b7bc7 100644 --- a/Resources/Locale/en-US/nutrition/components/food-sequence.ftl +++ b/Resources/Locale/en-US/nutrition/components/food-sequence.ftl @@ -1,53 +1,99 @@ food-sequence-no-space = You can't put any more! -food-sequence-standart-gen = {$prefix}{$content}{$suffix} +# GENERAL -#Burger -food-sequence-burger-suffix = burger +food-sequence-content-chicken = chicken +food-sequence-content-duck = duck +food-sequence-content-crab = crabs +food-sequence-content-dragon = dragon +food-sequence-content-snake = snake +food-sequence-content-xeno = xeno +food-sequence-content-rouny = rouny +food-sequence-content-tomato = tomato +food-sequence-content-salami = salami +food-sequence-content-slime = slime +food-sequence-content-clown = clown +food-sequence-content-pea = pea +food-sequence-content-bungo = bungo +food-sequence-content-banana = banana +food-sequence-content-mimana = mimana +food-sequence-content-lemon = lemon +food-sequence-content-lemoon = lemoon +food-sequence-content-lime = lime +food-sequence-content-orange = orange +food-sequence-content-potato = potato +food-sequence-content-apple = apple +food-sequence-content-cocoa = cocoa +food-sequence-content-corn = corn +food-sequence-content-chili = chili +food-sequence-content-chilly = chilly +food-sequence-content-mushroom = shrooms +food-sequence-content-aloe = aloe +food-sequence-content-poppy = poppy +food-sequence-content-lily = lily +food-sequence-content-soy = soy +food-sequence-content-cheese = cheese +food-sequence-content-chevre = chèvre +food-sequence-content-tofu = tofu +food-sequence-content-brain = brain +food-sequence-content-tongue = tongue +food-sequence-content-ears = ear +food-sequence-content-stomach = stomach +food-sequence-content-liver = liver +food-sequence-content-clump = clump +food-sequence-content-raw-meat = raw meat +food-sequence-content-meat = meat +food-sequence-content-carp = carp meat +food-sequence-content-bear = bear meat +food-sequence-content-penguin = penguin meat +food-sequence-content-corgi = corgi meat +food-sequence-content-goliath = goliath meat +food-sequence-content-rat = rat +food-sequence-content-lizard = lizard meat +food-sequence-content-plant = plant meat +food-sequence-content-rotten = rotten meat +food-sequence-content-spider = spider legs +food-sequence-content-carrot = carrot +food-sequence-content-cabbage = cabbage +food-sequence-content-garlic = garlic +food-sequence-content-pineapple = pineapple +food-sequence-content-onion = onion +food-sequence-content-ambrosia = ambrosia +food-sequence-content-galaxy = galaxythistle +food-sequence-content-glasstle = glasstle +food-sequence-content-gatfruit = gatfruit +food-sequence-content-koibean = koibean +food-sequence-content-watermelon = watermelon +food-sequence-content-cannabis = cannabis +food-sequence-content-rainbow-cannabis = rainbow cannabis +food-sequence-content-tobacco = tobacco +food-sequence-content-hamster = hamster +food-sequence-content-suppermatter = suppermatter +food-sequence-content-capfruit = capfruit +food-sequence-content-berries = berries +food-sequence-content-spacemans-trumpet = spacemans trupmet + +# BURGERS + +food-sequence-burger-gen = {$content}burger food-sequence-burger-content-raw-meat = raw +food-sequence-burger-content-meat = meaty food-sequence-burger-content-carp = carpo food-sequence-burger-content-bear = bear food-sequence-burger-content-penguin = peng -food-sequence-burger-content-chiken = chiken -food-sequence-burger-content-duck = duck food-sequence-burger-content-corgi = corgi -food-sequence-burger-content-crab = crabs food-sequence-burger-content-goliath = goli -food-sequence-burger-content-dragon = dragon food-sequence-burger-content-rat = rat food-sequence-burger-content-lizard = lizzy food-sequence-burger-content-plant = plant food-sequence-burger-content-rotten = trash food-sequence-burger-content-spider = web -food-sequence-burger-content-clump = clump -food-sequence-burger-content-snake = snake -food-sequence-burger-content-xeno = xeno -food-sequence-burger-content-tomato = tomato -food-sequence-burger-content-salami = salami -food-sequence-burger-content-clown = clown -food-sequence-burger-content-slime = slime - -food-sequence-burger-content-pea = pea -food-sequence-burger-content-banana = banana -food-sequence-burger-content-mimana = mimana food-sequence-burger-content-carrot = carro food-sequence-burger-content-cabbage = cabba food-sequence-burger-content-garlic = garli -food-sequence-burger-content-lemon = lemon -food-sequence-burger-content-orange = orange food-sequence-burger-content-pineapple = pine -food-sequence-burger-content-potato = potato -food-sequence-burger-content-apple = apple -food-sequence-burger-content-cocoa = cocoa -food-sequence-burger-content-corn = corn food-sequence-burger-content-onion = oni -food-sequence-burger-content-mushroom = shroom -food-sequence-burger-content-chili = chili -food-sequence-burger-content-chilly = chilly -food-sequence-burger-content-aloe = aloe -food-sequence-burger-content-poppy = poppy -food-sequence-burger-content-lily = lily food-sequence-burger-content-ambrosia = ambro food-sequence-burger-content-galaxy = galaxy food-sequence-burger-content-glasstle = glass @@ -60,12 +106,15 @@ food-sequence-burger-content-watermelon = water food-sequence-burger-content-cannabis = funny food-sequence-burger-content-rainbow-cannabis = FUNNY food-sequence-burger-content-tobacco = tobaco +food-sequence-burger-content-suppermatter = supper +food-sequence-burger-content-hamster = hams +food-sequence-burger-content-berries = berri +food-sequence-burger-content-spacemans-trumpet = spacetrump -food-sequence-burger-content-cheese = cheese +# TACO -food-sequence-burger-content-brain = brain -food-sequence-burger-content-tongue = tongue -food-sequence-burger-content-appendix = appendi -food-sequence-burger-content-ears = ear -food-sequence-burger-content-stomach = stomach -food-sequence-burger-content-liver = liver \ No newline at end of file +food-sequence-taco-gen = taco with {$content} + +# SKEWER + +food-sequence-skewer-gen = {$content} kebab \ No newline at end of file diff --git a/Resources/Prototypes/Body/Organs/human.yml b/Resources/Prototypes/Body/Organs/human.yml index 962ec18e70..6bfee0568a 100644 --- a/Resources/Prototypes/Body/Organs/human.yml +++ b/Resources/Prototypes/Body/Organs/human.yml @@ -68,12 +68,14 @@ flavors: - people - type: FoodSequenceElement + sprite: + sprite: Mobs/Species/Human/organs.rsi + state: brain entries: burger: - name: food-sequence-burger-content-brain - sprite: - sprite: Mobs/Species/Human/organs.rsi - state: brain + name: food-sequence-content-brain + taco: + name: food-sequence-content-brain - type: entity id: OrganHumanEyes @@ -95,12 +97,14 @@ - type: Sprite state: tongue - type: FoodSequenceElement + sprite: + sprite: Mobs/Species/Human/organs.rsi + state: tongue entries: burger: - name: food-sequence-burger-content-tongue - sprite: - sprite: Mobs/Species/Human/organs.rsi - state: tongue + name: food-sequence-content-tongue + taco: + name: food-sequence-content-tongue - type: entity id: OrganHumanAppendix @@ -112,13 +116,6 @@ - state: appendix - state: appendix-inflamed visible: false - - type: FoodSequenceElement - entries: - burger: - name: food-sequence-burger-content-appendix - sprite: - sprite: Mobs/Species/Human/organs.rsi - state: appendix - type: entity id: OrganHumanEars @@ -129,12 +126,14 @@ - type: Sprite state: ears - type: FoodSequenceElement + sprite: + sprite: Mobs/Species/Human/organs.rsi + state: ears entries: burger: - name: food-sequence-burger-content-ears - sprite: - sprite: Mobs/Species/Human/organs.rsi - state: ears + name: food-sequence-content-ears + taco: + name: food-sequence-content-ears - type: entity id: OrganHumanLungs @@ -218,12 +217,14 @@ - id: Food - id: Drink - type: FoodSequenceElement + sprite: + sprite: Mobs/Species/Human/organs.rsi + state: stomach entries: burger: - name: food-sequence-burger-content-stomach - sprite: - sprite: Mobs/Species/Human/organs.rsi - state: stomach + name: food-sequence-content-stomach + taco: + name: food-sequence-content-stomach - type: entity id: OrganHumanLiver @@ -240,12 +241,14 @@ - id: Alcohol rateModifier: 0.1 # removes alcohol very slowly along with the stomach removing it as a drink - type: FoodSequenceElement + sprite: + sprite: Mobs/Species/Human/organs.rsi + state: liver entries: burger: - name: food-sequence-burger-content-liver - sprite: - sprite: Mobs/Species/Human/organs.rsi - state: liver + name: food-sequence-content-liver + taco: + name: food-sequence-content-liver - type: entity id: OrganHumanKidneys diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_meal.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_meal.yml index 75d4f9308c..4c64bdd786 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_meal.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_meal.yml @@ -69,7 +69,6 @@ - FoodSoupOnion - FoodSoupBisque - FoodSoupBungo - - FoodMealSoftTaco - FoodMealCornInButter - FoodSoupStew chance: 0.8 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_single.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_single.yml index f325c084de..4b7805c3d3 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_single.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_single.yml @@ -32,9 +32,6 @@ - FoodBurgerChicken - FoodBurgerDuck - FoodBurgerCheese - - FoodMeatHawaiianKebab - - FoodMeatKebab - - FoodMeatFiestaKebab - FoodNoodlesBoiled - FoodNoodles - FoodNoodlesCopy @@ -51,11 +48,7 @@ - FoodBakedDumplings - FoodBakedChevreChaud - FoodBakedNugget - - FoodTacoBeef - - FoodTacoChicken - - FoodTacoFish - - FoodTacoBeefSupreme - - FoodTacoChickenSupreme + - FoodTacoShell chance: 0.8 offset: 0.0 #rare @@ -72,12 +65,6 @@ - FoodBurgerSpell - FoodBurgerSuper - FoodBurgerCrazy - - FoodMeatHumanKebab - - FoodMeatLizardtailKebab - - FoodMeatRatKebab - - FoodMeatRatdoubleKebab - - FoodMeatSnakeKebab - FoodPizzaArnoldSlice - FoodPizzaUraniumSlice - - FoodTacoRat rareChance: 0.05 diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 7fa23cd2dc..0ea345bb6f 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -1675,6 +1675,21 @@ - type: FireVisuals sprite: Mobs/Effects/onfire.rsi normalState: Mouse_burning + - type: FoodSequenceElement + sprite: + sprite: Mobs/Animals/mouse.rsi + state: dead-0 + entries: + burger: + name: food-sequence-burger-content-rat + taco: + name: food-sequence-content-rat + skewer: + name: food-sequence-content-rat + sprite: + sprite: Objects/Consumable/Food/skewer.rsi + state: skewer-rat + - type: entity parent: MobMouse @@ -1731,6 +1746,10 @@ - type: Item size: Tiny heldPrefix: 1 + - type: FoodSequenceElement + sprite: + sprite: Mobs/Animals/mouse.rsi + state: dead-1 - type: entity parent: MobMouse @@ -1760,6 +1779,10 @@ - type: Item size: Tiny heldPrefix: 2 + - type: FoodSequenceElement + sprite: + sprite: Mobs/Animals/mouse.rsi + state: dead-2 - type: entity name: cancer mouse @@ -3183,6 +3206,15 @@ - type: FireVisuals sprite: Mobs/Effects/onfire.rsi normalState: Mouse_burning + - type: FoodSequenceElement + sprite: + sprite: Mobs/Animals/hamster.rsi + state: dead-0 + entries: + burger: + name: food-sequence-burger-content-hamster + taco: + name: food-sequence-content-hamster - type: entity name: pig diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml index bbf02fdb88..06c4d5e871 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml @@ -784,3 +784,12 @@ - type: Tag tags: - Slice + - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/Baked/cake.rsi + state: suppermatter-shard + entries: + burger: + name: food-sequence-burger-content-suppermatter + taco: + name: food-sequence-content-suppermatter diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml index 8009779a36..8384b9ca8c 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml @@ -33,6 +33,8 @@ name: bottom bun 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 - type: Food - type: Sprite drawdepth: Mobs @@ -40,18 +42,21 @@ sprite: Objects/Consumable/Food/burger.rsi layers: - state: bun_bottom + - map: ["foodSequenceLayers"] - type: FoodSequenceStartPoint key: burger - maxLayers: 20 + maxLayers: 10 startPosition: 0, 0 offset: 0, 0.1 - nameGeneration: food-sequence-standart-gen - nameSuffix: food-sequence-burger-suffix + minLayerOffset: -0.05, 0 + maxLayerOffset: 0.05, 0 + nameGeneration: food-sequence-burger-gen - type: Appearance - type: SolutionContainerManager solutions: food: maxVol: 5 + canReact: false # Dont want cause reactions inside burgers after merging ingredients reagents: - ReagentId: Nutriment Quantity: 3.3 # 1/2 of a bun @@ -75,12 +80,12 @@ - ReagentId: Nutriment Quantity: 3.3 # 1/2 of a bun - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/burger.rsi + state: bun_top entries: burger: final: true - sprite: - sprite: Objects/Consumable/Food/burger.rsi - state: bun_top # Base @@ -982,4 +987,4 @@ - type: Tag tags: - Meat - \ No newline at end of file + diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml index 5272334511..2579410689 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml @@ -570,13 +570,6 @@ - type: SliceableFood count: 3 slice: FoodCheeseSlice - - type: FoodSequenceElement - entries: - burger: - name: food-sequence-burger-content-cheese - sprite: - sprite: Objects/Consumable/Food/ingredients.rsi - state: cheesewheel - type: entity name: cheese wedge @@ -600,12 +593,14 @@ tags: - Slice - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/ingredients.rsi + state: cheesewedge entries: burger: - name: food-sequence-burger-content-cheese - sprite: - sprite: Objects/Consumable/Food/ingredients.rsi - state: cheesewedge + name: food-sequence-content-cheese + taco: + name: food-sequence-content-cheese - type: entity name: chèvre log @@ -656,6 +651,15 @@ - type: Tag tags: - Slice + - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/ingredients.rsi + state: chevredisk + entries: + burger: + name: food-sequence-content-chevre + taco: + name: food-sequence-content-chevre - type: entity name: tofu @@ -704,6 +708,15 @@ - type: Tag tags: - Slice + - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/ingredients.rsi + state: tofu + entries: + burger: + name: food-sequence-content-tofu + taco: + name: food-sequence-content-tofu - type: entity name: burned mess @@ -760,3 +773,12 @@ - type: Tag tags: - Ingredient + - type: FoodSequenceElement + sprite: + sprite: Objects/Specific/Hydroponics/cocoa.rsi + state: produce-beans + entries: + burger: + name: food-sequence-content-cocoa + taco: + name: food-sequence-content-cocoa diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml index b9b4b90a08..d1e885080f 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml @@ -106,16 +106,18 @@ graph: MeatSteak node: start defaultTarget: meat steak - - type: FoodSequenceElement - entries: - burger: - name: food-sequence-burger-content-raw-meat - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: plain - type: Tag tags: - Meat + - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: plain + entries: + burger: + name: food-sequence-burger-content-raw-meat + taco: + name: food-sequence-content-raw-meat - type: entity name: raw human meat @@ -158,12 +160,14 @@ - ReagentId: CarpoToxin Quantity: 5 - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: fish entries: burger: name: food-sequence-burger-content-carp - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: fish + taco: + name: food-sequence-content-carp - type: Extractable juiceSolution: reagents: @@ -200,12 +204,14 @@ node: start defaultTarget: bacon - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: bacon entries: burger: - name: food-sequence-burger-content-carp - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: bacon + name: food-sequence-burger-content-meat + taco: + name: food-sequence-content-meat - type: entity name: raw bear meat @@ -231,13 +237,14 @@ node: start defaultTarget: filet migrawr - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: bear entries: burger: name: food-sequence-burger-content-bear - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: bear - + taco: + name: food-sequence-content-bear - type: entity name: raw penguin meat @@ -263,13 +270,14 @@ node: start defaultTarget: cooked penguin - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: bird entries: burger: name: food-sequence-burger-content-penguin - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: bird - + taco: + name: food-sequence-content-penguin - type: entity name: raw chicken meat parent: FoodMeatRawBase @@ -296,12 +304,19 @@ node: start defaultTarget: cooked chicken - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: bird entries: burger: - name: food-sequence-burger-content-chiken - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: bird + name: food-sequence-content-chicken + taco: + name: food-sequence-content-chicken + skewer: + name: food-sequence-content-chicken + sprite: + sprite: Objects/Consumable/Food/skewer.rsi + state: skewer-meat - type: entity name: raw duck meat @@ -327,12 +342,14 @@ node: start defaultTarget: cooked duck - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: bird entries: burger: - name: food-sequence-burger-content-penguin - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: bird + name: food-sequence-content-duck + taco: + name: food-sequence-content-duck - type: entity name: prime-cut corgi meat @@ -359,12 +376,14 @@ - type: StealTarget stealGroup: FoodMeatCorgi - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: corgi entries: burger: name: food-sequence-burger-content-corgi - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: corgi + taco: + name: food-sequence-content-corgi - type: entity name: raw crab meat @@ -390,12 +409,14 @@ node: start defaultTarget: cooked crab - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: crab entries: burger: - name: food-sequence-burger-content-crab - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: crab + name: food-sequence-content-crab + taco: + name: food-sequence-content-crab - type: entity name: raw goliath meat @@ -420,12 +441,14 @@ node: start defaultTarget: goliath steak - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: goliath entries: burger: name: food-sequence-burger-content-goliath - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: goliath + taco: + name: food-sequence-content-goliath - type: entity name: dragon flesh @@ -454,12 +477,14 @@ - ReagentId: Ichor Quantity: 10 - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: dragon entries: burger: - name: food-sequence-burger-content-dragon - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: dragon + name: food-sequence-content-dragon + taco: + name: food-sequence-content-dragon - type: entity name: raw rat meat @@ -481,12 +506,14 @@ count: 3 slice: FoodMeatCutlet - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: plain entries: burger: name: food-sequence-burger-content-rat - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: plain + taco: + name: food-sequence-content-rat - type: entity name: raw lizard meat @@ -512,12 +539,19 @@ node: start defaultTarget: lizard steak - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: lizard entries: burger: name: food-sequence-burger-content-lizard - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: lizard + taco: + name: food-sequence-content-lizard + skewer: + name: food-sequence-content-lizard + sprite: + sprite: Objects/Consumable/Food/skewer.rsi + state: skewer-tail - type: entity name: raw plant meat @@ -528,12 +562,14 @@ - type: Sprite state: plant - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: plant entries: burger: name: food-sequence-burger-content-plant - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: plant + taco: + name: food-sequence-content-plant - type: entity name: rotten meat @@ -560,12 +596,14 @@ - ReagentId: Fat Quantity: 4 - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: rotten entries: burger: name: food-sequence-burger-content-rotten - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: rotten + taco: + name: food-sequence-content-rotten - type: entity name: raw spider meat @@ -587,12 +625,14 @@ count: 3 slice: FoodMeatSpiderCutlet - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: spider entries: burger: name: food-sequence-burger-content-spider - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: spider + taco: + name: food-sequence-content-spider - type: entity name: raw spider leg @@ -611,12 +651,14 @@ - ReagentId: Fat Quantity: 3 - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: spiderleg entries: burger: name: food-sequence-burger-content-spider - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: spiderleg + taco: + name: food-sequence-content-spider - type: entity name: meatwheat clump @@ -633,12 +675,14 @@ - ReagentId: UncookedAnimalProteins Quantity: 1 - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: clump entries: burger: - name: food-sequence-burger-content-clump - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: clump + name: food-sequence-content-clump + taco: + name: food-sequence-content-clump - type: entity name: raw snake meat @@ -660,12 +704,19 @@ - ReagentId: Toxin Quantity: 2 - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: snake entries: burger: - name: food-sequence-burger-content-snake - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: snake + name: food-sequence-content-snake + taco: + name: food-sequence-content-snake + skewer: + name: food-sequence-content-snake + sprite: + sprite: Objects/Consumable/Food/skewer.rsi + state: skewer-snake - type: entity name: raw xeno meat @@ -694,12 +745,14 @@ count: 3 slice: FoodMeatXenoCutlet - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: xeno entries: burger: - name: food-sequence-burger-content-xeno - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: xeno + name: food-sequence-content-xeno + taco: + name: food-sequence-content-xeno - type: entity name: raw rouny meat @@ -730,12 +783,14 @@ node: start defaultTarget: rouny steak - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: rouny entries: burger: - name: food-sequence-burger-content-xeno - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: xeno + name: food-sequence-content-rouny + taco: + name: food-sequence-content-rouny - type: entity name: killer tomato meat @@ -751,12 +806,19 @@ - type: StaticPrice price: 100 - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: tomato entries: burger: - name: food-sequence-burger-content-tomato - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: tomato + name: food-sequence-content-tomato + taco: + name: food-sequence-content-tomato + skewer: + name: food-sequence-content-tomato + sprite: + sprite: Objects/Consumable/Food/skewer.rsi + state: skewer-tomato - type: entity name: salami @@ -783,6 +845,15 @@ damage: types: Blunt: 2 + - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/salami.rsi + state: salami + entries: + burger: + name: food-sequence-content-salami + taco: + name: food-sequence-content-salami - type: entity name: meat clown @@ -803,12 +874,14 @@ - type: SliceableFood slice: FoodMeatSalamiSlice - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: clown entries: burger: - name: food-sequence-burger-content-clown - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: clown + name: food-sequence-content-clown + taco: + name: food-sequence-content-clown - type: entity name: meatball @@ -823,12 +896,14 @@ - type: Sprite state: meatball - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: meatball entries: burger: name: food-sequence-burger-content-raw-meat - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: meatball + taco: + name: food-sequence-content-raw-meat - type: entity name: slimeball @@ -846,12 +921,14 @@ - type: Sprite state: slime - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: slime entries: burger: - name: food-sequence-burger-content-slime - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: slime + name: food-sequence-content-slime + taco: + name: food-sequence-content-slime # Cooked @@ -916,11 +993,19 @@ graph: MeatSteak node: meat steak - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: plain-cooked entries: burger: - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: plain-cooked + name: food-sequence-burger-content-meat + taco: + name: food-sequence-content-meat + skewer: + name: food-sequence-content-meat + sprite: + sprite: Objects/Consumable/Food/skewer.rsi + state: skewer-meat - type: entity name: bacon @@ -953,11 +1038,19 @@ graph: Bacon node: bacon - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: bacon-cooked entries: burger: - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: bacon-cooked + name: food-sequence-burger-content-meat + taco: + name: food-sequence-content-meat + skewer: + name: food-sequence-content-meat + sprite: + sprite: Objects/Consumable/Food/skewer.rsi + state: skewer-meat - type: entity name: cooked bear @@ -988,12 +1081,14 @@ graph: BearSteak node: filet migrawr - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: product-cooked entries: burger: name: food-sequence-burger-content-bear - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: product-cooked + taco: + name: food-sequence-content-bear - type: entity name: penguin filet @@ -1023,12 +1118,14 @@ graph: PenguinSteak node: cooked penguin - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: bird-cooked entries: burger: name: food-sequence-burger-content-penguin - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: bird-cooked + taco: + name: food-sequence-content-penguin - type: entity name: cooked chicken @@ -1058,12 +1155,19 @@ graph: ChickenSteak node: cooked chicken - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: bird-cooked entries: burger: - name: food-sequence-burger-content-chiken - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: bird-cooked + name: food-sequence-content-chicken + taco: + name: food-sequence-content-chicken + skewer: + name: food-sequence-content-chicken + sprite: + sprite: Objects/Consumable/Food/skewer.rsi + state: skewer-meat - type: entity name: fried chicken @@ -1093,12 +1197,19 @@ - ReagentId: Protein Quantity: 5 - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: chicken-fried entries: burger: - name: food-sequence-burger-content-chiken - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: chicken-fried + name: food-sequence-content-chicken + taco: + name: food-sequence-content-chicken + skewer: + name: food-sequence-content-chicken + sprite: + sprite: Objects/Consumable/Food/skewer.rsi + state: skewer-meat - type: entity name: cooked duck @@ -1128,12 +1239,19 @@ graph: DuckSteak node: cooked duck - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: bird-cooked entries: burger: - name: food-sequence-burger-content-duck - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: bird-cooked + name: food-sequence-content-duck + taco: + name: food-sequence-content-duck + skewer: + name: food-sequence-content-duck + sprite: + sprite: Objects/Consumable/Food/skewer.rsi + state: skewer-meat - type: entity name: cooked crab @@ -1163,12 +1281,14 @@ graph: CrabSteak node: cooked crab - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: crab-cooked entries: burger: - name: food-sequence-burger-content-crab - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: crab-cooked + name: food-sequence-content-crab + taco: + name: food-sequence-content-crab - type: entity name: goliath steak @@ -1196,12 +1316,14 @@ graph: GoliathSteak node: goliath steak - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: goliath-cooked entries: burger: name: food-sequence-burger-content-goliath - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: goliath-cooked + taco: + name: food-sequence-content-goliath - type: entity name: rouny steak @@ -1233,12 +1355,14 @@ graph: RounySteak node: rouny steak - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: rouny-cooked entries: burger: - name: food-sequence-burger-content-xeno - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: rouny-cooked + name: food-sequence-content-rouny + taco: + name: food-sequence-content-rouny - type: entity name: lizard steak @@ -1269,12 +1393,19 @@ graph: LizardSteak node: lizard steak - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: lizard-cooked entries: burger: name: food-sequence-burger-content-lizard - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: lizard-cooked + taco: + name: food-sequence-content-lizard + skewer: + name: food-sequence-content-lizard + sprite: + sprite: Objects/Consumable/Food/skewer.rsi + state: skewer-tail-cooked - type: entity name: boiled spider leg @@ -1298,12 +1429,14 @@ - ReagentId: Protein Quantity: 5 - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: spiderleg-cooked entries: burger: name: food-sequence-burger-content-spider - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: spiderleg-cooked + taco: + name: food-sequence-content-spider - type: entity name: meatball @@ -1326,11 +1459,19 @@ - ReagentId: Protein Quantity: 5 - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: meatball-cooked entries: burger: - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: meatball-cooked + name: food-sequence-burger-content-meat + taco: + name: food-sequence-content-meat + skewer: + name: food-sequence-content-meat + sprite: + sprite: Objects/Consumable/Food/skewer.rsi + state: skewer-meat # Cutlets @@ -1358,11 +1499,19 @@ - ReagentId: Fat Quantity: 2 - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: cutlet entries: burger: - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: cutlet + name: food-sequence-burger-content-meat + taco: + name: food-sequence-content-meat + skewer: + name: food-sequence-content-meat + sprite: + sprite: Objects/Consumable/Food/skewer.rsi + state: skewer-meat - type: entity name: raw bear cutlet @@ -1389,13 +1538,15 @@ - ReagentId: Fat Quantity: 2 - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: cutlet + color: brown entries: burger: name: food-sequence-burger-content-bear - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: cutlet - color: brown + taco: + name: food-sequence-content-bear - type: entity name: raw penguin cutlet @@ -1420,13 +1571,15 @@ - ReagentId: Fat Quantity: 2 - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: cutlet + color: white entries: burger: name: food-sequence-burger-content-penguin - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: cutlet - color: white + taco: + name: food-sequence-content-penguin - type: entity name: raw chicken cutlet @@ -1451,13 +1604,20 @@ - ReagentId: Fat Quantity: 2 - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: cutlet + color: white entries: burger: - name: food-sequence-burger-content-chiken - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: cutlet - color: white + name: food-sequence-content-chicken + taco: + name: food-sequence-content-chicken + skewer: + name: food-sequence-content-chicken + sprite: + sprite: Objects/Consumable/Food/skewer.rsi + state: skewer-meat - type: entity name: raw duck cutlet @@ -1482,13 +1642,20 @@ - ReagentId: Fat Quantity: 2 - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: cutlet + color: white entries: burger: - name: food-sequence-burger-content-duck - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: cutlet - color: white + name: food-sequence-content-duck + taco: + name: food-sequence-content-duck + skewer: + name: food-sequence-content-duck + sprite: + sprite: Objects/Consumable/Food/skewer.rsi + state: skewer-meat - type: entity name: raw lizard cutlet @@ -1516,13 +1683,20 @@ - ReagentId: Fat Quantity: 2 - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: cutlet + color: pink entries: burger: name: food-sequence-burger-content-lizard - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: cutlet - color: pink + taco: + name: food-sequence-content-lizard + skewer: + name: food-sequence-content-lizard + sprite: + sprite: Objects/Consumable/Food/skewer.rsi + state: skewer-tail - type: entity name: raw spider cutlet @@ -1546,12 +1720,14 @@ - ReagentId: Fat Quantity: 2 - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: spidercutlet entries: burger: name: food-sequence-burger-content-spider - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: spidercutlet + taco: + name: food-sequence-content-spider - type: entity name: raw xeno cutlet @@ -1577,12 +1753,14 @@ - ReagentId: SulfuricAcid Quantity: 20 - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: xenocutlet entries: burger: - name: food-sequence-burger-content-xeno - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: xenocutlet + name: food-sequence-content-xeno + taco: + name: food-sequence-content-xeno - type: entity name: raw killer tomato cutlet @@ -1600,12 +1778,14 @@ - type: StaticPrice price: 30 - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: salami-slice entries: burger: - name: food-sequence-burger-content-tomato - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: salami-slice + name: food-sequence-content-tomato + taco: + name: food-sequence-content-tomato - type: entity name: salami slice @@ -1629,12 +1809,14 @@ - ReagentId: Protein Quantity: 1 - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: salami-slice entries: burger: - name: food-sequence-burger-content-salami - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: salami-slice + name: food-sequence-content-salami + taco: + name: food-sequence-content-salami # Cooked @@ -1660,6 +1842,9 @@ - ReagentId: Protein Quantity: 2 - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: cutlet-cooked entries: burger: sprite: @@ -1691,12 +1876,14 @@ - ReagentId: Protein Quantity: 2 - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: cutlet-cooked entries: burger: name: food-sequence-burger-content-bear - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: cutlet-cooked + taco: + name: food-sequence-content-bear - type: entity name: penguin cutlet @@ -1721,12 +1908,14 @@ - ReagentId: Protein Quantity: 2 - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: cutlet-cooked entries: burger: name: food-sequence-burger-content-penguin - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: cutlet-cooked + taco: + name: food-sequence-content-penguin - type: entity name: chicken cutlet @@ -1751,12 +1940,19 @@ - ReagentId: Protein Quantity: 2 - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: cutlet-cooked entries: burger: - name: food-sequence-burger-content-chiken - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: cutlet-cooked + name: food-sequence-content-chicken + taco: + name: food-sequence-content-chicken + skewer: + name: food-sequence-content-chicken + sprite: + sprite: Objects/Consumable/Food/skewer.rsi + state: skewer-meat - type: entity name: duck cutlet @@ -1781,12 +1977,19 @@ - ReagentId: Protein Quantity: 2 - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: cutlet-cooked entries: burger: - name: food-sequence-burger-content-duck - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: cutlet-cooked + name: food-sequence-content-duck + taco: + name: food-sequence-content-duck + skewer: + name: food-sequence-content-duck + sprite: + sprite: Objects/Consumable/Food/skewer.rsi + state: skewer-meat - type: entity name: lizard cutlet @@ -1812,12 +2015,19 @@ - ReagentId: Protein Quantity: 2 - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: cutlet-cooked entries: burger: name: food-sequence-burger-content-lizard - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: cutlet-cooked + taco: + name: food-sequence-content-lizard + skewer: + name: food-sequence-content-lizard + sprite: + sprite: Objects/Consumable/Food/skewer.rsi + state: skewer-tail-cooked - type: entity name: spider cutlet @@ -1841,12 +2051,12 @@ - ReagentId: Protein Quantity: 1 - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: cutlet-cooked entries: burger: name: food-sequence-burger-content-spider - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: cutlet-cooked - type: entity name: xeno cutlet @@ -1870,9 +2080,9 @@ - ReagentId: Protein Quantity: 1 - type: FoodSequenceElement + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: xenocutlet-cooked entries: burger: - name: food-sequence-burger-content-xeno - sprite: - sprite: Objects/Consumable/Food/meat.rsi - state: xenocutlet-cooked + name: food-sequence-content-xeno diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index fea880706d..d8234a5bfb 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -143,12 +143,14 @@ tags: - Vegetable - type: FoodSequenceElement + sprite: + sprite: Objects/Specific/Hydroponics/laughin_pea.rsi + state: produce entries: burger: - name: food-sequence-burger-content-pea - sprite: - sprite: Objects/Specific/Hydroponics/laughin_pea.rsi - state: produce + name: food-sequence-content-pea + taco: + name: food-sequence-content-pea - type: entity name: tower-cap log @@ -286,12 +288,14 @@ - Fruit - Banana - type: FoodSequenceElement + sprite: + sprite: Objects/Specific/Hydroponics/banana.rsi + state: produce entries: burger: - name: food-sequence-burger-content-banana - sprite: - sprite: Objects/Specific/Hydroponics/banana.rsi - state: produce + name: food-sequence-content-banana + taco: + name: food-sequence-content-banana - type: entity name: mimana @@ -330,12 +334,14 @@ tags: - Fruit - type: FoodSequenceElement + sprite: + sprite: Objects/Specific/Hydroponics/mimana.rsi + state: produce entries: burger: - name: food-sequence-burger-content-mimana - sprite: - sprite: Objects/Specific/Hydroponics/mimana.rsi - state: produce + name: food-sequence-content-mimana + taco: + name: food-sequence-content-mimana - type: entity name: banana peel @@ -475,12 +481,14 @@ - ReagentId: Oculine Quantity: 2 - type: FoodSequenceElement + sprite: + sprite: Objects/Specific/Hydroponics/carrot.rsi + state: produce entries: burger: name: food-sequence-burger-content-carrot - sprite: - sprite: Objects/Specific/Hydroponics/carrot.rsi - state: produce + taco: + name: food-sequence-content-carrot - type: entity name: cabbage @@ -508,12 +516,14 @@ tags: - Vegetable - type: FoodSequenceElement + sprite: + sprite: Objects/Specific/Hydroponics/cabbage.rsi + state: produce entries: burger: name: food-sequence-burger-content-cabbage - sprite: - sprite: Objects/Specific/Hydroponics/cabbage.rsi - state: produce + taco: + name: food-sequence-content-cabbage - type: entity name: garlic @@ -543,12 +553,14 @@ tags: - Vegetable - type: FoodSequenceElement + sprite: + sprite: Objects/Specific/Hydroponics/garlic.rsi + state: produce entries: burger: name: food-sequence-burger-content-garlic - sprite: - sprite: Objects/Specific/Hydroponics/garlic.rsi - state: produce + taco: + name: food-sequence-content-garlic - type: entity name: lemon @@ -582,12 +594,14 @@ - Lemon - Fruit - type: FoodSequenceElement + sprite: + sprite: Objects/Specific/Hydroponics/lemon.rsi + state: produce entries: burger: - name: food-sequence-burger-content-lemon - sprite: - sprite: Objects/Specific/Hydroponics/lemon.rsi - state: produce + name: food-sequence-content-lemon + taco: + name: food-sequence-content-lemon - type: entity name: lemoon @@ -620,12 +634,14 @@ tags: - Fruit - type: FoodSequenceElement + sprite: + sprite: Objects/Specific/Hydroponics/lemoon.rsi + state: produce entries: burger: - name: food-sequence-burger-content-lemon - sprite: - sprite: Objects/Specific/Hydroponics/lemoon.rsi - state: produce + name: food-sequence-content-lemoon + taco: + name: food-sequence-content-lemoon - type: entity name: lime @@ -650,12 +666,14 @@ - Lime - Fruit - type: FoodSequenceElement + sprite: + sprite: Objects/Specific/Hydroponics/lime.rsi + state: produce entries: burger: - name: food-sequence-burger-content-lemon - sprite: - sprite: Objects/Specific/Hydroponics/lime.rsi - state: produce + name: food-sequence-content-lime + taco: + name: food-sequence-content-lime - type: entity name: orange @@ -679,12 +697,14 @@ tags: - Fruit - type: FoodSequenceElement + sprite: + sprite: Objects/Specific/Hydroponics/orange.rsi + state: produce entries: burger: - name: food-sequence-burger-content-orange - sprite: - sprite: Objects/Specific/Hydroponics/orange.rsi - state: produce + name: food-sequence-content-orange + taco: + name: food-sequence-content-orange - type: entity name: pineapple @@ -721,13 +741,6 @@ - type: Tag tags: - Fruit - - type: FoodSequenceElement - entries: - burger: - name: food-sequence-burger-content-pineapple - sprite: - sprite: Objects/Specific/Hydroponics/pineapple.rsi - state: produce - type: entity name: potato @@ -761,12 +774,14 @@ - Potato - Vegetable - type: FoodSequenceElement + sprite: + sprite: Objects/Specific/Hydroponics/potato.rsi + state: produce entries: burger: - name: food-sequence-burger-content-potato - sprite: - sprite: Objects/Specific/Hydroponics/potato.rsi - state: produce + name: food-sequence-content-potato + taco: + name: food-sequence-content-potato - type: entity @@ -824,12 +839,19 @@ - Fruit - Vegetable - type: FoodSequenceElement + sprite: + sprite: Objects/Specific/Hydroponics/tomato.rsi + state: produce entries: burger: - name: food-sequence-burger-content-tomato - sprite: - sprite: Objects/Specific/Hydroponics/tomato.rsi - state: produce + name: food-sequence-content-tomato + taco: + name: food-sequence-content-tomato + skewer: + name: food-sequence-content-tomato + sprite: + sprite: Objects/Consumable/Food/skewer.rsi + state: skewer-tomato - type: entity name: blue tomato @@ -876,12 +898,14 @@ - Fruit - Vegetable - type: FoodSequenceElement + sprite: + sprite: Objects/Specific/Hydroponics/blue_tomato.rsi + state: produce entries: burger: - name: food-sequence-burger-content-tomato - sprite: - sprite: Objects/Specific/Hydroponics/blue_tomato.rsi - state: produce + name: food-sequence-content-tomato + taco: + name: food-sequence-content-tomato - type: entity name: blood tomato @@ -926,12 +950,19 @@ - Fruit # Fuck you they're a fruit - Vegetable - type: FoodSequenceElement + sprite: + sprite: Objects/Specific/Hydroponics/blood_tomato.rsi + state: produce entries: burger: - name: food-sequence-burger-content-tomato - sprite: - sprite: Objects/Specific/Hydroponics/blood_tomato.rsi - state: produce + name: food-sequence-content-tomato + taco: + name: food-sequence-content-tomato + skewer: + name: food-sequence-content-tomato + sprite: + sprite: Objects/Consumable/Food/skewer.rsi + state: skewer-tomato - type: entity name: eggplant @@ -991,12 +1022,14 @@ tags: - Fruit - type: FoodSequenceElement + sprite: + sprite: Objects/Specific/Hydroponics/apple.rsi + state: produce entries: burger: - name: food-sequence-burger-content-apple - sprite: - sprite: Objects/Specific/Hydroponics/apple.rsi - state: produce + name: food-sequence-content-apple + taco: + name: food-sequence-content-apple - type: entity name: golden apple @@ -1034,12 +1067,14 @@ tags: - Fruit - type: FoodSequenceElement + sprite: + sprite: Objects/Specific/Hydroponics/golden_apple.rsi + state: produce entries: burger: - name: food-sequence-burger-content-apple - sprite: - sprite: Objects/Specific/Hydroponics/golden_apple.rsi - state: produce + name: food-sequence-content-apple + taco: + name: food-sequence-content-apple - type: entity name: cocoa pod @@ -1074,12 +1109,14 @@ tags: - Fruit - type: FoodSequenceElement + sprite: + sprite: Objects/Specific/Hydroponics/cocoa.rsi + state: produce entries: burger: - name: food-sequence-burger-content-cocoa - sprite: - sprite: Objects/Specific/Hydroponics/cocoa.rsi - state: produce + name: food-sequence-content-cocoa + taco: + name: food-sequence-content-cocoa - type: entity name: ear of corn @@ -1119,12 +1156,19 @@ - ReagentId: Enzyme Quantity: 2 - type: FoodSequenceElement + sprite: + sprite: Objects/Specific/Hydroponics/corn.rsi + state: produce entries: burger: - name: food-sequence-burger-content-corn - sprite: - sprite: Objects/Specific/Hydroponics/corn.rsi - state: produce + name: food-sequence-content-corn + taco: + name: food-sequence-content-corn + skewer: + name: food-sequence-content-corn + sprite: + sprite: Objects/Consumable/Food/skewer.rsi + state: skewer-corn - type: entity name: corn cob @@ -1148,12 +1192,14 @@ - ReagentId: Cornmeal Quantity: 10 - type: FoodSequenceElement + sprite: + sprite: Objects/Specific/Hydroponics/corn.rsi + state: produce entries: burger: - name: food-sequence-burger-content-corn - sprite: - sprite: Objects/Specific/Hydroponics/corn.rsi - state: produce + name: food-sequence-content-corn + taco: + name: food-sequence-content-corn - type: entity name: onion @@ -1186,12 +1232,14 @@ tags: - Vegetable - type: FoodSequenceElement + sprite: + sprite: Objects/Specific/Hydroponics/onion.rsi + state: produce entries: burger: name: food-sequence-burger-content-onion - sprite: - sprite: Objects/Specific/Hydroponics/onion.rsi - state: produce + taco: + name: food-sequence-content-onion - type: entity name: red onion @@ -1224,12 +1272,14 @@ tags: - Vegetable - type: FoodSequenceElement + sprite: + sprite: Objects/Specific/Hydroponics/onion_red.rsi + state: produce entries: burger: name: food-sequence-burger-content-onion - sprite: - sprite: Objects/Specific/Hydroponics/onion_red.rsi - state: produce + taco: + name: food-sequence-content-onion - type: entity name: chanterelle cluster @@ -1251,12 +1301,19 @@ tags: - Vegetable - type: FoodSequenceElement + sprite: + sprite: Objects/Specific/Hydroponics/chanterelle.rsi + state: produce entries: burger: - name: food-sequence-burger-content-mushroom - sprite: - sprite: Objects/Specific/Hydroponics/chanterelle.rsi - state: produce + name: food-sequence-content-mushroom + taco: + name: food-sequence-content-mushroom + skewer: + name: food-sequence-content-mushroom + sprite: + sprite: Objects/Consumable/Food/skewer.rsi + state: skewer-mushroom # Slices @@ -1301,12 +1358,14 @@ - Fruit - Slice - type: FoodSequenceElement + sprite: + sprite: Objects/Specific/Hydroponics/pineapple.rsi + state: slice entries: burger: name: food-sequence-burger-content-pineapple - sprite: - sprite: Objects/Specific/Hydroponics/pineapple.rsi - state: slice + taco: + name: food-sequence-content-pineapple - type: entity name: onion slice @@ -1335,12 +1394,14 @@ - Vegetable - Slice - type: FoodSequenceElement + sprite: + sprite: Objects/Specific/Hydroponics/onion.rsi + state: slice entries: burger: name: food-sequence-burger-content-onion - sprite: - sprite: Objects/Specific/Hydroponics/onion.rsi - state: slice + taco: + name: food-sequence-content-onion - type: entity name: red onion slice @@ -1369,12 +1430,14 @@ - Vegetable - Slice - type: FoodSequenceElement + sprite: + sprite: Objects/Specific/Hydroponics/onion_red.rsi + state: slice entries: burger: name: food-sequence-burger-content-onion - sprite: - sprite: Objects/Specific/Hydroponics/onion_red.rsi - state: slice + taco: + name: food-sequence-content-onion - type: entity name: chili pepper @@ -1382,34 +1445,41 @@ id: FoodChiliPepper description: Spicy, best not touch your eyes. components: - - type: FlavorProfile - flavors: - - spicy - - type: SolutionContainerManager - solutions: - food: - maxVol: 18 - reagents: - - ReagentId: Nutriment - Quantity: 4 - - ReagentId: CapsaicinOil - Quantity: 10 - - ReagentId: Vitamin - Quantity: 4 - - type: Sprite + - type: FlavorProfile + flavors: + - spicy + - type: SolutionContainerManager + solutions: + food: + maxVol: 18 + reagents: + - ReagentId: Nutriment + Quantity: 4 + - ReagentId: CapsaicinOil + Quantity: 10 + - ReagentId: Vitamin + Quantity: 4 + - type: Sprite + sprite: Objects/Specific/Hydroponics/chili.rsi + - type: Produce + seedId: chili + - type: Tag + tags: + - Vegetable + - type: FoodSequenceElement + sprite: sprite: Objects/Specific/Hydroponics/chili.rsi - - type: Produce - seedId: chili - - type: Tag - tags: - - Vegetable - - type: FoodSequenceElement - entries: - burger: - name: food-sequence-burger-content-chili - sprite: - sprite: Objects/Specific/Hydroponics/chili.rsi - state: produce + state: produce + entries: + burger: + name: food-sequence-content-chili + taco: + name: food-sequence-content-chili + skewer: + name: food-sequence-content-chili + sprite: + sprite: Objects/Consumable/Food/skewer.rsi + state: skewer-pepper - type: entity name: chilly pepper @@ -1417,32 +1487,39 @@ id: FoodChillyPepper description: Icy hot. components: - - type: FlavorProfile - flavors: - - spicy - - cold - - type: SolutionContainerManager - solutions: - food: - maxVol: 18 - reagents: - - ReagentId: Nutriment - Quantity: 4 - - ReagentId: Frostoil - Quantity: 10 - - ReagentId: Vitamin - Quantity: 4 - - type: Sprite + - type: FlavorProfile + flavors: + - spicy + - cold + - type: SolutionContainerManager + solutions: + food: + maxVol: 18 + reagents: + - ReagentId: Nutriment + Quantity: 4 + - ReagentId: Frostoil + Quantity: 10 + - ReagentId: Vitamin + Quantity: 4 + - type: Sprite + sprite: Objects/Specific/Hydroponics/chilly.rsi + - type: Produce + seedId: chilly + - type: FoodSequenceElement + sprite: sprite: Objects/Specific/Hydroponics/chilly.rsi - - type: Produce - seedId: chilly - - type: FoodSequenceElement - entries: - burger: - name: food-sequence-burger-content-chilly - sprite: - sprite: Objects/Specific/Hydroponics/chilly.rsi - state: produce + state: produce + entries: + burger: + name: food-sequence-content-chilly + taco: + name: food-sequence-content-chilly + skewer: + name: food-sequence-content-chilly + sprite: + sprite: Objects/Consumable/Food/skewer.rsi + state: skewer-bluepepper - type: entity name: aloe @@ -1472,12 +1549,14 @@ tags: - Vegetable - type: FoodSequenceElement + sprite: + sprite: Objects/Specific/Hydroponics/aloe.rsi + state: produce entries: burger: - name: food-sequence-burger-content-aloe - sprite: - sprite: Objects/Specific/Hydroponics/aloe.rsi - state: produce + name: food-sequence-content-aloe + taco: + name: food-sequence-content-aloe - type: entity name: poppy @@ -1511,12 +1590,14 @@ tags: - Flower # TODO add "RedFlower" or "Poppy" tag, when other color flowers will be - type: FoodSequenceElement + sprite: + sprite: Objects/Specific/Hydroponics/poppy.rsi + state: produce entries: burger: - name: food-sequence-burger-content-poppy - sprite: - sprite: Objects/Specific/Hydroponics/poppy.rsi - state: produce + name: food-sequence-content-poppy + taco: + name: food-sequence-content-poppy - type: entity name: lily @@ -1546,12 +1627,14 @@ tags: - Flower - type: FoodSequenceElement + sprite: + sprite: Objects/Specific/Hydroponics/lily.rsi + state: produce entries: burger: - name: food-sequence-burger-content-lily - sprite: - sprite: Objects/Specific/Hydroponics/lily.rsi - state: produce + name: food-sequence-content-lily + taco: + name: food-sequence-content-lily - type: entity name: lingzhi @@ -1579,12 +1662,19 @@ - type: Extractable grindableSolutionName: food - type: FoodSequenceElement + sprite: + sprite: Objects/Specific/Hydroponics/lingzhi.rsi + state: produce entries: burger: - name: food-sequence-burger-content-mushroom - sprite: - sprite: Objects/Specific/Hydroponics/lingzhi.rsi - state: produce + name: food-sequence-content-mushroom + taco: + name: food-sequence-content-mushroom + skewer: + name: food-sequence-content-mushroom + sprite: + sprite: Objects/Consumable/Food/skewer.rsi + state: skewer-mushroom - type: entity name: ambrosia vulgaris @@ -1669,12 +1759,14 @@ tags: - Ambrosia - type: FoodSequenceElement + sprite: + sprite: Objects/Specific/Hydroponics/ambrosia_deus.rsi + state: produce entries: burger: name: food-sequence-burger-content-ambrosia - sprite: - sprite: Objects/Specific/Hydroponics/ambrosia_deus.rsi - state: produce + taco: + name: food-sequence-content-ambrosia - type: entity name: galaxythistle @@ -1703,12 +1795,14 @@ - Galaxythistle - Fruit # Probably? - type: FoodSequenceElement + sprite: + sprite: Objects/Specific/Hydroponics/galaxythistle.rsi + state: produce entries: burger: name: food-sequence-burger-content-galaxy - sprite: - sprite: Objects/Specific/Hydroponics/galaxythistle.rsi - state: produce + taco: + name: food-sequence-content-galaxy - type: entity name: glasstle @@ -1774,12 +1868,14 @@ tags: - Galaxythistle - type: FoodSequenceElement + sprite: + sprite: Objects/Specific/Hydroponics/glasstle.rsi + state: produce entries: burger: name: food-sequence-burger-content-glasstle - sprite: - sprite: Objects/Specific/Hydroponics/glasstle.rsi - state: produce + taco: + name: food-sequence-content-glasstle - type: entity name: fly amanita @@ -1807,12 +1903,19 @@ grindableSolutionName: food - type: BadFood - type: FoodSequenceElement + sprite: + sprite: Objects/Specific/Hydroponics/fly_amanita.rsi + state: produce entries: burger: - name: food-sequence-burger-content-mushroom - sprite: - sprite: Objects/Specific/Hydroponics/fly_amanita.rsi - state: produce + name: food-sequence-content-mushroom + taco: + name: food-sequence-content-mushroom + skewer: + name: food-sequence-content-mushroom + sprite: + sprite: Objects/Consumable/Food/skewer.rsi + state: skewer-mushroom - type: entity name: gatfruit @@ -1843,12 +1946,14 @@ tags: - Fruit # It's in the name - type: FoodSequenceElement + sprite: + sprite: Objects/Specific/Hydroponics/gatfruit.rsi + state: produce entries: burger: name: food-sequence-burger-content-gatfruit - sprite: - sprite: Objects/Specific/Hydroponics/gatfruit.rsi - state: produce + taco: + name: food-sequence-content-gatfruit - type: entity name: capfruit @@ -1879,12 +1984,14 @@ tags: - Fruit - type: FoodSequenceElement + sprite: + sprite: Objects/Specific/Hydroponics/capfruit.rsi + state: produce entries: burger: name: food-sequence-burger-content-capfruit - sprite: - sprite: Objects/Specific/Hydroponics/capfruit.rsi - state: produce + taco: + name: food-sequence-content-capfruit - type: entity name: capfruit @@ -1914,13 +2021,6 @@ Quantity: 10 - type: Produce seedId: rice - - type: FoodSequenceElement - entries: - burger: - name: food-sequence-burger-content-rice - sprite: - sprite: Objects/Specific/Hydroponics/rice.rsi - state: produce - type: entity name: soybeans @@ -1948,12 +2048,14 @@ tags: - Vegetable - type: FoodSequenceElement + sprite: + sprite: Objects/Specific/Hydroponics/soybeans.rsi + state: produce entries: burger: - name: food-sequence-burger-content-soy - sprite: - sprite: Objects/Specific/Hydroponics/soybeans.rsi - state: produce + name: food-sequence-content-soy + taco: + name: food-sequence-content-soy - type: entity name: spaceman's trumpet @@ -1983,12 +2085,14 @@ - type: Instrument #hehe trumpet program: 56 - type: FoodSequenceElement + sprite: + sprite: Objects/Specific/Hydroponics/spacemans_trumpet.rsi + state: produce entries: burger: - name: food-sequence-burger-content-soy - sprite: - sprite: Objects/Specific/Hydroponics/soybeans.rsi - state: produce + name: food-sequence-burger-content-spacemans-trumpet + taco: + name: food-sequence-content-spacemans-trumpet - type: entity name: koibean @@ -2018,12 +2122,14 @@ tags: - Vegetable - type: FoodSequenceElement + sprite: + sprite: Objects/Specific/Hydroponics/koibean.rsi + state: produce entries: burger: name: food-sequence-burger-content-koibean - sprite: - sprite: Objects/Specific/Hydroponics/koibean.rsi - state: produce + taco: + name: food-sequence-content-koibean - type: entity name: watermelon @@ -2121,12 +2227,14 @@ - Fruit - Slice - type: FoodSequenceElement + sprite: + sprite: Objects/Specific/Hydroponics/watermelon.rsi + state: slice entries: burger: name: food-sequence-burger-content-watermelon - sprite: - sprite: Objects/Specific/Hydroponics/watermelon.rsi - state: slice + taco: + name: food-sequence-content-watermelon - type: entity name: grapes @@ -2189,6 +2297,15 @@ - type: Tag tags: - Fruit + - type: FoodSequenceElement + sprite: + sprite: Objects/Specific/Hydroponics/berries.rsi + state: produce + entries: + burger: + name: food-sequence-burger-content-berries + taco: + name: food-sequence-content-berries - type: entity name: bungo fruit @@ -2218,6 +2335,15 @@ - type: Tag tags: - Fruit + - type: FoodSequenceElement + sprite: + sprite: Objects/Specific/Hydroponics/bungo.rsi + state: produce + entries: + burger: + name: food-sequence-content-bungo + taco: + name: food-sequence-content-bungo - type: entity name: bungo pit @@ -2272,6 +2398,15 @@ - type: Tag tags: - Vegetable + - type: FoodSequenceElement + sprite: + sprite: Objects/Specific/Hydroponics/pea.rsi + state: produce + entries: + burger: + name: food-sequence-content-pea + taco: + name: food-sequence-content-pea - type: entity name: pumpkin diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml index 64b8c288af..641f494a9d 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml @@ -1,40 +1,6 @@ # When adding new food also add to random spawner located in Resources\Prototypes\Entities\Markers\Spawners\Random\Food_Drinks\food_single.yml -# Base - -- type: entity - parent: FoodInjectableBase - id: FoodSkewerBase - abstract: true - components: - - type: Food - trash: - - FoodKebabSkewer - - type: Sprite - sprite: Objects/Consumable/Food/skewer.rsi - - type: SolutionContainerManager - solutions: - food: - maxVol: 10 - reagents: - - ReagentId: Nutriment - Quantity: 8 - - type: Item - size: Small - storedRotation: -90 - # Kebabs -# Thoughts on custom kebab system. Kebab items are separated into layers. Only -# cutlets and specific items should be put on skewers, which is why i've tagged the cutlets -# among other reasons. The system would specify between large and small skewer items, since -# there is only so much space the sprite can hold. There are four "spots" on the skewer for -# items, which means only 2 large items at a time can be on one. For examplehe thought it -# you can put two lizard tails on a skewer with two cutlets inbetween. -# This system of layers and spots also means that skewers can be progressively "eaten", meaning -# that layers are made invisible as it gets eaten. - -# NOTE: Rats take up spots 2 and 4 and tails take up 1 and 3. This is important for sprite layering. - - type: entity name: skewer parent: BaseItem @@ -43,137 +9,36 @@ components: - type: Sprite sprite: Objects/Consumable/Food/skewer.rsi - state: skewer + state: + layers: + - state: skewer + - map: ["foodSequenceLayers"] + - type: MeleeWeapon + wideAnimationRotation: -120 + damage: + types: + Piercing: 4 + angle: 0 + animation: WeaponArcThrust + soundHit: + path: /Audio/Weapons/bladeslice.ogg - type: Tag tags: - Trash - Skewer - -# Custom Kebab Example - -- type: entity - name: Hawaiian kebab - parent: FoodSkewerBase - id: FoodMeatHawaiianKebab - description: A delicious kebab made of pineapple, ham and green peppers. - components: - - type: Sprite - layers: - - state: skewer - - state: skewer-meat-alpha1 - color: yellow - - state: skewer-meat-alpha2 - color: brown - - state: skewer-meat-alpha3 - color: green - - state: skewer-meat-alpha4 - color: brown - - type: Tag - tags: - - Meat - - Fruit - -- type: entity - name: meat kebab - parent: FoodSkewerBase - id: FoodMeatKebab - description: Delicious meat, on a stick. - components: - - type: Sprite - layers: - - state: skewer - - state: skewer-meat1 - - state: skewer-meat2 - - state: skewer-meat3 - - state: skewer-meat4 - - type: Tag - tags: - - Meat - -- type: entity - name: human kebab - parent: FoodMeatKebab - id: FoodMeatHumanKebab - description: Human meat. On a stick! - -- type: entity - name: lizard-tail kebab - parent: FoodMeatKebab - id: FoodMeatLizardtailKebab - description: Severed lizard tail on a stick. - components: - - type: Sprite - layers: - - state: skewer - - state: skewer-tail1 - -- type: entity - name: rat kebab - parent: FoodMeatKebab - id: FoodMeatRatKebab - description: Not so delicious rat meat, on a stick. - components: - - type: Sprite - layers: - - state: skewer - - state: skewer-rat1 + - type: Food + trash: + - FoodKebabSkewer - type: SolutionContainerManager solutions: food: - reagents: - - ReagentId: Nutriment - Quantity: 6 - - ReagentId: Vitamin - Quantity: 2 - -- type: entity - name: double rat kebab - parent: FoodMeatKebab - id: FoodMeatRatdoubleKebab - description: A double serving of not so delicious rat meat, on a stick. - components: - - type: Sprite - layers: - - state: skewer - - state: skewer-rat1 - - state: skewer-rat2 - - type: SolutionContainerManager - solutions: - food: - reagents: - - ReagentId: Nutriment - Quantity: 12 - - ReagentId: Vitamin - Quantity: 6 - -- type: entity - name: fiesta kebab - parent: FoodSkewerBase - id: FoodMeatFiestaKebab - description: Always a cruise ship party somewhere in the world, right? - components: - - type: Sprite - layers: - - state: skewer - - state: skewer-pepper4 - - state: skewer-corn2 - - state: skewer-mushroom2 - - state: skewer-tomato1 - -- type: entity - name: snake kebab - parent: FoodSkewerBase - id: FoodMeatSnakeKebab - description: Snake meat on a stick. It's a little tough. - components: - - type: Sprite - layers: - - state: skewer - - state: skewer-snake1 - - state: skewer-snake2 - - type: SolutionContainerManager - solutions: - food: - reagents: - - ReagentId: Nutriment - Quantity: 12 + canReact: false # Dont want cause reactions inside skewers after merging ingredients + maxVol: 0 + - type: FoodSequenceStartPoint + key: skewer + maxLayers: 4 + startPosition: -0.27, -0.19 + inverseLayers: true + offset: 0.2, 0.1 + nameGeneration: food-sequence-skewer-gen + contentSeparator: ", " diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml index 9df2f3039e..6254ad5cc0 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml @@ -8,163 +8,29 @@ components: - type: Item storedRotation: -90 - - type: Food - - type: Sprite - sprite: Objects/Consumable/Food/taco.rsi - layers: - - state: tacoshell - - type: SolutionContainerManager - solutions: - food: - maxVol: 10 - reagents: - - ReagentId: Nutriment - Quantity: 6.66 # Just using the same values as the bun values, since the recipe for taco shells is roughly the same as buns. -# Base - -- type: entity - parent: FoodInjectableBase - id: FoodTacoBase - abstract: true - components: - - type: FlavorProfile - flavors: - - meaty - - cheesy - type: Food transferAmount: 3 - type: Sprite sprite: Objects/Consumable/Food/taco.rsi + layers: + - state: tacoshell_back + - map: ["foodSequenceLayers"] + - state: tacoshell_forward - type: SolutionContainerManager solutions: food: - maxVol: 15 + canReact: false # Dont want cause reactions inside tacos after merging ingredients + maxVol: 10 reagents: - ReagentId: Nutriment - Quantity: 6 - - ReagentId: Vitamin - Quantity: 4 - - type: Item - sprite: Objects/Consumable/Food/taco.rsi - storedRotation: -90 - - type: Tag - tags: - - Meat - -- type: entity - name: beef taco - parent: FoodTacoBase - id: FoodTacoBeef - description: A very basic and run of the mill beef taco, now with cheese! - components: - - type: Food - - type: Sprite - state: beeftaco - -- type: entity - name: chicken taco - parent: FoodTacoBase - id: FoodTacoChicken - description: A very basic and run of the mill chicken taco, now with cheese! - components: - - type: Food - - type: Sprite - state: chickentaco - -- type: entity - name: fish taco - parent: FoodTacoBase - id: FoodTacoFish - description: Sounds kinda gross, but it's actually not that bad. - components: - - type: FlavorProfile - flavors: - - onion - - fishy - - type: Food - - type: Sprite - state: fishtaco - - type: SolutionContainerManager - solutions: - food: - maxVol: 20 - reagents: - - ReagentId: Nutriment - Quantity: 10 - - ReagentId: Vitamin - Quantity: 6 - -- type: entity - name: rat taco - parent: FoodTacoBase - id: FoodTacoRat - description: Yeah, that looks about right... - components: - - type: Food - - type: Sprite - state: rattaco - - type: SolutionContainerManager - solutions: - food: - maxVol: 15 - reagents: - - ReagentId: Nutriment - Quantity: 6 - - ReagentId: Vitamin - Quantity: 4 - -- type: entity - name: beef taco supreme - parent: FoodTacoBase - id: FoodTacoBeefSupreme - description: It's like a regular beef taco, but surpeme! - components: - - type: Food - - type: Sprite - state: beeftacosupreme - - type: SolutionContainerManager - solutions: - food: - maxVol: 26 - reagents: - - ReagentId: Nutriment - Quantity: 14 - - ReagentId: Vitamin - Quantity: 6 - -- type: entity - name: chicken taco supreme - parent: FoodTacoBase - id: FoodTacoChickenSupreme - description: It's like a regular chicken taco, but surpeme! - components: - - type: Food - - type: Sprite - state: chickentacosupreme - - type: SolutionContainerManager - solutions: - food: - maxVol: 26 - reagents: - - ReagentId: Nutriment - Quantity: 14 - - ReagentId: Vitamin - Quantity: 6 - -- type: entity - name: soft taco - parent: FoodMealBase - id: FoodMealSoftTaco - description: Take a bite! - components: - - type: FlavorProfile - flavors: - - cheesy - - tomato - - meaty - - onion - - type: Sprite - state: softtaco - - type: Tag - tags: - - Meat + Quantity: 6.66 + - type: FoodSequenceStartPoint + key: taco + maxLayers: 3 + startPosition: -0.2, 0 + offset: 0.1, 0 + minLayerOffset: 0, 0 + maxLayerOffset: 0, 0.05 + nameGeneration: food-sequence-taco-gen + contentSeparator: ", " + - type: Appearance \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml index 6bef30e8c7..6fb0ac9566 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml @@ -18,12 +18,14 @@ - ReagentId: THC Quantity: 15 - type: FoodSequenceElement + sprite: + sprite: Objects/Specific/Hydroponics/cannabis.rsi + state: produce entries: burger: name: food-sequence-burger-content-cannabis - sprite: - sprite: Objects/Specific/Hydroponics/cannabis.rsi - state: produce + taco: + name: food-sequence-content-cannabis - type: entity @@ -44,13 +46,6 @@ - type: Sprite sprite: Objects/Specific/Hydroponics/tobacco.rsi state: dried - - type: FoodSequenceElement - entries: - burger: - name: food-sequence-burger-content-cannabis - sprite: - sprite: Objects/Specific/Hydroponics/tobacco.rsi - state: dried - type: entity name: ground cannabis @@ -79,13 +74,6 @@ - Smokable - type: Item size: Tiny - - type: FoodSequenceElement - entries: - burger: - name: food-sequence-burger-content-cannabis - sprite: - sprite: Objects/Misc/reagent_fillings.rsi - state: powderpile - type: entity name: rainbow cannabis leaves @@ -119,12 +107,14 @@ - ReagentId: Psicodine Quantity: 0.6 - type: FoodSequenceElement + sprite: + sprite: Objects/Specific/Hydroponics/rainbow_cannabis.rsi + state: produce entries: burger: name: food-sequence-burger-content-rainbow-cannabis - sprite: - sprite: Objects/Specific/Hydroponics/rainbow_cannabis.rsi - state: produce + taco: + name: food-sequence-content-rainbow-cannabis - type: entity name: dried rainbow cannabis leaves @@ -155,13 +145,6 @@ - type: Sprite sprite: Objects/Specific/Hydroponics/rainbow_cannabis.rsi state: dried - - type: FoodSequenceElement - entries: - burger: - name: food-sequence-burger-content-rainbow-cannabis - sprite: - sprite: Objects/Specific/Hydroponics/rainbow_cannabis.rsi - state: dried - type: entity name: ground rainbow cannabis @@ -195,13 +178,6 @@ - type: Construction graph: smokeableGroundCannabisRainbow node: groundRainbow - - type: FoodSequenceElement - entries: - burger: - name: food-sequence-burger-content-rainbow-cannabis - sprite: - sprite: Objects/Specific/Hydroponics/rainbow_cannabis.rsi - state: powderpile_rainbow - type: entity name: tobacco leaves @@ -259,11 +235,4 @@ tags: - Smokable - type: Item - size: Tiny - - type: FoodSequenceElement - entries: - burger: - name: food-sequence-burger-content-tobacco - sprite: - sprite: Objects/Misc/reagent_fillings.rsi - state: powderpile + size: Tiny \ No newline at end of file diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index 1aace5896e..70c4f5523b 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -1763,98 +1763,6 @@ Nitrogen: 10 Plasma: 10 -# Kebabs -- type: microwaveMealRecipe - id: RecipeMeatKebab - name: meat kebab recipe - result: FoodMeatKebab - time: 5 - solids: - FoodMeatCutlet: 3 - FoodKebabSkewer: 1 - -- type: microwaveMealRecipe - id: RecipeHawaiianKebab - name: Hawaiian kebab recipe - result: FoodMeatHawaiianKebab - time: 5 - solids: - FoodChiliPepper: 1 - FoodMeatCutlet: 1 - FoodPineappleSlice: 1 - FoodKebabSkewer: 1 - -- type: microwaveMealRecipe - id: RecipeFiestaKebab - name: fiesta kebab recipe - result: FoodMeatFiestaKebab - time: 5 - solids: - FoodChiliPepper: 1 - FoodCorn: 1 - FoodMeatCutlet: 1 - FoodTomato: 1 - FoodKebabSkewer: 1 - -- type: microwaveMealRecipe - id: RecipeRatKebab - name: rat kebab recipe - result: FoodMeatRatKebab - time: 10 - solids: - FoodMeatRat: 1 - FoodKebabSkewer: 1 - -- type: microwaveMealRecipe - id: RecipeDoubleRatKebab - name: double rat kebab recipe - result: FoodMeatRatdoubleKebab - time: 20 - solids: - FoodMeatRat: 2 - FoodKebabSkewer: 1 - -- type: microwaveMealRecipe - id: RecipeHumanKebab - name: human kebab recipe - result: FoodMeatHumanKebab - time: 15 - solids: - TorsoHuman: 1 - FoodKebabSkewer: 1 - -- type: microwaveMealRecipe - id: RecipeLizardKebab - name: lizard kebab recipe - result: FoodMeatLizardtailKebab - time: 15 - solids: - FoodMeatLizard: 1 - FoodKebabSkewer: 1 - -- type: microwaveMealRecipe - id: RecipeSnakeKebab - name: snake kebab recipe - result: FoodMeatSnakeKebab - time: 15 - reagents: - Wine: 5 - solids: - FoodMeatSnake: 1 - FoodKebabSkewer: 1 - -- type: microwaveMealRecipe - id: RecipeFoodMealSoftTaco - name: soft taco recipe - result: FoodMealSoftTaco - time: 10 - solids: - FoodDoughSlice: 1 - FoodTomato: 1 - FoodOnionSlice: 2 - FoodCheeseSlice: 1 - FoodMeatCutlet: 1 - - type: microwaveMealRecipe id: RecipeFoodBakedChevreChaud name: chevre chaud recipe @@ -1921,72 +1829,4 @@ result: FoodTacoShell time: 5 solids: - FoodDoughTortillaFlat: 1 # one third of a standard bread dough recipe - -- type: microwaveMealRecipe - id: RecipeTacoBeef - name: beef taco recipe - result: FoodTacoBeef - time: 10 - solids: - FoodTacoShell: 1 - FoodMeatCutlet: 1 - FoodCheeseSlice: 1 - -- type: microwaveMealRecipe - id: RecipeTacoChicken - name: chicken taco recipe - result: FoodTacoChicken - time: 10 - solids: - FoodTacoShell: 1 - FoodMeatChickenCutlet: 1 - FoodCheeseSlice: 1 - -- type: microwaveMealRecipe - id: RecipeTacoFish - name: fish taco recipe - result: FoodTacoFish - time: 10 - solids: - FoodTacoShell: 1 - FoodMeatFish: 1 - FoodOnionSlice: 2 - FoodTomato: 1 - FoodCabbage: 1 - -- type: microwaveMealRecipe - id: RecipeTacoRat - name: rat taco recipe - result: FoodTacoRat - time: 10 - solids: - FoodTacoShell: 1 - FoodCheeseSlice: 1 - FoodMeatRat: 1 - -- type: microwaveMealRecipe - id: RecipeTacoBeefSupreme - name: beef taco supreme recipe - result: FoodTacoBeefSupreme - time: 10 - solids: - FoodTacoShell: 1 - FoodCheeseSlice: 1 - FoodMeatCutlet: 1 - FoodTomato: 1 - FoodCabbage: 1 - FoodOnionSlice: 2 - -- type: microwaveMealRecipe - id: RecipeTacoChickenSupreme - name: beef taco supreme recipe - result: FoodTacoChickenSupreme - time: 10 - solids: - FoodTacoShell: 1 - FoodCheeseSlice: 1 - FoodMeatChickenCutlet: 1 - FoodTomato: 1 - FoodCabbage: 1 - FoodOnionSlice: 2 + FoodDoughTortillaFlat: 1 # one third of a standard bread dough recipe \ No newline at end of file diff --git a/Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml b/Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml index 797591dd78..450f5f088b 100644 --- a/Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml +++ b/Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml @@ -76,7 +76,6 @@ WARNING: This is not an automatically generated list, things here may become out - diff --git a/Resources/Textures/Mobs/Pets/hamlet.rsi/dead-0.png b/Resources/Textures/Mobs/Pets/hamlet.rsi/dead-0.png index cea6149d7eca6c30707a84c927e3e394c049c32b..b039878382953dea274e53f140b31715c1ad17ad 100644 GIT binary patch delta 367 zcmV-#0g(RpmH~+akR*Qrb5ch_0Itp)=>Px$LrFwIR9J=Wl&??2KorM6H;N-!rcfhY z#t(zQU3MJ$S?`gAXB%GiqqHr=NEm;~QKW_nWQRk%=1JHU z&dy)a9SsLFVk?nLTj;j~xjJn~*cBdMvOTMQL~Xu@?r3gKN`&3SX(f_rS)CpefJ#wO z%0~l{Qa-&S^`iiQ&5gR%C{m9mEs?{WaR6?g1@NqbbF(!7`t5*lZA&iidzlic0%}ev zh`UfJs)2;zql{+>H^HMYv_-n9#b5OYGLsW=NxASYGPT}dWqI*S?bE{&ruN$cX&9Mu zAs*4*{_ZCU+dJ^1pNMX1xjy#UzCf7^YZx~BUqf1A|IIlZ4u|6}@&=8keqNn0Y!Cnd N002ovPDHLkV1lmcq38er literal 19319 zcmeI4e~es39l&4tVSh-mKuKF9x@=W2@NVbLydN{m-opK8xdyMC?ICTW$h?_(cMEsB z%kCa`tx+kclplX6F@m%S6bwXBek7s=qb&i!7-Ec(pd!X7n1DpkAVrD6@7sNQyEk|D zdaP?=%-iH{cji0a@67vrzw@0Ro9vAvTQ6F@>Wo!}VXWRVG`J1kQ{mr=_rU+^o;`2C z+sg9L&Z=R&_q6bDnQ_N~^@g!!Utx4dZO8D(vZ6HE!)3`=Ju{PKXl)p|3uek(T%~F$ zUyT)tz3JC}a5$YR$lmm2&M+D-52*3N(4LCgzGv&G*mIR&GJQdQRcQoE`*-4}M4+A%zm8Yop%%IR@Ufm|=;u^!9uJli`jg^}fC z5Xlf^Vv@B{*2bymmCmn%Pq~T=vfBnXN8LfGH$7gfm9v@5^z?MkH0dc-#xfRTEQ4?c zV-s4K)!oG!pD~NojSVABJAm^jwqW*^Y|Uh#gSO z%Oq->l%$x|DNj`<>O+$vqbAg(D%Pr?XDz5#9xv5O)$!6IUCxRZ?HGJAJUrX? zg5#Z>T(IkEZPPV?AVRvJW_5ITS!K4VYH6w>)TV3TQ8q60^tD3Ja?Tt}p=8mqtC_+g zYN4c|Ru6@ShjQ?&*@24UwNhoYRGP>)qHLszFf}kxkE+x;mlcY#G+q5@E~Bfo{N1vq z26;{8F@g}XEE9X97S1{rgygO^{YE2AeYhkG!S1FyF_CLpY}A5q_Ogz1F0!%+HEguC z)NR1jk-Wy2WTm}rn;j{#L8&syYx%+?A5)ofaV(cX zh-T$Cfhb5)z9*qWOjzJ_%9={-DeQ9-$)N5=WpWBLh%t&0VTcgcDQkwYR5o|Q;ERCJ zE(ITxLMh~82tMU?*Nsd`68K;hoY$ONc zpuX)h66O#Z0qIf>kwkExNMTYQL^*`pf}7MK7-LHy;MC!$AxSW9sQ}z4qkK)fltUzk z9K<|kGD}53d>@Li1P~u%$7NopNmcs7mlEOsLcUg(Qq<*j*3qcD#ac1JZ3&r)*$(P% zQdOK#Y(c(;wK1BF-C7$JSH2W5WgtSDqwZ3KC}~T~X%NPBw^=KKE#C$=22K>$oO{^h z4&*~BX<%8MZgEsVJx4-9Lnu-KZ-m z5Olfe`Ecy8ZAX~Qfylr_1TtKJB|SD--6)e5_o?fdn8AL-4qV6@*!E1t9oSAvIJjHK z-bd?317yKA8Me8M!=$jK4f_|1NYf*>1yd3FT*6*-o>9gW7?!Z3mGJo75+?UtXjs z#5-5Lb()JzH+u)u3!mt)@(~Su9KWT)(r)auMER&41#vW16W8{717n*;Sn3?HTqaQkHz$zm^yUAW9@Yp}TfT$D?=Vq1y_TEi3L zyf~(0KGPgdvqB%y|FYATmIWJN-j&l9yF&aw@La>6b2DKxyUx#?x$xpR3t1P^0Iz2| zNX7H&S~1gTzaz|^6I1o}9!BuWSmFOjwOy>M?u=J$7wf7m%}a}gS|09t>I2oP+qA;l z?Z*AZVoAR?>+EB)*v7isz$A6I>dQ_+o-9o{uI? zaA`o|iwUlHKAJSar2&aACb;7HXwn3i1|+_i;ELy?NfTTekoaPPE1r)gO>k*I;)@Bc zcs`mm!KDF-FDAI+`DoGvmj)!hnBa=%qe&B78j$#6f-9bnCQWc@K;nxDu6RD0G{L0- zi7zI&;`wOO1eXRRzL?;O=c7pzTpE!0VuCB4k0woUX+YwO39fiPnl!dQ_+o-9o{uI?aA`o|iwUlHKAJSar2&aA#^PGl`gtW)gx^$} zh96JL{r=^f;fI$}Vrbj2VeI*^VO)E?Vf^DAcz@Y2rjTL0a)n`JZ#Rr}rCUG!}i=Vh~?Nf)JJFtJvfdi{nZvNDnj~!aO?yT$IT7KvRv)FUp{pmyJ zpHJ7GO%Ac_Ia6!a-S)sEH!a_~;foXZ=5LreYwt%U@BZ@RpD91_*T1~*_6si@y}bXK zTe9ETd<c52`d58jP_{z!V}+>Jju z_~d7w+q~uzZ{Iue&mZnv@qj?aclV$0{4J-hdH$KhU-{WL-)H>lcds0I?V{10$LFrd z|9by2Blja>SeO3csax+Wu6g`VCm(;;m6twr=52fby#BYvZO0uvZ}mO5-v8w1w|(iS zkBvR}ko)aBx3AA#aPik)`rd|vM_>QK-yeDQ;fD|Z;=+TkA6Osop3mL=#6AByY4G&b zUp>w+c5i%iy2y{7@r@JifAvi@sNR3d?QFyLr%$?R-F-(7*hBA}cBQfUu4VR-!^_|L dfbrso4uAibM~*xb{xsH>OPx$wMj%lR9J=Wl(9=AQ4oi}mpr58Sty)( z5Wy&jccf56O>+<|?hmjDr? z;p|SsW9fa~j(D0#^*rHZ95xr*$>t>RPE>7EvLh@2gKdiT4}}WxNFrZ)kjg4!^JxIS zkBqsav8w3!jzE8oMdl{z0N6bjT8|Svb_00-$)3X87AEiPNWQ zcl0-)x|D)a7ZM*8`}ajO@TIYt!`o}}P5p%IEh0mCSG+7-3%)y0W^v&U$}VuzP#Wjq z?X_#-@^cXsY}k9gxo;8ZQ?Wo45LSxImTs=NN-0SEr9o;?fe0*qq_i}usun1U2&zRJm9!v8D++ykKlXWi z-nhqARjak+yPJ9Q-pqb)=FOWq>9(!9=o=?2{L(^A(@yAFnOY6+vEaYu^YB_2AO8T} zj?1lFSJ1TMPYM1PX!qWCnx^&W>AtnawY?W6cy_3biL58vMu&3HTGNutMstjBl*O1Q z`_q~B*7u%yt~Hhx?X8zty+&`YTMndGj_2i?@r(NS_(txE)@2f#=h?Vmh0N1$LR29WJ)Fwgw$d{Z*c8C^ywnrchxA z6yu{T7e{SIyq=QaQ#!ff{9tKlg2&~c9Fm!00rXH^z1%>ym@N!s=jd`uJZHz?liuE` zzUz*6XsB-2h2ru}fS`i3u4bWcEGOfuWg$D9=W_Wbc$72iJ$*6lPdjIZr9d+0*yU(? z4z)m1Rx3?~vWJrJtcmWtWW{X0FPk0gD9^H0RfMtb?$WG^ef_d@Mr20{XC>pR%Cx_y zt;rNC$_{M66hcVHP9MSv3&E7Uyhgv=NKx<2inKpgRVTV(>&WdxFr8@v;j;~tFpRQ| znwF{!SUQ3g*}SaOwym)vc*4)-hgh*AJ;eHDJeTQD#-}T5T24)z`R$6%3|3&u`A~8K`gL5V^hA3mxz>8Aoo&hi1mIiW(Ne!1b zXc`&Pb1a|fwzRCWX~r!_cNwv`YjP}^*{Es6e6Z~4LJ+TPntDj+Fdv9#5SwEQHEJ3= z%=QtO=9E`VBj441(=st7$a8I{LDR$`j^VqmE^Y2tOmjfPO;=Lv3mapvLDMF~!tj~Y zT@%ZSX`f&n9)t;On9?vBWo-djYGXr}j%hY`)Q%wFKg7T^ugnln0w3;Bhhgk9f^dUC zsENQ)6lSyZsz4+JDbEqmAttVGHOiU_>`3e}-4K4sjZ$Y6R*>sbY!KHV#BG$di?NU< zvx3Q20YaNJ`CP%JG;9o$Pdd$YqbmjRJ+KPStFFc-vF6CMENXK|f=D%nVB6GTx(i8c zmq;QToFUw&p6R(Hh#|BBq)9PE5Y9XzxK5d0i6PA7Os5vX7$a@~rv^t2LBeH7`rt-U ziPyAAF+?zkL9XNKE|L`>o(DzP0*HsPWxGzJK~;F%6T-m%fp{&El+r}PU}j*#eG%-Ef*zTyYSa~odDM1v>_Spt`Zg?WY&yDR7UX;aPS@zj$*yYD zHxT5qkc+wu7KJHHNHP!+xXZ^3D*RlV2?80VvrL; z?n-qV+guosGdr$3e`Aco;gKWV1~nL75Lz4n=o16`+`ura;EYx8U{kK0d0?tNjfEYz zf&*-CZ=xqtC^9&W^`tt2hf4z~8#XD!U`R){!6Cncp}2+#t|goxieNu*{nD{?ruy`e zt75v^JD9G2?2?R7j38f!vr#1*s}t_ZHmFeKvIyUosSvt0^kyp*Eoj$gfu8eXlUy#9tNPBDb zMr7)aseDGQoK#B}D+$Jf%cc$<+*e3gfo=M19zdQiA^usqX-GqdNC^?w z^G)4`1A{=s^t~Vx{wy9K34#-d!j02^&jSJLa_@YAW%{M)h*yVGt@vMZ+Wewm15TUk zp6~y_bLB-iGZI##>+Hyx3~qN55OpC8uu`;xlhv%c={Zwwzcz@TgTtlv4u*}&h@;@O zqFO6fRo8{9){0ftY0XPB>0$?5$dm@ERM%()SJ354(lzjHiR`c~i$H#%R;wDT(xY;4 zZ7L0yq=g{<6X>a=qYCOOuA57-Mo>{KyQ=1Ujnd{-u7z(+;0v4h)HgP>_O+>9rFVB)k~m3g@FpBU}oQ@M453 zoR1=na4A5-ixIAHK8iHLr2q*pM!3THDAEX*0wlZ`;R@%YNF!Vdknm!JE1Zuajc_SI z!iy2Ea6XDO!leKSFGje+`6$u|mjWcb7~u-%qevrM3Xt$(ge#nnB8_kuxrbvmbZ62 z^!Bdh0}sZw{^qOO$If_r$>R3zThG7i>bnlS_0hF&O}_B{Ki_&`+avpadDCluY+2B? zdC~KS*Qee&|CO=Vc1~`6(Vx8K@JZW`efgma_v^20Ipvr$orQPwp1$|RA3p!!(l&j=-E#n_clL!^+&&_$sPNw^IrVN`3EnZIQuWB zKKtuV^ZoSVC(rm~({JAa;i1@v_g~hzVdC=1r{3H+_WUw&%uP2x@#&${uTMO!!7o)D zN*(_2ihB+p+Ww;tj*tK3izk_9q&jcA?wJic@si2OO?D>>DO5&I~%v*H$`h8;|6r z?UIrbHzdsD_Z~lRAmGS>0|L&QB2$(&CLixJyt1Z}k^i%my`mc%5U{hePdcll&81-H z*09X?{RwXdo)ovn-79&TtxdkHvNrpho{*5RV&Ab3^Bd0y$im#ciIKs{ME~G>%LjXa P{$lWS^>bP0l+XkKK*?tm literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-corn.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-corn.png new file mode 100644 index 0000000000000000000000000000000000000000..1d23efa6cd3451cd2af9073f57957efaa81a0c22 GIT binary patch literal 346 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^TE%pD+8#g3cn!7UJGt788DT{|^d;goX zfUS>Gc5HgB-F%>b%l~)Fj8ta27D@g1d-Bcy$=d%VQ%WQx*S-05YQf`UXA4rVhqJkz z`_J>duQnwC2t2ZCy|(OBX+Q8%TUcV}kN-w8k$)Qh?ugnnbYX=4vgQu&X%Q~loCIBkyk?{Zk literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-corn1.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-corn1.png deleted file mode 100644 index e1f8ec3cebf00b5a49b470896680ee087727a013..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 292 zcmV+<0o(qGP)ro*+`{=a91ZWxsuhY`tY?!6U qmXCr_FbYP&C>RB!VBi4*0|NkEt5boTjy7ok0000B#KfAm}z+>B+Fg$%QfpC>6ynaGU+kmYwzGB8+~ zz4}kC8Du*EWcl-33=GPaHVk(THG}zVY-|j|LB+Ip0L*epH3o*;M|Lx)T5&R5+4Yq{ z;78hjcT*XX9Y9hV`2ET3|C1~K8Dw-A!ItW{af4|_&i@SOj(r5HNosvcl9?oh!09U! z7`gcWG8|d`fk8@>9ZVxzuH?FuB+E&5z~-a(7$$5hVic5MVYqPU69XeF14WjD01GLK zVR8I{VH)GpC(-cKPp;)4KvD?2PD_KcVU|*2`6w6#qhJ&aJYZm8006x0SE(EYE$#pS N002ovPDHLkV1kmAe0u-@ diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha.png new file mode 100644 index 0000000000000000000000000000000000000000..c35173308fc6de6f8b92a42991a88bab0d0263cf GIT binary patch literal 243 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ydu{YLn2z= zPBi2?q9EW}FSh=H@1C%CN-uniI1g^gd@H87O-P{S=BW*9CuiNPR0#h0KbcK{#ZjPc z?lq~{>#leHuV4OjYuKFUoa$%RL~b zvGjn%=AKWvw|4~EbiAlLXW3;qsW`8S`Bi7j)@f6MUhGwFX}I^hgzY!Wz2Dz8{?FU2 r6T`?Lp)LRP^)9gSr!x=nX{an^LB{Ts53#??3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha1.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha1.png deleted file mode 100644 index 97e0d482fb0c70d3811900bb0cc4232efb9f9e24..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 228 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ)t)YnArY-_CpvN+QQ%>?d{qC7 z`roksN-z9>bvo_+_9|EKi&j&>iAheo?#6vvvYf|5phZ%Nqeu?B@k?=LIzt%B+7mXE)a@_6a4kmNh;-y=hC>Kd0Bv zl6wy3-kzXlA7rbv<=ToVO^+=SVy_n)o!x&R>UY}DS|jJz3{BzZK2^@!UBT)oz~cCW cpP`0f4QtBh&5|LXfX-&{boFyt=akR{0HaZ05C8xG diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha2.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha2.png deleted file mode 100644 index 8d729f22e1ab49445da56a56a69261828a55d832..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 285 zcmV+&0pk9NP)fG5z_9K%a^7;hqY5DPEi1*~HyD0ZR5JIkK zt&LjixMO&1^}rsUbB0n1>?Jto8>YbPYPb*rQc9TY^#bScV|}#1Z@Bj!U0~_{#`wHD zYwg@Q&v%!=O(}K-Q(7mxOVSUgVQWRW(%TI6B3^{swn-a?@?$GaN_uQIV#(udGq3Vx&Z~6 ztXXT1|K7E(Yw>}C%jZAj-d?wS>$i_W>u)l(T0PHGwcz2ta9udL$LjF++H_5WmX7U$ zP6y@~pH7_<=OmQuves1RG?S)k-=B~A0ba2W_kK@4_w@C-k}v6;?``9`75|Ad>|y*{ W8m@bgW0NJ&!3>_RelF{r5}E*x`dtG6 diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat.png new file mode 100644 index 0000000000000000000000000000000000000000..d8989e080af28de252ba02a378ca741c7cad4da7 GIT binary patch literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}$2?seLn2z= zPBP>=h%pD+0^8Ydg(tBy>!&*M&ykSr$xQjytuUa71q7YQ%rvBwPCie z>bd6BRe#?b^C)mMDg3c2Irk#+oW_^>V%`RVII=K*d1Fnis~%U}iO zLrwU~O)Y^>3FW(hg;&n Am;e9( diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat2.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat2.png deleted file mode 100644 index 1dbc77d261e473efd745f5069a5b8c53eb54b736..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 276 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ+nz3tArY;~60D08M0%P64K6fH zob~Phew)Al_nW_$oZ-SEDN$dCZ|Kme<{#Repuci2* zy#Dt8?YsGnVrsuPJ4Saf`*m-7mynWjB%k%DV#Dbo0bia4HyC&5uwOjQE5Yf;c$7he z>Hq)#=?sYhbIup1upj?xRLf?dmST5Qu^{8ApGEcQkIXz>uf!5&MI3Ni$(-Q$*STYE zGhfiXU-XCJD4zo7pa1{md!Acv`p^C_JoMccUuJ^?AK$6Z*qW|A_ws>8pZ5Q! zc_se;7f5QiZVEc!v8pcM!eO2MT^_ssfowmhAraHi*vQCWch~d!`F6nxKu0ooy85}S Ib4q9e0GC`=zW@LL diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat4.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat4.png deleted file mode 100644 index a9f8ad789f77eeddb0a03703185ace66aa39694d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 241 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ9iA?ZArY;~60D08M0%P64Y=G6 zYDipp@c!Sn{|Y|d=0*=EF+~0;`|jB0tX*z&;gVp_51swL-my1t6JVbsmVLW3)K--t zouff#D|fkjA&V|U7<)qvKa&sN)EaYZ?hDDJ{|GKE6{w?4K8wb-Q~5_k0zN m7m0lfTHm_^9mmQ81Pry0!e6qPtzHQ91B0ilpUXO@geCxdM_k7M diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom.png new file mode 100644 index 0000000000000000000000000000000000000000..2b007414bb0d3aa13950c0f585a23d5c7b6e338a GIT binary patch literal 247 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}8$DedLn2y} z6C_v{Cy4Yk1sZU%Nf=C8_3%I=Gtcwoq5snp5)yX&`yuTdQf;ry%*@=}+{_%wm!K5N zyy@wzO))&DwYdLp-nemMs%0df!I`YomdLulAI;lZ?yc;Z-G5K{HlxmytQN~8$HH&* zD+Eqn^qj_gBH%XQ#9t(11Jc0RzKaDZR~WyDvom9nawD>gTe~DWM4fMKoYa literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom1.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom1.png deleted file mode 100644 index e2747afae3d4ad0d496227c39822d4d2c3531ca1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 218 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJg`O^sArY;~60D08M0%PU*?P8Y z`+uO3ndkZP(Esck*W3R)CUEs0|F+8q4>IbUcgbc~h+e08`sju=n?Be}OH0Shd&XyQ zCM&fil5df4)pDaeyDEOY^G@092N=!>a(8Y1@7yZ!@)1Ko0XMs7v##~71wZ!-$cuN` zoE3h!wbqJf{fuP?eg<#4d{A-2vsb>eZrgIX9n^q2CD1{_z`%fkfk{Vi^HeX12SCR% Nc)I$ztaD0e0stAQQJ4S# diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom2.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom2.png deleted file mode 100644 index 505d9599e145811350f75a13a7953eec353a2560..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 220 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ#hxyXArY;~60D08M0%P64IVKn zZ)JLLpplv9`SQ^J>>JnH|2rmd^&Y?3?Slsy*W0OOSu)%#@{QDMOP$*K|K^Pw9IqD7 zV&>T#C7C#_`9;gUl|8fj?V4R^WCX)WYo$Fz5+A2#1kvoSRk0zY%)64j$ zf8@C96uVWbhq8Z{NW>ZXHhx~7vb@Z(jHBH+0$hz4>fGL4m?)ZJ#As4%=dar*$Vrrar7UGc((y zqkfvPEply-!D+`5r}rVp&bq&!_?AJe$n=oR#swC??L#`AyihsKxZr^ppB7tmS&8H4 zdPO_EqBpI~lVWRg=kp!bUZz>_Z_1mJ0**C1t0u1zfV*ZxLt`T&L)TZm&Bt0#oCCU- N!PC{xWt~$(69AXmS3Lj# diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom4.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom4.png deleted file mode 100644 index 78f86e3a7b0d721634e5e5224993b25f9addc6b5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 220 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ#hxyXArY;~60D08M0%P64Y=G6 zYDj!+5DaIKu_$PG_-D(j{|eu}9=|WK=+^IpS+X)RE2PqVcBo9yy*}k>QbbtfkNLg5 zy{`n@E;F`8uI({6?O5XUKIGV0_xFK!8FgAj4#;d=VDZ~Ngd=@R;8n&255)Mi*rLly z96#49+UaH8;%2v~EzX_KcUXIwX2HKHZ%PU{*6ggByh;(`j)x76jf@QbiF%taWQjim PI+wxI)z4*}Q$iB}BtumC diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-pepper.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-pepper.png new file mode 100644 index 0000000000000000000000000000000000000000..bb1a0af50dfc12c055fa684f0f0de9eff18a8107 GIT binary patch literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}M?GB}Ln2y} z6C_v{Cy4Yk1sZU%Nf=C8teHLk;D3W!G>vXPVc#%e@ykp5e0e6lk2f+f z4KdtgXkd_ISJmIxxUi$KQL!y$^9e8J<9)Kp6|*KV@E2c<+$;eyKt@K!!>oIaM#B#Y z#<=B6Cr)ROIKk7%%+7bD>aLhZsCv{an^L HB{Ts5WX)m~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-pepper1.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-pepper1.png deleted file mode 100644 index dac4665696b06a993817114e6065c652e1da60df..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 241 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ9iA?ZArY;~60D08M0zR?c=R)z zxRw6Fz9*BZEB2aOD$kmll(u>J#eX`ca zKA0#n%CRomoYwfZw4h*tzlcLk55xM)mmc&j^yZMUC}23ZZ$>Q3cANjNEO*_o=W;u! k0dZkdV1u-QfdK=&6951J diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-pepper2.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-pepper2.png deleted file mode 100644 index 670b66ff9fefb4150c3a5e9b76d456c215848049..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 249 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ1D-C9ArY;~60D08M0%P64K6fH zob@gJt?>`}Vd#b1 zlPmKZm#$^cdHqsbSYpSI|BtR7cJgJ9xwXC1@zY;#wq(U~Hhq))!=F5>VbS$lD|#BIz85)}W;pS2!{+O6Bvh8`|Lf2BIa&Mv$LvMRn8jrO zol=l`b^gGmYs}leewoV26Z5D3WDx_m@2D*&CGoG+2ZdK5)xfN zoaABFy~d>A%?-o0<(!-!48-S}a_96lH#471n<&aEAg_Gj^%j#)LJT_<3mzO`wD_G= sCV1!5pViM#80ABqdGG)u8yg!#?G%G`eB39afqr4|boFyt=akR{03otq&j0`b diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-pepper4.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-pepper4.png deleted file mode 100644 index d0d8caae3e072029623138f50287635a5c021f1d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 250 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJgPtyqArY;~60D08M0%P64Y=G6 zYDi=p=s5pxO)cC1!!y(ttk`I#m7MU@+SN4O_~B%m>a%^0MZX^XKQYaI=O_93Vy~{c%N)?#jFVo{KXd|Hy?NPx$Ye_^wR9J=WlQB!fKp2Lf1XoL!E>a5JoOH}kuHX+4LKi!@ii=a}@95+rN=HE) z?b78a91d9orBFAQ>y)i@{~SunwKYxapvyfF$Q^h0KKJDdcsw4D=bs7o-Jp~bcWjKw zJws%%Gzjuz4)zU?qG%&$UBr3_P+#jDv&jkJ9l;{OeT{+YmL^L@p#N|IAk;$ zF`LbnRRWgbKQ-;%h{(#5ad&kg?t3PzloF+sbh};oe14Ro9@r_=4bH8YCX?`BuU13RaKE0Y|)Ia>u|7CTwGMxB^g0sj6Bal(=^Ht z!!VA)7R8Z&)xhn;6B+S+pQULEaU4?~h2i@uR8{>kCyF8nf`IzCk=ZA}i%HB~9x-T| zMnPeWx~?J1GAN1y`o14e3E|?~igq^mEsMdy+7SEPFt!+B7_ztLN9xZmLQ#mLD1R@5 oCir#1mLHZxB9TZW`vU+z0VYSK!V#6U@c;k-07*qoM6N<$g5;8}>i_@% diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-rat2.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-rat2.png deleted file mode 100644 index 36f7c5bfdbfb5c2b0bd50e38d0309e42cde202b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 400 zcmV;B0dM|^P)AgG;^%N`iNZ06##~%PkOr5a5NvDF$xYmE zoLg7!vu9mf-~GWsy6HG&ej@9Ojrj`okiaUAknhyE1c+dU0$ng$HRn2M0D>uC7v$Fpee zh&l~N`}2c6`f>~`%aR_kOw$BaRl)PTH3?nU;jVmv>!&wBnd!_339xW>jlp~u+O`GP zb!lZ;2CLPIt`Ea7?qM=Z*f;~1w+~dr_kEHi3B++s*D)BrKZT}gYtKYc1VIqc^CdGd zc7P2NfAeIQKwZ}g24huK1!p6Af_{n#ahg>M?##o)ip7vtvQjPU177>`(C7?StL ud$ME(My8>B@Ep7lFY+$|iA1uU0Kg~FU$tNN=It>60000Px$IY~r8R9J=Wlp$}zKorOSw=9q#s)}k5hz40s)gee~meZ}|15{S^6HHa|0gy%G znjq$;7;-@%ma3boXhO|Rz!65aggZ72_jB(q@9zKZ{oerwgTZj`5S^qn^u>D9Mc*kg zU97aukUXj;JW(b9j>&ijz{a*@!gD#E=dW5q9#j+hPKja90sur=K_=rJs=7G{yMch| zVnt@l_A!pKf{X^X&fR(f0Kjwkw>ZiQ;<+4o5-7idwt-?sg{(Zv3IgoSS=9|j1N*r4 zuf&XsJPE{k|I^UF_$97ZnTEa?_AI=-e`<}Sk_Xbz7crwhR%dluT9crpSXL`J?X%od z?Y&kDP7Nr9Px$I7vi7R9J=Wlp&A8FcioCy%0zcQ$sBX#DW}Ea|n`|OZ6uC0FzVu1g9qX0LY!j zEkWQ;amWh-ahckwi6zYR1a#rpK&>;^pL=c7_kVr=S3sdq{C9|qOGDS@hvNtnBgJa7 zf10D$cJf!sIFMnvI0MjeN*TAz3~%orjY3}97BDeV%*Gl3z>5;HT%3^?_rKgPxXiATNeNTmYMyDy(l4;nIR6G+ABygAprP{a#6V#B?P#bGcQWar+T#} z6`xTa2M)jQf9Tp(EL}zD+I%+Fu>1OH9LZKa5V|(^8EtgCHtaV}LaQ$zsukS!S?t~S zUP=pY4Jd@ffy39^LG5>xIt8cHxc-P2KEHG1McIu2AwnDWaX5}(nOQA)C-{s$G^RqK cP$&T47p`A);D$9GT>t<807*qoM6N<$g8KlV0ssI2 diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-snake2.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-snake2.png deleted file mode 100644 index aac0763b6ee1ce9ad725868083b1c69eb7962b84..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 412 zcmV;N0b~A&P)Px$R!KxbR9J=Wlp$}zKorOSw=9q#s;FuZ2!e!DI0Q)zIZY)Wpt6cjfU4vJAd4n5 zO%OO#sU#H@q^hV25->Nhb!l0baW{h5{oJK}_kQ>8-UAd0g+lS)Au>U;$$*EEj<%6t zu@0p6$axhF7*oc96w}cKKofDoc(0RUzS>ENyod(0jRgIc1^}>JpG-#=WasOr*b@X6 z>wqjb^{=(%`efK`%H;lCz-F}aRJ~4GTIZFRO$Pj@7%71`G2l7ow+-j39oZgE@Enup z-!0cC0PvS;R8mZGi_Iwa9Fxo5KX6AI+Kh6oQ7b*XD#`8PB-N642aGA>AFWrGm`w(} z-_o!@W(Xr4Z^2qfLg?qb8rk`ZVYgW+QdOac2^2+&kIiy@;yET?ZtB9*QF@HpjPf`! zkY5V`?2j3;^Yu9bxrElJA&hkNI;n8-hhQ@*JbV-iMUi(%ypJ=dS*NT30000Px$x=BPqR9J=Wlg~>VK@@<$g%TGO0znd2VRtWf4<3T_q+mcuPC*a3=3g*>f#?1O z6?$z?J!zpi_8>&4xs+rNJ*0&a17;^Gfq(-^F4IG^i>+=q{RM^2cN*S2-hA`k3}`eO zjpl#Hm?!CA+g0J(7n1zS;=P>1BTJ>A;||Lh7*M^(aH80CmZCBBf)S?|w|uy~`89zc2p9|o)GDRB#f^HaukMOe z%S9Dezhl}h1xUKHDZ@>mTgip+w+-sURxR-ZTTKN`SX2mh47_adfgMzLzSsKS}oTYa9s zIF4=iZwth+v9_#ckMM_I?ys`3wjBEiH5!fPpXLj%PqTfg?-jNH0000@He2TKC7Kh_AKuuCA-?1E!g4xSjU*3pcfs2PXis06En_fQz zhYXqmYMVVDEL r6z(JZ@|XKlATg9+g+ihDUl7qJ?yR$YZK@b000000NkvXXu0mjf9qrE> diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail-cooked2.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail-cooked2.png deleted file mode 100644 index f40274d08bd928ef413b47c6cd5f3326a303e474..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 445 zcmV;u0Yd(XP)q!-)x#StOpW$v z?PiKf)|O@cnYKcB*czuubdu614u|7EKustVZ&?nAVEUq>`nUcazVrK63S!r8lV096 zhkQ2$)HW8Usp>Xqb$M3G8uh~6lV=g1>w$^p$IoGOglLNz*N1hHu zu!e|N3FSBr2g&Gjr8+<87D*)&v=$kIq{fu6mSe(1FvaWIvo`_Pb*a&4utZmLl`GYC zw@50P(EXYm9A{NL9`}+@%C>Ea#bVTIwM2wEB78ZI>{`#!ghC+-1Oikpm#N)ulh<$- zz)wD(C%@m%BEsg<98Uz{xO_O8)5{xv|1W~S2nZsA-3b`IoH-=+4l|y|{i8rX=4U2! n=MoO|$qfV~h7xS}-w@FU%rUclE;86o00000NkvXXu0mjf`WVKa diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail.png new file mode 100644 index 0000000000000000000000000000000000000000..555e8678b5eea60dfe629c35df133a9343a071d5 GIT binary patch literal 519 zcmV+i0{H!jP)Px$!AV3xR9J=Wlh11tQ51#02imbAo6-JAN~Q^=?PS+VjB!=6FI{yplD|t`b{Q;~ zmBxju(2!E3rPWoV1J)*+83?n5Sq+a6WkOxZHQoc?T|}q@<*z{O_nF zO*N+~`tG?t%j-+O^t^h}ie_04Rsj%+o}tuqsaOLwrz&Q_WN~eQ?m>^`^(D-L3Bcmo zLe%%^=rf+{14IT-UcOhii38k;GjM$|z;k_qVL&(z@mzmu3ZCmzuG<8|fX$r^0G>R3 zEI&=nbP#I*ZhqvsK1SA{dDx7GHJpY3d^x>RlY%<2&7BRMmRy~EooXW1K&#zS4W}VG zdM(;KY$`3R@m!y991;wJsHT(qV+NyZj@=%mN>TE5PHIk7M1)eMD5XkKM1*6vN8ZlK ztkeGRdglDt1o~c|ZR;W3cU@JuZ$)*T$VxdcM%JL!p4bA@Vty{e#o(Oq`!{yC_GZpc zw1$)G1TY$pcvP=QI1Vwg2IacVWv9<+=S%^KgcBQ>6o32i4aVJjWactaZGU%PR<|w8 zg2`p4&+~(4Dv7Wr(H7jc$J~4(a``*rf0ewQllZQbl$4ZzkRQf5wa`X>8m9mN002ov JPDHLkV1g0(^Xvcs literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail1.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail1.png deleted file mode 100644 index c8033c05bd064107cda0044a9ca98f5ffae672d1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 459 zcmV;+0W|)JP)OD2*c% z+1pbkZ##i%t4d*GjS3e9<{vk{{1zlK7xHoZ8YCrahS#7`mxn6N8|uBkQEYWrz31o{ znvWA`ciXfcjc`N@acsW(T$M_>vgmIm?AU-={QT~W+`}W}ae35QJQnAHup!cbiG$QW zvl5m#ItAu)Y*mI&Ir&ZePr+szjIu_f(flij=mQMbwa_VyDt7UsZMYUu=`F*)PT^fTc`*FDs-s6K$Wz&&lO#rjl6A@wGVNj@UOXfn zCZ54}S+J-!L5TUmvNQ9}%=7HCGo;aIG#ZUYGiU_#H{=luPE7IQjr%%)`Z_G6&e;)#0`Hi#Tx9N_Dky>!n4V zc1N{8O95lSNI=b7-d<8;Te};wYs$6*2Y(SZa*etub(AtUOT-f@l%O0J<{ay#ATSS%Wo{*a;4fQkL&p6G`# uqi(@B_ZUUfWk1D#1rFO_lr{evBKiPP5w*}aHLHUF0000 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tomato1.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tomato1.png deleted file mode 100644 index 39399183ee2d95a6ec6a11b9fb99a3fa6334802a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 189 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ7Ec$)kcie~3D(64B0Wuk4%r0{ z4luT9S2g`llsMwf=Ch@&!6WWL{lp(K2EQ-&tnJCk$@x;sz_BONf;H#ov&G*fz>TzrVG6;bP0l+XkKVcAAM diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tomato2.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tomato2.png deleted file mode 100644 index c3d3a70e02aad8564de33cfc6a9aecd206d7f1c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 190 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJR!3SZkM?MMNqW9|4e|RjhTh)5t=%kfB3hp&E|7FjF-{0CjF)FPe mWRKfH4GGr65(Wka3=CZFwF<9oUi1#=AO=rYKbLh*2~7ZrqDh|s diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tomato3.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tomato3.png deleted file mode 100644 index 1edf8de4c9fcdc7648be0061b260a89c71ea5df1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 190 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJR!9RA(gC0`IsXNq3);h*(k_oy3v`Yd|Wd{S8~A3gs4K4IUlb+J7r kMTdd5EKX2iW@BSxSP`LB_{c+~4(J{RPgg&ebxsLQ04HicrvLx| diff --git a/Resources/Textures/Objects/Consumable/Food/taco.rsi/beeftaco.png b/Resources/Textures/Objects/Consumable/Food/taco.rsi/beeftaco.png deleted file mode 100644 index 36e605235b5993578cf56840cb42f74e8972b411..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 303 zcmV+~0nq-5P)WT4{ZrikNp%F#mPdxF{)agN7yW+@2T6_~Is_yor5Spg z#o<23MKdrkFeqI5%aCNvM3f_lasYa;W22)|&O!J#CJf2*e=*EWWFyKEL?xQ7OGW={ zseWU)cAJY~$p!(2n1BxqFg`XqCh{wTx&#x$%@_X|j^4#@2T=~#vEKOqhxdON1O!RB!U=)lT008pMpG64@mz4kj002ovPDHLkV1l}8 BfIa{K diff --git a/Resources/Textures/Objects/Consumable/Food/taco.rsi/beeftacosupreme.png b/Resources/Textures/Objects/Consumable/Food/taco.rsi/beeftacosupreme.png deleted file mode 100644 index 4db06131dce7e2f745568d4a6f0d1c1ccd2ccec3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 307 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJU!E?GArY;~2@#5yEbD3Ao!D>pm0mjg6^3g;Tf$kU??zny85}Sb4q9e0G()r AO#lD@ diff --git a/Resources/Textures/Objects/Consumable/Food/taco.rsi/chickentaco.png b/Resources/Textures/Objects/Consumable/Food/taco.rsi/chickentaco.png deleted file mode 100644 index 014e20c0e96aefc2e7f7135cc4fa58815e276643..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 308 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ-<~dxArY;~2@=0O;wsjB8kb);J}X?FK$OKm3Y$QEGaiP_Uwae71HZvT`UuhS3UkOfA4>y zfIv#3!nCwqA37VoPt7=}R?8Y`nG5zIm)k)N2}=fstI7)wg!cYh0SpEPPgg&ebxsLQ E0H#5yEbD3Ao!D>pm0mjgT8M?AW-nE5SoRlqq_8 z*T3sQe~%TsH4{HPiI<7TkWpSDp(f|c<3Gg!isRw+z1u94!CvHYJE$S?iGg9qrP&{%{CtIh;lSYO>gTe~DWM4f DruKs) diff --git a/Resources/Textures/Objects/Consumable/Food/taco.rsi/fishtaco.png b/Resources/Textures/Objects/Consumable/Food/taco.rsi/fishtaco.png deleted file mode 100644 index 4a2a6055234cfd987914d15b9d79ec33f83adfec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 286 zcmV+(0pb3MP)NkdKx49UWY!G0G3HZPO z<71zZ}<>ckG kQ7{Td!6+C7qhRC!0KPrHzdt#tZ~y=R07*qoM6N<$f+7}!E&u=k diff --git a/Resources/Textures/Objects/Consumable/Food/taco.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/taco.rsi/meta.json index 3e028b55c9..6f07c71238 100644 --- a/Resources/Textures/Objects/Consumable/Food/taco.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/taco.rsi/meta.json @@ -1,32 +1,17 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Added by Phunny", + "copyright": "Original sprite by Phunny, redrawn by TheShuEd", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "tacoshell" + "name": "tacoshell_back" }, { - "name": "beeftaco" - }, - { - "name": "beeftacosupreme" - }, - { - "name": "chickentaco" - }, - { - "name": "chickentacosupreme" - }, - { - "name": "fishtaco" - }, - { - "name": "rattaco" + "name": "tacoshell_forward" } ] } diff --git a/Resources/Textures/Objects/Consumable/Food/taco.rsi/rattaco.png b/Resources/Textures/Objects/Consumable/Food/taco.rsi/rattaco.png deleted file mode 100644 index f80673f6a685cd9786f0c9bbf1d7fa7f196a0d04..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFba6OIEF;DCMQU+E=~~XX$mwr z&@fTP_rHDH|N4J_G@F+!F**GCxxeJO`Fl?;So*8i@!}iplg|tvZe6kbxxLZ$t*0^| zhcqw$S~E$e(fs0prux|_>dn($nYU$c-zhOIM!;7KF4w!W zX36#Sk`mfl25*$LuD*-N|MUOwZ+jl5CLNw5m&Eg17tRQbi}MTXlZN@6tIeK)VY$)< V(S(VT>wrPT;OXk;vd$@?2>|nika++A diff --git a/Resources/Textures/Objects/Consumable/Food/taco.rsi/tacoshell.png b/Resources/Textures/Objects/Consumable/Food/taco.rsi/tacoshell.png deleted file mode 100644 index 63a396484ce9a4922224beaf9fafacbec44afd63..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJN1iT@ArY;~2@NpBnze9yq|CYRp9+(9l+EsL6mj1m zuv#EVlDX^Yjf^11K*a{RH#c6am{QC$Y0@R0wqvhUTA2bn(_RN%{2#UIzQnq_&ypfG zIW{P&Jz!?;>F-xl3lw_VAp5%ae|^ROc1MQ^t&I}5VxIFI-g-NR=ibHjCr_n9y~5>o c@B|Y>qhjZoITL0AJFVdQ&MBb@01fMadH?_b diff --git a/Resources/Textures/Objects/Consumable/Food/taco.rsi/tacoshell_back.png b/Resources/Textures/Objects/Consumable/Food/taco.rsi/tacoshell_back.png new file mode 100644 index 0000000000000000000000000000000000000000..979a8a92d8114e28d279275fdcafa9294c85e8cf GIT binary patch literal 171 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}sh%#5ArY;~ z2@=r N@O1TaS?83{1OT<2H^Kk_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/taco.rsi/tacoshell_forward.png b/Resources/Textures/Objects/Consumable/Food/taco.rsi/tacoshell_forward.png new file mode 100644 index 0000000000000000000000000000000000000000..4d01f637fec56b1bb4ef33e003baf45bede70907 GIT binary patch literal 294 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}4?JBQLn2y} z6C_v{Cy4Yk1sZUyfI!MYZ{_BW iCEX(80bt)uWM=sJa#oXj+dGiQ89ZJ6T-G@yGywq6Kymc| literal 0 HcmV?d00001 diff --git a/Resources/migration.yml b/Resources/migration.yml index b20d7fc4f4..c533e11bf4 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -378,3 +378,20 @@ SignHydro3: SignHydro1 # 2024-07-27 LogicGate: LogicGateOr + +# 2024-08-11 +FoodTacoBeef: FoodTacoShell +FoodTacoChicken: FoodTacoShell +FoodTacoFish: FoodTacoShell +FoodTacoBeefSupreme: FoodTacoShell +FoodTacoChickenSupreme: FoodTacoShell +FoodTacoRat: FoodTacoShell + +FoodMeatHumanKebab: FoodKebabSkewer +FoodMeatLizardtailKebab: FoodKebabSkewer +FoodMeatRatKebab: FoodKebabSkewer +FoodMeatRatdoubleKebab: FoodKebabSkewer +FoodMeatSnakeKebab: FoodKebabSkewer +FoodMeatHawaiianKebab: FoodKebabSkewer +FoodMeatKebab: FoodKebabSkewer +FoodMeatFiestaKebab: FoodKebabSkewer \ No newline at end of file