From c2a5ca96e87633541986df25007ef40cdb060a84 Mon Sep 17 00:00:00 2001 From: potato1234_x <79580518+potato1234x@users.noreply.github.com> Date: Sat, 6 May 2023 17:43:09 +1000 Subject: [PATCH] TG Station Burgers (#15217) Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> --- .../Locale/en-US/flavors/flavor-profiles.ftl | 8 + .../catalog/fills/crates/livestock-crates.ftl | 3 + .../Catalog/Cargo/cargo_livestock.yml | 10 + .../Prototypes/Catalog/Fills/Crates/npc.yml | 9 + .../Random/Food_Drinks/food_single.yml | 3 + .../Entities/Mobs/Species/dwarf.yml | 5 + .../Entities/Mobs/Species/human.yml | 5 + .../Entities/Mobs/Species/reptilian.yml | 5 + .../Objects/Consumable/Food/burger.yml | 678 ++++++++++++------ .../Entities/Objects/Consumable/Food/meat.yml | 27 + Resources/Prototypes/Flavors/flavors.yml | 40 ++ .../Recipes/Cooking/meal_recipes.yml | 292 ++++++-- .../Consumable/Food/burger.rsi/cat.png | Bin 0 -> 506 bytes .../Consumable/Food/burger.rsi/human.png | Bin 0 -> 418 bytes .../Consumable/Food/burger.rsi/meta.json | 26 +- 15 files changed, 801 insertions(+), 310 deletions(-) create mode 100644 Resources/Textures/Objects/Consumable/Food/burger.rsi/cat.png create mode 100644 Resources/Textures/Objects/Consumable/Food/burger.rsi/human.png diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl index bf7012e6a492..0bdd22804d94 100644 --- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl @@ -17,6 +17,7 @@ flavor-base-spicy = spicy flavor-base-metallic = metallic flavor-base-meaty = meaty flavor-base-fishy = fishy +flavor-base-crabby = crabby flavor-base-cheesy = cheesy flavor-base-funny = funny flavor-base-tingly = tingly @@ -69,6 +70,8 @@ flavor-complex-batter = like batter flavor-complex-butter = like butter flavor-complex-egg = like egg flavor-complex-bacon = like bacon +flavor-complex-chicken = like chicken +flavor-complex-duck = like duck flavor-complex-chocolate = like chocolate flavor-complex-pasta = like pasta flavor-complex-rice = like rice @@ -128,6 +131,11 @@ flavor-complex-bad-joke = like a bad joke flavor-complex-memory-leek = like a fork bomb flavor-complex-gunpowder = like gunpowder flavor-complex-validhunting = like validhunting +flavor-complex-people = like people +flavor-complex-cat = like cat +flavor-complex-homerun = like a home run +flavor-complex-grass = like grass +flavor-complex-flare = like a smoking flare flavor-complex-cobwebs = like cobwebs flavor-complex-sadness = like sadness flavor-complex-hope = like hope diff --git a/Resources/Locale/en-US/prototypes/catalog/fills/crates/livestock-crates.ftl b/Resources/Locale/en-US/prototypes/catalog/fills/crates/livestock-crates.ftl index 2b8427fed99b..9742b83b3401 100644 --- a/Resources/Locale/en-US/prototypes/catalog/fills/crates/livestock-crates.ftl +++ b/Resources/Locale/en-US/prototypes/catalog/fills/crates/livestock-crates.ftl @@ -10,6 +10,9 @@ ent-CrateNPCCat = Cat crate ent-CrateNPCChicken = Chicken crate .desc = A crate containing four fully grown chickens. +ent-CrateNPCCrab = Crab crate + .desc = A crate containing three huge crabs. + ent-CrateNPCDuck = Duck crate .desc = A crate containing six fully grown ducks. diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml index cfb1c95db059..c1bdf1adc732 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml @@ -38,6 +38,16 @@ category: Livestock group: market +- type: cargoProduct + id: LivestockCrab + icon: + sprite: Mobs/Animals/crab.rsi + state: crab + product: CrateNPCCrab + cost: 1800 + category: Livestock + group: market + - type: cargoProduct id: LivestockDuck icon: diff --git a/Resources/Prototypes/Catalog/Fills/Crates/npc.yml b/Resources/Prototypes/Catalog/Fills/Crates/npc.yml index 826f7b2b5b87..8dc0104bbbca 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/npc.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/npc.yml @@ -44,6 +44,15 @@ - id: MobChicken amount: 4 +- type: entity + id: CrateNPCCrab + parent: CrateLivestock + components: + - type: StorageFill + contents: + - id: MobCrab + amount: 3 + - type: entity id: CrateNPCDuck parent: CrateLivestock 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 df5c9750b7c9..5cbc17665cdc 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 @@ -23,6 +23,7 @@ - FoodBurgerBacon - FoodBurgerEmpowered - FoodBurgerCrab + - FoodBurgerHuman - FoodBurgerSoy - FoodBurgerMcrib - FoodBurgerMcguffin @@ -51,7 +52,9 @@ rarePrototypes: - FoodBurgerAppendix - FoodBurgerRobot + - FoodBurgerBaseball - FoodBurgerBear + - FoodBurgerCat - FoodBurgerClown - FoodBurgerMime - FoodBurgerBrain diff --git a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml index 02cd708abafa..80ac808d202f 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml @@ -25,6 +25,11 @@ - type: Body prototype: Dwarf requiredLegs: 2 + - type: Butcherable + butcheringType: Spike + spawned: + - id: FoodMeatHuman + amount: 5 - type: Fixtures fixtures: # TODO: This needs a second fixture just for mob collisions. fix1: diff --git a/Resources/Prototypes/Entities/Mobs/Species/human.yml b/Resources/Prototypes/Entities/Mobs/Species/human.yml index 7413e179deba..a83539a2598d 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/human.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/human.yml @@ -8,6 +8,11 @@ - type: Hunger - type: Thirst - type: Perishable + - type: Butcherable + butcheringType: Spike + spawned: + - id: FoodMeatHuman + amount: 5 - type: entity name: Urist McHands diff --git a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml index dc17cbfe1c50..8812da99efb9 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml @@ -15,6 +15,11 @@ - type: Body prototype: Reptilian requiredLegs: 2 + - type: Butcherable + butcheringType: Spike + spawned: + - id: FoodMeatLizard + amount: 5 - type: LizardAccent - type: Speech speechSounds: Lizard diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml index d126b46e8dde..2f0334a8e8d2 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml @@ -55,6 +55,10 @@ id: FoodBurgerJelly description: Culinary delight..? components: + - type: FlavorProfile + flavors: + - bun + - jelly - type: Sprite layers: - state: custburg-bottom @@ -70,96 +74,230 @@ id: FoodBurgerAppendix description: Tastes like appendicitis. components: + - type: FlavorProfile + flavors: + - bun + - grass - type: Sprite state: appendix + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Nutriment + Quantity: 2 + - ReagentId: Protein + Quantity: 6 + - ReagentId: Vitamin + Quantity: 6 # Tastes like bun, grass. - type: entity - name: fillet -o- carp burger + name: bacon burger parent: FoodBurgerBase - id: FoodBurgerCarp - description: Almost like a carp is yelling somewhere... + id: FoodBurgerBacon + description: The perfect combination of all things American. components: - type: FlavorProfile flavors: - bun - - fishy + - bacon - type: Sprite - state: fish -# Tastes like bun, fish. + state: bacon + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: Nutriment + Quantity: 19 + - ReagentId: Vitamin + Quantity: 5 +# Tastes like bun, bacon. - type: entity - name: tofu burger + name: baseball burger parent: FoodBurgerBase - id: FoodBurgerTofu - description: What... is that meat? + id: FoodBurgerBaseball + description: It's still warm. The steam coming off of it smells kinda sweaty. components: - type: FlavorProfile flavors: - bun - - tofu + - homerun - type: Sprite - state: tofu + state: baseball - type: SolutionContainerManager solutions: food: maxVol: 15 reagents: - ReagentId: Nutriment - Quantity: 8 - - ReagentId: Protein Quantity: 3 -# Tastes like bun, tofu. + - ReagentId: Protein + Quantity: 5 + - ReagentId: Vitamin + Quantity: 2 - type: entity - name: roburger + name: bearger parent: FoodBurgerBase - id: FoodBurgerRobot - description: The lettuce is the only organic component. Beep. + id: FoodBurgerBear + description: Best served rawr. components: - type: FlavorProfile flavors: - bun - - leafy - - metallic + - meaty - type: Sprite - state: ro -# Tastes like bun, lettuce, sludge. + state: bearger + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 3 + - ReagentId: Protein + Quantity: 6 + - ReagentId: Vitamin + Quantity: 5 - type: entity - name: xenoburger + name: big bite burger parent: FoodBurgerBase - id: FoodBurgerXeno - description: Smells caustic. Tastes like heresy. + id: FoodBurgerBig + description: Forget the Big Mac. THIS is the future! + components: + - type: FlavorProfile + flavors: # What bun? + - meaty + - oily + - cheesy + - type: SolutionContainerManager + solutions: + food: + maxVol: 33 + reagents: + - ReagentId: Nutriment + Quantity: 17 + - ReagentId: Vitamin + Quantity: 9 + - type: Sprite + state: bigbite +# Tastes like bun, silver, magic. + +- type: entity + name: brain burger + parent: FoodBurgerBase + id: FoodBurgerBrain + description: A strange looking burger. It looks almost sentient. components: - type: FlavorProfile flavors: - bun - meaty - - acidic - type: Sprite - state: x -# Tastes like bun, acid. + state: brain + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Nutriment + Quantity: 6 + - ReagentId: Protein + Quantity: 6 + - ReagentId: Vitamin + Quantity: 5 +# Tastes like bun, brains. - type: entity - name: bearger + name: cat burger parent: FoodBurgerBase - id: FoodBurgerBear - description: Best served rawr. + id: FoodBurgerCat + description: Finally those cats and catpeople are worth something! components: - type: Sprite - state: bearger + state: cat + - type: FlavorProfile + flavors: + - bun + - meaty + - cat - type: SolutionContainerManager solutions: food: maxVol: 15 reagents: - ReagentId: Nutriment + Quantity: 6 + - ReagentId: Protein Quantity: 3 - ReagentId: Vitamin - Quantity: 5 + Quantity: 2 + +- type: entity + name: cheese burger + parent: FoodBurgerBase + id: FoodBurgerCheese + description: This noble burger stands proudly clad in golden cheese. + components: + - type: FlavorProfile + flavors: + - bun + - meaty + - cheesy + - type: Sprite + state: cheese + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 3 + - ReagentId: Vitamin + Quantity: 7 - ReagentId: Protein - Quantity: 6 + Quantity: 1 +# TODO: Make this work. + # - type: Sprite + # state: plate + # - type: RandomSpriteState + # spriteLayer: 1 + # spriteStates: + # - cheese + # - cheesealt +# Tastes like bun, beef patty, cheese. + +- type: entity + name: chicken sandwich # Burger for you euro-cucks + parent: FoodBurgerBase + id: FoodBurgerChicken + description: A delicious chicken sandwich, it is said the proceeds from this treat helps criminalize disarming people on the space frontier. + components: + - type: FlavorProfile + flavors: + - bun + - chicken + - type: Sprite + state: chicken + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 3 + - ReagentId: Protein + Quantity: 7 + - ReagentId: Vitamin + Quantity: 1 + - ReagentId: Mayo + Quantity: 3 +# Tastes like bun, chicken. - type: entity name: clown burger @@ -169,265 +307,383 @@ components: - type: FlavorProfile flavors: + - bun - funny - type: Sprite state: clown + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 4 + - ReagentId: Protein + Quantity: 6 + - ReagentId: Vitamin + Quantity: 6 - type: entity - name: mime burger + name: corgi burger #curger... parent: FoodBurgerBase - id: FoodBurgerMime - description: Its taste defies language. + id: FoodBurgerCorgi + description: The Head of Personnel's favorite! components: - type: FlavorProfile flavors: - - nothing + - bun + - validhunting - type: Sprite - state: mime -# Tastes like . + state: ian + - type: SolutionContainerManager + solutions: + food: + maxVol: 25 + reagents: + - ReagentId: Bicaridine #keeping it somewhat consistent with the meat itself + Quantity: 7 + - ReagentId: Vitamin + Quantity: 12 - type: entity - name: brain burger + name: crab burger parent: FoodBurgerBase - id: FoodBurgerBrain - description: A strange looking burger. It looks almost sentient. + id: FoodBurgerCrab + description: A delicious patty of the crabby kind, slapped in between a bun. components: + - type: FlavorProfile + flavors: + - bun + - crabby - type: Sprite - state: brain -# Tastes like bun, brains. + state: crab + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 4 + - ReagentId: Protein + Quantity: 5 + - ReagentId: Vitamin + Quantity: 4 - type: entity - name: ghost burger + name: crazy hamburger # Burger for you euro-cucks parent: FoodBurgerBase - id: FoodBurgerGhost - description: Too spooky! + id: FoodBurgerCrazy + description: This looks like the sort of food that a demented clown in a trenchcoat would make. components: - type: FlavorProfile flavors: - bun - - spooky + - meaty + - cheesy + - flare - type: Sprite - state: ghost + state: crazy - type: SolutionContainerManager solutions: food: maxVol: 25 reagents: - ReagentId: Nutriment - Quantity: 7 + Quantity: 4 + - ReagentId: Protein + Quantity: 6 + - ReagentId: CapsaicinOil + Quantity: 3 - ReagentId: Vitamin - Quantity: 12 -# Tastes like bun, ectoplasm. + Quantity: 6 - type: entity - name: curger #curger... + name: duck sandwich # Burger for you sick bastards parent: FoodBurgerBase - id: FoodBurgerCorgi - description: The Head of Personnel's favorite! + id: FoodBurgerDuck + description: A duck sandwich, only the criminally insane would dare to eat the meat of such an adorable creature. components: - type: FlavorProfile flavors: - bun - - validhunting + - duck - type: Sprite - state: ian + state: chicken - type: SolutionContainerManager solutions: food: - maxVol: 25 + maxVol: 15 reagents: - - ReagentId: Bicaridine #keeping it somewhat consistent with the meat itself + - ReagentId: Nutriment + Quantity: 3 + - ReagentId: Protein Quantity: 7 - ReagentId: Vitamin - Quantity: 12 + Quantity: 1 +# Tastes like bun, duck. -# Note: I would put a bunch of colored burgers here as listed in the tg .dm but -# I'd rather wait for a custom burger component. +- type: entity + name: empowered burger + parent: FoodBurgerBase + id: FoodBurgerEmpowered + description: It's shockingly good, if you live off of electricity that is. + components: + - type: Sprite + state: empowered + - type: FlavorProfile + flavors: + - bun + - shocking + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 8 + - ReagentId: Licoxide + Quantity: 5 +# Tastes like bun, pure electricity. - type: entity - name: spell burger + name: fillet-o-carp burger parent: FoodBurgerBase - id: FoodBurgerSpell - description: This is absolutely Ei Nath. + id: FoodBurgerCarp + description: Almost like a carp is yelling somewhere... components: - type: FlavorProfile flavors: - bun - - magical + - fishy - type: Sprite - state: spell -# Tastes like bun, silver. + state: fish +# Tastes like bun, fish. - type: entity - name: big bite burger + name: five alarm burger parent: FoodBurgerBase - id: FoodBurgerBig - description: Forget the Big Mac. THIS is the future! + id: FoodBurgerFive + description: HOT! HOT! HOT! components: - type: FlavorProfile - flavors: # What bun? + flavors: - meaty - - oily - - cheesy + - spicy + - type: Sprite + state: fivealarm - type: SolutionContainerManager solutions: food: - maxVol: 33 + maxVol: 15 reagents: - ReagentId: Nutriment - Quantity: 17 + Quantity: 6 + - ReagentId: CapsaicinOil + Quantity: 5 + - ReagentId: Blackpepper + Quantity: 5 - ReagentId: Vitamin - Quantity: 9 + Quantity: 1 + +# Tastes like bun, HEAT. + +- type: entity + name: ghost burger + parent: FoodBurgerBase + id: FoodBurgerGhost + description: Too spooky! + components: + - type: FlavorProfile + flavors: + - bun + - spooky - type: Sprite - state: bigbite -# Tastes like bun, silver, magic. + state: ghost + - type: SolutionContainerManager + solutions: + food: + maxVol: 25 + reagents: + - ReagentId: Nutriment + Quantity: 7 + - ReagentId: Vitamin + Quantity: 12 +# Tastes like bun, ectoplasm. - type: entity - name: super bite burger + name: human burger parent: FoodBurgerBase - id: FoodBurgerSuper - description: This is a mountain of a burger. FOOD! + id: FoodBurgerHuman + description: You cant tell who this is made of... components: - type: FlavorProfile - flavors: # What bun? - - meaty - - oily - - cheesy + flavors: + - bun + - people + - type: Sprite + state: human - type: SolutionContainerManager solutions: food: - maxVol: 53 + maxVol: 15 reagents: - ReagentId: Nutriment - Quantity: 44 + Quantity: 2 + - ReagentId: Protein + Quantity: 6 - ReagentId: Vitamin - Quantity: 24 - - ReagentId: TableSalt - Quantity: 5 - - ReagentId: Blackpepper Quantity: 5 - - type: Sprite - state: superbite -# Tastes like bun, diabetes. - type: entity - name: five alarm burger + name: McGuffin parent: FoodBurgerBase - id: FoodBurgerFive - description: HOT! HOT! HOT! + id: FoodBurgerMcguffin + description: A cheap and greasy imitation of an eggs Benedict. components: - type: FlavorProfile flavors: - - meaty - - spicy + - muffin + - egg - type: Sprite - state: fivealarm + state: mcguffin - type: SolutionContainerManager solutions: food: maxVol: 15 reagents: - ReagentId: Nutriment - Quantity: 6 - - ReagentId: CapsaicinOil - Quantity: 5 - - ReagentId: Blackpepper - Quantity: 5 + Quantity: 2 + - ReagentId: Protein + Quantity: 7 - ReagentId: Vitamin Quantity: 1 -# Tastes like bun, HEAT. - - type: entity - name: rat burger + name: McRib parent: FoodBurgerBase - id: FoodBurgerRat - description: Pretty much what you'd expect... + id: FoodBurgerMcrib + description: An elusive rib shaped burger with limited availablity across the galaxy. Not as good as you remember it. components: + - type: FlavorProfile + flavors: + - bun + - bacon - type: Sprite - state: rat + state: mcrib - type: SolutionContainerManager solutions: food: - maxVol: 10 + maxVol: 15 reagents: - ReagentId: Nutriment - Quantity: 3 + Quantity: 2 + - ReagentId: Protein + Quantity: 7 - ReagentId: Vitamin + Quantity: 4 + - ReagentId: BbqSauce Quantity: 1 -# Tastes like bun, HEAT. +# Tastes like bun, pork patty. - type: entity - name: home run baseball burger + name: mime burger parent: FoodBurgerBase - id: FoodBurgerBaseball - description: It's still warm. The steam coming off of it smells kinda sweaty. + id: FoodBurgerMime + description: Its taste defies language. components: + - type: FlavorProfile + flavors: + - bun + - nothing - type: Sprite - state: baseball -# Tastes like bun, victory. + state: mime + - type: SolutionContainerManager + solutions: + food: + maxVol: 25 + reagents: + - ReagentId: Nutriment + Quantity: 6 + - ReagentId: Protein + Quantity: 9 + - ReagentId: Vitamin + Quantity: 4 + - ReagentId: Nothing + Quantity: 1 +# Tastes like . - type: entity - name: bacon burger + name: plain burger parent: FoodBurgerBase - id: FoodBurgerBacon - description: The perfect combination of all things American. + id: FoodBurgerPlain + description: A boring, dry burger. components: - type: FlavorProfile flavors: + - bun - meaty - - bacon - type: Sprite - state: bacon + state: plain + - type: SolutionContainerManager solutions: food: - maxVol: 30 + maxVol: 25 reagents: - ReagentId: Nutriment - Quantity: 19 + Quantity: 2 + - ReagentId: Protein + Quantity: 6 - ReagentId: Vitamin - Quantity: 5 -# Tastes like bun, bacon. + Quantity: 3 - type: entity - name: empowered burger + name: rat burger parent: FoodBurgerBase - id: FoodBurgerEmpowered - description: It's shockingly good, if you live off of electricity that is. + id: FoodBurgerRat + description: Pretty much what you'd expect... components: + - type: FlavorProfile + flavors: + - bun + - meaty - type: Sprite - state: empowered + state: rat - type: SolutionContainerManager solutions: food: maxVol: 15 reagents: - ReagentId: Nutriment - Quantity: 8 - - ReagentId: Licoxide - Quantity: 5 -# Tastes like bun, pure electricity. + Quantity: 3 + - ReagentId: Protein + Quantity: 6 + - ReagentId: Vitamin + Quantity: 2 +# Tastes like bun, HEAT. - type: entity - name: empowered burger + name: roburger parent: FoodBurgerBase - id: FoodBurgerCrab - description: A delicious patty of the crabby kind, slapped in between a bun. + id: FoodBurgerRobot + description: The lettuce is the only organic component. Beep. components: + - type: FlavorProfile + flavors: + - bun + - leafy + - metallic - type: Sprite - state: crab + state: ro - type: SolutionContainerManager solutions: food: maxVol: 15 reagents: - ReagentId: Nutriment - Quantity: 3 - - ReagentId: Protein Quantity: 5 - - ReagentId: Vitamin - Quantity: 4 -# Tastes like bun, crab meat. + - ReagentId: SulfuricAcid + Quantity: 5 +# Tastes like bun, lettuce, sludge. - type: entity name: soylent burger @@ -455,82 +711,70 @@ # Tastes like bun, redditors. - type: entity - name: mcrib - parent: FoodBurgerBase - id: FoodBurgerMcrib - description: An elusive rib shaped burger with limited availablity across the galaxy. Not as good as you remember it. - components: - - type: Sprite - state: mcrib - - type: SolutionContainerManager - solutions: - food: - maxVol: 15 - reagents: - - ReagentId: Nutriment - Quantity: 2 - - ReagentId: Protein - Quantity: 7 - - ReagentId: Vitamin - Quantity: 4 - - ReagentId: Allicin - Quantity: 2 -# Tastes like bun, pork patty. - -- type: entity - name: mcguffin + name: spell burger parent: FoodBurgerBase - id: FoodBurgerMcguffin - description: A cheap and greasy imitation of an eggs Benedict. + id: FoodBurgerSpell + description: This is absolutely Ei Nath. components: - type: FlavorProfile flavors: - - muffin - - egg + - bun + - magical - type: Sprite - state: mcguffin + state: spell - type: SolutionContainerManager solutions: food: - maxVol: 15 + maxVol: 20 reagents: - ReagentId: Nutriment - Quantity: 2 + Quantity: 4 - ReagentId: Protein - Quantity: 7 + Quantity: 5 - ReagentId: Vitamin - Quantity: 1 -# Tastes like muffin, bacon. + Quantity: 10 +# Tastes like bun, silver. - type: entity - name: chicken sandwich # Burger for you euro-cucks + name: super bite burger parent: FoodBurgerBase - id: FoodBurgerChicken - description: A delicious chicken sandwich, it is said the proceeds from this treat helps criminalize disarming people on the space frontier. + id: FoodBurgerSuper + description: This is a mountain of a burger. FOOD! components: - - type: Sprite - state: chicken + - type: FlavorProfile + flavors: # What bun? + - meaty + - oily + - cheesy - type: SolutionContainerManager solutions: food: - maxVol: 15 + maxVol: 55 reagents: - ReagentId: Nutriment - Quantity: 3 - - ReagentId: Protein - Quantity: 7 + Quantity: 44 - ReagentId: Vitamin - Quantity: 1 -# Tastes like bun, chicken. + Quantity: 24 + - ReagentId: TableSalt + Quantity: 5 + - ReagentId: Blackpepper + Quantity: 5 + - type: Sprite + state: superbite +# Tastes like bun, diabetes. - type: entity - name: duck sandwich # Burger for you sick bastards + name: tofu burger parent: FoodBurgerBase - id: FoodBurgerDuck - description: A duck sandwich, only the criminally insane would dare to eat the meat of such an adorable creature. + id: FoodBurgerTofu + description: What... is that meat? components: + - type: FlavorProfile + flavors: + - bun + - tofu - type: Sprite - state: chicken + state: tofu - type: SolutionContainerManager solutions: food: @@ -539,23 +783,24 @@ - ReagentId: Nutriment Quantity: 3 - ReagentId: Protein - Quantity: 7 + Quantity: 6 - ReagentId: Vitamin - Quantity: 1 -# Tastes like bun, duck. + Quantity: 3 +# Tastes like bun, tofu. - type: entity - name: cheese burger + name: xenoburger parent: FoodBurgerBase - id: FoodBurgerCheese - description: This noble burger stands proudly clad in golden cheese. + id: FoodBurgerXeno + description: Smells caustic. Tastes like heresy. components: - type: FlavorProfile flavors: + - bun - meaty - - cheesy + - acidic - type: Sprite - state: cheese + state: x - type: SolutionContainerManager solutions: food: @@ -563,26 +808,11 @@ reagents: - ReagentId: Nutriment Quantity: 3 - - ReagentId: Vitamin - Quantity: 7 - ReagentId: Protein - Quantity: 1 -# TODO: Make this work. - # - type: Sprite - # state: plate - # - type: RandomSpriteState - # spriteLayer: 1 - # spriteStates: - # - cheese - # - cheesealt -# Tastes like bun, beef patty, cheese. + Quantity: 6 + - ReagentId: Vitamin + Quantity: 5 +# Tastes like bun, acid. -- type: entity - name: crazy hamburger # Burger for you euro-cucks - parent: FoodBurgerBase - id: FoodBurgerCrazy - description: This looks like the sort of food that a demented clown in a trenchcoat would make. - components: - - type: Sprite - state: crazy -# Tastes like bun, a smoking flare, chili. +# Note: I would put a bunch of colored burgers here as listed in the tg .dm but +# I'd rather wait for a custom burger component. diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml index 4e8fa0bb2e0d..61f3e2c29216 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml @@ -64,6 +64,27 @@ node: start defaultTarget: meat steak +- type: entity + name: raw human meat + parent: FoodMeatBase + id: FoodMeatHuman + description: Gross. + components: + - type: Tag + tags: + - Raw + - type: Sprite + state: plain + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: UncookedAnimalProteins + Quantity: 9 + - type: SliceableFood + count: 3 + slice: FoodMeatCutlet + - type: entity name: raw carp fillet parent: FoodMeatBase @@ -237,6 +258,9 @@ id: FoodMeatCrab description: A pile of raw crab meat. components: + - type: FlavorProfile + flavors: + - crabby - type: Tag tags: - Raw @@ -720,6 +744,9 @@ id: FoodMeatCrabCooked description: Some deliciously cooked crab meat. components: + - type: FlavorProfile + flavors: + - crabby - type: Tag tags: - Cooked diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml index 39060a47045a..eccef978ab18 100644 --- a/Resources/Prototypes/Flavors/flavors.yml +++ b/Resources/Prototypes/Flavors/flavors.yml @@ -44,6 +44,11 @@ flavorType: Base description: flavor-base-fishy +- type: flavor + id: crabby + flavorType: Base + description: flavor-base-crabby + - type: flavor id: cheesy flavorType: Base @@ -224,6 +229,16 @@ flavorType: Complex description: flavor-complex-bacon +- type: flavor + id: chicken + flavorType: Complex + description: flavor-complex-chicken + +- type: flavor + id: duck + flavorType: Complex + description: flavor-complex-duck + - type: flavor id: chocolate flavorType: Complex @@ -454,6 +469,31 @@ flavorType: Complex description: flavor-complex-validhunting +- type: flavor + id: people + flavorType: Complex + description: flavor-complex-people + +- type: flavor + id: cat + flavorType: Complex + description: flavor-complex-cat + +- type: flavor + id: homerun + flavorType: Complex + description: flavor-complex-homerun + +- type: flavor + id: grass + flavorType: Complex + description: flavor-complex-grass + +- type: flavor + id: flare + flavorType: Complex + description: flavor-complex-flare + - type: flavor id: cobwebs flavorType: Complex diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index e956b71aaa66..ee4224e97e42 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -7,25 +7,43 @@ FoodDoughSlice: 1 # one third of a standard bread dough recipe #Burgers + - type: microwaveMealRecipe - id: RecipeCheeseburger - name: cheeseburger recipe - result: FoodBurgerCheese - time: 5 + id: RecipeAppendixBurger + name: appendix burger recipe + result: FoodBurgerAppendix + time: 10 solids: FoodBreadBun: 1 - FoodMeat: 1 - FoodCheeseSlice: 1 + OrganHumanAppendix: 1 - type: microwaveMealRecipe - id: RecipeFiveBurger - name: five alarm burger recipe - result: FoodBurgerFive - time: 5 + id: RecipeBaconBurger + name: bacon burger recipe + result: FoodBurgerBacon + time: 10 solids: FoodBreadBun: 1 - FoodMeat: 1 - FoodChili: 3 + FoodMeatCutlet: 3 #replace with bacon + FoodCheeseSlice: 2 + +- type: microwaveMealRecipe + id: RecipeBaseballBurger + name: baseball burger recipe + result: FoodBurgerBaseball + time: 10 + solids: + FoodBreadBun: 1 + BaseBallBat: 1 + +- type: microwaveMealRecipe + id: RecipeBearger + name: bearger recipe + result: FoodBurgerBear + time: 10 + solids: + FoodBreadBun: 1 + FoodMeatBear: 1 - type: microwaveMealRecipe id: RecipeBigBiteBurger @@ -39,109 +57,230 @@ FoodTomato: 1 FoodOnionSlice: 2 +- type: microwaveMealRecipe + id: RecipeBrainBurger + name: brain burger recipe + result: FoodBurgerBrain + time: 10 + solids: + FoodBreadBun: 1 + OrganHumanBrain: 1 + +- type: microwaveMealRecipe + id: RecipeCatBurger + name: cat burger recipe + result: FoodBurgerCat + time: 10 + solids: + FoodBreadBun: 1 + FoodMeat: 1 + ClothingHeadHatCatEars: 1 + +- type: microwaveMealRecipe + id: RecipeCheeseburger + name: cheeseburger recipe + result: FoodBurgerCheese + time: 10 + solids: + FoodBreadBun: 1 + FoodMeat: 1 + FoodCheeseSlice: 1 + - type: microwaveMealRecipe id: RecipeChickenSandwich name: chicken sandwich recipe result: FoodBurgerChicken - time: 5 + time: 10 + reagents: + Mayo: 5 solids: FoodBreadBun: 1 FoodMeatChicken: 1 - FoodCheeseSlice: 1 + +- type: microwaveMealRecipe + id: RecipeClownBurger + name: clownburger recipe + result: FoodBurgerClown + time: 10 + solids: + FoodBreadBun: 1 + ClothingMaskClown: 1 + +- type: microwaveMealRecipe + id: RecipeCorgiBurger + name: corgi burger recipe + result: FoodBurgerCorgi + time: 10 + solids: + FoodBreadBun: 1 + FoodMeatCorgi: 1 + +- type: microwaveMealRecipe + id: RecipeCrabBurger + name: crab burger recipe + result: FoodBurgerCrab + time: 10 + solids: + FoodBreadBun: 1 + FoodMeatCrab: 2 + +- type: microwaveMealRecipe + id: RecipeCrazyHamburger + name: crazy hamburger recipe + result: FoodBurgerCrazy + time: 15 + reagents: + OilOlive: 15 + solids: + FoodBreadBun: 1 + FoodMeat: 2 + FoodCheeseSlice: 2 + FoodChili: 1 + FoodCabbage: 1 + CrayonGreen: 1 + Flare: 1 - type: microwaveMealRecipe id: RecipeDuckBurger name: duck sandwich recipe result: FoodBurgerDuck - time: 5 + time: 10 solids: FoodBreadBun: 1 FoodMeatDuck: 1 FoodCheeseSlice: 1 +- type: microwaveMealRecipe + id: RecipeEmpoweredBurger + name: empowered burger recipe + result: FoodBurgerEmpowered + time: 10 + solids: + FoodBreadBun: 1 + SheetPlasma1: 2 + - type: microwaveMealRecipe id: RecipeCarpBurger - name: carp burger recipe + name: fillet-o-carp burger recipe result: FoodBurgerCarp - time: 5 + time: 10 solids: FoodBreadBun: 1 FoodMeatFish: 1 FoodCheeseSlice: 1 - type: microwaveMealRecipe - id: RecipeBrainBurger - name: brain burger recipe - result: FoodBurgerBrain - time: 5 + id: RecipeFiveBurger + name: five alarm burger recipe + result: FoodBurgerFive + time: 10 solids: FoodBreadBun: 1 - OrganHumanBrain: 1 - FoodCheeseSlice: 1 + FoodMeat: 1 + FoodChili: 3 - type: microwaveMealRecipe - id: RecipeAppendixBurger - name: appendix burger recipe - result: FoodBurgerAppendix - time: 5 + id: RecipeGhostBurger + name: ghost burger recipe + result: FoodBurgerGhost + time: 10 + solids: + FoodBreadBun: 1 + ClothingOuterGhostSheet: 1 #replace with ectoplasm once added + +- type: microwaveMealRecipe + id: RecipeHumanBurger + name: human burger recipe + result: FoodBurgerHuman + time: 10 + solids: + FoodBreadBun: 1 + FoodMeatHuman: 1 + +- type: microwaveMealRecipe + id: RecipeJellyBurger + name: jelly burger recipe + result: FoodBurgerJelly + time: 10 + solids: + FoodBreadBun: 1 + FoodJellyAmanita: 1 + +- type: microwaveMealRecipe + id: RecipeBurgerMcguffin + name: McGuffin recipe + result: FoodBurgerMcguffin + time: 10 solids: FoodBreadBun: 1 - OrganHumanAppendix: 1 FoodCheeseSlice: 1 + FoodEgg: 2 - type: microwaveMealRecipe - id: RecipeClownBurger - name: clownburger recipe - result: FoodBurgerClown - time: 5 + id: RecipeBurgerMcrib + name: McRib recipe + result: FoodBurgerMcrib + time: 10 solids: FoodBreadBun: 1 - ClothingMaskClown: 1 + FoodMealRibs: 1 + FoodOnionSlice: 1 - type: microwaveMealRecipe id: RecipeMimeBurger - name: mimeburger recipe + name: mime burger recipe result: FoodBurgerMime - time: 5 + time: 10 solids: FoodBreadBun: 1 - ClothingHeadHatBeret: 1 + ClothingMaskMime: 1 - type: microwaveMealRecipe - id: RecipeTofuBurger - name: tofu burger recipe - result: FoodBurgerTofu - time: 5 + id: RecipePlainBurger + name: plain burger recipe + result: FoodBurgerPlain + time: 10 solids: FoodBreadBun: 1 - FoodTofuSlice: 1 + FoodMeat: 1 - type: microwaveMealRecipe - id: RecipeXenoburger - name: xenoburger recipe - result: FoodBurgerXeno - time: 5 + id: RecipeRatBurger + name: rat burger recipe + result: FoodBurgerRat + time: 10 solids: FoodBreadBun: 1 - FoodMeatXeno: 1 + FoodMeatRat: 1 - type: microwaveMealRecipe - id: RecipeBearger - name: bearger recipe - result: FoodBurgerBear - time: 5 + id: RecipeRobotBurger + name: roburger recipe + result: FoodBurgerRobot + time: 10 solids: FoodBreadBun: 1 - FoodMeatBear: 1 + CapacitorStockPart: 2 + # i would add steel to this recipe but the microwave explodes - type: microwaveMealRecipe - id: RecipeCurger - name: curger recipe - result: FoodBurgerCorgi - time: 5 + id: RecipeSoylentBurger + name: soylent burger recipe + result: FoodBurgerSoy + time: 10 solids: FoodBreadBun: 1 - FoodMeatCorgi: 1 + FoodCheeseSlice: 2 + FoodSoybeans: 2 #replace with soylent green when those become craftable + +- type: microwaveMealRecipe + id: RecipeSpellBurger + name: spell burger recipe + result: FoodBurgerSpell + time: 10 + solids: + FoodBreadBun: 1 + ClothingHeadHatWizard: 1 - type: microwaveMealRecipe id: RecipeSuperBiteBurger @@ -158,32 +297,22 @@ FoodEgg: 2 - type: microwaveMealRecipe - id: RecipeEmpoweredBurger - name: empowered burger recipe - result: FoodBurgerEmpowered - time: 5 - solids: - FoodBreadBun: 1 - SheetPlasma1: 2 - -- type: microwaveMealRecipe - id: RecipeJellyBurger - name: jelly burger recipe - result: FoodBurgerJelly - time: 5 + id: RecipeTofuBurger + name: tofu burger recipe + result: FoodBurgerTofu + time: 10 solids: FoodBreadBun: 1 - FoodJellyAmanita: 1 + FoodTofuSlice: 1 - type: microwaveMealRecipe - id: RecipeBurgerMcguffin - name: mcguffin recipe - result: FoodBurgerMcguffin - time: 5 + id: RecipeXenoburger + name: xenoburger recipe + result: FoodBurgerXeno + time: 10 solids: FoodBreadBun: 1 - FoodCheeseSlice: 1 - FoodEgg: 2 + FoodMeatXeno: 1 #Breads & Sandwiches @@ -1208,6 +1337,17 @@ FoodChili: 1 FoodCheeseSlice: 2 +- type: microwaveMealRecipe + id: RecipeRibs + name: BBQ ribs recipe + result: FoodMealRibs + time: 15 + reagents: + BbqSauce: 5 + solids: + FoodMeat: 2 + FoodKebabSkewer: 1 + - type: microwaveMealRecipe id: RecipeEnchiladas name: enchiladas recipe diff --git a/Resources/Textures/Objects/Consumable/Food/burger.rsi/cat.png b/Resources/Textures/Objects/Consumable/Food/burger.rsi/cat.png new file mode 100644 index 0000000000000000000000000000000000000000..3588eb65a5057320731ec1cbf249a900a2de78a0 GIT binary patch literal 506 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil`1AIbUPo6w^_x`=FZf-3;2LI>Je|94M*<`ETyLYEq8s2Quo-t#_&6_tr zE%xm3(F#(PJvi5`!BJ&Hap>l5vj`)J0w>kQDXsxJB8e6&oE6i<`y z@zaYok*xOAku6oWT4tWG%Y9j_I?&FKwkPF*lxj(kU+{k-0E7K`Cx4&@&H|6fVg?4j zLmBd$uk7K<_em My85}Sb4q9e0RE-eKL7v# literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/burger.rsi/human.png b/Resources/Textures/Objects/Consumable/Food/burger.rsi/human.png new file mode 100644 index 0000000000000000000000000000000000000000..46794298ff32057d18d743b408add588e8718c52 GIT binary patch literal 418 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCijA1AIbUTYL;YE%yBVy!Y8;t7j+D(<}{dHfjHVJFCY>>*wRv&D~}}s? zx-~eeY$y(mFp?;6QeB+l8lWSRXd$z?EV94#?C4TbzNEbV-n3 z@PC|uLEVJg6sU}|z$3Dlfr0NZ2s0kfUy%Y7-0bP%7-Hf7c0wXwvjUIX>ejxK0#kjj z{FX0SJ1IhZQtW~6-P_iGV7>9LfScW(iQ{Qa!Agc%+Z>syI z?-Z|ad&52U(>~hF3(`Go^Q11OC@R=%D^Jdu%Cp{mhAp@3HzcNeDoA>@Uu@EdGn$h1 gTq|S;YvS#F{<1NS=UR7r0G-d^>FVdQ&MBb@0E1JhVE_OC literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/burger.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/burger.rsi/meta.json index 1fce1d8ac8ed..c18c4b604060 100644 --- a/Resources/Textures/Objects/Consumable/Food/burger.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/burger.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa, ian.png created by EmoGarbage", + "copyright": "Taken from tgstation and modified by Swept and potato1234x at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa, ian.png created by EmoGarbage", "size": { "x": 32, "y": 32 @@ -31,6 +31,9 @@ { "name": "c" }, + { + "name": "cat" + }, { "name": "cheese" }, @@ -85,27 +88,30 @@ "name": "ghost", "delays": [ [ - 0.01, + 0.11, 0.08, 0.06, 0.05, 0.04, 0.04, - 0.06, - 0.01, - 0.01, - 0.01, + 0.07, + 0.1, + 0.13, + 0.11, 0.09, - 0.06, + 0.07, 0.05, 0.06, - 0.06, + 0.07, 0.08, - 0.01, - 0.02 + 0.1, + 0.12 ] ] }, + { + "name": "human" + }, { "name": "ian" },