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 cea6149d7e..b039878382 100644 Binary files a/Resources/Textures/Mobs/Pets/hamlet.rsi/dead-0.png and b/Resources/Textures/Mobs/Pets/hamlet.rsi/dead-0.png differ diff --git a/Resources/Textures/Mobs/Pets/hamlet.rsi/splat-0.png b/Resources/Textures/Mobs/Pets/hamlet.rsi/splat-0.png index f9ab920ac6..3f11164a42 100644 Binary files a/Resources/Textures/Mobs/Pets/hamlet.rsi/splat-0.png and b/Resources/Textures/Mobs/Pets/hamlet.rsi/splat-0.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/meta.json index 03fb0afdae..bf65bed84b 100644 --- a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/meta.json @@ -11,94 +11,37 @@ "name": "skewer" }, { - "name": "skewer-meat1" + "name": "skewer-meat" }, { - "name": "skewer-meat2" + "name": "skewer-meat-alpha" }, { - "name": "skewer-meat3" + "name": "skewer-mushroom" }, { - "name": "skewer-meat4" + "name": "skewer-pepper" }, { - "name": "skewer-meat-alpha1" + "name": "skewer-bluepepper" }, { - "name": "skewer-meat-alpha2" + "name": "skewer-tomato" }, { - "name": "skewer-meat-alpha3" + "name": "skewer-corn" }, { - "name": "skewer-meat-alpha4" + "name": "skewer-tail" }, { - "name": "skewer-mushroom1" + "name": "skewer-tail-cooked" }, { - "name": "skewer-mushroom2" + "name": "skewer-rat" }, { - "name": "skewer-mushroom3" - }, - { - "name": "skewer-mushroom4" - }, - { - "name": "skewer-pepper1" - }, - { - "name": "skewer-pepper2" - }, - { - "name": "skewer-pepper3" - }, - { - "name": "skewer-pepper4" - }, - { - "name": "skewer-tomato1" - }, - { - "name": "skewer-tomato2" - }, - { - "name": "skewer-tomato3" - }, - { - "name": "skewer-tomato4" - }, - { - "name": "skewer-corn1" - }, - { - "name": "skewer-corn2" - }, - { - "name": "skewer-tail1" - }, - { - "name": "skewer-tail2" - }, - { - "name": "skewer-tail-cooked1" - }, - { - "name": "skewer-tail-cooked2" - }, - { - "name": "skewer-rat1" - }, - { - "name": "skewer-rat2" - }, - { - "name": "skewer-snake1" - }, - { - "name": "skewer-snake2" + "name": "skewer-snake" } ] } diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-bluepepper.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-bluepepper.png new file mode 100644 index 0000000000..4a4809ef4a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-bluepepper.png differ 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 0000000000..1d23efa6cd Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-corn.png differ 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 e1f8ec3ceb..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-corn1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-corn2.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-corn2.png deleted file mode 100644 index 8dc4eec7c3..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-corn2.png and /dev/null differ 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 0000000000..c35173308f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha.png differ 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 97e0d482fb..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha1.png and /dev/null differ 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 8d729f22e1..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha3.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha3.png deleted file mode 100644 index 3f62a05be5..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha4.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha4.png deleted file mode 100644 index 4753c6a2f2..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha4.png and /dev/null differ 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 0000000000..d8989e080a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat1.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat1.png deleted file mode 100644 index 8f1ae81e9b..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat1.png and /dev/null differ 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 1dbc77d261..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat3.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat3.png deleted file mode 100644 index 39f4888018..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat3.png and /dev/null differ 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 a9f8ad789f..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat4.png and /dev/null differ 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 0000000000..2b007414bb Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom.png differ 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 e2747afae3..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom1.png and /dev/null differ 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 505d9599e1..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom3.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom3.png deleted file mode 100644 index e9cbf32606..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom3.png and /dev/null differ 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 78f86e3a7b..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom4.png and /dev/null differ 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 0000000000..bb1a0af50d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-pepper.png differ 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 dac4665696..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-pepper1.png and /dev/null differ 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 670b66ff9f..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-pepper2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-pepper3.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-pepper3.png deleted file mode 100644 index 3c8b115ee8..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-pepper3.png and /dev/null differ 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 d0d8caae3e..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-pepper4.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-rat.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-rat.png new file mode 100644 index 0000000000..10d7501bc3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-rat.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-rat1.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-rat1.png deleted file mode 100644 index 3e41b5ea86..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-rat1.png and /dev/null differ 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 36f7c5bfdb..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-rat2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-snake.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-snake.png new file mode 100644 index 0000000000..ad93db9354 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-snake.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-snake1.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-snake1.png deleted file mode 100644 index a3a7ce808b..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-snake1.png and /dev/null differ 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 aac0763b6e..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-snake2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail-cooked.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail-cooked.png new file mode 100644 index 0000000000..9b02bb0166 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail-cooked.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail-cooked1.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail-cooked1.png deleted file mode 100644 index 02e8069f3d..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail-cooked1.png and /dev/null differ 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 f40274d08b..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail-cooked2.png and /dev/null differ 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 0000000000..555e8678b5 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail.png differ 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 c8033c05bd..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail2.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail2.png deleted file mode 100644 index 0227fd5470..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tomato.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tomato.png new file mode 100644 index 0000000000..4cefaada53 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tomato.png differ 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 39399183ee..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tomato1.png and /dev/null differ 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 c3d3a70e02..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tomato2.png and /dev/null differ 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 1edf8de4c9..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tomato3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tomato4.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tomato4.png deleted file mode 100644 index cc79b96e78..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tomato4.png and /dev/null differ 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 36e605235b..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/taco.rsi/beeftaco.png and /dev/null differ 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 4db06131dc..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/taco.rsi/beeftacosupreme.png and /dev/null differ 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 014e20c0e9..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/taco.rsi/chickentaco.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/taco.rsi/chickentacosupreme.png b/Resources/Textures/Objects/Consumable/Food/taco.rsi/chickentacosupreme.png deleted file mode 100644 index ac07ed66b2..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/taco.rsi/chickentacosupreme.png and /dev/null differ 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 4a2a605523..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/taco.rsi/fishtaco.png and /dev/null differ 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 f80673f6a6..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/taco.rsi/rattaco.png and /dev/null differ 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 63a396484c..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/taco.rsi/tacoshell.png and /dev/null differ 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 0000000000..979a8a92d8 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/taco.rsi/tacoshell_back.png differ 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 0000000000..4d01f637fe Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/taco.rsi/tacoshell_forward.png differ 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