diff --git a/Content.Server/Nutrition/EntitySystems/FoodSequenceSystem.cs b/Content.Server/Nutrition/EntitySystems/FoodSequenceSystem.cs index d5b4a0e2b3..8953773053 100644 --- a/Content.Server/Nutrition/EntitySystems/FoodSequenceSystem.cs +++ b/Content.Server/Nutrition/EntitySystems/FoodSequenceSystem.cs @@ -9,6 +9,7 @@ using Content.Shared.Nutrition.Components; using Content.Shared.Nutrition.EntitySystems; using Content.Shared.Nutrition.Prototypes; using Content.Shared.Popups; +using Content.Shared.Storage.Components; using Content.Shared.Tag; using Robust.Server.GameObjects; using Robust.Shared.Prototypes; @@ -129,6 +130,13 @@ public sealed class FoodSequenceSystem : SharedFoodSequenceSystem return false; } + // Prevents plushies with items hidden in them from being added to prevent deletion of items + // If more of these types of checks need to be added, this should be changed to an event or something. + if (TryComp(element, out var stashComponent) && stashComponent.ItemContainer.Count != 0) + { + return false; + } + //Generate new visual layer var flip = start.Comp.AllowHorizontalFlip && _random.Prob(0.5f); var layer = new FoodSequenceVisualLayer(elementIndexed, diff --git a/Resources/Locale/en-US/nutrition/components/food-sequence.ftl b/Resources/Locale/en-US/nutrition/components/food-sequence.ftl index b21d2a8315..3d1d9be565 100644 --- a/Resources/Locale/en-US/nutrition/components/food-sequence.ftl +++ b/Resources/Locale/en-US/nutrition/components/food-sequence.ftl @@ -121,6 +121,44 @@ food-sequence-burger-content-anomaly-berry = anom food-sequence-burger-content-extradimensional-orange = 3d food-sequence-burger-content-world-pea = peace +# COTTON BURGERS + +food-sequence-cotton-burger-gen = {$content}burger + +food-sequence-cotton-burger-content-cotton-bol = cotton +food-sequence-cotton-burger-content-pyrotton-bol = pyro +food-sequence-cotton-burger-content-plushie-throngler = throngle +food-sequence-cotton-burger-content-plushie-ghost = spooky +food-sequence-cotton-burger-content-plushie-revenant = spookier +food-sequence-cotton-burger-content-plushie-bee = buzzzy +food-sequence-cotton-burger-content-plushie-hamptr = hampt +food-sequence-cotton-burger-content-plushie-nukie = nukie +food-sequence-cotton-burger-content-plushie-rouny = rouny +food-sequence-cotton-burger-content-plushie-lamp = lamp +food-sequence-cotton-burger-content-plushie-arachnid = spider +food-sequence-cotton-burger-content-plushie-lizard = weh +food-sequence-cotton-burger-content-plushie-experiment = experimental +food-sequence-cotton-burger-content-plushie-spacelizard = space +food-sequence-cotton-burger-content-plushie-lizard-inversed = hew +food-sequence-cotton-burger-content-plushie-diona = dion +food-sequence-cotton-burger-content-plushie-shark = shonk +food-sequence-cotton-burger-content-plushie-ratvar = ratvarian +food-sequence-cotton-burger-content-plushie-narsie = nar' +food-sequence-cotton-burger-content-plushie-carp = carp +food-sequence-cotton-burger-content-plushie-magicarp = magi +food-sequence-cotton-burger-content-plushie-holocarp = holo +food-sequence-cotton-burger-content-plushie-slime = slime +food-sequence-cotton-burger-content-plushie-snake = snek +food-sequence-cotton-burger-content-plushie-mouse = mouse +food-sequence-cotton-burger-content-plushie-vox = skree +food-sequence-cotton-burger-content-plushie-atmosian = atmos +food-sequence-cotton-burger-content-plushie-xeno = xeno +food-sequence-cotton-burger-content-plushie-penguin = peng +food-sequence-cotton-burger-content-plushie-human = uristmc +food-sequence-cotton-burger-content-plushie-moth = fluff +food-sequence-cotton-burger-content-plushie-ian = corgi +food-sequence-cotton-burger-content-among-pequeno = sus + # TACO food-sequence-taco-gen = taco with {$content} diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/cottonburger.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/cottonburger.yml new file mode 100644 index 0000000000..e12eed22c0 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/cottonburger.yml @@ -0,0 +1,109 @@ +# Cotton Bun + +- type: entity + parent: FoodBreadSliceBase + id: FoodCottonBun + name: cotton bun + description: A cotton hamburger bun. Soft, round and convenient to hold. + components: + - type: Food + requiresSpecialDigestion: true + - type: Sprite + sprite: Objects/Consumable/Food/cottonburger.rsi + layers: + - state: cottonbun + - type: SolutionContainerManager + solutions: + food: + maxVol: 10 + reagents: + - ReagentId: Nutriment + Quantity: 3.33 + - ReagentId: Fiber + Quantity: 3.33 + - type: Butcherable + butcherDelay: 1 + spawned: + - id: FoodCottonBunTop + amount: 1 + - id: FoodCottonBunBottom + amount: 1 + - type: Tag + tags: + - ClothMade + - Bread + - Slice + + +- type: entity + parent: FoodBreadSliceBase + id: FoodCottonBunBottom + name: cotton bottom bun + description: It's time for moths to experience the burger tower. + components: + - type: Item + size: Normal #patch until there is an adequate resizing system in place + - type: Food + requiresSpecialDigestion: true + - type: Sprite + drawdepth: Mobs + noRot: true + sprite: Objects/Consumable/Food/cottonburger.rsi + layers: + - state: cottonbun_bottom + - map: ["foodSequenceLayers"] + - type: FoodSequenceStartPoint + key: CottonBurger + maxLayers: 10 + startPosition: 0, 0 + offset: 0, 0.07 + minLayerOffset: -0.05, 0 + maxLayerOffset: 0.05, 0 + nameGeneration: food-sequence-cotton-burger-gen + - type: Appearance + - type: FoodMetamorphableByAdding + - type: SolutionContainerManager + solutions: + food: + maxVol: 5 + canReact: false # Dont want cause reactions inside burgers after merging ingredients + reagents: + - ReagentId: Nutriment + Quantity: 1.665 + - ReagentId: Fiber + Quantity: 1.665 + - type: Tag + tags: + - ClothMade + - Bread + - Slice + +- type: entity + parent: FoodBreadSliceBase + id: FoodCottonBunTop + name: cotton top bun + description: The perfect finish for your fibrous burger tower. + components: + - type: Food + requiresSpecialDigestion: true + - type: Sprite + sprite: Objects/Consumable/Food/cottonburger.rsi + layers: + - state: cottonbun_top + - type: SolutionContainerManager + solutions: + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 1.665 + - ReagentId: Fiber + Quantity: 1.665 + - type: FoodSequenceElement + entries: + CottonBurger: CottonBunTopBurger + - type: Tag + tags: + - ClothMade + - Bread + - Slice diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml index 129fa9fc1f..f29d919b0f 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml @@ -475,6 +475,7 @@ - type: Tag tags: - Slice + - ClothMade - type: Construction graph: DoughRopeCotton node: start @@ -512,6 +513,10 @@ Quantity: 1.5 - ReagentId: Fiber Quantity: 3.5 + - type: Tag + tags: + - ClothMade + - Ingredient - type: entity name: raw pastry base diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 0c79c233a4..25a60dfc75 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -2575,6 +2575,9 @@ tags: - ClothMade - CottonBoll + - type: FoodSequenceElement + entries: + CottonBurger: CottonBol - type: entity name: pyrotton boll @@ -2608,6 +2611,9 @@ - CottonBoll - type: Extractable grindableSolutionName: food + - type: FoodSequenceElement + entries: + CottonBurger: PyrottonBol - type: entity name: cherry diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index e69f056285..27187f6119 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -95,6 +95,10 @@ - type: Item size: Ginormous sprite: Objects/Weapons/Melee/Throngler-in-hand.rsi + - type: FoodSequenceElement + entries: + CottonBurger: ThronglerPlushie + - type: entity parent: BasePlushie @@ -134,6 +138,9 @@ accumulatorRatio: 0.5 maxSpeed: 1 minSpeed: 0.25 + - type: FoodSequenceElement + entries: + CottonBurger: GhostPlushie - type: entity parent: PlushieGhost @@ -151,6 +158,9 @@ - type: Construction graph: PlushieGhostRevenant node: plushie + - type: FoodSequenceElement + entries: + CottonBurger: RevenantPlushie - type: entity parent: BasePlushie @@ -186,6 +196,9 @@ equippedPrefix: bee slots: - HEAD + - type: FoodSequenceElement + entries: + CottonBurger: BeePlushie - type: entity parent: BasePlushie @@ -218,6 +231,9 @@ wideAnimationRotation: 180 soundHit: path: /Audio/Items/Toys/mousesqueek.ogg + - type: FoodSequenceElement + entries: + CottonBurger: HamptrPlushie - type: entity parent: PlushieBee @@ -252,6 +268,9 @@ components: - type: Sprite state: plushie_nuke + - type: FoodSequenceElement + entries: + CottonBurger: NukiePlushie - type: entity parent: BasePlushie @@ -262,6 +281,9 @@ - type: Sprite state: plushie_rouny - type: Rotatable + - type: FoodSequenceElement + entries: + CottonBurger: RounyPlushie - type: entity parent: BasePlushie @@ -275,6 +297,9 @@ radius: 1.5 energy: 2 netsync: false + - type: FoodSequenceElement + entries: + CottonBurger: LampPlushie - type: entity parent: BasePlushie @@ -307,6 +332,9 @@ wideAnimationRotation: 180 soundHit: path: /Audio/Voice/Arachnid/arachnid_laugh.ogg + - type: FoodSequenceElement + entries: + CottonBurger: ArachnidPlushie - type: entity parent: BasePlushie @@ -369,6 +397,9 @@ - ClothMade - Payload - PlushieLizard + - type: FoodSequenceElement + entries: + CottonBurger: LizardPlushie - type: entity parent: BasePlushie @@ -425,6 +456,9 @@ equippedPrefix: expi slots: - HEAD + - type: FoodSequenceElement + entries: + CottonBurger: ExperimentPlushie - type: entity parent: PlushieLizard @@ -518,6 +552,9 @@ head: - state: spacelizard-equipped-HELMET offset: "0, 0.03" + - type: FoodSequenceElement + entries: + CottonBurger: SpaceLizardPlushie - type: entity parent: PlushieLizard @@ -569,6 +606,9 @@ equippedPrefix: lizard-inversed slots: - HEAD + - type: FoodSequenceElement + entries: + CottonBurger: InversedLizardPlushie - type: entity @@ -649,6 +689,9 @@ - LowImpassable - type: CollisionWake enabled: false + - type: FoodSequenceElement + entries: + CottonBurger: DionaPlushie - type: entity parent: BasePlushie @@ -685,6 +728,9 @@ tags: - PlushieSharkBlue - Payload + - type: FoodSequenceElement + entries: + CottonBurger: BlueSharkPlushie - type: entity parent: PlushieSharkBlue @@ -701,6 +747,9 @@ tags: - PlushieSharkPink - Payload + - type: FoodSequenceElement + entries: + CottonBurger: PinkSharkPlushie - type: entity parent: PlushieSharkBlue @@ -717,6 +766,9 @@ tags: - PlushieSharkGrey - Payload + - type: FoodSequenceElement + entries: + CottonBurger: GreySharkPlushie - type: entity parent: BasePlushie @@ -728,6 +780,9 @@ size: Normal - type: Sprite state: plushie_ratvar + - type: FoodSequenceElement + entries: + CottonBurger: RatvarPlushie - type: entity parent: BasePlushie @@ -739,6 +794,9 @@ size: Normal - type: Sprite state: narplush + - type: FoodSequenceElement + entries: + CottonBurger: NarPlushie - type: entity parent: BasePlushie @@ -781,6 +839,9 @@ - Payload - ClothMade - PlushieCarp + - type: FoodSequenceElement + entries: + CottonBurger: CarpPlushie - type: entity parent: PlushieCarp @@ -790,6 +851,9 @@ components: - type: Sprite state: magicplush + - type: FoodSequenceElement + entries: + CottonBurger: MagicarpPlushie - type: entity parent: PlushieCarp @@ -821,6 +885,9 @@ components: - type: Sprite state: holoplush + - type: FoodSequenceElement + entries: + CottonBurger: HolocarpPlushie - type: entity parent: BasePlushie @@ -846,6 +913,9 @@ wideAnimationRotation: 180 soundHit: path: /Audio/Voice/Slime/slime_squish.ogg + - type: FoodSequenceElement + entries: + CottonBurger: SlimePlushie - type: entity parent: BasePlushie @@ -887,6 +957,9 @@ - NECK - type: Speech speechVerb: Reptilian # for pais (In the secret stash) + - type: FoodSequenceElement + entries: + CottonBurger: SnakePlushie - type: entity parent: BasePlushie @@ -925,6 +998,9 @@ equippedPrefix: mouse slots: - HEAD + - type: FoodSequenceElement + entries: + CottonBurger: MousePlushie - type: entity parent: BasePlushie @@ -957,6 +1033,9 @@ wideAnimationRotation: 180 soundHit: path: /Audio/Voice/Vox/shriek1.ogg + - type: FoodSequenceElement + entries: + CottonBurger: VoxPlushie - type: entity parent: BasePlushie @@ -966,6 +1045,9 @@ components: - type: Sprite state: plushie_atmosian + - type: FoodSequenceElement + entries: + CottonBurger: AtmosianPlushie - type: entity parent: BasePlushie @@ -1000,6 +1082,9 @@ wideAnimationRotation: 180 soundHit: path: /Audio/Weapons/Xeno/alien_spitacid.ogg + - type: FoodSequenceElement + entries: + CottonBurger: XenoPlushie - type: entity parent: BasePlushie @@ -1009,6 +1094,9 @@ components: - type: Sprite state: plushie_penguin + - type: FoodSequenceElement + entries: + CottonBurger: PenguinPlushie - type: entity parent: BasePlushie @@ -1040,6 +1128,9 @@ - type: EmitSoundOnTrigger sound: path: /Audio/Voice/Human/malescream_5.ogg + - type: FoodSequenceElement + entries: + CottonBurger: HumanPlushie - type: entity parent: BasePlushie @@ -1071,6 +1162,9 @@ requiresSpecialDigestion: true useSound: path: /Audio/Voice/Moth/moth_chitter.ogg + - type: FoodSequenceElement + entries: + CottonBurger: MothPlushie ## Rubber @@ -1271,6 +1365,9 @@ requiresSpecialDigestion: true useSound: path: /Audio/Items/Toys/ian.ogg + - type: FoodSequenceElement + entries: + CottonBurger: IanPlushie ## Toyweapons @@ -1691,6 +1788,10 @@ available: - enum.DamageStateVisualLayers.Base: base: Sixteen +# - type: FoodSequenceElement - does not work with randomized sprites +# entries: +# CottonBurger: AmongPequeno + - type: entity parent: BaseItem diff --git a/Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml b/Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml index 4b189a824d..cc9979b0a5 100644 --- a/Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml +++ b/Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml @@ -1218,3 +1218,337 @@ sprites: - sprite: Objects/Specific/Hydroponics/anomaly_berry.rsi state: produce + +# Cotton Top Bun + +- type: foodSequenceElement + id: CottonBunTopBurger + final: true + sprites: + - sprite: Objects/Consumable/Food/cottonburger.rsi + state: cottonbun_top + tags: + - Bun + - ClothMade + +# Cotton Bol + +- type: foodSequenceElement + id: CottonBol + name: food-sequence-cotton-burger-content-cotton-bol + sprites: + - sprite: Objects/Specific/Hydroponics/cotton.rsi + state: produce + +# Pyrotton Bol + +- type: foodSequenceElement + id: PyrottonBol + name: food-sequence-cotton-burger-content-pyrotton-bol + sprites: + - sprite: Objects/Specific/Hydroponics/pyrotton.rsi + state: produce + +# Throngler Plushie + +- type: foodSequenceElement + id: ThronglerPlushie + scale: 0.75, 0.75 + name: food-sequence-cotton-burger-content-plushie-throngler + sprites: + - sprite: Objects/Weapons/Melee/ThronglerPlushie.rsi + state: icon + +# Ghost Plushie + +- type: foodSequenceElement + id: GhostPlushie + name: food-sequence-cotton-burger-content-plushie-ghost + scale: 0.8, 0.8 + sprites: + - sprite: Mobs/Ghosts/ghost_human.rsi + state: icon + noRot: true + +# Revenant Plushie + +- type: foodSequenceElement + id: RevenantPlushie + name: food-sequence-cotton-burger-content-plushie-revenant + scale: 0.75, 0.75 + sprites: + - sprite: Mobs/Ghosts/revenant.rsi + state: icon + noRot: true + +# Bee Plushie + +- type: foodSequenceElement + id: BeePlushie + name: food-sequence-cotton-burger-content-plushie-bee + scale: 0.75, 0.75 + sprites: + - sprite: Objects/Fun/toys.rsi + state: plushie_h + +# Hamptr Plushie + +- type: foodSequenceElement + id: HamptrPlushie + name: food-sequence-cotton-burger-content-plushie-hamptr + sprites: + - sprite: Objects/Fun/toys.rsi + state: plushie_hampter + +# Nukie Plushie + +- type: foodSequenceElement + id: NukiePlushie + scale: 0.8, 0.8 + name: food-sequence-cotton-burger-content-plushie-nukie + sprites: + - sprite: Objects/Fun/toys.rsi + state: plushie_nuke + +# Rouny Plushie + +- type: foodSequenceElement + id: RounyPlushie + name: food-sequence-cotton-burger-content-plushie-rouny + sprites: + - sprite: Objects/Fun/toys.rsi + state: plushie_rouny + +# Lamp Plushie + +- type: foodSequenceElement + id: LampPlushie + name: food-sequence-cotton-burger-content-plushie-lamp + sprites: + - sprite: Objects/Fun/toys.rsi + state: plushie_lamp + +# Arachnid Plushie + +- type: foodSequenceElement + id: ArachnidPlushie + scale: 0.8, 0.8 + name: food-sequence-cotton-burger-content-plushie-arachnid + sprites: + - sprite: Objects/Fun/toys.rsi + state: plushie_arachnid + +# Lizard Plushies + +- type: foodSequenceElement + id: LizardPlushie + name: food-sequence-cotton-burger-content-plushie-lizard #Weh! + sprites: + - sprite: Objects/Fun/toys.rsi + state: plushie_lizard + +- type: foodSequenceElement + id: SpaceLizardPlushie + name: food-sequence-cotton-burger-content-plushie-spacelizard + sprites: + - sprite: Objects/Fun/toys.rsi + state: plushie_spacelizard + +- type: foodSequenceElement + id: InversedLizardPlushie + name: food-sequence-cotton-burger-content-plushie-lizard-inversed #Hew! + sprites: + - sprite: Objects/Fun/toys.rsi + state: plushie_lizard_inversed + +# Experiment Plushie + +- type: foodSequenceElement + id: ExperimentPlushie + scale: 0.8, 0.8 + name: food-sequence-cotton-burger-content-plushie-experiment + sprites: + - sprite: Objects/Fun/expiplush.rsi + state: expi + +#Diona Plushie + +- type: foodSequenceElement + id: DionaPlushie + scale: 0.8, 0.8 + name: food-sequence-cotton-burger-content-plushie-diona + sprites: + - sprite: Objects/Fun/toys.rsi + state: plushie_diona + +#Shark Plushies + +- type: foodSequenceElement + id: BlueSharkPlushie + scale: 0.8, 0.8 + name: food-sequence-cotton-burger-content-plushie-shark + sprites: + - sprite: Objects/Fun/sharkplush.rsi + state: blue + +- type: foodSequenceElement + id: PinkSharkPlushie + scale: 0.8, 0.8 + name: food-sequence-cotton-burger-content-plushie-shark + sprites: + - sprite: Objects/Fun/sharkplush.rsi + state: pink + +- type: foodSequenceElement + id: GreySharkPlushie + scale: 0.8, 0.8 + name: food-sequence-cotton-burger-content-plushie-shark + sprites: + - sprite: Objects/Fun/sharkplush.rsi + state: grey + +#Ratvar Plushie + +- type: foodSequenceElement + id: RatvarPlushie + scale: 0.8, 0.8 + name: food-sequence-cotton-burger-content-plushie-ratvar + sprites: + - sprite: Objects/Fun/toys.rsi + state: plushie_ratvar + +#Nar'sie Plushie + +- type: foodSequenceElement + id: NarPlushie + scale: 0.75, 0.75 + name: food-sequence-cotton-burger-content-plushie-narsie + sprites: + - sprite: Objects/Fun/toys.rsi + state: narplush + +#Carp Plushies + +- type: foodSequenceElement + id: CarpPlushie + name: food-sequence-cotton-burger-content-plushie-carp + sprites: + - sprite: Objects/Fun/toys.rsi + state: carpplush + +- type: foodSequenceElement + id: MagicarpPlushie + name: food-sequence-cotton-burger-content-plushie-magicarp + sprites: + - sprite: Objects/Fun/toys.rsi + state: magicplush + +- type: foodSequenceElement + id: HolocarpPlushie + name: food-sequence-cotton-burger-content-plushie-holocarp + sprites: + - sprite: Objects/Fun/toys.rsi + state: holoplush + +#Slime Plushie + +- type: foodSequenceElement + id: SlimePlushie + name: food-sequence-cotton-burger-content-plushie-slime + sprites: + - sprite: Objects/Fun/toys.rsi + state: plushie_slime + +#Snake Plushie + +- type: foodSequenceElement + id: SnakePlushie + name: food-sequence-cotton-burger-content-plushie-snake + sprites: + - sprite: Objects/Fun/toys.rsi + state: plushie_snake + +#Mouse Plushie + +- type: foodSequenceElement + id: MousePlushie + name: food-sequence-cotton-burger-content-plushie-mouse + sprites: + - sprite: Objects/Fun/toys.rsi + state: toy_mouse + +#Vox Plushie + +- type: foodSequenceElement + id: VoxPlushie + name: food-sequence-cotton-burger-content-plushie-vox + sprites: + - sprite: Objects/Fun/toys.rsi + state: plushie_vox + +#Atmosian Plushie + +- type: foodSequenceElement + id: AtmosianPlushie + scale: 0.8, 0.8 + name: food-sequence-cotton-burger-content-plushie-atmosian + sprites: + - sprite: Objects/Fun/toys.rsi + state: plushie_atmosian + +#Xeno Plushie + +- type: foodSequenceElement + id: XenoPlushie + scale: 0.8, 0.8 + name: food-sequence-cotton-burger-content-plushie-xeno + sprites: + - sprite: Objects/Fun/toys.rsi + state: plushie_xeno + +#Penguin Plushie + +- type: foodSequenceElement + id: PenguinPlushie + scale: 0.8, 0.8 + name: food-sequence-cotton-burger-content-plushie-penguin + sprites: + - sprite: Objects/Fun/toys.rsi + state: plushie_penguin + +#Human Plushie + +- type: foodSequenceElement + id: HumanPlushie + scale: 0.8, 0.8 + name: food-sequence-cotton-burger-content-plushie-human + sprites: + - sprite: Objects/Fun/toys.rsi + state: plushie_human + +#Moth Plushie + +- type: foodSequenceElement + id: MothPlushie + scale: 0.8, 0.8 + name: food-sequence-cotton-burger-content-plushie-moth + sprites: + - sprite: Objects/Fun/toys.rsi + state: plushie_moth + +#Ian Plushie + +- type: foodSequenceElement + id: IanPlushie + name: food-sequence-cotton-burger-content-plushie-ian + sprites: + - sprite: Objects/Fun/toys.rsi + state: ian + +#Among pequeño - does not work with randomized sprites + +#- type: foodSequenceElement +# id: AmongPequeno +# name: food-sequence-cotton-burger-content-among-pequeno +# sprites: +# - sprite: Objects/Fun/pequeno.rsi diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index 589d98e34b..9ac9ee1ed8 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -7,6 +7,15 @@ solids: FoodDoughSlice: 1 # one third of a standard bread dough recipe +- type: microwaveMealRecipe + id: RecipeCottonBun + name: cotton bun recipe + result: FoodCottonBun + time: 5 + group: Breads + solids: + FoodDoughCottonSlice: 1 + #Bagels - type: microwaveMealRecipe id: RecipeBagel diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 6eb882b984..65e02c3ea5 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -353,6 +353,9 @@ - type: Tag id: CottonBoll +- type: Tag + id: CottonBurger + - type: Tag id: Cow diff --git a/Resources/Textures/Objects/Consumable/Food/cottonburger.rsi/cottonbun.png b/Resources/Textures/Objects/Consumable/Food/cottonburger.rsi/cottonbun.png new file mode 100644 index 0000000000..6718fd0685 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/cottonburger.rsi/cottonbun.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/cottonburger.rsi/cottonbun_bottom.png b/Resources/Textures/Objects/Consumable/Food/cottonburger.rsi/cottonbun_bottom.png new file mode 100644 index 0000000000..a84aeb47b7 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/cottonburger.rsi/cottonbun_bottom.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/cottonburger.rsi/cottonbun_top.png b/Resources/Textures/Objects/Consumable/Food/cottonburger.rsi/cottonbun_top.png new file mode 100644 index 0000000000..9c7b952cb8 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/cottonburger.rsi/cottonbun_top.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/cottonburger.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/cottonburger.rsi/meta.json new file mode 100644 index 0000000000..f7c72be515 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Food/cottonburger.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by Wolfkey. Modified from bun taken from tgstation and modified by Swept and potato1234x at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa, and Top and bottom bun edited by TheShuEd", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "cottonbun" + }, + { + "name": "cottonbun_top" + }, + { + "name": "cottonbun_bottom" + } + ] +}