From 5cdfc4f09ad1b8007352afb9ce75c9022fdbcbd8 Mon Sep 17 00:00:00 2001 From: Cerebulon Date: Sat, 24 Jun 2023 01:54:49 +0100 Subject: [PATCH] Flavour Enhancement: Flavour (#9034) * Flavour strings and food tweaks * Secret Meats... * beet soup runtime * fixes chip plates and subtypes * final spelling corrections --- .../examine/descriptions/containers.dm | 72 +- code/modules/food/food/cans.dm | 11 +- code/modules/food/food/lunch.dm | 2 +- code/modules/food/food/snacks.dm | 1934 ++++++++--------- code/modules/food/food/snacks/meat.dm | 6 +- code/modules/food/recipes_fryer.dm | 9 +- code/modules/food/recipes_grill.dm | 7 +- code/modules/food/recipes_microwave.dm | 40 +- code/modules/food/recipes_oven.dm | 40 +- code/modules/mob/living/carbon/taste.dm | 4 +- .../reagents/reactions/instant/food.dm | 34 +- code/modules/reagents/reagents/food_drinks.dm | 10 +- icons/obj/food.dmi | Bin 182423 -> 182423 bytes 13 files changed, 1095 insertions(+), 1074 deletions(-) diff --git a/code/modules/examine/descriptions/containers.dm b/code/modules/examine/descriptions/containers.dm index bc2d948ca1..b30d7c2f3f 100644 --- a/code/modules/examine/descriptions/containers.dm +++ b/code/modules/examine/descriptions/containers.dm @@ -1,41 +1,3 @@ -/obj/item/reagent_containers/food/drinks/cans/cola - description_fluff = "Space Cola is the most popular soft drink in known space. It was invented by Nikolas Fedorov, a Martian-Russian immagrant to Tau Ceti. He then went on to create Nikolas Beverages Inc., a soft drink corporation that is now part of Centauri Provisions." - -/obj/item/reagent_containers/food/drinks/cans/waterbottle - description_fluff = "This is a generic, NanoTrasen branded bottle of water. The company swears on the quality of the water, saying it comes from the Martian poles. Most people disregard that and assume it's recycled from hydroponics trays." - -/obj/item/reagent_containers/food/drinks/cans/space_mountain_wind - description_fluff = "This cola was allegedly made after Vasily Federov, the son of Nikolas Federov and the second CEO of Federov Beverages Inc., went on a climbing expedition to an arctic planet. He then created this citris flavored soft drink. Scientists claim that it can eat through styrafoam in a matter of weeks, but people drink it anyway." - -/obj/item/reagent_containers/food/drinks/cans/thirteenloko - description_fluff = "A beverage loved by college students. The Thirteen Loko Company created this highly alcoholic beverage as an energy drink. It is illegal in much of SolGov space and most of Skrell space. This drink has been regulated more than any other in known space, and doctors strongly advise not to drink it." - -/obj/item/reagent_containers/food/drinks/cans/dr_gibb - description_fluff = "Originally made by a doctor seeking to mix several different flavors, this soda has become widely popular in the past decade. The drink has become so popular, in fact, that Nikolas Beverages bought it. Ever since then, the drink has never been the same. As a result, people all across known space beg for the old formula, but Nikolas Beverages does not appear to be listening." - -/obj/item/reagent_containers/food/drinks/cans/starkist - description_fluff = "Nikolas Beverages' attempt at an orange-flavored drink. Advertised as a nice summer beverage. The company tries to paint it as one of their more 'healthy' beverages due to its 'orange' and 'vitamins'." - -/obj/item/reagent_containers/food/drinks/cans/space_up - description_fluff = "This drink is advertised as one of the most carbonated beverages on the market. It's owned by Federov Beverages, and advertised for its carbonation, not its flavor. Children will commonly make 'Space-Up Volcanoes' by dropping mints into a can of Space-Up and causing it to create a long stream of fizz upward." - -/obj/item/reagent_containers/food/drinks/cans/lemon_lime - description_fluff = "This is a NanoTrasen branded can of Lemon-Lime juice. NanoTrasen swears to their 'natural' beverage, but most people think differently." - -/obj/item/reagent_containers/food/drinks/cans/iced_tea - description_fluff = "Vrisk Iced Tea is named after its creator, Penelope Vrisk. She was a canner for Federov Beverages who wanted to create an authentic-tasting Southern iced tea. After finishing her formula and managing to get it produced, the tea became an instant hit." - -/obj/item/reagent_containers/food/drinks/cans/grape_juice - description_fluff = "This is a NanoTrasen branded can of grape juice. NanoTrasen claims that they use the same grapes that this juice is made of to make their wine." - -/obj/item/reagent_containers/food/drinks/cans/tonic - description_fluff = "Endorsed by the popular positronic rapper, T-Borg, this drink is advertised as a 'high class' drink. Most people just use it to mix with their gin, and not much can be said about the quality." - -/obj/item/reagent_containers/food/drinks/cans/sodawater - description_fluff = "This is a NanoTrasen branded can of soda water. They use the same water for this that they use for the bottled water that they sell. That may explain why the stuff isn't exactly flying off of the shelves." - -/obj/item/reagent_containers/food/drinks/cans/gingerale - description_fluff = "Somehow, NanoTrasen wound up taking this ginger ale formula from Centauri Provisions, some say as payback for the DONKpocket incident. It tastes like ginger ale." /obj/item/reagent_containers/food/drinks/bottle/gin description_fluff = "Griffeater Gin was originally an independent disillery in Alpha Centauri, but financial troubles obligated them to sell out to Centauri Provisions. It's said that Centauri ruined the brew, but it's pretty much impossible to tell." @@ -45,54 +7,54 @@ /obj/item/reagent_containers/food/drinks/bottle/specialwhiskey description_fluff = "Nobody knows what Special Blend Whiskey really is, how it's made, or where it comes from. It's an expensive Gilthari product, for only the most luxurious, but NanoTrasen managed to secure a supply deal." - + /obj/item/reagent_containers/food/drinks/bottle/vodka description_fluff = "Centauri Provisions claims that their vodka wins in blind taste-tests against traditional mixes from Earth, but they're not fooling anyone." - + /obj/item/reagent_containers/food/drinks/bottle/tequilla - description_fluff = "This tequilla comes from the 'Cancer Craze' of the 20's, where consumer products would openly advertize their blatently carcinogenic nature to a burgeoning middle class with newfound access to cloned organs." - + description_fluff = "This tequilla comes from the 'Cancer Craze' of the 2520's, where consumer products would openly advertize their blatently carcinogenic nature to a burgeoning middle class with newfound access to cloned organs." + /obj/item/reagent_containers/food/drinks/bottle/patron description_fluff = "This emerged as a response to Caccavo, with Patron advertising claiming to be even more toxic and dangerous. Unfortunately, when the Cancer Craze ended, Patron's stocks nosedived and they now operate only a handful of distilleries." - + /obj/item/reagent_containers/food/drinks/bottle/rum description_fluff = "Captain Pete's was involved in a long, expensive lawsuit against Gilthari concerning their claims to be from Cuba. They're actually owned and operated by none other than Centauri Provisions, with no distillaries on Earth to speak of." - + /obj/item/reagent_containers/food/drinks/bottle/vermouth description_fluff = "One of Gilthari's less expensive products, Goldeneye Vermouth still manages to sell itself as a drink for only the richest and most successful; giving any number of poseurs a swollen head in the process." - + /obj/item/reagent_containers/food/drinks/bottle/kahlua description_fluff = "One of Centauri Provision's least successful products, this coffee liquour continues to be produced for the handful of mixed drinks requiring it. Surprisingly energizing!" - + /obj/item/reagent_containers/food/drinks/bottle/goldschlager description_fluff = "Drinks laced with gold and other precious metals are a common indulgence among those who live on planets where these metals are still somewhat rare and expensive. On asteroid colonies and better-developed regions, they're seen as a ridiculous waste of materials." - + /obj/item/reagent_containers/food/drinks/bottle/cognac description_fluff = "Another Gilthari product, Chataeu du Baton is one of the few brandies to still be produced using traditional methods, instead of chemical synthesizers." - + /obj/item/reagent_containers/food/drinks/bottle/wine description_fluff = "NanoTrasen makes this wine, which is generally regarded as better used for cooking than actually drinking. Morpheus specifically names Doublebeard in their recipe for Twobread." - + /obj/item/reagent_containers/food/drinks/bottle/absinthe description_fluff = "A product of the anarchists of Casini's Reach, Jailebreaker Verte is an open-source synthesized liquour that has actually managed to succeed over traditional absinthes. Gilthari is livid." - + /obj/item/reagent_containers/food/drinks/bottle/melonliquor description_fluff = "Melon liquor, formerly an obscure drink, took off when young Skrell started dabbling in alcohol. This brand is owned by Vey-Med, one of their few diversified holdings." /obj/item/reagent_containers/food/drinks/bottle/bluecuracao description_fluff = "Centauri Provisions is currently marketing Miss Blue as the next big thing in mixed drinks. Analysts suggest that they're mistaken." - + /obj/item/reagent_containers/food/drinks/bottle/pwine description_fluff = "You've never heard of this before, but it looks vaguely Gilthari, so it's probably good, right?" - + /obj/item/reagent_containers/food/drinks/bottle/tomatojuice description_fluff = "Morpheus used to sell 'Tomato Juice' that was actually synthetic blood in a carton, until they got sued for damages." - + /obj/item/reagent_containers/food/drinks/bottle/small/beer description_fluff = "Getting synthesized booze to taste decent is always a challenge, but Space Beer is a resounding success. As the most popular drink in human space, it'd have to be." - + /obj/item/reagent_containers/food/drinks/bottle/small/ale description_fluff = "A product of Titan and enjoyed widely among the hydrocarbon workers of the oil moon. Often described as 'Beer, but better.'" - + /obj/item/reagent_containers/food/drinks/bottle/sake description_fluff = "An export from New Kyoto, Mono-no-Aware promises to show to the drinker the beautiful transience of all life. Mostly it just tastes like dry booze." diff --git a/code/modules/food/food/cans.dm b/code/modules/food/food/cans.dm index d0aeb9636a..af832dd3ef 100644 --- a/code/modules/food/food/cans.dm +++ b/code/modules/food/food/cans.dm @@ -32,6 +32,7 @@ /obj/item/reagent_containers/food/drinks/cans/waterbottle name = "bottled water" desc = "Ice cold and utterly tasteless, this 'all-natural' mineral water comes 'fresh' from one of NanoTrasen's heavy-duty bottling plants in the Sivian poles." + description_fluff = "This is a generic, NanoTrasen branded bottle of water. The company swears on the quality of the water, saying it comes from the Sivian poles. Most people disregard that and assume it's recycled from hydroponics trays." icon_state = "waterbottle" center_of_mass = list("x"=16, "y"=8) drop_sound = 'sound/items/drop/disk.ogg' @@ -164,6 +165,7 @@ /obj/item/reagent_containers/food/drinks/cans/sodawater name = "soda water" desc = "A can of soda water. Still water's more refreshing cousin." + description_fluff = "This is a NanoTrasen branded can of soda water. They use the same water for this that they use for the bottled water that they sell, which may explain why the stuff isn't exactly flying off of the shelves." icon_state = "sodawater" center_of_mass = list("x"=16, "y"=8) @@ -270,7 +272,7 @@ /obj/item/reagent_containers/food/drinks/cans/terra_cola name = "\improper Terra-Cola" desc = "Made by the people. Served to the people." - description_fluff = "A can of the only soft drink state approved for the benefit of the people. Served at room temperature regardless of ambient temperatures thanks to innovative Terran insulation technology." + description_fluff = "A can of the only soft drink state approved for the benefit of the people. Served at room temperature regardless of ambient temperatures thanks to innovative 'Terran' insulation technology." icon_state = "terra_cola" center_of_mass = list("x"=16, "y"=8) @@ -323,7 +325,7 @@ /obj/item/reagent_containers/food/drinks/cans/grape_cola name = "\improper Gravity Grape" - desc = "Get down with Newton's favorite corbonated science experiment!" + desc = "Get down with Newton's favorite carbonated science experiment!" icon_state = "grapesoda" center_of_mass = list("x"=16, "y"=8) @@ -374,8 +376,9 @@ reagents.add_reagent("beer", 30) /obj/item/reagent_containers/food/drinks/cans/alecan - name = "\improper Spacecastle Pale Ale" - desc = "A delicious IPA that's canned for your pleasure. Drink up!" + name = "\improper Hushed Whisper Pale Ale" + desc = "A delicious Sivian IPA that's canned for your pleasure. Drink up!" + description_fluff = "Named for one of history's most infamous pirates, Qar’raqel, who ruled over Natuna before suffering a mysterious fate. This ale is brewed on Sif by a small company... Owned by Centauri Provisions." icon_state = "alecan" center_of_mass = list("x"=16, "y"=8) diff --git a/code/modules/food/food/lunch.dm b/code/modules/food/food/lunch.dm index eabbb5ddbb..c3cbadd2b0 100644 --- a/code/modules/food/food/lunch.dm +++ b/code/modules/food/food/lunch.dm @@ -6,7 +6,7 @@ var/global/list/lunchables_lunches_ = list(/obj/item/reagent_containers/food/sna /obj/item/reagent_containers/food/snacks/slice/meatpizza/filled, /obj/item/reagent_containers/food/snacks/slice/mushroompizza/filled, /obj/item/reagent_containers/food/snacks/slice/vegetablepizza/filled, - /obj/item/reagent_containers/food/snacks/pineappleslice/filled, + /obj/item/reagent_containers/food/snacks/slice/pineapple/filled, /obj/item/reagent_containers/food/snacks/tastybread, /obj/item/reagent_containers/food/snacks/bagelplain, /obj/item/reagent_containers/food/snacks/bagelsunflower, diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index 8495399e24..f42fdb3482 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -13,6 +13,7 @@ var/dry = 0 var/survivalfood = FALSE var/nutriment_amt = 0 + var/nutriment_allergens = null //Apply allergens to nutriment independent of reagents, for recipes that clear their constituent parts. var/list/nutriment_desc = list("food" = 1) var/datum/reagent/nutriment/coating/coating = null var/icon/flat_icon = null //Used to cache a flat icon generated from dipping in batter. This is used again to make the cooked-batter-overlay @@ -31,6 +32,10 @@ . = ..() if(nutriment_amt) reagents.add_reagent("nutriment",nutriment_amt,nutriment_desc) + if(nutriment_allergens && reagents) + for(var/datum/reagent/r in reagents.reagent_list) + if(r.id == "nutriment") + r.allergen_type = nutriment_allergens //Placeholder for effect that trigger on eating that aren't tied to reagents. /obj/item/reagent_containers/food/snacks/proc/On_Consume(var/mob/M) @@ -268,7 +273,7 @@ bitecount++ spawn(5) if(!src && !user.client) - user.custom_emote(VISIBLE_MESSAGE,"[pick("burps", "cries for more", "burps twice", "looks at the area where the food was")]") + user.custom_emote(1,"[pick("burps", "cries for more", "burps twice", "looks at the area where the food was")]") qdel(src) if(!QDELETED(src)) On_Consume(user) @@ -298,16 +303,19 @@ // desc = "Smells caustic. Tastes like heresy." //Duh // icon_state = "xburger" //Refers to an icon in food.dmi // nutriment_amt = 2 //How much nutriment to add. +// nutriment_desc = list("heresy" = 2) //The taste string for specifically the 'nutriment' added according to nutriment_amt. Does not override tastes of other reagents/ingredients introduced in recipes. Clear reagents in recipe datum if you want ONLY this string. +// nutriment_allergens = ALLERGEN_EGGS|ALLERGEN_GRAINS //Any allergens present in the described nutriment. Useful for when a recipe has had its reagents cleared but should contain e.g. nuts, without having to add a special nut reagent which may mess with taste. // bitesize = 3 //This is the amount each bite consumes. -///obj/item/reagent_containers/food/snacks/xenoburger/Initialize() //Don't mess with this. (We use Initialize now instead of New()) +///obj/item/reagent_containers/food/snacks/xenoburger/Initialize() //Don't mess with this. (We use Initialize now instead of New()) // . = ..() //Same here. // reagents.add_reagent("xenomicrobes", 10) //This is what is in the food item. you may copy/paste this line of code for all the contents. +// reagents.add_reagent("protein", 10, list("caustic meat" = 10)) //As above. Subtypes of nutriment may be assigned taste string overrides as so. It's recommended to add e.g. protein for meats as these nutriment subtypes often have special behaviour (e.g. unathi meat benefits), pre-built allergens etc. /obj/item/reagent_containers/food/snacks/aesirsalad - name = "Aesir salad" + name = "\improper Aesir salad" desc = "Probably too incredible for mortal men to fully enjoy." icon_state = "aesirsalad" trash = /obj/item/trash/snack_bowl @@ -315,6 +323,7 @@ center_of_mass = list("x"=17, "y"=11) nutriment_amt = 8 nutriment_desc = list("apples" = 3,"salad" = 5) + nutriment_allergens = ALLERGEN_FRUIT bitesize = 3 /obj/item/reagent_containers/food/snacks/aesirsalad/Initialize() @@ -323,11 +332,12 @@ reagents.add_reagent("tricordrazine", 8) /obj/item/reagent_containers/food/snacks/candy/donor - name = "Donor Candy" + name = "donor candy" desc = "A little treat for blood donors." trash = /obj/item/trash/candy nutriment_amt = 9 nutriment_desc = list("candy" = 10) + nutriment_allergens = ALLERGEN_SUGARS // It's literally just sugar bitesize = 5 /obj/item/reagent_containers/food/snacks/candy/donor/Initialize() @@ -342,7 +352,8 @@ filling_color = "#FFFCB0" center_of_mass = list("x"=14, "y"=10) nutriment_amt = 4 - nutriment_desc = list("candy corn" = 4) + nutriment_desc = list("waxy sugar" = 2, "vanilla marshmallow flavouring") + nutriment_allergens = ALLERGEN_SUGARS // It's literally just sugar and... Who knows what. bitesize = 2 /obj/item/reagent_containers/food/snacks/candy_corn/Initialize() @@ -350,13 +361,14 @@ reagents.add_reagent("sugar", 2) /obj/item/reagent_containers/food/snacks/chocolatebar //not a vending item - name = "Chocolate Bar" + name = "chocolate bar" desc = "Such sweet, fattening food." icon_state = "chocolatebar" filling_color = "#7D5F46" center_of_mass = list("x"=15, "y"=15) nutriment_amt = 2 nutriment_desc = list("chocolate" = 5) + nutriment_allergens = ALLERGEN_SUGARS bitesize = 2 /obj/item/reagent_containers/food/snacks/chocolatebar/Initialize() @@ -372,6 +384,7 @@ center_of_mass = list("x"=15, "y"=15) nutriment_amt = 1 nutriment_desc = list("chocolate" = 3, "caramel" = 2, "lusciousness" = 1) + nutriment_allergens = ALLERGEN_SUGARS bitesize = 2 /obj/item/reagent_containers/food/snacks/chocolatepiece/white @@ -388,13 +401,14 @@ nutriment_desc = list("chocolate" = 3, "undying devotion" = 3) /obj/item/reagent_containers/food/snacks/chocolateegg - name = "Chocolate Egg" - desc = "Such sweet, fattening food." + name = "chocolate egg" + desc = "Predates the chocolate chicken." icon_state = "chocolateegg" filling_color = "#7D5F46" center_of_mass = list("x"=16, "y"=13) nutriment_amt = 3 nutriment_desc = list("chocolate" = 5) + nutriment_allergens = ALLERGEN_SUGARS bitesize = 2 /obj/item/reagent_containers/food/snacks/chocolateegg/Initialize() @@ -404,13 +418,14 @@ /obj/item/reagent_containers/food/snacks/donut name = "donut" - desc = "Goes great with Robust Coffee." + desc = "Goes great with coffee." description_fluff = "These donuts claim to be made fresh daily in a boutique bakery in New Reykjavik and delivered to Nanotrasen's hardworking asset protection crew. They're probably synthesized." icon = 'icons/obj/food_donuts.dmi' icon_state = "donut" filling_color = "#D9C386" - nutriment_desc = list("sweetness", "donut") + nutriment_desc = list("sweetness", "fried dough") nutriment_amt = 3 + nutriment_allergens = ALLERGEN_SUGARS|ALLERGEN_EGGS|ALLERGEN_GRAINS bitesize = 4 var/overlay_state = "donut_inbox" @@ -419,10 +434,6 @@ icon_state = "donut" desc = "A plain ol' donut." -/obj/item/reagent_containers/food/snacks/donut/plain/Initialize() - . = ..() - reagents.add_reagent("nutriment", 3, nutriment_desc) - /obj/item/reagent_containers/food/snacks/donut/plain/jelly name = "plain jelly donut" icon_state = "jelly" @@ -430,7 +441,6 @@ /obj/item/reagent_containers/food/snacks/donut/plain/jelly/Initialize() . = ..() - reagents.add_reagent("nutriment", 3, nutriment_desc) reagents.add_reagent("berryjuice", 5) /obj/item/reagent_containers/food/snacks/donut/pink @@ -439,10 +449,6 @@ desc = "This one has pink frosting!" overlay_state = "donut_pink_inbox" -/obj/item/reagent_containers/food/snacks/donut/pink/Initialize() - . = ..() - reagents.add_reagent("nutriment", 3, nutriment_desc) - /obj/item/reagent_containers/food/snacks/donut/pink/jelly name = "pink frosted jelly donut" icon_state = "jelly_pink" @@ -450,7 +456,6 @@ /obj/item/reagent_containers/food/snacks/donut/pink/jelly/Initialize() . = ..() - reagents.add_reagent("nutriment", 3, nutriment_desc) reagents.add_reagent("berryjuice", 5) /obj/item/reagent_containers/food/snacks/donut/purple @@ -459,10 +464,6 @@ desc = "This one has purple frosting!" overlay_state = "donut_purple_inbox" -/obj/item/reagent_containers/food/snacks/donut/purple/Initialize() - . = ..() - reagents.add_reagent("nutriment", 3, nutriment_desc) - /obj/item/reagent_containers/food/snacks/donut/purple/jelly name = "purple frosted jelly donut" icon_state = "jelly_purple" @@ -470,7 +471,6 @@ /obj/item/reagent_containers/food/snacks/donut/purple/jelly/Initialize() . = ..() - reagents.add_reagent("nutriment", 3, nutriment_desc) reagents.add_reagent("berryjuice", 5) /obj/item/reagent_containers/food/snacks/donut/green @@ -479,10 +479,6 @@ desc = "This one has green frosting!" overlay_state = "donut_green_inbox" -/obj/item/reagent_containers/food/snacks/donut/green/Initialize() - . = ..() - reagents.add_reagent("nutriment", 3, nutriment_desc) - /obj/item/reagent_containers/food/snacks/donut/green/jelly name = "green frosted jelly donut" icon_state = "jelly_green" @@ -490,7 +486,6 @@ /obj/item/reagent_containers/food/snacks/donut/green/jelly/Initialize() . = ..() - reagents.add_reagent("nutriment", 3, nutriment_desc) reagents.add_reagent("berryjuice", 5) /obj/item/reagent_containers/food/snacks/donut/beige @@ -499,10 +494,6 @@ desc = "This one has beige frosting!" overlay_state = "donut_beige_inbox" -/obj/item/reagent_containers/food/snacks/donut/beige/Initialize() - . = ..() - reagents.add_reagent("nutriment", 3, nutriment_desc) - /obj/item/reagent_containers/food/snacks/donut/beige/jelly name = "beige frosted jelly donut" icon_state = "jelly_beige" @@ -510,7 +501,6 @@ /obj/item/reagent_containers/food/snacks/donut/beige/jelly/Initialize() . = ..() - reagents.add_reagent("nutriment", 3, nutriment_desc) reagents.add_reagent("berryjuice", 5) /obj/item/reagent_containers/food/snacks/donut/choc @@ -519,10 +509,6 @@ desc = "This one has chocolate frosting!" overlay_state = "donut_choc_inbox" -/obj/item/reagent_containers/food/snacks/donut/choc/Initialize() - . = ..() - reagents.add_reagent("nutriment", 3, nutriment_desc) - /obj/item/reagent_containers/food/snacks/donut/choc/jelly name = "chocolate frosted jelly donut" icon_state = "jelly_choc" @@ -530,7 +516,6 @@ /obj/item/reagent_containers/food/snacks/donut/choc/jelly/Initialize() . = ..() - reagents.add_reagent("nutriment", 3, nutriment_desc) reagents.add_reagent("berryjuice", 5) /obj/item/reagent_containers/food/snacks/donut/blue @@ -539,10 +524,6 @@ desc = "This one has blue frosting!" overlay_state = "donut_blue_inbox" -/obj/item/reagent_containers/food/snacks/donut/blue/Initialize() - . = ..() - reagents.add_reagent("nutriment", 3, nutriment_desc) - /obj/item/reagent_containers/food/snacks/donut/blue/jelly name = "blue frosted jelly donut" icon_state = "jelly_blue" @@ -550,7 +531,6 @@ /obj/item/reagent_containers/food/snacks/donut/blue/jelly/Initialize() . = ..() - reagents.add_reagent("nutriment", 3, nutriment_desc) reagents.add_reagent("berryjuice", 5) /obj/item/reagent_containers/food/snacks/donut/yellow @@ -559,10 +539,6 @@ desc = "This one has yellow frosting!" overlay_state = "donut_yellow_inbox" -/obj/item/reagent_containers/food/snacks/donut/yellow/Initialize() - . = ..() - reagents.add_reagent("nutriment", 3, nutriment_desc) - /obj/item/reagent_containers/food/snacks/donut/yellow/jelly name = "yellow frosted jelly donut" icon_state = "jelly_yellow" @@ -570,7 +546,6 @@ /obj/item/reagent_containers/food/snacks/donut/yellow/jelly/Initialize() . = ..() - reagents.add_reagent("nutriment", 3, nutriment_desc) reagents.add_reagent("berryjuice", 5) /obj/item/reagent_containers/food/snacks/donut/olive @@ -579,10 +554,6 @@ desc = "This one has olive frosting!" overlay_state = "donut_olive_inbox" -/obj/item/reagent_containers/food/snacks/donut/olive/Initialize() - . = ..() - reagents.add_reagent("nutriment", 3, nutriment_desc) - /obj/item/reagent_containers/food/snacks/donut/olive/jelly name = "olive frosted jelly donut" icon_state = "jelly_olive" @@ -590,7 +561,6 @@ /obj/item/reagent_containers/food/snacks/donut/olive/jelly/Initialize() . = ..() - reagents.add_reagent("nutriment", 3, nutriment_desc) reagents.add_reagent("berryjuice", 5) /obj/item/reagent_containers/food/snacks/donut/homer @@ -601,7 +571,6 @@ /obj/item/reagent_containers/food/snacks/donut/homer/Initialize() . = ..() - reagents.add_reagent("nutriment", 3, nutriment_desc) reagents.add_reagent("sprinkles", 1) /obj/item/reagent_containers/food/snacks/donut/homer/jelly @@ -611,7 +580,6 @@ /obj/item/reagent_containers/food/snacks/donut/homer/jelly/Initialize() . = ..() - reagents.add_reagent("nutriment", 3, nutriment_desc) reagents.add_reagent("sprinkles", 1) reagents.add_reagent("berryjuice", 5) @@ -623,7 +591,6 @@ /obj/item/reagent_containers/food/snacks/donut/choc_sprinkles/Initialize() . = ..() - reagents.add_reagent("nutriment", 3, nutriment_desc) reagents.add_reagent("sprinkles", 1) /obj/item/reagent_containers/food/snacks/donut/choc_sprinkles/jelly @@ -633,7 +600,6 @@ /obj/item/reagent_containers/food/snacks/donut/choc_sprinkles/jelly/Initialize() . = ..() - reagents.add_reagent("nutriment", 3, nutriment_desc) reagents.add_reagent("sprinkles", 1) reagents.add_reagent("berryjuice", 5) @@ -642,6 +608,7 @@ icon_state = "donut_meat" desc = "This donut has ... meat? Is it made of meat?!" overlay_state = "donut_meat_inbox" + nutriment_allergens = ALLERGEN_MEAT /obj/item/reagent_containers/food/snacks/donut/meat/Initialize() . = ..() @@ -653,10 +620,6 @@ desc = "Try not to laugh." overlay_state = "donut_laugh_inbox" -/obj/item/reagent_containers/food/snacks/donut/laugh/Initialize() - . = ..() - reagents.add_reagent("nutriment", 3, nutriment_desc) - /obj/item/reagent_containers/food/snacks/donut/laugh/jelly name = "laugh jelly donut" icon_state = "jelly_laugh" @@ -664,11 +627,10 @@ /obj/item/reagent_containers/food/snacks/donut/laugh/jelly/Initialize() . = ..() - reagents.add_reagent("nutriment", 3, nutriment_desc) reagents.add_reagent("berryjuice", 5) /obj/item/reagent_containers/food/snacks/donut/chaos - name = "Chaos Donut" + name = "chaos donut" desc = "Like life, it never quite tastes the same." icon_state = "donut_chaos" filling_color = "#ED11E6" @@ -795,7 +757,7 @@ icon_state = "egg-yellow" /obj/item/reagent_containers/food/snacks/friedegg - name = "Fried egg" + name = "fried egg" desc = "A fried egg, with a touch of salt and pepper." icon_state = "friedegg" filling_color = "#FFDF78" @@ -804,19 +766,19 @@ /obj/item/reagent_containers/food/snacks/friedegg/Initialize() . = ..() - reagents.add_reagent("protein", 3) + reagents.add_reagent("egg", 2) reagents.add_reagent("sodiumchloride", 1) reagents.add_reagent("blackpepper", 1) /obj/item/reagent_containers/food/snacks/boiledegg - name = "Boiled egg" + name = "boiled egg" desc = "A hard boiled egg." icon_state = "egg" filling_color = "#FFFFFF" /obj/item/reagent_containers/food/snacks/boiledegg/Initialize() . = ..() - reagents.add_reagent("protein", 2) + reagents.add_reagent("egg", 3) /obj/item/reagent_containers/food/snacks/organ name = "organ" @@ -841,37 +803,36 @@ qdel(donor) /obj/item/reagent_containers/food/snacks/tofu - name = "Tofu" + name = "tofu" icon_state = "tofu" desc = "We all love tofu." filling_color = "#FFFEE0" center_of_mass = list("x"=17, "y"=10) nutriment_amt = 3 nutriment_desc = list("tofu" = 3, "goeyness" = 3) + nutriment_allergens = ALLERGEN_BEANS bitesize = 3 /obj/item/reagent_containers/food/snacks/tofurkey - name = "Tofurkey" + name = "tofurkey" desc = "A fake turkey made from tofu." icon_state = "tofurkey" filling_color = "#FFFEE0" center_of_mass = list("x"=16, "y"=8) nutriment_amt = 12 - nutriment_desc = list("turkey" = 3, "tofu" = 5, "goeyness" = 4) + nutriment_desc = list("herbal seasoning" = 3, "tofu" = 5, "goeyness" = 4) + nutriment_allergens = ALLERGEN_BEANS bitesize = 3 -/obj/item/reagent_containers/food/snacks/tofurkey/Initialize() - . = ..() - reagents.add_reagent("stoxin", 3) - /obj/item/reagent_containers/food/snacks/stuffing - name = "Stuffing" + name = "stuffing" desc = "Moist, peppery breadcrumbs for filling the body cavities of dead birds. Dig in!" icon_state = "stuffing" filling_color = "#C9AC83" center_of_mass = list("x"=16, "y"=10) nutriment_amt = 3 - nutriment_desc = list("dryness" = 2, "bread" = 2) + nutriment_desc = list("herbs" = 2, "bread" = 2) + nutriment_allergens = ALLERGEN_GRAINS bitesize = 1 /obj/item/reagent_containers/food/snacks/carpmeat @@ -901,19 +862,21 @@ color = "#2c2cff" /obj/item/reagent_containers/food/snacks/fishfingers - name = "Fish Fingers" - desc = "A finger of fish." + name = "fish fingers" + desc = "You didn't think fish had those?" icon_state = "fishfingers" filling_color = "#FFDEFE" center_of_mass = list("x"=16, "y"=13) + nutriment_amt = 2 + nutriment_desc = list("fried batter" = 2) bitesize = 3 /obj/item/reagent_containers/food/snacks/fishfingers/Initialize() . = ..() - reagents.add_reagent("seafood", 4) + reagents.add_reagent("seafood", 4, list("fried fish" = 4)) /obj/item/reagent_containers/food/snacks/zestfish - name = "Zesty Fish" + name = "zesty fish" desc = "Lightly seasoned fish fillets." icon_state = "zestfish" filling_color = "#FFDEFE" @@ -922,7 +885,7 @@ /obj/item/reagent_containers/food/snacks/zestfish/Initialize() . = ..() - reagents.add_reagent("seafood", 4) + reagents.add_reagent("seafood", 4, list("lemon-infused fish meat" = 4)) /obj/item/reagent_containers/food/snacks/mushroomslice name = "mushroom slice" @@ -931,7 +894,7 @@ filling_color = "#E0D7C5" center_of_mass = list("x"=17, "y"=16) nutriment_amt = 3 - nutriment_desc = list("raw" = 2, "mushroom" = 2) + nutriment_desc = list("raw mushroom" = 3) bitesize = 6 /obj/item/reagent_containers/food/snacks/mushroomslice/Initialize() @@ -945,7 +908,7 @@ filling_color = "#DB0000" center_of_mass = list("x"=17, "y"=16) nutriment_amt = 3 - nutriment_desc = list("raw" = 2, "tomato" = 3) + nutriment_desc = list("raw tomato" = 3) bitesize = 6 /obj/item/reagent_containers/food/snacks/bearmeat @@ -958,7 +921,7 @@ /obj/item/reagent_containers/food/snacks/bearmeat/Initialize() . = ..() - reagents.add_reagent("protein", 12) + reagents.add_reagent("protein", 12, list("gamey meat" = 12)) reagents.add_reagent("hyperzine", 5) /obj/item/reagent_containers/food/snacks/xenomeat @@ -971,7 +934,7 @@ /obj/item/reagent_containers/food/snacks/xenomeat/Initialize() . = ..() - reagents.add_reagent("protein", 6) + reagents.add_reagent("protein", 6, list("faintly metallic meat" = 6)) reagents.add_reagent("pacid",6) /obj/item/reagent_containers/food/snacks/xenomeat/spidermeat // Substitute for recipes requiring xeno meat. @@ -997,10 +960,10 @@ /obj/item/reagent_containers/food/snacks/meatball/Initialize() . = ..() - reagents.add_reagent("protein", 3) + reagents.add_reagent("protein", 3, list("ground meat" = 3)) /obj/item/reagent_containers/food/snacks/sausage - name = "Sausage" + name = "sausage" desc = "A piece of mixed, long meat." icon_state = "sausage" filling_color = "#DB0000" @@ -1009,23 +972,23 @@ /obj/item/reagent_containers/food/snacks/sausage/Initialize() . = ..() - reagents.add_reagent("protein", 6) + reagents.add_reagent("protein", 6, list("mildly seasoned meat" = 6)) /obj/item/reagent_containers/food/snacks/donkpocket - name = "Donk-pocket" - desc = "The food of choice for the seasoned traitor." - description_fluff = "DONKpockets were originally a Nanotrasen product, an attempt to break into the food market controlled by Centauri Provisions. Somehow, Centauri wound up with the rights to the DONK brand, ending Nanotrasen's ambitions. They taste pretty okay." + name = "\improper Donk-pocket" + desc = "The food of choice for the seasoned slob." + description_fluff = "Donk-pockets were originally a NanoTrasen product, an attempt to break into the food market controlled by Centauri Provisions. Somehow, Centauri wound up with the rights to the Donk brand, ending NanoTrasen's ambitions. They taste pretty okay." icon_state = "donkpocket" filling_color = "#DEDEAB" center_of_mass = list("x"=16, "y"=10) nutriment_amt = 2 - nutriment_desc = list("heartiness" = 1, "dough" = 2) + nutriment_desc = list("grease" = 1, "undercooked dough" = 2) var/warm = FALSE var/list/heated_reagents = list("tricordrazine" = 5) /obj/item/reagent_containers/food/snacks/donkpocket/Initialize() . = ..() - reagents.add_reagent("protein", 2) + reagents.add_reagent("protein", 2, list("salty meat mush" = 2)) /obj/item/reagent_containers/food/snacks/donkpocket/proc/heat() warm = 1 @@ -1046,7 +1009,7 @@ /obj/item/reagent_containers/food/snacks/donkpocket/sinpocket name = "\improper Sin-pocket" - desc = "The food of choice for the veteran. Do NOT overconsume." + desc = "The food of choice for the veteran slob. Do NOT overconsume." filling_color = "#6D6D00" heated_reagents = list("doctorsdelight" = 5, "hyperzine" = 0.75, "synaptizine" = 0.25) var/has_been_heated = 0 @@ -1071,16 +1034,16 @@ /obj/item/reagent_containers/food/snacks/brainburger/Initialize() . = ..() - reagents.add_reagent("protein", 6) + reagents.add_reagent("protein", 6, list("buttery meat" = 6)) reagents.add_reagent("alkysine", 6) /obj/item/reagent_containers/food/snacks/ghostburger - name = "Ghost Burger" + name = "ghost burger" desc = "Spooky! It doesn't look very filling." icon_state = "ghostburger" filling_color = "#FFF2FF" center_of_mass = list("x"=16, "y"=11) - nutriment_desc = list("buns" = 3, "spookiness" = 3) + nutriment_desc = list("bread bun" = 3, "spookiness" = 3) nutriment_amt = 2 bitesize = 2 @@ -1098,7 +1061,7 @@ /obj/item/reagent_containers/food/snacks/human/burger/Initialize() . = ..() - reagents.add_reagent("protein", 6) + reagents.add_reagent("protein", 6, list("mild pork" = 6)) /obj/item/reagent_containers/food/snacks/cheeseburger name = "cheeseburger" @@ -1106,11 +1069,11 @@ icon_state = "cheeseburger" center_of_mass = list("x"=16, "y"=11) nutriment_amt = 2 - nutriment_desc = list("cheese" = 2, "bun" = 2) + nutriment_desc = list("cheese" = 2, "bread bun" = 1) /obj/item/reagent_containers/food/snacks/cheeseburger/Initialize() . = ..() - reagents.add_reagent("protein", 2) + reagents.add_reagent("protein", 3, list("grilled meat" = 3)) /obj/item/reagent_containers/food/snacks/monkeyburger name = "burger" @@ -1119,33 +1082,36 @@ filling_color = "#D63C3C" center_of_mass = list("x"=16, "y"=11) nutriment_amt = 3 - nutriment_desc = list("bun" = 2) + nutriment_desc = list("bread bun" = 2) bitesize = 2 /obj/item/reagent_containers/food/snacks/monkeyburger/Initialize() . = ..() - reagents.add_reagent("protein", 3) + reagents.add_reagent("protein", 3, list("grilled meat" = 3)) /obj/item/reagent_containers/food/snacks/fishburger - name = "Fillet -o- Carp Sandwich" + name = "fried fish sandwich" desc = "Almost like a carp is yelling somewhere... Give me back that fillet -o- carp, give me that carp." icon_state = "fishburger" filling_color = "#FFDEFE" center_of_mass = list("x"=16, "y"=10) + nutriment_amt = 3 + nutriment_desc = list("bread bun" = 2, "fried batter" = 1) bitesize = 3 /obj/item/reagent_containers/food/snacks/fishburger/Initialize() . = ..() - reagents.add_reagent("protein", 6) + reagents.add_reagent("seafood", 6, list("fried fish" = 6)) /obj/item/reagent_containers/food/snacks/tofuburger - name = "Tofu Burger" + name = "tofu burger" desc = "What.. is that meat?" icon_state = "tofuburger" filling_color = "#FFFEE0" center_of_mass = list("x"=16, "y"=10) nutriment_amt = 6 - nutriment_desc = list("bun" = 2, "pseudo-soy meat" = 3) + nutriment_desc = list("bread bun" = 2, "imitation meat" = 3) + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_BEANS bitesize = 2 /obj/item/reagent_containers/food/snacks/roburger @@ -1155,7 +1121,7 @@ filling_color = "#CCCCCC" center_of_mass = list("x"=16, "y"=11) nutriment_amt = 2 - nutriment_desc = list("bun" = 2, "metal" = 3) + nutriment_desc = list("bread bun" = 2, "metal" = 3) bitesize = 2 /obj/item/reagent_containers/food/snacks/roburgerbig @@ -1165,6 +1131,7 @@ filling_color = "#CCCCCC" volume = 100 center_of_mass = list("x"=16, "y"=11) + nutriment_desc = list("bread bun" = 2, "metal" = 3) bitesize = 0.1 /obj/item/reagent_containers/food/snacks/xenoburger @@ -1173,36 +1140,37 @@ icon_state = "xburger" filling_color = "#43DE18" center_of_mass = list("x"=16, "y"=11) + nutriment_amt = 3 + nutriment_desc = list("bread bun" = 2) bitesize = 2 /obj/item/reagent_containers/food/snacks/xenoburger/Initialize() . = ..() - reagents.add_reagent("protein", 8) + reagents.add_reagent("protein", 8, list("unpleasantly metallic meat" = 8)) /obj/item/reagent_containers/food/snacks/clownburger - name = "Clown Burger" + name = "clown burger" desc = "This tastes funny..." icon_state = "clownburger" filling_color = "#FF00FF" center_of_mass = list("x"=17, "y"=12) nutriment_amt = 6 - nutriment_desc = list("bun" = 2, "clown shoe" = 3) + nutriment_desc = list("bread bun" = 2, "clown shoe" = 3) bitesize = 2 - /obj/item/reagent_containers/food/snacks/mimeburger - name = "Mime Burger" + name = "mime burger" desc = "Its taste defies language." icon_state = "mimeburger" filling_color = "#FFFFFF" center_of_mass = list("x"=16, "y"=11) nutriment_amt = 12 - nutriment_desc = list("bun" = 2, "face paint" = 3) + nutriment_desc = list("bread bun" = 2, "ennui" = 3) bitesize = 2 /obj/item/reagent_containers/food/snacks/omelette - name = "Omelette Du Fromage" - desc = "That's all you can say!" + name = "cheese omelette" + desc = "Omelette Du Fromage... That's all you can say!" icon_state = "omelette" trash = /obj/item/trash/plate filling_color = "#FFF9A8" @@ -1214,17 +1182,17 @@ reagents.add_reagent("protein", 8) /obj/item/reagent_containers/food/snacks/muffin - name = "Muffin" - desc = "A delicious and spongy little cake" + name = "muffin" + desc = "A delicious and spongy little cake." icon_state = "muffin" filling_color = "#E0CF9B" center_of_mass = list("x"=17, "y"=4) nutriment_amt = 6 - nutriment_desc = list("sweetness" = 3, "muffin" = 3) + nutriment_desc = list("mild sweetness" = 3, "fluffy bread" = 3) bitesize = 2 /obj/item/reagent_containers/food/snacks/pie - name = "Banana Cream Pie" + name = "banana cream pie" desc = "Just like back home, on clown planet! HONK!" description_fluff = "One of the more esoteric terms of the Nanotrasen-Centauri Noncompetition Agreement of 2545 was a requirement that Nanotrasen stock these pies on all their stations. They're calibrated for comedic value, not taste." icon_state = "pie" @@ -1232,7 +1200,7 @@ filling_color = "#FBFFB8" center_of_mass = list("x"=16, "y"=13) nutriment_amt = 4 - nutriment_desc = list("pie" = 3, "cream" = 2) + nutriment_desc = list("sweet wholewheat crust" = 3, "whipped cream" = 2) bitesize = 3 /obj/item/reagent_containers/food/snacks/pie/Initialize() @@ -1246,13 +1214,14 @@ qdel(src) /obj/item/reagent_containers/food/snacks/berryclafoutis - name = "Berry Clafoutis" + name = "berry clafoutis" desc = "No black birds, this is a good sign." icon_state = "berryclafoutis" trash = /obj/item/trash/plate center_of_mass = list("x"=16, "y"=13) nutriment_amt = 4 - nutriment_desc = list("sweetness" = 2, "pie" = 3) + nutriment_desc = list("egg custard" = 2, "sweet pie crust" = 3) + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_EGGS bitesize = 3 /obj/item/reagent_containers/food/snacks/berryclafoutis/berry/Initialize() @@ -1271,22 +1240,22 @@ filling_color = "#E6DEB5" center_of_mass = list("x"=15, "y"=11) nutriment_amt = 8 - nutriment_desc = list("waffle" = 8) + nutriment_desc = list("toasted batter" = 8) bitesize = 2 /obj/item/reagent_containers/food/snacks/eggplantparm - name = "Eggplant Parmigiana" + name = "eggplant parmigiana" desc = "The only good recipe for eggplant." icon_state = "eggplantparm" trash = /obj/item/trash/plate filling_color = "#4D2F5E" center_of_mass = list("x"=16, "y"=11) nutriment_amt = 6 - nutriment_desc = list("cheese" = 3, "eggplant" = 3) + nutriment_desc = list("mozzarella cheese" = 3, "baked eggplant" = 3) bitesize = 2 /obj/item/reagent_containers/food/snacks/soylentgreen - name = "Soylent Green" + name = "soylent green" desc = "Not made of people. Honest." //Totally people. icon_state = "soylent_green" trash = /obj/item/trash/waffles @@ -1296,41 +1265,44 @@ /obj/item/reagent_containers/food/snacks/soylentgreen/Initialize() . = ..() - reagents.add_reagent("protein", 10) + reagents.add_reagent("protein", 10, list("stale bread paste" = 5, "unidentifiable meat" = 5)) /obj/item/reagent_containers/food/snacks/soylenviridians - name = "Soylen Virdians" + name = "soylent virdians" desc = "Not made of people. Honest." //Actually honest for once. icon_state = "soylent_yellow" trash = /obj/item/trash/waffles filling_color = "#E6FA61" center_of_mass = list("x"=15, "y"=11) nutriment_amt = 10 - nutriment_desc = list("some sort of protein" = 10) //seasoned VERY well. + nutriment_desc = list("wet starch" = 10) bitesize = 2 /obj/item/reagent_containers/food/snacks/meatpie - name = "Meat-pie" + name = "meat-pie" icon_state = "meatpie" - desc = "An old barber recipe, very delicious!" + desc = "An old barber's recipe, very delicious!" trash = /obj/item/trash/plate filling_color = "#948051" center_of_mass = list("x"=16, "y"=13) bitesize = 2 + nutriment_amt = 2 + nutriment_desc = list("savory pastry" = 2) /obj/item/reagent_containers/food/snacks/meatpie/Initialize() . = ..() - reagents.add_reagent("protein", 10) + reagents.add_reagent("protein", 8, list("lightly seasoned mince" = 4, "meat gravy" = 4)) /obj/item/reagent_containers/food/snacks/tofupie - name = "Tofu-pie" + name = "tofu-pie" icon_state = "meatpie" desc = "A delicious tofu pie." trash = /obj/item/trash/plate filling_color = "#FFFEE0" center_of_mass = list("x"=16, "y"=13) nutriment_amt = 10 - nutriment_desc = list("tofu" = 2, "pie" = 8) + nutriment_desc = list("lightly seasoned tofu" = 2, "savory pastry" = 8) + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_BEANS bitesize = 2 /obj/item/reagent_containers/food/snacks/amanita_pie @@ -1340,7 +1312,7 @@ filling_color = "#FFCCCC" center_of_mass = list("x"=17, "y"=9) nutriment_amt = 5 - nutriment_desc = list("sweetness" = 3, "mushroom" = 3, "pie" = 2) + nutriment_desc = list("sweetness" = 2, "sour fungus" = 4, "savory pastry" = 2) bitesize = 3 /obj/item/reagent_containers/food/snacks/amanita_pie/Initialize() @@ -1355,7 +1327,7 @@ filling_color = "#B8279B" center_of_mass = list("x"=17, "y"=9) nutriment_amt = 8 - nutriment_desc = list("heartiness" = 2, "mushroom" = 3, "pie" = 3) + nutriment_desc = list("umami gravy" = 2, "chewy mushroom" = 3, "savory pastry" = 3) bitesize = 2 /obj/item/reagent_containers/food/snacks/plump_pie/Initialize() @@ -1367,7 +1339,7 @@ reagents.add_reagent("tricordrazine", 5) /obj/item/reagent_containers/food/snacks/xemeatpie - name = "Xeno-pie" + name = "xeno-pie" icon_state = "xenomeatpie" desc = "A delicious meatpie. Probably heretical." trash = /obj/item/trash/plate @@ -1377,11 +1349,11 @@ /obj/item/reagent_containers/food/snacks/xemeatpie/Initialize() . = ..() - reagents.add_reagent("protein", 10) + reagents.add_reagent("protein", 10, list("unpleasantly metallic meat" = 10)) /obj/item/reagent_containers/food/snacks/wingfangchu - name = "Wing Fang Chu" - desc = "A savory dish of alien wing wang in soy." + name = "sticky alien wings" + desc = "A savory dish of questionable alien meat shaped into easily comprehensible pieces, and slathered in a sticky soy sauce." icon_state = "wingfangchu" trash = /obj/item/trash/small_bowl filling_color = "#43DE18" @@ -1390,7 +1362,7 @@ /obj/item/reagent_containers/food/snacks/wingfangchu/Initialize() . = ..() - reagents.add_reagent("protein", 6) + reagents.add_reagent("protein", 6, list("unpleasantly metallic meat" = 5, "hoisin sauce" = 5)) /obj/item/reagent_containers/food/snacks/human/kabob name = "-kabob" @@ -1403,10 +1375,10 @@ /obj/item/reagent_containers/food/snacks/human/kabob/Initialize() . = ..() - reagents.add_reagent("protein", 8) + reagents.add_reagent("protein", 8, list("mild chargrilled pork" = 8)) /obj/item/reagent_containers/food/snacks/monkeykabob - name = "Meat-kabob" + name = "meat-kabob" icon_state = "kabob" desc = "Delicious meat, on a stick." trash = /obj/item/stack/rods @@ -1416,10 +1388,10 @@ /obj/item/reagent_containers/food/snacks/monkeykabob/Initialize() . = ..() - reagents.add_reagent("protein", 8) + reagents.add_reagent("protein", 8, list("chargrilled meat" = 8)) /obj/item/reagent_containers/food/snacks/tofukabob - name = "Tofu-kabob" + name = "tofu-kabob" icon_state = "kabob" desc = "Vegan meat, on a stick." trash = /obj/item/stack/rods @@ -1428,9 +1400,10 @@ center_of_mass = list("x"=17, "y"=15) nutriment_amt = 8 nutriment_desc = list("tofu" = 3, "metal" = 1) + nutriment_allergens = ALLERGEN_BEANS /obj/item/reagent_containers/food/snacks/cubancarp - name = "Cuban Carp" + name = "\improper Cuban carp" desc = "A sandwich that burns your tongue and then leaves it numb!" icon_state = "cubancarp" trash = /obj/item/trash/plate @@ -1438,15 +1411,16 @@ center_of_mass = list("x"=12, "y"=5) nutriment_amt = 3 nutriment_desc = list("toasted bread" = 3) + nutriment_allergens = ALLERGEN_GRAINS bitesize = 3 /obj/item/reagent_containers/food/snacks/cubancarp/Initialize() . = ..() - reagents.add_reagent("protein", 3) + reagents.add_reagent("seafood", 3, list("spicy fish meat" = 3)) reagents.add_reagent("capsaicin", 3) /obj/item/reagent_containers/food/snacks/popcorn - name = "Popcorn" + name = "popcorn" desc = "Now let's find some cinema." icon = 'icons/obj/food_snacks.dmi' icon_state = "popcorn" @@ -1455,7 +1429,8 @@ filling_color = "#FFFAD4" center_of_mass = list("x"=16, "y"=8) nutriment_amt = 2 - nutriment_desc = list("popcorn" = 3) + nutriment_desc = list("toasted corn" = 2, "butter" = 1) + nutriment_allergens = ALLERGEN_GRAINS bitesize = 0.1 //This snack is supposed to be eaten for a long time. @@ -1470,32 +1445,29 @@ . = ..() /obj/item/reagent_containers/food/snacks/loadedbakedpotato - name = "Loaded Baked Potato" + name = "loaded baked potato" desc = "Totally baked." icon_state = "loadedbakedpotato" filling_color = "#9C7A68" center_of_mass = list("x"=16, "y"=10) - nutriment_amt = 3 - nutriment_desc = list("baked potato" = 3) + nutriment_amt = 12 + nutriment_desc = list("baked potato" = 3, "cheese" = 3) + nutriment_allergens = ALLERGEN_VEGETABLE|ALLERGEN_DAIRY bitesize = 2 -/obj/item/reagent_containers/food/snacks/loadedbakedpotato/Initialize() - . = ..() - reagents.add_reagent("protein", 3) - /obj/item/reagent_containers/food/snacks/fries - name = "Space Fries" - desc = "AKA: French Fries, Freedom Fries, etc." + name = "skinny fries" + desc = "AKA: French Fries, chips, etc." icon_state = "fries" trash = /obj/item/trash/plate filling_color = "#EDDD00" center_of_mass = list("x"=16, "y"=11) - nutriment_amt = 4 + nutriment_amt = 8 nutriment_desc = list("fresh fries" = 4) bitesize = 2 /obj/item/reagent_containers/food/snacks/bangersandmash - name = "Bangers and Mash" + name = "bangers and mash" desc = "An English treat." icon_state = "bangersandmash" trash = /obj/item/trash/plate @@ -1503,14 +1475,11 @@ center_of_mass = list("x"=16, "y"=11) nutriment_amt = 4 nutriment_desc = list("fluffy potato" = 3, "sausage" = 2) + nutriment_allergens = ALLERGEN_MEAT bitesize = 4 -/obj/item/reagent_containers/food/snacks/bangersandmash/Initialize() - . = ..() - reagents.add_reagent("protein", 3) - /obj/item/reagent_containers/food/snacks/cheesymash - name = "Cheesy Mashed Potato" + name = "cheesy mashed potato" desc = "The only thing that could make mash better." icon_state = "cheesymash" trash = /obj/item/trash/plate @@ -1518,14 +1487,11 @@ center_of_mass = list("x"=16, "y"=11) nutriment_amt = 4 nutriment_desc = list("cheesy potato" = 4) + nutriment_allergens = ALLERGEN_DAIRY bitesize = 2 -/obj/item/reagent_containers/food/snacks/cheesymash/Initialize() - . = ..() - reagents.add_reagent("protein", 3) - /obj/item/reagent_containers/food/snacks/blackpudding - name = "Black Pudding" + name = "black pudding" desc = "This doesn't seem like a pudding at all." icon_state = "blackpudding" filling_color = "#FF0000" @@ -1534,11 +1500,11 @@ /obj/item/reagent_containers/food/snacks/blackpudding/Initialize() . = ..() - reagents.add_reagent("protein", 2) + reagents.add_reagent("protein", 2, list("seasoned meat" = 2)) reagents.add_reagent("blood", 5) /obj/item/reagent_containers/food/snacks/soydope - name = "Soy Dope" + name = "soy dope" desc = "Dope from a soy." icon_state = "soydope" trash = /obj/item/trash/plate @@ -1546,20 +1512,22 @@ center_of_mass = list("x"=16, "y"=10) nutriment_amt = 2 nutriment_desc = list("slime" = 2, "soy" = 2) + nutriment_allergens = ALLERGEN_BEANS bitesize = 2 /obj/item/reagent_containers/food/snacks/spagetti - name = "Spaghetti" + name = "spaghetti" desc = "A bundle of raw spaghetti." icon_state = "spagetti" filling_color = "#EDDD00" center_of_mass = list("x"=16, "y"=16) nutriment_amt = 1 - nutriment_desc = list("noodles" = 2) + nutriment_desc = list("pasta" = 2) + nutriment_allergens = ALLERGEN_GRAINS bitesize = 1 /obj/item/reagent_containers/food/snacks/cheesyfries - name = "Cheesy Fries" + name = "cheesy fries" desc = "Fries. Covered in cheese. Duh." icon_state = "cheesyfries" trash = /obj/item/trash/plate @@ -1567,24 +1535,21 @@ center_of_mass = list("x"=16, "y"=11) nutriment_amt = 4 nutriment_desc = list("fresh fries" = 3, "cheese" = 3) + nutriment_allergens = ALLERGEN_DAIRY bitesize = 2 -/obj/item/reagent_containers/food/snacks/cheesyfries/Initialize() - . = ..() - reagents.add_reagent("protein", 2) - /obj/item/reagent_containers/food/snacks/fortunecookie - name = "Fortune cookie" + name = "fortune cookie" desc = "A true prophecy in each cookie!" icon_state = "fortune_cookie" filling_color = "#E8E79E" center_of_mass = list("x"=15, "y"=14) nutriment_amt = 3 - nutriment_desc = list("fortune cookie" = 2) + nutriment_desc = list("sweet cracker" = 2, "vanilla" = 1) bitesize = 2 /obj/item/reagent_containers/food/snacks/badrecipe - name = "Burned mess" + name = "burned mess" desc = "Someone should be demoted from chef for this." icon_state = "badrecipe" filling_color = "#211F02" @@ -1597,8 +1562,8 @@ reagents.add_reagent("carbon", 3) /obj/item/reagent_containers/food/snacks/meatsteak - name = "Meat steak" - desc = "A piece of hot spicy meat." + name = "meat steak" + desc = "Firm, but with a little give. " icon_state = "meatstake" trash = /obj/item/trash/plate filling_color = "#7A3D11" @@ -1607,19 +1572,19 @@ /obj/item/reagent_containers/food/snacks/meatsteak/Initialize() . = ..() - reagents.add_reagent("protein", 4) + reagents.add_reagent("protein", 4, "grilled meat") reagents.add_reagent("sodiumchloride", 1) reagents.add_reagent("blackpepper", 1) /obj/item/reagent_containers/food/snacks/spacylibertyduff - name = "Spacy Liberty Duff" - desc = "Jello gelatin, from Alfred Hubbard's cookbook" + name = "psilocybin duff" + desc = "Powerful fungal pudding. While geared for skrell tastes, it's as if it came straight from Alfred Hubbard's cookbook." icon_state = "spacylibertyduff" trash = /obj/item/trash/snack_bowl filling_color = "#42B873" center_of_mass = list("x"=16, "y"=8) nutriment_amt = 6 - nutriment_desc = list("mushroom" = 6) + nutriment_desc = list("alcohol" = 3, "fungal umami" = 3) bitesize = 3 /obj/item/reagent_containers/food/snacks/spacylibertyduff/Initialize() @@ -1627,14 +1592,14 @@ reagents.add_reagent("psilocybin", 6) /obj/item/reagent_containers/food/snacks/amanitajelly - name = "Amanita Jelly" - desc = "Looks curiously toxic" + name = "amanita jelly" + desc = "Looks curiously toxic." icon_state = "amanitajelly" trash = /obj/item/trash/snack_bowl filling_color = "#ED0758" center_of_mass = list("x"=16, "y"=5) nutriment_amt = 6 - nutriment_desc = list("jelly" = 3, "mushroom" = 3) + nutriment_desc = list("alcohol" = 3, "fungal umami" = 3) bitesize = 3 /obj/item/reagent_containers/food/snacks/amanitajelly/Initialize() @@ -1643,18 +1608,18 @@ reagents.add_reagent("psilocybin", 3) /obj/item/reagent_containers/food/snacks/poppypretzel - name = "Poppy pretzel" + name = "poppy pretzel" desc = "It's all twisted up!" icon_state = "poppypretzel" bitesize = 2 filling_color = "#916E36" center_of_mass = list("x"=16, "y"=10) nutriment_amt = 5 - nutriment_desc = list("poppy seeds" = 2, "pretzel" = 3) + nutriment_desc = list("poppy seeds" = 2, "salty bread" = 3) bitesize = 2 /obj/item/reagent_containers/food/snacks/meatballsoup - name = "Meatball soup" + name = "meatball soup" desc = "You've got balls kid, BALLS!" icon_state = "meatballsoup" trash = /obj/item/trash/snack_bowl @@ -1664,23 +1629,19 @@ /obj/item/reagent_containers/food/snacks/meatballsoup/Initialize() . = ..() - reagents.add_reagent("protein", 8) - reagents.add_reagent("water", 5) + reagents.add_reagent("protein", 8, list("meat dumplings" = 8)) /obj/item/reagent_containers/food/snacks/slimesoup name = "slime soup" desc = "If no water is available, you may substitute tears." - icon_state = "slimesoup" //nonexistent? - 3/1/2020 FIXED. roro's live on. - 7/14/2020 - The fuck are you smoking, roro's is stupid, name it slimesoup so it's clear wtf it is. + icon_state = "rorosoup" //nonexistant? - 3/1/2020 FIXED. roro's live on. - 7/14/2020 - The fuck are you smoking, roro's is stupid, name it slimesoup so it's clear wtf it is. - 05/03/23 - FIXED; it's roros. filling_color = "#C4DBA0" + nutriment_amt = 6 + nutriment_desc = "chlorine" bitesize = 5 -/obj/item/reagent_containers/food/snacks/slimesoup/Initialize() - . = ..() - reagents.add_reagent("slimejelly", 5) - reagents.add_reagent("water", 10) - /obj/item/reagent_containers/food/snacks/bloodsoup - name = "Tomato soup" + name = "tomato soup" desc = "Smells like copper." icon_state = "tomatosoup" filling_color = "#FF0000" @@ -1689,12 +1650,11 @@ /obj/item/reagent_containers/food/snacks/bloodsoup/Initialize() . = ..() - reagents.add_reagent("protein", 2) + reagents.add_reagent("protein", 2, list("something distinctly un-tomato-like" = 2)) reagents.add_reagent("blood", 10) - reagents.add_reagent("water", 5) /obj/item/reagent_containers/food/snacks/clownstears - name = "Clown's Tears" + name = "\improper Clown's Tears" desc = "Not very funny." icon_state = "clownstears" filling_color = "#C4FBFF" @@ -1709,29 +1669,27 @@ reagents.add_reagent("water", 10) /obj/item/reagent_containers/food/snacks/vegetablesoup - name = "Vegetable soup" - desc = "A true vegan meal" //TODO + name = "vegetable soup" + desc = "A hearty broth of vegetables, suitable for vegans." icon_state = "vegetablesoup" trash = /obj/item/trash/snack_bowl filling_color = "#AFC4B5" center_of_mass = list("x"=16, "y"=8) - nutriment_amt = 8 - nutriment_desc = list("carrot" = 2, "corn" = 2, "eggplant" = 2, "potato" = 2) + nutriment_amt = 10 + nutriment_desc = list("rich broth" = 2, "carrot" = 2, "corn" = 2, "eggplant" = 2, "potato" = 2) + nutriment_allergens = ALLERGEN_VEGETABLE bitesize = 5 -/obj/item/reagent_containers/food/snacks/vegetablesoup/Initialize() - . = ..() - reagents.add_reagent("water", 5) - /obj/item/reagent_containers/food/snacks/nettlesoup - name = "Nettle soup" - desc = "To think, the botanist would've beat you to death with one of these." + name = "nettle soup" + desc = "All the ting, none of the sting!" icon_state = "nettlesoup" trash = /obj/item/trash/snack_bowl filling_color = "#AFC4B5" center_of_mass = list("x"=16, "y"=7) nutriment_amt = 8 - nutriment_desc = list("salad" = 4, "egg" = 2, "potato" = 2) + nutriment_desc = list("tangy salad" = 4, "egg" = 2, "potato" = 2) + nutriment_allergens = ALLERGEN_EGGS bitesize = 5 /obj/item/reagent_containers/food/snacks/nettlesoup/Initialize() @@ -1740,7 +1698,7 @@ reagents.add_reagent("tricordrazine", 5) /obj/item/reagent_containers/food/snacks/mysterysoup - name = "Mystery soup" + name = "mystery soup" desc = "The mystery is, why aren't you eating it?" icon_state = "mysterysoup" trash = /obj/item/trash/snack_bowl @@ -1790,7 +1748,7 @@ reagents.add_reagent("imidazoline", 5) /obj/item/reagent_containers/food/snacks/wishsoup - name = "Wish Soup" + name = "wish soup" desc = "I wish this was soup." icon_state = "wishsoup" trash = /obj/item/trash/snack_bowl @@ -1806,7 +1764,7 @@ reagents.add_reagent("nutriment", 8, list("something good" = 8)) /obj/item/reagent_containers/food/snacks/hotchili - name = "Hot Chili" + name = "hot chili" desc = "A five alarm Texan Chili!" icon_state = "hotchili" trash = /obj/item/trash/snack_bowl @@ -1818,24 +1776,24 @@ /obj/item/reagent_containers/food/snacks/hotchili/Initialize() . = ..() - reagents.add_reagent("protein", 3) + reagents.add_reagent("protein", 3, list("stewed meat" = 3)) reagents.add_reagent("capsaicin", 3) reagents.add_reagent("tomatojuice", 2) /obj/item/reagent_containers/food/snacks/coldchili - name = "Cold Chili" + name = "cold chili" desc = "This slush is barely a liquid!" icon_state = "coldchili" filling_color = "#2B00FF" center_of_mass = list("x"=15, "y"=9) trash = /obj/item/trash/snack_bowl nutriment_amt = 3 - nutriment_desc = list("ice peppers" = 3) + nutriment_desc = list("overwhelming menthol" = 3) bitesize = 5 /obj/item/reagent_containers/food/snacks/coldchili/Initialize() . = ..() - reagents.add_reagent("protein", 3) + reagents.add_reagent("protein", 3, list("chilled meat" = 3)) reagents.add_reagent("frostoil", 3) reagents.add_reagent("tomatojuice", 2) @@ -1921,11 +1879,11 @@ wrapped = 1 /obj/item/reagent_containers/food/snacks/cube/monkeycube/farwacube - name = "Farwa cube" + name = "farwa cube" monkey_type = "Farwa" /obj/item/reagent_containers/food/snacks/cube/monkeycube/wrapped/farwacube - name = "Farwa cube" + name = "farwa cube" monkey_type = "Farwa" /obj/item/reagent_containers/food/snacks/cube/monkeycube/stokcube @@ -1937,11 +1895,11 @@ monkey_type = "Stok" /obj/item/reagent_containers/food/snacks/cube/monkeycube/neaeracube - name = "Neaera cube" + name = "neaera cube" monkey_type = "Neaera" /obj/item/reagent_containers/food/snacks/cube/monkeycube/wrapped/neaeracube - name = "Neaera cube" + name = "neaera cube" monkey_type = "Neaera" //Food cubes @@ -1957,8 +1915,6 @@ if(reagents.has_reagent("water")) Expand() -/obj/item/reagent_containers/food/snacks/cube/protein - /obj/item/reagent_containers/food/snacks/cube/protein/Initialize() . = ..() reagents.add_reagent("meatcolony", 5) @@ -1969,12 +1925,10 @@ icon = 'icons/obj/food_syn.dmi' icon_state = "proteinslab" bitesize = 10 - nutriment_amt = 5 - nutriment_desc = list("bitter chyme" = 50) /obj/item/reagent_containers/food/snacks/proteinslab/Initialize() . = ..() - reagents.add_reagent("protein", 30) + reagents.add_reagent("protein", 35, list("bitter chyme" = 35)) /obj/item/reagent_containers/food/snacks/cube/nutriment name = "nutriment cube" @@ -1995,9 +1949,9 @@ bitesize = 10 nutriment_amt = 20 nutriment_desc = list("compost" = 50) + nutriment_allergens = ALLERGEN_VEGETABLE - -/obj/item/storage/box/wings/tray //Might as well re-use this code. +/obj/item/storage/box/wings/tray name = "ration cube tray" desc = "A tray of food cubes, the label warns not to consume before adding water or mixing with virusfood." icon_state = "tray8" @@ -2018,7 +1972,7 @@ icon = 'icons/obj/food_syn.dmi' icon_state = "locust" nutriment_amt = 4 - nutriment_desc = list("crunchy" = 1, "goo" = 1) + nutriment_desc = list("crunchiness" = 1, "goo" = 1) /obj/item/reagent_containers/food/snacks/locust/Initialize() . = ..() @@ -2030,31 +1984,33 @@ desc = "A fried locust, extremely crunchy." icon = 'icons/obj/food_syn.dmi' icon_state = "locust_cooked" + bitesize = 2 nutriment_amt = 2 - nutriment_desc = list("crunchy" = 4) + nutriment_desc = list("crunchiness" = 4) /obj/item/reagent_containers/food/snacks/locust_cooked/Initialize() . = ..() reagents.add_reagent("protein", 3) - bitesize = 2 /obj/item/reagent_containers/food/snacks/spellburger - name = "Spell Burger" + name = "spell burger" desc = "This is absolutely Ei Nath." icon_state = "spellburger" filling_color = "#D505FF" nutriment_amt = 6 - nutriment_desc = list("magic" = 3, "buns" = 3) + nutriment_desc = list("magic" = 3, "bread bun" = 3) + nutriment_allergens = ALLERGEN_GRAINS bitesize = 2 /obj/item/reagent_containers/food/snacks/bigbiteburger - name = "Big Bite Burger" + name = "\improper Big Bite Burger" desc = "Forget the Big Mac. THIS is the future!" icon_state = "bigbiteburger" filling_color = "#E3D681" center_of_mass = list("x"=16, "y"=11) - nutriment_amt = 4 - nutriment_desc = list("buns" = 4) + nutriment_amt = 10 + nutriment_desc = list("bread" = 4, "egg" = 2, "grease") + nutriment_allergens = ALLERGEN_MEAT|ALLERGEN_EGGS|ALLERGEN_DAIRY bitesize = 3 /obj/item/reagent_containers/food/snacks/bigbiteburger/Initialize() @@ -2062,23 +2018,23 @@ reagents.add_reagent("protein", 10) /obj/item/reagent_containers/food/snacks/enchiladas - name = "Enchiladas" + name = "enchiladas" desc = "Viva La Mexico!" icon_state = "enchiladas" trash = /obj/item/trash/tray filling_color = "#A36A1F" center_of_mass = list("x"=16, "y"=13) nutriment_amt = 2 - nutriment_desc = list("tortilla" = 3, "corn" = 3) + nutriment_desc = list("corn tortilla" = 2) bitesize = 4 /obj/item/reagent_containers/food/snacks/enchiladas/Initialize() . = ..() - reagents.add_reagent("protein", 6) + reagents.add_reagent("protein", 6, list("spiced meats" = 6)) reagents.add_reagent("capsaicin", 6) /obj/item/reagent_containers/food/snacks/monkeysdelight - name = "monkey's Delight" + name = "monkey's delight" desc = "Eeee Eee!" icon_state = "monkeysdelight" trash = /obj/item/trash/tray @@ -2094,23 +2050,18 @@ reagents.add_reagent("sodiumchloride", 1) /obj/item/reagent_containers/food/snacks/baguette - name = "Baguette" + name = "baguette" desc = "Bon appetit!" icon_state = "baguette" filling_color = "#E3D796" center_of_mass = list("x"=18, "y"=12) nutriment_amt = 6 - nutriment_desc = list("french bread" = 6) + nutriment_desc = list("crusty bread" = 6) bitesize = 3 -/obj/item/reagent_containers/food/snacks/baguette/Initialize() - . = ..() - reagents.add_reagent("blackpepper", 1) - reagents.add_reagent("sodiumchloride", 1) - /obj/item/reagent_containers/food/snacks/fishandchips - name = "Fish and Chips" - desc = "I do say so myself chap." + name = "fish and chips" + desc = "I do say so myself old chap." icon_state = "fishandchips" filling_color = "#E3D796" center_of_mass = list("x"=16, "y"=16) @@ -2120,10 +2071,10 @@ /obj/item/reagent_containers/food/snacks/fishandchips/Initialize() . = ..() - reagents.add_reagent("protein", 3) + reagents.add_reagent("seafood", 3) /obj/item/reagent_containers/food/snacks/sandwich - name = "Sandwich" + name = "sandwich" desc = "A grand creation of meat, cheese, bread, and several leaves of lettuce! Arthur Dent would be proud." icon_state = "sandwich" trash = /obj/item/trash/plate @@ -2131,75 +2082,75 @@ center_of_mass = list("x"=16, "y"=4) nutriment_amt = 3 nutriment_desc = list("bread" = 3, "cheese" = 3) + nutriment_allergens = ALLERGEN_DAIRY bitesize = 2 -/obj/item/reagent_containers/food/snacks/sandwich/Initialize() - . = ..() - reagents.add_reagent("protein", 3) - /obj/item/reagent_containers/food/snacks/clubsandwich - name = "Club Sandwich" + name = "club sandwich" desc = "Tastes like the good feelings when you're part of a clique." icon_state = "clubsandwich" trash = "obj/item/trash/plate" - nutriment_amt = 3 - nutriment_desc = list("a galactic economy coming together in pursuit of mundane foods" = 3) + nutriment_amt = 10 + nutriment_desc = list("lettuce and tomato" = 5, "a galactic economy coming together in pursuit of mundane foods" = 3) + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_DAIRY|ALLERGEN_EGGS bitesize = 2 +/obj/item/reagent_containers/food/snacks/clubsandwich/Initialize() + . = ..() + reagents.add_reagent("protein", 6, list("chicken" = 3, "bacon" = 3)) + /obj/item/reagent_containers/food/snacks/toastedsandwich - name = "Toasted Sandwich" + name = "toasted sandwich" desc = "Now if you only had a pepper bar." icon_state = "toastedsandwich" trash = /obj/item/trash/plate filling_color = "#D9BE29" center_of_mass = list("x"=16, "y"=4) - nutriment_amt = 3 + nutriment_amt = 5 nutriment_desc = list("toasted bread" = 3, "cheese" = 3) + nutriment_allergens = ALLERGEN_DAIRY|ALLERGEN_GRAINS bitesize = 2 /obj/item/reagent_containers/food/snacks/toastedsandwich/Initialize() . = ..() - reagents.add_reagent("protein", 3) - reagents.add_reagent("carbon", 2) + reagents.add_reagent("carbon", 1) /obj/item/reagent_containers/food/snacks/grilledcheese - name = "Grilled Cheese Sandwich" - desc = "Goes great with Tomato soup!" + name = "grilled cheese sandwich" + desc = "Goes great with tomato soup!" icon_state = "toastedsandwich" trash = /obj/item/trash/plate filling_color = "#D9BE29" - nutriment_amt = 3 + nutriment_amt = 6 nutriment_desc = list("toasted bread" = 3, "cheese" = 3) + nutriment_allergens = ALLERGEN_DAIRY bitesize = 2 -/obj/item/reagent_containers/food/snacks/grilledcheese/Initialize() - . = ..() - reagents.add_reagent("protein", 4) - /obj/item/reagent_containers/food/snacks/tomatosoup - name = "Tomato Soup" + name = "tomato soup" desc = "Drinking this feels like being a vampire! A tomato vampire..." icon_state = "tomatosoup" trash = /obj/item/trash/snack_bowl filling_color = "#D92929" center_of_mass = list("x"=16, "y"=7) - nutriment_amt = 5 - nutriment_desc = list("soup" = 5) + nutriment_amt = 3 + nutriment_desc = list("a hint of basil" = 3) bitesize = 3 /obj/item/reagent_containers/food/snacks/tomatosoup/Initialize() . = ..() - reagents.add_reagent("tomatojuice", 10) + reagents.add_reagent("tomatojuice", 12) /obj/item/reagent_containers/food/snacks/rofflewaffles - name = "Roffle Waffles" - desc = "Waffles from Roffle. Co." + name = "fungal waffles" + desc = "Mushroom based waffles designed for the skrellian palette." icon_state = "rofflewaffles" trash = /obj/item/trash/waffles filling_color = "#FF00F7" center_of_mass = list("x"=15, "y"=11) nutriment_amt = 8 - nutriment_desc = list("waffle" = 7, "sweetness" = 1) + nutriment_desc = list("toasted fungal umami" = 7, "sweetness" = 1) + nutriment_allergens = ALLERGEN_FUNGI bitesize = 4 /obj/item/reagent_containers/food/snacks/rofflewaffles/Initialize() @@ -2207,13 +2158,14 @@ reagents.add_reagent("psilocybin", 8) /obj/item/reagent_containers/food/snacks/stew - name = "Stew" + name = "stew" desc = "A nice and warm stew. Healthy and strong." icon_state = "stew" filling_color = "#9E673A" center_of_mass = list("x"=16, "y"=5) nutriment_amt = 6 nutriment_desc = list("tomato" = 2, "potato" = 2, "carrot" = 2, "eggplant" = 2, "mushroom" = 2) + nutriment_allergens = ALLERGEN_FUNGI|ALLERGEN_MEAT|ALLERGEN_VEGETABLE drop_sound = 'sound/items/drop/shovel.ogg' pickup_sound = 'sound/items/pickup/shovel.ogg' bitesize = 10 @@ -2226,7 +2178,7 @@ reagents.add_reagent("water", 5) /obj/item/reagent_containers/food/snacks/jelliedtoast - name = "Jellied Toast" + name = "jellied toast" desc = "A slice of bread covered with delicious jam." icon_state = "jellytoast" trash = /obj/item/trash/plate @@ -2245,13 +2197,13 @@ reagents.add_reagent("slimejelly", 5) /obj/item/reagent_containers/food/snacks/jellyburger - name = "Jelly Burger" + name = "jelly burger" desc = "Culinary delight..?" icon_state = "jellyburger" filling_color = "#B572AB" center_of_mass = list("x"=16, "y"=11) nutriment_amt = 5 - nutriment_desc = list("buns" = 5) + nutriment_desc = list("jelly-saturated bread" = 5) bitesize = 2 /obj/item/reagent_containers/food/snacks/jellyburger/slime/Initialize() @@ -2263,21 +2215,17 @@ reagents.add_reagent("cherryjelly", 5) /obj/item/reagent_containers/food/snacks/milosoup - name = "Miso soup" - desc = "The universes best soup! Yum!!!" + name = "miso soup" + desc = "The universe's best soup! Yum!!!" icon_state = "milosoup" trash = /obj/item/trash/snack_bowl center_of_mass = list("x"=16, "y"=7) - nutriment_amt = 8 - nutriment_desc = list("soy" = 8) - bitesize = 4 - -/obj/item/reagent_containers/food/snacks/milosoup/Initialize() - . = ..() - reagents.add_reagent("water", 5) + nutriment_amt = 10 + nutriment_desc = list("seaweed" = 5, "umami" = 5) + bitesize = 3 /obj/item/reagent_containers/food/snacks/stewedsoymeat - name = "Stewed Soy Meat" + name = "stewed soy meat" desc = "Even non-vegetarians will LOVE this!" icon_state = "stewedsoymeat" trash = /obj/item/trash/plate @@ -2287,18 +2235,19 @@ bitesize = 2 /obj/item/reagent_containers/food/snacks/boiledspagetti - name = "Boiled Spaghetti" + name = "boiled spaghetti" desc = "A plain dish of noodles, this sucks." icon_state = "spagettiboiled" trash = /obj/item/trash/plate filling_color = "#FCEE81" center_of_mass = list("x"=16, "y"=10) nutriment_amt = 2 - nutriment_desc = list("noodles" = 2) + nutriment_desc = list("pasta" = 2) + nutriment_allergens = ALLERGEN_GRAINS bitesize = 2 /obj/item/reagent_containers/food/snacks/boiledrice - name = "Boiled Rice" + name = "boiled rice" desc = "A boring dish of boring rice." icon_state = "boiledrice" trash = /obj/item/trash/snack_bowl @@ -2309,69 +2258,64 @@ bitesize = 2 /obj/item/reagent_containers/food/snacks/ricepudding - name = "Rice Pudding" + name = "rice pudding" desc = "Where's the jam?" icon_state = "rpudding" trash = /obj/item/trash/snack_bowl filling_color = "#FFFBDB" center_of_mass = list("x"=17, "y"=11) nutriment_amt = 4 - nutriment_desc = list("rice" = 2) + nutriment_desc = list("creaminess" = 2) bitesize = 2 /obj/item/reagent_containers/food/snacks/kudzudonburi - name = "Zhan-Kudzu Overtaker" + name = "\improper Zhan-Kudzu Overtaker" desc = "Seasoned Kudzu and fish donburi." icon_state = "kudzudonburi" trash = /obj/item/trash/snack_bowl filling_color = "#FFFBDB" center_of_mass = list("x"=17, "y"=11) - nutriment_amt = 16 - nutriment_desc = list("rice" = 2, "gauze" = 4, "fish" = 10) + nutriment_amt = 18 + nutriment_desc = list("rice" = 2, "gauze" = 4, "steamed fish" = 10) + nutriment_allergens = ALLERGEN_FISH bitesize = 2 -/obj/item/reagent_containers/food/snacks/kudzudonburi/Initialize() - . = ..() - reagents.add_reagent("protein", 4) - /obj/item/reagent_containers/food/snacks/pastatomato - name = "Spaghetti" - desc = "Spaghetti and crushed tomatoes. Just like your abusive father used to make!" + name = "spaghetti" + desc = "Spaghetti and crushed tomatoes." icon_state = "pastatomato" trash = /obj/item/trash/plate filling_color = "#DE4545" center_of_mass = list("x"=16, "y"=10) - nutriment_amt = 6 - nutriment_desc = list("tomato" = 3, "noodles" = 3) + nutriment_amt = 15 + nutriment_desc = list("tomato sauce" = 3, "pasta" = 3) + nutriment_allergens = ALLERGEN_FRUIT|ALLERGEN_GRAINS bitesize = 4 -/obj/item/reagent_containers/food/snacks/pastatomato/Initialize() - . = ..() - reagents.add_reagent("tomatojuice", 10) - /obj/item/reagent_containers/food/snacks/meatballspagetti - name = "Spaghetti & Meatballs" - desc = "Now that's a nic'e meatball!" + name = "spaghetti & meatballs" + desc = "Now that's a nice-y meatball!" icon_state = "meatballspagetti" trash = /obj/item/trash/plate filling_color = "#DE4545" center_of_mass = list("x"=16, "y"=10) nutriment_amt = 4 - nutriment_desc = list("noodles" = 4) + nutriment_desc = list("pasta" = 4) + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_MEAT bitesize = 2 /obj/item/reagent_containers/food/snacks/meatballspagetti/Initialize() . = ..() - reagents.add_reagent("protein", 4) + reagents.add_reagent("protein", 4, list("ground meat" = 4)) /obj/item/reagent_containers/food/snacks/spesslaw - name = "Spesslaw" - desc = "A lawyer's favourite" + name = "beef stroganoff" + desc = "It doesn't have to be beef." icon_state = "spesslaw" filling_color = "#DE4545" center_of_mass = list("x"=16, "y"=10) nutriment_amt = 4 - nutriment_desc = list("noodles" = 4) + nutriment_desc = list("pasta" = 4) bitesize = 2 /obj/item/reagent_containers/food/snacks/spesslaw/Initialize() @@ -2379,14 +2323,14 @@ reagents.add_reagent("protein", 4) /obj/item/reagent_containers/food/snacks/carrotfries - name = "Carrot Fries" - desc = "Tasty fries from fresh Carrots." + name = "carrot fries" + desc = "Tasty fries from fresh carrots." icon_state = "carrotfries" trash = /obj/item/trash/plate filling_color = "#FAA005" center_of_mass = list("x"=16, "y"=11) nutriment_amt = 3 - nutriment_desc = list("carrot" = 3, "salt" = 1) + nutriment_desc = list("carrot" = 3,) bitesize = 2 /obj/item/reagent_containers/food/snacks/carrotfries/Initialize() @@ -2394,13 +2338,14 @@ reagents.add_reagent("imidazoline", 3) /obj/item/reagent_containers/food/snacks/superbiteburger - name = "Super Bite Burger" + name = "\improper Super Bite Burger" desc = "This is a mountain of a burger. FOOD!" icon_state = "superbiteburger" filling_color = "#CCA26A" center_of_mass = list("x"=16, "y"=3) nutriment_amt = 25 - nutriment_desc = list("buns" = 25) + nutriment_desc = list("bread" = 10, "cheese" = 10, "grease" = 10, "fried egg" = 10) + nutriment_allergens = ALLERGEN_MEAT|ALLERGEN_EGGS|ALLERGEN_DAIRY bitesize = 10 /obj/item/reagent_containers/food/snacks/superbiteburger/Initialize() @@ -2408,7 +2353,7 @@ reagents.add_reagent("protein", 25) /obj/item/reagent_containers/food/snacks/candiedapple - name = "Candied Apple" + name = "candied apple" desc = "An apple coated in sugary sweetness." icon_state = "candiedapple2" filling_color = "#F21873" @@ -2428,28 +2373,30 @@ bitesize = 3 /obj/item/reagent_containers/food/snacks/applepie - name = "Apple Pie" + name = "apple pie" desc = "A pie containing sweet sweet love... or apple." icon_state = "applepie" filling_color = "#E0EDC5" center_of_mass = list("x"=16, "y"=13) nutriment_amt = 4 - nutriment_desc = list("sweetness" = 2, "apple" = 2, "pie" = 2) + nutriment_desc = list("sweetness" = 2, "apple" = 2, "sweet pie crust" = 2) + nutriment_allergens = ALLERGEN_FRUIT|ALLERGEN_GRAINS|ALLERGEN_SUGARS bitesize = 3 /obj/item/reagent_containers/food/snacks/cherrypie - name = "Cherry Pie" + name = "cherry pie" desc = "Taste so good, make a grown man cry." icon_state = "cherrypie" filling_color = "#FF525A" center_of_mass = list("x"=16, "y"=11) nutriment_amt = 4 - nutriment_desc = list("sweetness" = 2, "cherry" = 2, "pie" = 2) + nutriment_desc = list("sweetness" = 2, "cherry" = 2, "sweet pie crust" = 2) + nutriment_allergens = ALLERGEN_FRUIT|ALLERGEN_GRAINS|ALLERGEN_SUGARS bitesize = 3 /obj/item/reagent_containers/food/snacks/twobread - name = "Two Bread" - desc = "It is very bitter and winy." + name = "two bread" + desc = "It is very bitter and whiny." description_fluff = "The most popular recipe from the Morpheus Cyberkinetics cookbook 'Calories for Organics'" icon_state = "twobread" filling_color = "#DBCC9A" @@ -2459,7 +2406,7 @@ bitesize = 3 /obj/item/reagent_containers/food/snacks/jellysandwich - name = "Jelly Sandwich" + name = "jelly sandwich" desc = "You wish you had some peanut butter to go with this..." icon_state = "jellysandwich" trash = /obj/item/trash/plate @@ -2486,7 +2433,7 @@ reagents.add_reagent("peanutbutter", 5) /obj/item/reagent_containers/food/snacks/boiledslimecore - name = "Boiled Slime Core" + name = "boiled slime core" desc = "A boiled red thing." icon_state = "boiledslimecore" bitesize = 3 @@ -2531,13 +2478,13 @@ /obj/item/reagent_containers/food/snacks/mushroomsoup name = "chantrelle soup" - desc = "A delicious and hearty mushroom soup." + desc = "A delicious and hearty cream and mushroom soup." icon_state = "mushroomsoup" trash = /obj/item/trash/snack_bowl filling_color = "#E386BF" center_of_mass = list("x"=17, "y"=10) nutriment_amt = 8 - nutriment_desc = list("mushroom" = 8, "milk" = 2) + nutriment_desc = list("creamy mushroom" = 8) bitesize = 3 /obj/item/reagent_containers/food/snacks/plumphelmetbiscuit @@ -2547,7 +2494,7 @@ filling_color = "#CFB4C4" center_of_mass = list("x"=16, "y"=13) nutriment_amt = 5 - nutriment_desc = list("mushroom" = 4) + nutriment_desc = list("mushroom bread" = 4) bitesize = 2 /obj/item/reagent_containers/food/snacks/plumphelmetbiscuit/Initialize() @@ -2564,12 +2511,11 @@ trash = /obj/item/trash/snack_bowl filling_color = "#F0F2E4" center_of_mass = list("x"=17, "y"=10) + nutriment_amt = 5 + nutriment_desc = "umami" + nutriment_allergens = ALLERGEN_DAIRY bitesize = 1 -/obj/item/reagent_containers/food/snacks/chawanmushi/Initialize() - . = ..() - reagents.add_reagent("protein", 5) - /obj/item/reagent_containers/food/snacks/beetsoup name = "beet soup" desc = "Wait, how do you spell it again..?" @@ -2578,7 +2524,7 @@ filling_color = "#FAC9FF" center_of_mass = list("x"=15, "y"=8) nutriment_amt = 8 - nutriment_desc = list("tomato" = 4, "beet" = 4) + nutriment_desc = list("sour tomato" = 4, "sour beets" = 4, "vinegar" = 4) bitesize = 2 /obj/item/reagent_containers/food/snacks/beetsoup/Initialize() @@ -2586,7 +2532,7 @@ name = pick(list("borsch","bortsch","borstch","borsh","borshch","borscht")) /obj/item/reagent_containers/food/snacks/tossedsalad - name = "tossed salad" + name = "garden salad" desc = "A proper salad, basic and simple, with little bits of carrot, tomato and apple intermingled. Vegan!" icon_state = "herbsalad" trash = /obj/item/trash/snack_bowl @@ -2671,8 +2617,9 @@ slices_num = 5 filling_color = "#FF7575" center_of_mass = list("x"=19, "y"=9) - nutriment_desc = list("bread" = 10) + nutriment_desc = list("meaty bread" = 10) nutriment_amt = 10 + nutriment_allergens = ALLERGEN_MEAT|ALLERGEN_GRAINS bitesize = 2 /obj/item/reagent_containers/food/snacks/sliceable/meatbread/Initialize() @@ -2700,8 +2647,9 @@ slices_num = 5 filling_color = "#8AFF75" center_of_mass = list("x"=16, "y"=9) - nutriment_desc = list("bread" = 10) + nutriment_desc = list("funky bread" = 10) nutriment_amt = 10 + nutriment_allergens = ALLERGEN_MEAT|ALLERGEN_GRAINS bitesize = 2 /obj/item/reagent_containers/food/snacks/sliceable/xenomeatbread/Initialize() @@ -2723,15 +2671,16 @@ filled = TRUE /obj/item/reagent_containers/food/snacks/sliceable/bananabread - name = "Banana-nut bread" + name = "banana bread" desc = "A heavenly and filling treat." icon_state = "bananabread" slice_path = /obj/item/reagent_containers/food/snacks/slice/bananabread slices_num = 5 filling_color = "#EDE5AD" center_of_mass = list("x"=16, "y"=9) - nutriment_desc = list("bread" = 10) + nutriment_desc = list("sweet bread" = 10) nutriment_amt = 10 + nutriment_allergens = ALLERGEN_FRUIT|ALLERGEN_GRAINS|ALLERGEN_SUGARS bitesize = 2 /obj/item/reagent_containers/food/snacks/sliceable/bananabread/Initialize() @@ -2739,7 +2688,7 @@ reagents.add_reagent("banana", 20) /obj/item/reagent_containers/food/snacks/slice/bananabread - name = "Banana-nut bread slice" + name = "banana bread slice" desc = "A slice of delicious banana bread." icon_state = "bananabreadslice" trash = /obj/item/trash/plate @@ -2752,19 +2701,20 @@ filled = TRUE /obj/item/reagent_containers/food/snacks/sliceable/tofubread - name = "Tofubread" + name = "tofubread" icon_state = "Like meatbread but for vegetarians. Not guaranteed to give superpowers." icon_state = "tofubread" slice_path = /obj/item/reagent_containers/food/snacks/slice/tofubread slices_num = 5 filling_color = "#F7FFE0" center_of_mass = list("x"=16, "y"=9) - nutriment_desc = list("tofu" = 10) + nutriment_desc = list("tofu" = 5, "bread" = 5) nutriment_amt = 10 bitesize = 2 + nutriment_allergens = ALLERGEN_FUNGI|ALLERGEN_GRAINS|ALLERGEN_SUGARS /obj/item/reagent_containers/food/snacks/slice/tofubread - name = "Tofubread slice" + name = "tofubread slice" desc = "A slice of delicious tofubread." icon_state = "tofubreadslice" trash = /obj/item/trash/plate @@ -2776,9 +2726,8 @@ /obj/item/reagent_containers/food/snacks/slice/tofubread/filled filled = TRUE - /obj/item/reagent_containers/food/snacks/sliceable/carrotcake - name = "Carrot Cake" + name = "carrot cake" desc = "A favorite desert of a certain wascally wabbit. Not a lie." icon_state = "carrotcake" slice_path = /obj/item/reagent_containers/food/snacks/slice/carrotcake @@ -2787,6 +2736,7 @@ center_of_mass = list("x"=16, "y"=10) nutriment_desc = list("cake" = 10, "sweetness" = 10, "carrot" = 15) nutriment_amt = 25 + nutriment_allergens = ALLERGEN_VEGETABLE|ALLERGEN_GRAINS|ALLERGEN_SUGARS|ALLERGEN_EGGS bitesize = 2 /obj/item/reagent_containers/food/snacks/sliceable/carrotcake/Initialize() @@ -2794,8 +2744,8 @@ reagents.add_reagent("imidazoline", 10) /obj/item/reagent_containers/food/snacks/slice/carrotcake - name = "Carrot Cake slice" - desc = "Carrotty slice of Carrot Cake, carrots are good for your eyes! Also not a lie." + name = "carrot cake slice" + desc = "Carrotty slice of carrot cake, carrots are good for your eyes! Also not a lie." icon_state = "carrotcake_slice" trash = /obj/item/trash/plate filling_color = "#FFD675" @@ -2807,7 +2757,7 @@ filled = TRUE /obj/item/reagent_containers/food/snacks/sliceable/braincake - name = "Brain Cake" + name = "brain cake" desc = "A squishy cake-thing." icon_state = "braincake" slice_path = /obj/item/reagent_containers/food/snacks/slice/braincake @@ -2815,16 +2765,17 @@ filling_color = "#E6AEDB" center_of_mass = list("x"=16, "y"=10) nutriment_desc = list("cake" = 10, "sweetness" = 10, "slime" = 15) - nutriment_amt = 5 + nutriment_amt = 15 + nutriment_allergens = ALLERGEN_MEAT|ALLERGEN_SUGARS|ALLERGEN_EGGS bitesize = 2 /obj/item/reagent_containers/food/snacks/sliceable/braincake/Initialize() . = ..() - reagents.add_reagent("protein", 25) + reagents.add_reagent("protein", 15) reagents.add_reagent("alkysine", 10) /obj/item/reagent_containers/food/snacks/slice/braincake - name = "Brain Cake slice" + name = "brain cake slice" desc = "Lemme tell you something about prions. THEY'RE DELICIOUS." icon_state = "braincakeslice" trash = /obj/item/trash/plate @@ -2837,23 +2788,20 @@ filled = TRUE /obj/item/reagent_containers/food/snacks/sliceable/cheesecake - name = "Cheese Cake" + name = "cheesecake" desc = "DANGEROUSLY cheesy." icon_state = "cheesecake" slice_path = /obj/item/reagent_containers/food/snacks/slice/cheesecake slices_num = 5 filling_color = "#FAF7AF" center_of_mass = list("x"=16, "y"=10) - nutriment_desc = list("cake" = 10, "cream" = 10, "cheese" = 15) - nutriment_amt = 10 + nutriment_desc = list("sweet wholewheat crust" = 5, "sweet cream cheese" = 20) + nutriment_amt = 25 + nutriment_allergens = ALLERGEN_DAIRY|ALLERGEN_GRAINS|ALLERGEN_SUGARS|ALLERGEN_EGGS bitesize = 2 -/obj/item/reagent_containers/food/snacks/sliceable/cheesecake/Initialize() - . = ..() - reagents.add_reagent("protein", 15) - /obj/item/reagent_containers/food/snacks/slice/cheesecake - name = "Cheese Cake slice" + name = "cheesecake slice" desc = "Slice of pure cheestisfaction." icon_state = "cheesecake_slice" trash = /obj/item/trash/plate @@ -2866,7 +2814,7 @@ filled = TRUE /obj/item/reagent_containers/food/snacks/sliceable/peanutcake - name = "Peanut Cake" + name = "peanut cake" desc = "DANGEROUSLY nutty. Sometimes literally." icon_state = "peanutcake" slice_path = /obj/item/reagent_containers/food/snacks/slice/peanutcake @@ -2874,15 +2822,12 @@ filling_color = "#4F3500" center_of_mass = list("x"=16, "y"=10) nutriment_desc = list("cake" = 10, "peanuts" = 15) - nutriment_amt = 10 + nutriment_amt = 25 + nutriment_allergens = ALLERGEN_DAIRY|ALLERGEN_GRAINS|ALLERGEN_SUGARS|ALLERGEN_EGGS|ALLERGEN_SEEDS //The ultimate food?? bitesize = 2 -/obj/item/reagent_containers/food/snacks/sliceable/peanutcake/Initialize() - . = ..() - reagents.add_reagent("protein", 5) - /obj/item/reagent_containers/food/snacks/slice/peanutcake - name = "Peanut Cake slice" + name = "peanut cake slice" desc = "Slice of nutty goodness." icon_state = "peanutcake_slice" trash = /obj/item/trash/plate @@ -2895,7 +2840,7 @@ filled = TRUE /obj/item/reagent_containers/food/snacks/sliceable/plaincake - name = "Vanilla Cake" + name = "spongecake" desc = "A plain cake, not a lie." icon_state = "plaincake" slice_path = /obj/item/reagent_containers/food/snacks/slice/plaincake @@ -2903,10 +2848,11 @@ filling_color = "#F7EDD5" center_of_mass = list("x"=16, "y"=10) nutriment_desc = list("cake" = 10, "sweetness" = 10, "vanilla" = 15) - nutriment_amt = 20 + nutriment_amt = 25 + nutriment_allergens = ALLERGEN_SUGARS|ALLERGEN_EGGS|ALLERGEN_DAIRY|ALLERGEN_GRAINS /obj/item/reagent_containers/food/snacks/slice/plaincake - name = "Vanilla Cake slice" + name = "spongecake slice" desc = "Just a slice of cake, it is enough for everyone." icon_state = "plaincake_slice" trash = /obj/item/trash/plate @@ -2919,18 +2865,19 @@ filled = TRUE /obj/item/reagent_containers/food/snacks/sliceable/orangecake - name = "Orange Cake" + name = "orange cake" desc = "A cake with added orange." icon_state = "orangecake" slice_path = /obj/item/reagent_containers/food/snacks/slice/orangecake slices_num = 5 filling_color = "#FADA8E" center_of_mass = list("x"=16, "y"=10) - nutriment_desc = list("cake" = 10, "sweetness" = 10, "orange" = 15) - nutriment_amt = 20 + nutriment_desc = list("cake" = 10, "sweetness" = 10, "orange marmalade" = 15) + nutriment_amt = 25 + nutriment_allergens = ALLERGEN_SUGARS|ALLERGEN_EGGS|ALLERGEN_DAIRY|ALLERGEN_GRAINS|ALLERGEN_FRUIT /obj/item/reagent_containers/food/snacks/slice/orangecake - name = "Orange Cake slice" + name = "orange cake slice" desc = "Just a slice of cake, it is enough for everyone." icon_state = "orangecake_slice" trash = /obj/item/trash/plate @@ -2942,21 +2889,20 @@ /obj/item/reagent_containers/food/snacks/slice/orangecake/filled filled = TRUE - /obj/item/reagent_containers/food/snacks/sliceable/limecake - name = "Lime Cake" + name = "lime cake" desc = "A cake with added lime." icon_state = "limecake" slice_path = /obj/item/reagent_containers/food/snacks/slice/limecake slices_num = 5 filling_color = "#CBFA8E" center_of_mass = list("x"=16, "y"=10) - nutriment_desc = list("cake" = 10, "sweetness" = 10, "lime" = 15) - nutriment_amt = 20 - + nutriment_desc = list("cake" = 10, "sweetness" = 10, "lime marmalade" = 15) + nutriment_amt = 25 + nutriment_allergens = ALLERGEN_SUGARS|ALLERGEN_EGGS|ALLERGEN_DAIRY|ALLERGEN_GRAINS|ALLERGEN_FRUIT /obj/item/reagent_containers/food/snacks/slice/limecake - name = "Lime Cake slice" + name = "lime cake slice" desc = "Just a slice of cake, it is enough for everyone." icon_state = "limecake_slice" trash = /obj/item/trash/plate @@ -2969,19 +2915,19 @@ filled = TRUE /obj/item/reagent_containers/food/snacks/sliceable/lemoncake - name = "Lemon Cake" + name = "lemon cake" desc = "A cake with added lemon." icon_state = "lemoncake" slice_path = /obj/item/reagent_containers/food/snacks/slice/lemoncake slices_num = 5 filling_color = "#FAFA8E" center_of_mass = list("x"=16, "y"=10) - nutriment_desc = list("cake" = 10, "sweetness" = 10, "lemon" = 15) - nutriment_amt = 20 - + nutriment_desc = list("cake" = 10, "sweetness" = 10, "lemon curd" = 15) + nutriment_amt = 25 + nutriment_allergens = ALLERGEN_SUGARS|ALLERGEN_EGGS|ALLERGEN_DAIRY|ALLERGEN_GRAINS|ALLERGEN_FRUIT /obj/item/reagent_containers/food/snacks/slice/lemoncake - name = "Lemon Cake slice" + name = "lemon cake slice" desc = "Just a slice of cake, it is enough for everyone." icon_state = "lemoncake_slice" trash = /obj/item/trash/plate @@ -2994,18 +2940,18 @@ filled = TRUE /obj/item/reagent_containers/food/snacks/sliceable/chocolatecake - name = "Chocolate Cake" + name = "chocolate cake" desc = "A cake with added chocolate." icon_state = "chocolatecake" slice_path = /obj/item/reagent_containers/food/snacks/slice/chocolatecake slices_num = 5 filling_color = "#805930" center_of_mass = list("x"=16, "y"=10) - nutriment_desc = list("cake" = 10, "sweetness" = 10, "chocolate" = 15) + nutriment_desc = list("cake" = 10, "sweetness" = 10, "ganache" = 10, "chocolate" = 15) nutriment_amt = 20 /obj/item/reagent_containers/food/snacks/slice/chocolatecake - name = "Chocolate Cake slice" + name = "chocolate cake slice" desc = "Just a slice of cake, it is enough for everyone." icon_state = "chocolatecake_slice" trash = /obj/item/trash/plate @@ -3018,8 +2964,8 @@ filled = TRUE /obj/item/reagent_containers/food/snacks/sliceable/cheesewheel - name = "Cheese wheel" - desc = "A big wheel of delcious Cheddar." + name = "cheese wheel" + desc = "A big wheel of delicious unbranded cheese product." icon_state = "cheesewheel" slice_path = /obj/item/reagent_containers/food/snacks/cheesewedge slices_num = 5 @@ -3027,30 +2973,28 @@ center_of_mass = list("x"=16, "y"=10) nutriment_desc = list("cheese" = 10) nutriment_amt = 10 + nutriment_allergens = ALLERGEN_DAIRY bitesize = 2 -/obj/item/reagent_containers/food/snacks/sliceable/cheesewheel/Initialize() - . = ..() - reagents.add_reagent("protein", 10) - /obj/item/reagent_containers/food/snacks/cheesewedge - name = "Cheese wedge" - desc = "A wedge of delicious Cheddar. The cheese wheel it was cut from can't have gone far." + name = "cheese wedge" + desc = "A wedge of delicious unbranded cheese product. The cheese wheel it was cut from can't have gone far." icon_state = "cheesewedge" filling_color = "#FFF700" bitesize = 2 center_of_mass = list("x"=16, "y"=10) /obj/item/reagent_containers/food/snacks/sliceable/birthdaycake - name = "Birthday Cake" - desc = "Happy Birthday..." + name = "birthday cake" + desc = "Happy birthday..." icon_state = "birthdaycake" slice_path = /obj/item/reagent_containers/food/snacks/slice/birthdaycake slices_num = 5 filling_color = "#FFD6D6" center_of_mass = list("x"=16, "y"=10) - nutriment_desc = list("cake" = 10, "sweetness" = 10) - nutriment_amt = 20 + nutriment_desc = list("cake" = 10, "sweetness" = 10, "buttercream icing" = 10) + nutriment_amt = 25 + nutriment_allergens = ALLERGEN_SUGARS|ALLERGEN_EGGS|ALLERGEN_DAIRY|ALLERGEN_GRAINS bitesize = 3 /obj/item/reagent_containers/food/snacks/sliceable/birthdaycake/Initialize() @@ -3058,7 +3002,7 @@ reagents.add_reagent("sprinkles", 10) /obj/item/reagent_containers/food/snacks/slice/birthdaycake - name = "Birthday Cake slice" + name = "birthday cake slice" desc = "A slice of your birthday." icon_state = "birthdaycakeslice" trash = /obj/item/trash/plate @@ -3071,19 +3015,20 @@ filled = TRUE /obj/item/reagent_containers/food/snacks/sliceable/bread - name = "Bread" - icon_state = "Some plain old Earthen bread." + name = "bread" + icon_state = "The foundation of human civilization." icon_state = "bread" slice_path = /obj/item/reagent_containers/food/snacks/slice/bread slices_num = 5 filling_color = "#FFE396" center_of_mass = list("x"=16, "y"=9) nutriment_desc = list("bread" = 6) - nutriment_amt = 6 + nutriment_amt = 10 + nutriment_allergens = ALLERGEN_GRAINS bitesize = 2 /obj/item/reagent_containers/food/snacks/slice/bread - name = "Bread slice" + name = "bread slice" desc = "A slice of home." icon_state = "breadslice" trash = /obj/item/trash/plate @@ -3095,25 +3040,21 @@ /obj/item/reagent_containers/food/snacks/slice/bread/filled filled = TRUE - /obj/item/reagent_containers/food/snacks/sliceable/creamcheesebread - name = "Cream Cheese Bread" + name = "cream cheese bread" desc = "Yum yum yum!" icon_state = "creamcheesebread" slice_path = /obj/item/reagent_containers/food/snacks/slice/creamcheesebread slices_num = 5 filling_color = "#FFF896" center_of_mass = list("x"=16, "y"=9) - nutriment_desc = list("bread" = 6, "cream" = 3, "cheese" = 3) - nutriment_amt = 5 + nutriment_desc = list("bread" = 6, "cream cheese" = 5) + nutriment_amt = 20 + nutriment_allergens = ALLERGEN_DAIRY|ALLERGEN_GRAINS bitesize = 2 -/obj/item/reagent_containers/food/snacks/sliceable/creamcheesebread/Initialize() - . = ..() - reagents.add_reagent("protein", 15) - /obj/item/reagent_containers/food/snacks/slice/creamcheesebread - name = "Cream Cheese Bread slice" + name = "cream cheese Bread slice" desc = "A slice of yum!" icon_state = "creamcheesebreadslice" trash = /obj/item/trash/plate @@ -3122,32 +3063,34 @@ center_of_mass = list("x"=16, "y"=14) whole_path = /obj/item/reagent_containers/food/snacks/sliceable/creamcheesebread - /obj/item/reagent_containers/food/snacks/slice/creamcheesebread/filled filled = TRUE - /obj/item/reagent_containers/food/snacks/watermelonslice - name = "Watermelon Slice" + name = "watermelon slice" desc = "A slice of watery goodness." icon_state = "watermelonslice" filling_color = "#FF3867" bitesize = 2 center_of_mass = list("x"=16, "y"=10) + nutriment_amt = 5 + nutriment_desc = list("watermelon" = 5) + nutriment_allergens = ALLERGEN_FRUIT /obj/item/reagent_containers/food/snacks/sliceable/applecake - name = "Apple Cake" + name = "apple cake" desc = "A cake centred with apples." icon_state = "applecake" slice_path = /obj/item/reagent_containers/food/snacks/slice/applecake slices_num = 5 filling_color = "#EBF5B8" center_of_mass = list("x"=16, "y"=10) - nutriment_desc = list("cake" = 10, "sweetness" = 10, "apple" = 15) - nutriment_amt = 15 + nutriment_desc = list("cake" = 10, "sweetness" = 10, "baked apple" = 15) + nutriment_amt = 25 + nutriment_allergens = ALLERGEN_SUGARS|ALLERGEN_EGGS|ALLERGEN_DAIRY|ALLERGEN_GRAINS|ALLERGEN_FRUIT /obj/item/reagent_containers/food/snacks/slice/applecake - name = "Apple Cake slice" + name = "apple cake slice" desc = "A slice of heavenly cake." icon_state = "applecakeslice" trash = /obj/item/trash/plate @@ -3160,18 +3103,18 @@ filled = TRUE /obj/item/reagent_containers/food/snacks/sliceable/pumpkinpie - name = "Pumpkin Pie" + name = "pumpkin pie" desc = "A delicious treat for the autumn months." icon_state = "pumpkinpie" slice_path = /obj/item/reagent_containers/food/snacks/slice/pumpkinpie slices_num = 5 filling_color = "#F5B951" center_of_mass = list("x"=16, "y"=10) - nutriment_desc = list("pie" = 5, "cream" = 5, "pumpkin" = 5) + nutriment_desc = list("sweet pie crust" = 5, "cream" = 5, "spiced pumpkin" = 5) nutriment_amt = 15 /obj/item/reagent_containers/food/snacks/slice/pumpkinpie - name = "Pumpkin Pie slice" + name = "pumpkin pie slice" desc = "A slice of pumpkin pie, with whipped cream on top. Perfection." icon_state = "pumpkinpieslice" trash = /obj/item/trash/plate @@ -3184,12 +3127,12 @@ filled = TRUE /obj/item/reagent_containers/food/snacks/cracker - name = "Cracker" + name = "cracker" desc = "It's a salted cracker." icon_state = "cracker" filling_color = "#F5DEB8" center_of_mass = list("x"=16, "y"=6) - nutriment_desc = list("salt" = 1, "cracker" = 2) + nutriment_desc = list("salt" = 1, "wheat cracker" = 2) w_class = ITEMSIZE_TINY nutriment_amt = 1 @@ -3202,23 +3145,20 @@ filling_color = "#BAA14C" /obj/item/reagent_containers/food/snacks/sliceable/pizza/margherita - name = "Margherita" + name = "\improper Margherita pizza" desc = "The golden standard of pizzas." icon_state = "pizzamargherita" slice_path = /obj/item/reagent_containers/food/snacks/slice/margherita slices_num = 6 center_of_mass = list("x"=16, "y"=11) - nutriment_desc = list("pizza crust" = 10, "tomato" = 10, "cheese" = 15) - nutriment_amt = 35 + nutriment_desc = list("pizza crust" = 10, "tomato" = 10, "mozzarella cheese" = 15, "fresh basil" = 5) + nutriment_amt = 40 + nutriment_allergens = ALLERGEN_DAIRY|ALLERGEN_GRAINS|ALLERGEN_FRUIT bitesize = 2 -/obj/item/reagent_containers/food/snacks/sliceable/pizza/margherita/Initialize() - . = ..() - reagents.add_reagent("protein", 5) - reagents.add_reagent("tomatojuice", 6) /obj/item/reagent_containers/food/snacks/slice/margherita - name = "Margherita slice" + name = "/improper Margherita slice" desc = "A slice of the classic pizza." icon_state = "pizzamargheritaslice" filling_color = "#BAA14C" @@ -3234,20 +3174,15 @@ desc = "One of the most debated pizzas in existence." icon = 'icons/obj/food_syn.dmi' icon_state = "pineapple_pizza" - slice_path = /obj/item/reagent_containers/food/snacks/pineappleslice + slice_path = /obj/item/reagent_containers/food/snacks/slice/pineapple slices_num = 6 center_of_mass = list("x"=16, "y"=11) - nutriment_desc = list("pizza crust" = 10, "tomato" = 10, "ham" = 10) - nutriment_amt = 30 + nutriment_desc = list("pizza crust" = 10, "tomato" = 10, "cooked ham" = 10, "baked pineapple" = 10) + nutriment_amt = 40 + nutriment_allergens = ALLERGEN_DAIRY|ALLERGEN_GRAINS|ALLERGEN_FRUIT|ALLERGEN_VEGETABLE|ALLERGEN_MEAT bitesize = 2 -/obj/item/reagent_containers/food/snacks/sliceable/pizza/pineapple/Initialize() - . = ..() - reagents.add_reagent("protein", 4) - reagents.add_reagent("cheese", 5) - reagents.add_reagent("tomatojuice", 6) - -/obj/item/reagent_containers/food/snacks/pineappleslice +/obj/item/reagent_containers/food/snacks/slice/pineapple name = "ham & pineapple pizza slice" desc = "A slice of contraband." icon = 'icons/obj/food_syn.dmi' @@ -3255,29 +3190,25 @@ filling_color = "#BAA14C" bitesize = 2 center_of_mass = list("x"=18, "y"=13) + whole_path = /obj/item/reagent_containers/food/snacks/sliceable/pizza/pineapple -/obj/item/reagent_containers/food/snacks/pineappleslice/filled - nutriment_desc = list("pizza crust" = 5, "tomato" = 5) - nutriment_amt = 5 +/obj/item/reagent_containers/food/snacks/slice/pineapple/filled + filled = TRUE /obj/item/reagent_containers/food/snacks/sliceable/pizza/meatpizza - name = "Meatpizza" - desc = "A pizza with meat topping." + name = "meat pizza" + desc = "A pizza with meat toppings." icon_state = "meatpizza" slice_path = /obj/item/reagent_containers/food/snacks/slice/meatpizza slices_num = 6 center_of_mass = list("x"=16, "y"=11) - nutriment_desc = list("pizza crust" = 10, "tomato" = 10, "cheese" = 15) - nutriment_amt = 10 + nutriment_desc = list("pizza crust" = 10, "tomato" = 10, "mozzarella cheese" = 10, "seasoned sausage" = 15, "ground meat" = 10, "ham" = 10) + nutriment_amt = 40 + nutriment_allergens = ALLERGEN_DAIRY|ALLERGEN_GRAINS|ALLERGEN_FRUIT|ALLERGEN_MEAT bitesize = 2 -/obj/item/reagent_containers/food/snacks/sliceable/pizza/meatpizza/Initialize() - . = ..() - reagents.add_reagent("protein", 34) - reagents.add_reagent("tomatojuice", 6) - /obj/item/reagent_containers/food/snacks/slice/meatpizza - name = "Meatpizza slice" + name = "meat pizza slice" desc = "A slice of a meaty pizza." icon_state = "meatpizzaslice" filling_color = "#BAA14C" @@ -3289,22 +3220,19 @@ filled = TRUE /obj/item/reagent_containers/food/snacks/sliceable/pizza/mushroompizza - name = "Mushroompizza" - desc = "Very special pizza." + name = "mushroom pizza" + desc = "There's so mush room for toppings!" icon_state = "mushroompizza" slice_path = /obj/item/reagent_containers/food/snacks/slice/mushroompizza slices_num = 6 center_of_mass = list("x"=16, "y"=11) - nutriment_desc = list("pizza crust" = 10, "tomato" = 10, "cheese" = 5, "mushroom" = 10) - nutriment_amt = 35 + nutriment_desc = list("pizza crust" = 10, "tomato" = 10, "mozzarella cheese" = 5, "baked mushroom" = 10) + nutriment_amt = 40 + nutriment_allergens = ALLERGEN_DAIRY|ALLERGEN_GRAINS|ALLERGEN_FRUIT|ALLERGEN_FUNGI bitesize = 2 -/obj/item/reagent_containers/food/snacks/sliceable/pizza/mushroompizza/Initialize() - . = ..() - reagents.add_reagent("protein", 5) - /obj/item/reagent_containers/food/snacks/slice/mushroompizza - name = "Mushroompizza slice" + name = "mushroom pizza slice" desc = "Maybe it is the last slice of pizza in your life." icon_state = "mushroompizzaslice" filling_color = "#BAA14C" @@ -3316,20 +3244,19 @@ filled = TRUE /obj/item/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza - name = "Vegetable pizza" - desc = "No one of Tomato Sapiens were harmed during making this pizza." + name = "vegetable pizza" + desc = "With this many fresh vegetables, nobody will even question the cheese!" icon_state = "vegetablepizza" slice_path = /obj/item/reagent_containers/food/snacks/slice/vegetablepizza slices_num = 6 center_of_mass = list("x"=16, "y"=11) - nutriment_desc = list("pizza crust" = 10, "tomato" = 10, "cheese" = 5, "eggplant" = 5, "carrot" = 5, "corn" = 5) - nutriment_amt = 25 + nutriment_desc = list("pizza crust" = 10, "tomato" = 10, "mozzarella cheese" = 5, "baked eggplant" = 5, "baked carrot" = 5, "sweetcorn" = 5) + nutriment_amt = 40 + nutriment_allergens = ALLERGEN_DAIRY|ALLERGEN_GRAINS|ALLERGEN_FRUIT|ALLERGEN_VEGETABLE bitesize = 2 /obj/item/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza/Initialize() . = ..() - reagents.add_reagent("protein", 5) - reagents.add_reagent("tomatojuice", 6) reagents.add_reagent("imidazoline", 12) /obj/item/reagent_containers/food/snacks/slice/vegetablepizza @@ -3352,13 +3279,12 @@ slices_num = 6 center_of_mass = list("x"=16, "y"=11) nutriment_desc = list("stale pizza crust" = 10, "moldy tomato" = 10, "moldy cheese" = 5) - nutriment_amt = 10 + nutriment_amt = 20 + nutriment_allergens = ALLERGEN_DAIRY|ALLERGEN_GRAINS|ALLERGEN_FRUIT|ALLERGEN_FUNGI bitesize = 2 /obj/item/reagent_containers/food/snacks/sliceable/pizza/oldpizza/Initialize() . = ..() - reagents.add_reagent("protein", 5) - reagents.add_reagent("tomatojuice", 6) reagents.add_reagent("mold", 8) /obj/item/reagent_containers/food/snacks/slice/oldpizza @@ -3370,6 +3296,9 @@ center_of_mass = list("x"=16, "y"=13) whole_path = /obj/item/reagent_containers/food/snacks/sliceable/pizza/oldpizza +/obj/item/reagent_containers/food/snacks/slice/oldpizza + filled = TRUE + /obj/item/pizzabox name = "pizza box" desc = "A box suited for pizzas." @@ -3538,7 +3467,7 @@ /obj/item/pizzabox/vegetable/Initialize() pizza = new /obj/item/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza(src) - boxtag = "Gourmet Vegatable" + boxtag = "Gourmet Vegetable" . = ..() /obj/item/pizzabox/mushroom/Initialize() @@ -3583,12 +3512,9 @@ icon_state = "dough" bitesize = 2 center_of_mass = list("x"=16, "y"=13) - nutriment_amt = 3 + nutriment_amt = 4 nutriment_desc = list("uncooked dough" = 3) - -/obj/item/reagent_containers/food/snacks/dough/Initialize() - . = ..() - reagents.add_reagent("protein", 1) + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_EGGS //We're going to call the egg a gameplay abstraction for the mostpart, but for now you JUST put an egg in here...= // Dough + rolling pin = flat dough /obj/item/reagent_containers/food/snacks/dough/attackby(obj/item/W as obj, mob/user as mob) @@ -3605,13 +3531,11 @@ icon_state = "flat dough" slice_path = /obj/item/reagent_containers/food/snacks/doughslice slices_num = 3 - nutriment_amt = 3 + nutriment_amt = 4 nutriment_desc = list("raw dough" = 3) center_of_mass = list("x"=16, "y"=16) + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_EGGS -/obj/item/reagent_containers/food/snacks/sliceable/flatdough/Initialize() - . = ..() - reagents.add_reagent("protein", 1) /obj/item/reagent_containers/food/snacks/doughslice name = "dough slice" @@ -3624,6 +3548,7 @@ center_of_mass = list("x"=17, "y"=19) nutriment_amt = 1 nutriment_desc = list("uncooked dough" = 1) + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_EGGS /obj/item/reagent_containers/food/snacks/bun name = "bun" @@ -3633,30 +3558,54 @@ bitesize = 2 center_of_mass = list("x"=16, "y"=12) nutriment_amt = 4 - nutriment_desc = list("bun" = 4) + nutriment_desc = list("bread bun" = 4) + nutriment_allergens = ALLERGEN_GRAINS //Egg cooked off, alright? Bread shouldn't be deadly to skrell. /obj/item/reagent_containers/food/snacks/bun/attackby(obj/item/W as obj, mob/user as mob) + var/obj/item/reagent_containers/food/snacks/result = null // Bun + meatball = burger if(istype(W,/obj/item/reagent_containers/food/snacks/meatball)) - new /obj/item/reagent_containers/food/snacks/monkeyburger(src) + result = new /obj/item/reagent_containers/food/snacks/monkeyburger(src) to_chat(user, "You make a burger.") qdel(W) qdel(src) // Bun + cutlet = hamburger else if(istype(W,/obj/item/reagent_containers/food/snacks/cutlet)) - new /obj/item/reagent_containers/food/snacks/monkeyburger(src) + result = new /obj/item/reagent_containers/food/snacks/monkeyburger(src) to_chat(user, "You make a burger.") qdel(W) qdel(src) // Bun + sausage = hotdog else if(istype(W,/obj/item/reagent_containers/food/snacks/sausage)) - new /obj/item/reagent_containers/food/snacks/hotdog(src) + result = new /obj/item/reagent_containers/food/snacks/hotdog(src) to_chat(user, "You make a hotdog.") qdel(W) qdel(src) + // Bun + mouse = mouseburger + else if(istype(W,/obj/item/reagent_containers/food/snacks/variable/mob)) + var/obj/item/reagent_containers/food/snacks/variable/mob/MF = W + + switch (MF.kitchen_tag) + if ("rodent") + result = new /obj/item/reagent_containers/food/snacks/mouseburger(src) + to_chat(user, "You make a mouseburger!") + + if (result) + if (W.reagents) + //Reagents of reuslt objects will be the sum total of both. Except in special cases where nonfood items are used + //Eg robot head + result.reagents.clear_reagents() + W.reagents.trans_to(result, W.reagents.total_volume) + reagents.trans_to(result, reagents.total_volume) + + //If the bun was in your hands, the result will be too + if (loc == user) + user.drop_from_inventory(src) + user.put_in_hands(result) + // Burger + cheese wedge = cheeseburger /obj/item/reagent_containers/food/snacks/monkeyburger/attackby(obj/item/reagent_containers/food/snacks/cheesewedge/W as obj, mob/user as mob) if(istype(W))// && !istype(src,/obj/item/reagent_containers/food/snacks/cheesewedge)) @@ -3686,7 +3635,8 @@ bitesize = 2 center_of_mass = list("x"=16, "y"=8) nutriment_amt = 8 - nutriment_desc = list("bun" = 8) + nutriment_desc = list("bread bun" = 6, "mischief" = 2) + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_EGGS /obj/item/reagent_containers/food/snacks/taco name = "taco" @@ -3696,6 +3646,7 @@ center_of_mass = list("x"=21, "y"=12) nutriment_amt = 4 nutriment_desc = list("cheese" = 2,"taco shell" = 2) + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_VEGETABLE|ALLERGEN_DAIRY|ALLERGEN_MEAT /obj/item/reagent_containers/food/snacks/taco/Initialize() . = ..() @@ -3748,14 +3699,6 @@ . = ..() reagents.add_reagent("protein", 6) -///obj/item/reagent_containers/food/snacks/hotdog/old (Commented out on 4/23/2021 to make room for ancient hotdog) -// name = "old hotdog" -// desc = "Covered in mold. You're not gonna eat that, are you?" -// -///obj/item/reagent_containers/food/snacks/hotdog/old/Initialize() -// . = ..() -// reagents.add_reagent("mold", 6) - /obj/item/reagent_containers/food/snacks/flatbread name = "flatbread" desc = "Bland but filling." @@ -3763,7 +3706,7 @@ icon_state = "flatbread" bitesize = 2 center_of_mass = list("x"=16, "y"=16) - nutriment_amt = 3 + nutriment_amt = 4 nutriment_desc = list("bread" = 3) /obj/item/reagent_containers/food/snacks/rawsticks @@ -3775,6 +3718,7 @@ center_of_mass = list("x"=16, "y"=12) nutriment_amt = 3 nutriment_desc = list("raw potato" = 3) + nutriment_allergens = ALLERGEN_VEGETABLE /obj/item/reagent_containers/food/snacks/rawsunflower name = "sunflower seeds" @@ -3785,6 +3729,7 @@ center_of_mass = list("x"=17, "y"=18) nutriment_amt = 1 nutriment_desc = list("starch" = 3) + nutriment_allergens = ALLERGEN_SEEDS /obj/item/reagent_containers/food/snacks/frostbelle name = "frostbelle bud" @@ -3794,6 +3739,7 @@ bitesize = 1 nutriment_amt = 1 nutriment_desc = list("another world" = 2) + nutriment_allergens = ALLERGEN_VEGETABLE catalogue_data = list(/datum/category_item/catalogue/flora/frostbelle) filling_color = "#5dadcf" @@ -3813,11 +3759,13 @@ filling_color = "#5dadcf" center_of_mass = list("x"=16, "y"=12) do_coating_prefix = 0 + nutriment_amt = 5 + nutriment_desc = list("fried batter" = 5) + nutriment_allergens = ALLERGEN_VEGETABLE|ALLERGEN_GRAINS bitesize = 2 /obj/item/reagent_containers/food/snacks/bellefritter/Initialize() . = ..() - reagents.add_reagent("batter", 10) reagents.add_reagent("sugar", 5) /obj/item/reagent_containers/food/snacks/roastedsunflower @@ -3829,6 +3777,7 @@ center_of_mass = list("x"=15, "y"=17) nutriment_amt = 2 nutriment_desc = list("salt" = 3) + nutriment_allergens = ALLERGEN_SEEDS /obj/item/reagent_containers/food/snacks/roastedpeanuts name = "peanuts" @@ -3839,6 +3788,7 @@ center_of_mass = list("x"=15, "y"=17) nutriment_amt = 2 nutriment_desc = list("salt" = 3) + nutriment_allergens = ALLERGEN_SEEDS /obj/item/reagent_containers/food/snacks/liquidfood name = "\improper LiquidFood Ration" @@ -3859,7 +3809,7 @@ /obj/item/reagent_containers/food/snacks/liquidprotein name = "\improper LiquidProtein Ration" - desc = "A variant of the liquidfood ration, designed for more carnivorous species. Only barely more appealing than regular liquidfood. Should this be crunchy?" + desc = "A variant of the LiquidFood ration, designed for more carnivorous species. Only barely more appealing than regular liquidfood. Should this be crunchy?" icon_state = "liquidprotein" trash = /obj/item/trash/liquidprotein filling_color = "#A8A8A8" @@ -3904,7 +3854,7 @@ /obj/item/reagent_containers/food/snacks/tastybread name = "bread tube" - desc = "Bread in a tube. Chewy...and surprisingly tasty." + desc = "Bread in a tube. Chewy... and surprisingly tasty." description_fluff = "This is the product that brought Centauri Provisions into the limelight. A product of the earliest extrasolar colony of Heaven, the Bread Tube, while bland, contains all the nutrients a spacer needs to get through the day and is decidedly edible when compared to some of its competitors. Due to the high-fructose corn syrup content of NanoTrasen's own-brand bread tubes, many jurisdictions classify them as a confectionary." icon = 'icons/obj/food_snacks.dmi' icon_state = "tastybread" @@ -3913,6 +3863,7 @@ center_of_mass = list("x"=17, "y"=16) nutriment_amt = 6 nutriment_desc = list("bread" = 2, "sweetness" = 3) + nutriment_allergens = ALLERGEN_GRAINS bitesize = 2 /obj/item/reagent_containers/food/snacks/skrellsnacks @@ -3925,7 +3876,8 @@ filling_color = "#A66829" center_of_mass = list("x"=15, "y"=12) nutriment_amt = 10 - nutriment_desc = list("mushroom" = 5, "salt" = 5) + nutriment_desc = list("dried mushroom" = 5, "salt" = 5) + nutriment_allergens = ALLERGEN_FUNGI bitesize = 3 /obj/item/reagent_containers/food/snacks/unajerky @@ -3948,7 +3900,7 @@ /obj/item/reagent_containers/food/snacks/sashimi name = "sashimi" - desc = "Expertly prepared. Hopefully the toxins got removed." + desc = "Expertly prepared. Hopefully non-toxic." filling_color = "#FFDEFE" icon_state = "sashimi" nutriment_amt = 6 @@ -3956,20 +3908,17 @@ /obj/item/reagent_containers/food/snacks/sashimi/Initialize() . = ..() - reagents.add_reagent("protein", 2) + reagents.add_reagent("seafood", 2) /obj/item/reagent_containers/food/snacks/benedict name = "eggs benedict" desc = "Hey, there's only one egg in this!" filling_color = "#FFDF78" icon_state = "benedict" - nutriment_amt = 4 - nutriment_desc = list("bread" = 2, "bacon" = 2, "egg" = 2) + nutriment_amt = 6 + nutriment_desc = list("toasted bread" = 2, "bacon" = 2, "egg" = 2) bitesize = 2 - -/obj/item/reagent_containers/food/snacks/benedict/Initialize() - . = ..() - reagents.add_reagent("protein", 2) + nutriment_allergens = ALLERGEN_EGGS|ALLERGEN_MEAT|ALLERGEN_GRAINS /obj/item/reagent_containers/food/snacks/beans name = "baked beans" @@ -3979,6 +3928,7 @@ trash = /obj/item/trash/snack_bowl nutriment_amt = 4 nutriment_desc = list("beans" = 4) + nutriment_allergens = ALLERGEN_BEANS|ALLERGEN_FRUIT bitesize = 2 /obj/item/reagent_containers/food/snacks/sugarcookie @@ -3987,9 +3937,14 @@ filling_color = "#DBC94F" icon_state = "sugarcookie" nutriment_amt = 5 - nutriment_desc = list("sweetness" = 4, "cookie" = 1) + nutriment_desc = list("sweet cookie" = 5) + nutriment_allergens = ALLERGEN_SUGARS|ALLERGEN_GRAINS bitesize = 1 +/obj/item/reagent_containers/food/snacks/sugarcookie/Initialize() + . = ..() + reagents.add_reagent("sugar", 3) + /obj/item/reagent_containers/food/snacks/berrymuffin name = "berry muffin" desc = "A delicious and spongy little cake, with berries." @@ -3997,7 +3952,8 @@ filling_color = "#E0CF9B" center_of_mass = list("x"=17, "y"=4) nutriment_amt = 6 - nutriment_desc = list("sweetness" = 2, "muffin" = 2, "berries" = 2) + nutriment_desc = list("sweet muffin" = 2, "berries" = 2) + nutriment_allergens = ALLERGEN_FRUIT|ALLERGEN_GRAINS|ALLERGEN_SUGARS bitesize = 2 /obj/item/reagent_containers/food/snacks/berrymuffin/berry/Initialize() @@ -4016,6 +3972,7 @@ center_of_mass = list("x"=17, "y"=4) nutriment_amt = 6 nutriment_desc = list("spookiness" = 4, "muffin" = 1, "berries" = 1) + nutriment_allergens = ALLERGEN_FRUIT|ALLERGEN_GRAINS|ALLERGEN_SUGARS bitesize = 2 /obj/item/reagent_containers/food/snacks/ghostmuffin/berry/Initialize() @@ -4033,13 +3990,10 @@ filling_color = "#799ACE" center_of_mass = list("x"=17, "y"=4) nutriment_amt = 4 - nutriment_desc = list("egg" = 4) + nutriment_desc = list("fried batter" = 4) + nutriment_allergens = ALLERGEN_EGGS|ALLERGEN_VEGETABLE bitesize = 2 -/obj/item/reagent_containers/food/snacks/eggroll/Initialize() - . = ..() - reagents.add_reagent("protein", 2) - /obj/item/reagent_containers/food/snacks/devilledegg name = "devilled eggs" desc = "Spicy homestyle favorite." @@ -4047,7 +4001,8 @@ filling_color = "#799ACE" center_of_mass = list("x"=17, "y"=16) nutriment_amt = 8 - nutriment_desc = list("egg" = 4, "chili" = 4) + nutriment_desc = list("egg" = 4, "chili peppers" = 4) + nutriment_allergens = ALLERGEN_EGGS bitesize = 2 /obj/item/reagent_containers/food/snacks/devilledegg/Initialize() @@ -4060,7 +4015,7 @@ icon_state = "fruitsalad" filling_color = "#FF3867" nutriment_amt = 10 - nutriment_desc = list("fruit" = 10) + nutriment_desc = list("mixed fruit" = 10) bitesize = 4 /obj/item/reagent_containers/food/snacks/flowerchildsalad @@ -4099,16 +4054,8 @@ . = ..() reagents.add_reagent("protein", 4) -/obj/item/reagent_containers/food/snacks/tortilla - name = "tortilla" - desc = "The base for all your burritos." - icon_state = "tortilla" - nutriment_amt = 2 - nutriment_desc = list("bread" = 2) - bitesize = 2 - /obj/item/reagent_containers/food/snacks/cubannachos - name = "cuban nachos" + name = "\improper Cuban nachos" desc = "That's some dangerously spicy nachos." icon_state = "cubannachos" nutriment_amt = 6 @@ -4124,7 +4071,7 @@ desc = "That's some dangerously spicy rice." icon_state = "curryrice" nutriment_amt = 6 - nutriment_desc = list("salt" = 1, "rice" = 2, "chili peppers" = 3) + nutriment_desc = list("salt" = 1, "rice" = 2, "rich spices" = 3) bitesize = 2 /obj/item/reagent_containers/food/snacks/curryrice/Initialize() @@ -4136,7 +4083,8 @@ desc = "A sausage embedded in soft, fluffy pastry. Free this pig from its blanket prison by eating it." icon_state = "piginblanket" nutriment_amt = 6 - nutriment_desc = list("meat" = 3, "pastry" = 3) + nutriment_desc = list("sausage" = 3, "puff pastry" = 3) + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_MEAT bitesize = 3 /obj/item/reagent_containers/food/snacks/piginblanket/Initialize() @@ -4148,14 +4096,15 @@ desc = "A worm, it doesn't look particularily healthy, but it will still serve as good fishing bait." icon_state = "worm_sickly" nutriment_amt = 1 - nutriment_desc = list("bugflesh" = 1) + nutriment_desc = list("dry bugflesh" = 1) + nutriment_allergens = ALLERGEN_MEAT w_class = ITEMSIZE_TINY bitesize = 5 /obj/item/reagent_containers/food/snacks/wormsickly/Initialize() . = ..() reagents.add_reagent("fishbait", 9) - reagents.add_reagent("protein", 3) + reagents.add_reagent("protein", 3, nutriment_desc) /obj/item/reagent_containers/food/snacks/worm name = "strange worm" @@ -4163,27 +4112,29 @@ icon_state = "worm" nutriment_amt = 1 nutriment_desc = list("bugflesh" = 1) + nutriment_allergens = ALLERGEN_MEAT w_class = ITEMSIZE_TINY bitesize = 5 /obj/item/reagent_containers/food/snacks/worm/Initialize() . = ..() reagents.add_reagent("fishbait", 15) - reagents.add_reagent("protein", 5) + reagents.add_reagent("protein", 5, nutriment_desc) /obj/item/reagent_containers/food/snacks/wormdeluxe name = "deluxe worm" desc = "A fancy worm, genetically engineered to appeal to fish." icon_state = "worm_deluxe" nutriment_amt = 5 - nutriment_desc = list("bugflesh" = 1) + nutriment_desc = list("juicy bugflesh" = 1) + nutriment_allergens = ALLERGEN_MEAT w_class = ITEMSIZE_TINY bitesize = 5 /obj/item/reagent_containers/food/snacks/wormdeluxe/Initialize() . = ..() reagents.add_reagent("fishbait", 30) - reagents.add_reagent("protein", 10) + reagents.add_reagent("protein", 10, nutriment_desc) /obj/item/reagent_containers/food/snacks/siffruit name = "pulsing fruit" @@ -4191,7 +4142,7 @@ icon = 'icons/obj/flora/foraging.dmi' icon_state = "siffruit" nutriment_amt = 2 - nutriment_desc = list("tart" = 1) + nutriment_desc = list("tartness" = 1) w_class = ITEMSIZE_TINY /obj/item/reagent_containers/food/snacks/siffruit/Initialize() @@ -4214,6 +4165,7 @@ icon_state = "bagelplain" nutriment_amt = 6 nutriment_desc = list("bread" = 6) + nutriment_allergens = ALLERGEN_GRAINS bitesize = 2 /obj/item/reagent_containers/food/snacks/bagelsunflower @@ -4222,6 +4174,7 @@ icon_state = "bagelsunflower" nutriment_amt = 7 nutriment_desc = list("bread" = 4, "sunflower seeds" = 3) + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_SEEDS bitesize = 2 /obj/item/reagent_containers/food/snacks/bagelcheese @@ -4230,26 +4183,25 @@ icon_state = "bagelcheese" nutriment_amt = 8 nutriment_desc = list("bread" = 4, "cheese" = 4) + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_DAIRY bitesize = 2 -/obj/item/reagent_containers/food/snacks/bagelcheese/Initialize() - . = ..() - reagents.add_reagent("protein", 4) - /obj/item/reagent_containers/food/snacks/bagelraisin name = "cinnamon raisin bagel" desc = "This bread's got... Raisins!" icon_state = "bagelraisin" nutriment_amt = 8 nutriment_desc = list("bread" = 4, "sweetness" = 4) + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_FRUIT bitesize = 2 /obj/item/reagent_containers/food/snacks/bagelpoppy name = "poppy seed bagel" - desc = "This bread's got Chutzpah, and poppy seeds!" + desc = "This bread's got chutzpah, and poppy seeds!" icon_state = "bagelpoppy" nutriment_amt = 6 - nutriment_desc = list("bread" = 1, "sweetness" = 1) + nutriment_desc = list("bread" = 1, "poppy seed" = 1) + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_SEEDS bitesize = 2 /obj/item/reagent_containers/food/snacks/bageleverything @@ -4258,6 +4210,7 @@ icon_state = "bageleverything" nutriment_amt = 20 nutriment_desc = list("life" = 1, "death" = 1, "entropy" = 1) + nutriment_allergens = ALLERGEN_MEAT|ALLERGEN_FISH|ALLERGEN_FRUIT|ALLERGEN_VEGETABLE|ALLERGEN_GRAINS|ALLERGEN_BEANS|ALLERGEN_SEEDS|ALLERGEN_DAIRY|ALLERGEN_FUNGI|ALLERGEN_COFFEE|ALLERGEN_SUGARS|ALLERGEN_EGGS|ALLERGEN_STIMULANT //Allergens: Yes bitesize = 2 /obj/item/reagent_containers/food/snacks/bageleverything/Initialize() @@ -4291,7 +4244,8 @@ trash = /obj/item/trash/snack_bowl center_of_mass = list("x"=16, "y"=16) nutriment_amt = 9 - nutriment_desc = list("Cheese" = 5, "pasta" = 4, "happiness" = 1) + nutriment_desc = list("cheese" = 5, "pasta" = 4, "happiness" = 1) + nutriment_allergens = ALLERGEN_DAIRY|ALLERGEN_GRAINS bitesize = 3 @@ -4451,13 +4405,13 @@ center_of_mass = list("x"=16, "y"=16) do_coating_prefix = 0 bitesize = 2 - + nutriment_amt = 5 + nutriment_desc = list("fried batter" = 5, "fried meat" = 6) + nutriment_allergens = ALLERGEN_MEAT|ALLERGEN_GRAINS /obj/item/reagent_containers/food/snacks/sausage/battered/Initialize() . = ..() - reagents.add_reagent("protein", 6) - reagents.add_reagent("batter", 1.7) - reagents.add_reagent("oil", 1.5) + reagents.add_reagent("protein", 6, nutriment_desc) /obj/item/reagent_containers/food/snacks/jalapeno_poppers name = "jalapeno popper" @@ -4467,14 +4421,11 @@ filling_color = "#00AA00" center_of_mass = list("x"=10, "y"=6) do_coating_prefix = 0 - nutriment_amt = 2 - nutriment_desc = list("chilli pepper" = 2) - bitesize = 1 + nutriment_amt = 6 + nutriment_desc = list("chilli pepper" = 2, "fried batter") + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_FRUIT + bitesize = 3 -/obj/item/reagent_containers/food/snacks/jalapeno_poppers/Initialize() - . = ..() - reagents.add_reagent("batter", 2) - reagents.add_reagent("oil", 2) /obj/item/reagent_containers/food/snacks/mouseburger name = "mouse burger" @@ -4482,11 +4433,12 @@ icon = 'icons/obj/food_syn.dmi' icon_state = "ratburger" center_of_mass = list("x"=16, "y"=11) + nutriment_desc = list("bony meat" = 2, "fuzz" = 2) bitesize = 2 /obj/item/reagent_containers/food/snacks/mouseburger/Initialize() . = ..() - reagents.add_reagent("protein", 4) + reagents.add_reagent("protein", 4, nutriment_desc) /obj/item/reagent_containers/food/snacks/chickenkatsu name = "chicken katsu" @@ -4498,21 +4450,13 @@ center_of_mass = list("x"=16, "y"=16) do_coating_prefix = 0 bitesize = 1.5 + nutriment_amt = 3 + nutriment_desc = list("fried beer batter" = 2, "fried chicken = 5") + nutriment_allergens = ALLERGEN_MEAT|ALLERGEN_GRAINS /obj/item/reagent_containers/food/snacks/chickenkatsu/Initialize() . = ..() - reagents.add_reagent("protein", 6) - reagents.add_reagent("beerbatter", 2) - reagents.add_reagent("oil", 1) - -/obj/item/reagent_containers/food/snacks/fries - nutriment_amt = 4 - nutriment_desc = list("fries" = 4) - bitesize = 2 - -/obj/item/reagent_containers/food/snacks/fries/Initialize() - . = ..() - reagents.add_reagent("oil", 1.2)//This is mainly for the benefit of adminspawning + reagents.add_reagent("protein", 6, nutriment_desc) /obj/item/reagent_containers/food/snacks/microchips name = "micro chips" @@ -4521,8 +4465,9 @@ icon_state = "microchips" trash = /obj/item/trash/plate filling_color = "#EDDD00" - nutriment_amt = 4 + nutriment_amt = 8 nutriment_desc = list("soggy fries" = 4) + nutriment_allergens = ALLERGEN_VEGETABLE center_of_mass = list("x"=16, "y"=11) bitesize = 2 @@ -4533,8 +4478,9 @@ icon_state = "ovenchips" trash = /obj/item/trash/plate filling_color = "#EDDD00" - nutriment_amt = 4 + nutriment_amt = 8 nutriment_desc = list("crisp, dry fries" = 4) + nutriment_allergens = ALLERGEN_VEGETABLE center_of_mass = list("x"=16, "y"=11) bitesize = 2 @@ -4543,27 +4489,25 @@ desc = "This was once a normal pizza, but it has been coated in batter and deep-fried. Whatever toppings it once had are a mystery, but they're still under there, somewhere..." icon = 'icons/obj/food_syn.dmi' icon_state = "pizzacrunch" - slice_path = /obj/item/reagent_containers/food/snacks/pizzacrunchslice + slice_path = /obj/item/reagent_containers/food/snacks/slice/pizzacrunch slices_num = 6 - nutriment_amt = 25 - nutriment_desc = list("fried pizza" = 25) + nutriment_amt = 30 + nutriment_desc = list("deep fried pizza" = 25) center_of_mass = list("x"=16, "y"=11) bitesize = 2 -/obj/item/reagent_containers/food/snacks/sliceable/pizza/crunch/Initialize() - . = ..() - reagents.add_reagent("batter", 6.5) - coating = reagents.get_reagent("batter") - reagents.add_reagent("oil", 4) - -/obj/item/reagent_containers/food/snacks/pizzacrunchslice - name = "pizza crunch" +/obj/item/reagent_containers/food/snacks/slice/pizzacrunch + name = "pizza crunch slice" desc = "A little piece of a heart attack. It's toppings are a mystery, hidden under batter" icon = 'icons/obj/food_syn.dmi' icon_state = "pizzacrunchslice" filling_color = "#BAA14C" bitesize = 2 center_of_mass = list("x"=18, "y"=13) + whole_path = /obj/item/reagent_containers/food/snacks/sliceable/pizza/crunch + +/obj/item/reagent_containers/food/snacks/slice/pizzacrunch/filled + filled = TRUE /obj/item/reagent_containers/food/snacks/funnelcake name = "funnel cake" @@ -4574,10 +4518,12 @@ center_of_mass = list("x"=16, "y"=12) do_coating_prefix = 0 bitesize = 2 + nutriment_amt = 10 + nutriment_desc = list("fried batter" = 10) + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_SUGARS|ALLERGEN_EGGS /obj/item/reagent_containers/food/snacks/funnelcake/Initialize() . = ..() - reagents.add_reagent("batter", 10) reagents.add_reagent("sugar", 5) /obj/item/reagent_containers/food/snacks/spreads @@ -4589,6 +4535,7 @@ center_of_mass = list("x"=16, "y"=16) nutriment_desc = list("margarine" = 1) nutriment_amt = 20 + nutriment_allergens = ALLERGEN_VEGETABLE /obj/item/reagent_containers/food/snacks/spreads/butter name = "butter" @@ -4598,11 +4545,12 @@ bitesize = 2 center_of_mass = list("x"=16, "y"=16) nutriment_desc = list("butter" = 1) - nutriment_amt = 0 + nutriment_amt = 20 + nutriment_allergens = ALLERGEN_MEAT /obj/item/reagent_containers/food/snacks/spreads/Initialize() . = ..() - reagents.add_reagent("triglyceride", 20) + reagents.add_reagent("triglyceride", 20, nutriment_desc) reagents.add_reagent("sodiumchloride",1) /obj/item/reagent_containers/food/snacks/rawcutlet/attackby(obj/item/W as obj, mob/user as mob) @@ -4616,7 +4564,7 @@ /obj/item/reagent_containers/food/snacks/rawbacon name = "raw bacon" - desc = "A very thin piece of raw meat, cut from beef." + desc = "A very thin cut of raw meat." icon = 'icons/obj/food_syn.dmi' icon_state = "rawbacon" bitesize = 1 @@ -4624,7 +4572,7 @@ /obj/item/reagent_containers/food/snacks/rawbacon/Initialize() . = ..() - reagents.add_reagent("protein", 0.33) + reagents.add_reagent("protein", 2) /obj/item/reagent_containers/food/snacks/bacon name = "bacon" @@ -4632,6 +4580,8 @@ icon = 'icons/obj/food_syn.dmi' icon_state = "bacon" bitesize = 2 + nutriment_desc = list("crispy bacon" = 2) + nutriment_allergens = ALLERGEN_MEAT center_of_mass = list("x"=16, "y"=16) /obj/item/reagent_containers/food/snacks/bacon/microwave @@ -4640,6 +4590,7 @@ icon = 'icons/obj/food_syn.dmi' icon_state = "bacon" bitesize = 2 + nutriment_desc = list("soggy bacon" = 2) center_of_mass = list("x"=16, "y"=16) /obj/item/reagent_containers/food/snacks/bacon/oven @@ -4648,11 +4599,12 @@ icon = 'icons/obj/food_syn.dmi' icon_state = "bacon" bitesize = 2 + nutriment_desc = list("crispy bacon" = 2) center_of_mass = list("x"=16, "y"=16) /obj/item/reagent_containers/food/snacks/bacon/Initialize() . = ..() - reagents.add_reagent("protein", 0.33) + reagents.add_reagent("protein", 2, nutriment_desc) reagents.add_reagent("triglyceride", 1) /obj/item/reagent_containers/food/snacks/bacon_stick @@ -4660,67 +4612,74 @@ desc = "A bacon wrapped boiled egg, conveniently skewered on a wooden stick." icon = 'icons/obj/food_syn.dmi' icon_state = "bacon_stick" + nutriment_desc = list("crispy bacon" = 3) + nutriment_allergens = ALLERGEN_MEAT|ALLERGEN_EGGS /obj/item/reagent_containers/food/snacks/bacon_stick/Initialize() . = ..() - reagents.add_reagent("protein", 3) + reagents.add_reagent("protein", 3, nutriment_desc) reagents.add_reagent("egg", 1) /obj/item/reagent_containers/food/snacks/chilied_eggs - name = "Redeemed eggs" + name = "\improper Redeemed eggs" desc = "Three deviled eggs floating in a bowl of meat chili. A popular lunchtime meal for Unathi, with mild religious undertones." icon_state = "chilied_eggs" + nutriment_desc = list("heavily spiced meat" = 2) + nutriment_allergens = ALLERGEN_MEAT|ALLERGEN_EGGS trash = /obj/item/trash/snack_bowl /obj/item/reagent_containers/food/snacks/chilied_eggs/Initialize() . = ..() reagents.add_reagent("egg", 6) - reagents.add_reagent("protein", 2) + reagents.add_reagent("protein", 2, nutriment_desc) /obj/item/reagent_containers/food/snacks/cheese_cracker name = "supreme cheese toast" desc = "A piece of toast lathered with butter, cheese, spices, and herbs." icon = 'icons/obj/food_syn.dmi' icon_state = "cheese_cracker" - nutriment_desc = list("cheese toast" = 8) + nutriment_desc = list("melted cheese" = 4, "toasted bread" = 2, "mild spices" = 2) nutriment_amt = 8 + nutriment_allergens = ALLERGEN_DAIRY|ALLERGEN_GRAINS /obj/item/reagent_containers/food/snacks/bacon_and_eggs name = "bacon and eggs" desc = "A piece of bacon and two fried eggs." icon = 'icons/obj/food_syn.dmi' icon_state = "bacon_and_eggs" + nutriment_desc = list("bacon" = 4) trash = /obj/item/trash/plate /obj/item/reagent_containers/food/snacks/bacon_and_eggs/Initialize() . = ..() - reagents.add_reagent("protein", 3) + reagents.add_reagent("protein", 3, nutriment_desc) reagents.add_reagent("egg", 1) /obj/item/reagent_containers/food/snacks/sweet_and_sour name = "sweet and sour pork" - desc = "A traditional ancient sol recipe with a few liberties taken with meat selection." + desc = "A traditional ancient Sol recipe with a few liberties taken with meat selection." icon = 'icons/obj/food_syn.dmi' icon_state = "sweet_and_sour" - nutriment_desc = list("sweet and sour" = 6) + nutriment_desc = list("sweet and sour sauce" = 6, "fried pork" = 3) nutriment_amt = 6 + nutriment_allergens = ALLERGEN_MEAT|ALLERGEN_GRAINS trash = /obj/item/trash/plate /obj/item/reagent_containers/food/snacks/sweet_and_sour/Initialize() . = ..() - reagents.add_reagent("protein", 3) + reagents.add_reagent("protein", 3, nutriment_desc) /obj/item/reagent_containers/food/snacks/corn_dog name = "corn dog" desc = "A cornbread covered sausage deepfried in oil." icon = 'icons/obj/food_syn.dmi' icon_state = "corndog" - nutriment_desc = list("corn batter" = 4) + nutriment_desc = list("fried corn batter" = 4, "fried sausage" = 3) nutriment_amt = 4 /obj/item/reagent_containers/food/snacks/corn_dog/Initialize() . = ..() - reagents.add_reagent("protein", 3) + reagents.add_reagent("protein", 3, nutriment_desc) /obj/item/reagent_containers/food/snacks/truffle name = "chocolate truffle" @@ -4748,24 +4707,26 @@ desc = "Not a pizza." icon_state = "bacon_pizza" icon = 'icons/obj/food_syn.dmi' - nutriment_desc = list("flatbread" = 5) + nutriment_desc = list("flatbread" = 5, "bacon" = 5) nutriment_amt = 5 + nutriment_allergens = ALLERGEN_MEAT|ALLERGEN_GRAINS|ALLERGEN_DAIRY /obj/item/reagent_containers/food/snacks/bacon_flatbread/Initialize() . = ..() - reagents.add_reagent("protein", 5) + reagents.add_reagent("protein", 5, nutriment_desc) /obj/item/reagent_containers/food/snacks/meat_pocket name = "meat pocket" desc = "Meat and cheese stuffed in a flatbread pocket, grilled to perfection." icon = 'icons/obj/food_syn.dmi' icon_state = "meat_pocket" - nutriment_desc = list("flatbread" = 3) + nutriment_desc = list("flatbread" = 3, "grilled meat" = 2, "cheese" = 2) nutriment_amt = 3 + nutriment_allergens = ALLERGEN_MEAT|ALLERGEN_GRAINS|ALLERGEN_DAIRY /obj/item/reagent_containers/food/snacks/meat_pocket/Initialize() . = ..() - reagents.add_reagent("protein", 3) + reagents.add_reagent("protein", 4) /obj/item/reagent_containers/food/snacks/fish_taco name = "fish taco" @@ -4774,6 +4735,7 @@ icon_state = "fish_taco" nutriment_desc = list("flatbread" = 3) nutriment_amt = 3 + nutriment_allergens = ALLERGEN_GRAINS /obj/item/reagent_containers/food/snacks/fish_taco/Initialize() . = ..() @@ -4781,15 +4743,11 @@ /obj/item/reagent_containers/food/snacks/nt_muffin name = "breakfast muffin" - desc = "An English muffin with egg, cheese, and sausage, as sold in fast food joints galaxy-wide." + desc = "An english muffin with egg, cheese, and sausage, as sold in fast food joints galaxy-wide." icon = 'icons/obj/food_syn.dmi' icon_state = "nt_muffin" - nutriment_desc = list("biscuit" = 3) - nutriment_amt = 3 - -/obj/item/reagent_containers/food/snacks/nt_muffin/Initialize() - . = ..() - reagents.add_reagent("protein",5) + nutriment_desc = list("buttermilk biscuit" = 4, "grilled meat" = 4, "cheese" = 4, "egg" = 4) + nutriment_amt = 16 /obj/item/reagent_containers/food/snacks/pineapple_ring name = "pineapple ring" @@ -4798,26 +4756,27 @@ icon_state = "pineapple_ring" nutriment_desc = list("sweetness" = 2) nutriment_amt = 2 + nutriment_allergens = ALLERGEN_SUGARS /obj/item/reagent_containers/food/snacks/pineapple_ring/Initialize() . = ..() reagents.add_reagent("pineapplejuice",3) -/obj/item/reagent_containers/food/snacks/burger/bacon +/obj/item/reagent_containers/food/snacks/baconburger name = "bacon burger" desc = "The cornerstone of every nutritious breakfast, now with bacon!" icon = 'icons/obj/food_syn.dmi' icon_state = "baconburger" filling_color = "#D63C3C" center_of_mass = list("x"=16, "y"=11) - nutriment_desc = list("bun" = 2) + nutriment_desc = list("bread bun" = 2, "grilled meat" = 4) nutriment_amt = 3 bitesize = 2 -/obj/item/reagent_containers/food/snacks/burger/bacon/Initialize() +/obj/item/reagent_containers/food/snacks/baconburger/Initialize() . = ..() - reagents.add_reagent("protein", 4) + reagents.add_reagent("protein", 4, nutriment_desc) /obj/item/reagent_containers/food/snacks/blt name = "BLT" @@ -4826,13 +4785,13 @@ icon_state = "blt" filling_color = "#D63C3C" center_of_mass = list("x"=16, "y"=16) - nutriment_desc = list("bread" = 4) - nutriment_amt = 4 + nutriment_desc = list("bacon" = 4, "lettuce" = 4, "tomato" = 4) + nutriment_amt = 12 bitesize = 2 /obj/item/reagent_containers/food/snacks/blt/Initialize() . = ..() - reagents.add_reagent("protein", 4) + reagents.add_reagent("protein", 4, nutriment_desc) /obj/item/reagent_containers/food/snacks/onionrings name = "onion rings" @@ -4843,7 +4802,8 @@ filling_color = "#eddd00" center_of_mass = list("x"=16,"y"=11) nutriment_desc = list("fried onions" = 5) - nutriment_amt = 5 + nutriment_amt = 6 + nutriment_allergens = ALLERGEN_VEGETABLE|ALLERGEN_EGGS|ALLERGEN_GRAINS bitesize = 2 /obj/item/reagent_containers/food/snacks/soup/onion @@ -4855,7 +4815,8 @@ filling_color = "#E0C367" center_of_mass = list("x"=16, "y"=7) nutriment_amt = 5 - nutriment_desc = list("onion" = 2, "soup" = 2) + nutriment_desc = list("onion" = 2, "umami broth" = 2) + nutriment_allergens = ALLERGEN_VEGETABLE bitesize = 3 /obj/item/reagent_containers/food/snacks/porkbowl @@ -4866,6 +4827,7 @@ trash = /obj/item/trash/snack_bowl filling_color = "#FFFBDB" bitesize = 2 + nutriment_desc = list("ginger and garlic" = 2, "spiced pork" = 2) /obj/item/reagent_containers/food/snacks/porkbowl/Initialize() . = ..() @@ -4880,30 +4842,33 @@ trash = /obj/item/trash/plate filling_color = "#EDDD00" center_of_mass = list("x"=16, "y"=11) - nutriment_amt = 4 - nutriment_desc = list("mashed potatoes" = 4) + nutriment_amt = 6 + nutriment_desc = list("mashed potatoes" = 6) + nutriment_allergens = ALLERGEN_VEGETABLE bitesize = 2 /obj/item/reagent_containers/food/snacks/croissant name = "croissant" - desc = "True French cuisine." + desc = "True french cuisine; invented in Austria..." icon = 'icons/obj/food_syn.dmi' filling_color = "#E3D796" icon_state = "croissant" nutriment_amt = 4 - nutriment_desc = list("french bread" = 4) + nutriment_desc = list("sweet laminated pastry" = 4) + nutriment_allergens = ALLERGEN_EGGS|ALLERGEN_GRAINS bitesize = 2 /obj/item/reagent_containers/food/snacks/crabmeat name = "crab legs" - desc = "... Coffee? Is that you?" + desc = "...Coffee? Is that you?" icon = 'icons/obj/food_syn.dmi' icon_state = "crabmeat" + nutriment_desc = list("crab meat" = 2) bitesize = 1 /obj/item/reagent_containers/food/snacks/crabmeat/Initialize() . = ..() - reagents.add_reagent("seafood", 2) + reagents.add_reagent("seafood", 2, nutriment_desc) /obj/item/reagent_containers/food/snacks/crab_legs name = "steamed crab legs" @@ -4911,13 +4876,14 @@ icon = 'icons/obj/food_syn.dmi' icon_state = "crablegs" nutriment_amt = 2 - nutriment_desc = list("savory butter" = 2) + nutriment_desc = list("savory butter" = 3, "crab meat" = 5) + nutriment_allergens = ALLERGEN_DAIRY|ALLERGEN_FISH bitesize = 2 trash = /obj/item/trash/plate /obj/item/reagent_containers/food/snacks/crab_legs/Initialize() . = ..() - reagents.add_reagent("seafood", 6) + reagents.add_reagent("seafood", 6, nutriment_desc) reagents.add_reagent("sodiumchloride", 1) /obj/item/reagent_containers/food/snacks/pancakes @@ -4927,8 +4893,9 @@ icon_state = "pancakes" trash = /obj/item/trash/plate center_of_mass = list("x"=15, "y"=11) - nutriment_desc = list("pancake" = 8) + nutriment_desc = list("pancake" = 6, "sweetness" = 2) nutriment_amt = 8 + nutriment_allergens = ALLERGEN_EGGS|ALLERGEN_GRAINS|ALLERGEN_SUGARS|ALLERGEN_DAIRY bitesize = 2 /obj/item/reagent_containers/food/snacks/pancakes/berry @@ -4937,14 +4904,17 @@ icon_state = "pancake_berry" trash = /obj/item/trash/plate center_of_mass = list("x"=15, "y"=11) - nutriment_desc = list("pancake" = 4, "berry" = 4) + nutriment_desc = list("pancake" = 6, "baked berries" = 4) nutriment_amt = 10 + nutriment_allergens = ALLERGEN_EGGS|ALLERGEN_GRAINS|ALLERGEN_SUGARS|ALLERGEN_DAIRY|ALLERGEN_FRUIT bitesize = 2 /obj/item/reagent_containers/food/snacks/nugget name = "chicken nugget" icon = 'icons/obj/food_syn.dmi' icon_state = "nugget_lump" + nutriment_desc = "mild battered chicken" + nutriment_allergens = ALLERGEN_EGGS|ALLERGEN_GRAINS|ALLERGEN_MEAT bitesize = 3 /obj/item/reagent_containers/food/snacks/nugget/Initialize() @@ -4952,7 +4922,7 @@ var/shape = pick("lump", "star", "lizard", "corgi") desc = "A chicken nugget vaguely shaped like a [shape]." icon_state = "nugget_[shape]" - reagents.add_reagent("protein", 4) + reagents.add_reagent("protein", 4, nutriment_desc) /obj/item/reagent_containers/food/snacks/icecreamsandwich name = "ice cream sandwich" @@ -4961,68 +4931,24 @@ icon_state = "icecreamsandwich" filling_color = "#343834" center_of_mass = list("x"=15, "y"=4) - nutriment_desc = list("ice cream" = 4) + nutriment_desc = list("vanilla ice cream" = 4) nutriment_amt = 4 + nutriment_allergens = ALLERGEN_DAIRY|ALLERGEN_GRAINS|ALLERGEN_SUGARS /obj/item/reagent_containers/food/snacks/honeybun name = "honey bun" desc = "A sticky pastry bun glazed with honey." icon = 'icons/obj/food_syn.dmi' icon_state = "honeybun" - nutriment_desc = list("pastry" = 1) + nutriment_desc = list("fried pastry" = 2, "sugar glaze" = 1) nutriment_amt = 3 + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_SUGARS bitesize = 3 /obj/item/reagent_containers/food/snacks/honeybun/Initialize() . = ..() reagents.add_reagent("honey", 3) -// Moved /bun/attackby() from /code/modules/food/food/snacks.dm -/obj/item/reagent_containers/food/snacks/bun/attackby(obj/item/W as obj, mob/user as mob) - var/obj/item/reagent_containers/food/snacks/result = null - // Bun + meatball = burger - if(istype(W,/obj/item/reagent_containers/food/snacks/meatball)) - result = new /obj/item/reagent_containers/food/snacks/monkeyburger(src) - to_chat(user, "You make a burger.") - qdel(W) - qdel(src) - - // Bun + cutlet = hamburger - else if(istype(W,/obj/item/reagent_containers/food/snacks/cutlet)) - result = new /obj/item/reagent_containers/food/snacks/monkeyburger(src) - to_chat(user, "You make a burger.") - qdel(W) - qdel(src) - - // Bun + sausage = hotdog - else if(istype(W,/obj/item/reagent_containers/food/snacks/sausage)) - result = new /obj/item/reagent_containers/food/snacks/hotdog(src) - to_chat(user, "You make a hotdog.") - qdel(W) - qdel(src) - - // Bun + mouse = mouseburger - else if(istype(W,/obj/item/reagent_containers/food/snacks/variable/mob)) - var/obj/item/reagent_containers/food/snacks/variable/mob/MF = W - - switch (MF.kitchen_tag) - if ("rodent") - result = new /obj/item/reagent_containers/food/snacks/mouseburger(src) - to_chat(user, "You make a mouseburger!") - - if (result) - if (W.reagents) - //Reagents of reuslt objects will be the sum total of both. Except in special cases where nonfood items are used - //Eg robot head - result.reagents.clear_reagents() - W.reagents.trans_to(result, W.reagents.total_volume) - reagents.trans_to(result, reagents.total_volume) - - //If the bun was in your hands, the result will be too - if (loc == user) - user.drop_from_inventory(src) - user.put_in_hands(result) - // Chip update. /obj/item/reagent_containers/food/snacks/tortilla name = "tortilla" @@ -5031,6 +4957,7 @@ icon_state = "tortilla" bitesize = 3 nutriment_desc = list("tortilla" = 1) + nutriment_allergens = ALLERGEN_GRAINS center_of_mass = list("x"=16, "y"=16) nutriment_amt = 6 @@ -5045,6 +4972,7 @@ center_of_mass = list("x"=16, "y"=16) nutriment_desc = list("nacho chips" = 1) nutriment_amt = 2 + nutriment_allergens = ALLERGEN_GRAINS /obj/item/reagent_containers/food/snacks/chip/on_consume(mob/M as mob) if(reagents && reagents.total_volume) @@ -5056,18 +4984,21 @@ desc = "A portion sized chip good for dipping. This one has salsa on it." icon_state = "chip_salsa" bitten_state = "chip_half" + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_VEGETABLE /obj/item/reagent_containers/food/snacks/chip/guac name = "guac chip" desc = "A portion sized chip good for dipping. This one has guac on it." icon_state = "chip_guac" bitten_state = "chip_half" + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_VEGETABLE /obj/item/reagent_containers/food/snacks/chip/cheese name = "cheese chip" desc = "A portion sized chip good for dipping. This one has cheese sauce on it." icon_state = "chip_cheese" bitten_state = "chip_half" + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_DAIRY /obj/item/reagent_containers/food/snacks/chip/nacho name = "nacho chip" @@ -5080,18 +5011,21 @@ desc = "A nacho ship stray from a plate of cheesy nachos. This one has salsa on it." icon_state = "chip_nacho_salsa" bitten_state = "chip_half" + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_VEGETABLE /obj/item/reagent_containers/food/snacks/chip/nacho/guac name = "nacho chip" desc = "A nacho ship stray from a plate of cheesy nachos. This one has guac on it." icon_state = "chip_nacho_guac" bitten_state = "chip_half" + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_VEGETABLE /obj/item/reagent_containers/food/snacks/chip/nacho/cheese name = "nacho chip" desc = "A nacho ship stray from a plate of cheesy nachos. This one has extra cheese on it." icon_state = "chip_nacho_cheese" bitten_state = "chip_half" + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_DAIRY // chip plates /obj/item/reagent_containers/food/snacks/chipplate @@ -5109,7 +5043,7 @@ /obj/item/reagent_containers/food/snacks/chipplate/attack_hand(mob/user as mob) var/obj/item/reagent_containers/food/snacks/returningitem = new vendingobject(loc) returningitem.reagents.clear_reagents() - reagents.trans_to(returningitem, bitesize) + reagents.trans_to_obj(returningitem, bitesize) returningitem.bitesize = bitesize/2 user.put_in_hands(returningitem) if (reagents && reagents.total_volume) @@ -5152,6 +5086,7 @@ nutriment_desc = list("queso" = 20) center_of_mass = list("x"=16, "y"=16) nutriment_amt = 20 + nutriment_allergens = ALLERGEN_DAIRY /obj/item/reagent_containers/food/snacks/dip/attackby(obj/item/reagent_containers/food/snacks/item as obj, mob/user as mob) . = ..() @@ -5163,7 +5098,7 @@ if(returningitem) returningitem.reagents.clear_reagents() //Clear the new chip var/memed = 0 - item.reagents.trans_to(returningitem, item.reagents.total_volume) //Old chip to new chip + item.reagents.trans_to_obj(returningitem, item.reagents.total_volume) //Old chip to new chip if(item.icon_state == "chip_half") returningitem.icon_state = "[returningitem.icon_state]_half" returningitem.bitesize = clamp(returningitem.reagents.total_volume,1,10) @@ -5175,7 +5110,7 @@ else returningitem.bitesize = clamp(returningitem.reagents.total_volume*0.5,1,10) qdel(item) - reagents.trans_to(returningitem, bitesize) //Dip to new chip + reagents.trans_to_obj(returningitem, bitesize) //Dip to new chip user.put_in_hands(returningitem) if (reagents && reagents.total_volume) @@ -5195,8 +5130,9 @@ nachotrans = /obj/item/reagent_containers/food/snacks/chip/nacho/salsa chiptrans = /obj/item/reagent_containers/food/snacks/chip/salsa icon_state = "dip_salsa" - nutriment_desc = list("salsa" = 20) + nutriment_desc = list("spicy tomato" = 20) nutriment_amt = 20 + nutriment_allergens = ALLERGEN_VEGETABLE /obj/item/reagent_containers/food/snacks/dip/guac name = "guac dip" @@ -5204,8 +5140,9 @@ nachotrans = /obj/item/reagent_containers/food/snacks/chip/nacho/guac chiptrans = /obj/item/reagent_containers/food/snacks/chip/guac icon_state = "dip_guac" - nutriment_desc = list("guacmole" = 20) + nutriment_desc = list("creamy vegetables" = 20) nutriment_amt = 20 + nutriment_allergens = ALLERGEN_VEGETABLE|ALLERGEN_BEANS //burritos /obj/item/reagent_containers/food/snacks/burrito @@ -5215,13 +5152,13 @@ icon_state = "burrito" bitesize = 4 center_of_mass = list("x"=16, "y"=16) - nutriment_desc = list("tortilla" = 6) + nutriment_desc = list("tortilla" = 3, "cheese" = 3) nutriment_amt = 6 + nutriment_allergens = ALLERGEN_MEAT|ALLERGEN_DAIRY|ALLERGEN_VEGETABLE|ALLERGEN_GRAINS /obj/item/reagent_containers/food/snacks/burrito/Initialize() . = ..() - reagents.add_reagent("protein", 4) - + reagents.add_reagent("protein", 6, list("spiced minced meat" = 6)) /obj/item/reagent_containers/food/snacks/burrito_vegan name = "vegan burrito" @@ -5232,10 +5169,11 @@ center_of_mass = list("x"=16, "y"=16) nutriment_desc = list("tortilla" = 6) nutriment_amt = 6 + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_BEANS /obj/item/reagent_containers/food/snacks/burrito_vegan/Initialize() . = ..() - reagents.add_reagent("tofu", 6) + reagents.add_reagent("tofu", 6, list("spiced tofu" = 6)) /obj/item/reagent_containers/food/snacks/burrito_spicy @@ -5245,12 +5183,13 @@ icon_state = "burrito_spicy" bitesize = 4 center_of_mass = list("x"=16, "y"=16) - nutriment_desc = list("tortilla" = 6) + nutriment_desc = list("tortilla" = 3, "chili peppers" = 3) nutriment_amt = 6 + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_MEAT|ALLERGEN_VEGETABLE /obj/item/reagent_containers/food/snacks/burrito_spicy/Initialize() . = ..() - reagents.add_reagent("protein", 6) + reagents.add_reagent("protein", 6, list("spicy minced meat" = 6)) /obj/item/reagent_containers/food/snacks/burrito_cheese name = "carne queso burrito" @@ -5259,12 +5198,13 @@ icon_state = "burrito_cheese" bitesize = 4 center_of_mass = list("x"=16, "y"=16) - nutriment_desc = list("tortilla" = 6) + nutriment_desc = list("tortilla" = 3, "cheese" = 3) nutriment_amt = 6 + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_MEAT|ALLERGEN_DAIRY /obj/item/reagent_containers/food/snacks/burrito_cheese/Initialize() . = ..() - reagents.add_reagent("protein", 6) + reagents.add_reagent("protein", 6, list("spiced minced meat" = 6)) /obj/item/reagent_containers/food/snacks/burrito_hell name = "el diablo" @@ -5275,31 +5215,35 @@ center_of_mass = list("x"=16, "y"=16) nutriment_desc = list("hellfire" = 6) nutriment_amt = 24// 10 Chilis is a lot. + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_MEAT|ALLERGEN_VEGETABLE + +/obj/item/reagent_containers/food/snacks/burrito_hell/Initialize() + . = ..() + reagents.add_reagent("protein", 9, list("brimstone" = 9)) + reagents.add_reagent("condensedcapsaicin", 10) //what could possibly go wrong /obj/item/reagent_containers/food/snacks/meatburrito name = "carne asada burrito" desc = "Sliced meat and beans, it's another basic burrito!" icon_state = "carneburrito" nutriment_amt = 6 - nutriment_desc = list("tortilla" = 3, "meat" = 3) + nutriment_desc = list("tortilla" = 3, "spiced beans" = 3) + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_MEAT|ALLERGEN_BEANS bitesize = 2 /obj/item/reagent_containers/food/snacks/meatburrito/Initialize() . = ..() - reagents.add_reagent("protein", 6) + reagents.add_reagent("protein", 6, list("spiced meat strips" = 6)) /obj/item/reagent_containers/food/snacks/cheeseburrito name = "Cheese burrito" desc = "It's a burrito filled with beans and cheese." icon_state = "cheeseburrito" nutriment_amt = 6 - nutriment_desc = list("tortilla" = 3, "cheese" = 3) + nutriment_desc = list("tortilla" = 2, "cheese" = 2, "spiced beans" = 2) + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_DAIRY|ALLERGEN_BEANS bitesize = 2 -/obj/item/reagent_containers/food/snacks/cheeseburrito/Initialize() - . = ..() - reagents.add_reagent("protein", 2) - /obj/item/reagent_containers/food/snacks/burrito_cheese_spicy name = "spicy cheese burrito" desc = "Melted cheese, beans and chillis wrapped in a flour tortilla." @@ -5307,19 +5251,21 @@ icon_state = "burrito_cheese_spicy" bitesize = 4 center_of_mass = list("x"=16, "y"=16) - nutriment_desc = list("tortilla" = 6) + nutriment_desc = list("tortilla" = 2, "cheese" = 2, "spicy beans" = 2, "chili peppers" = 2) nutriment_amt = 6 + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_MEAT|ALLERGEN_DAIRY|ALLERGEN_BEANS /obj/item/reagent_containers/food/snacks/burrito_cheese_spicy/Initialize() . = ..() - reagents.add_reagent("protein", 6) + reagents.add_reagent("protein", 6, list("spicy meat strips" = 6)) /obj/item/reagent_containers/food/snacks/fuegoburrito name = "fuego phoron burrito" desc = "A super spicy vegetarian burrito." icon_state = "fuegoburrito" nutriment_amt = 6 - nutriment_desc = list("chilli peppers" = 5, "tortilla" = 1) + nutriment_desc = list("chili peppers" = 2, "spicy beans" = 2, "tortilla" = 2) + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_BEANS bitesize = 2 /obj/item/reagent_containers/food/snacks/fuegoburrito/Initialize() @@ -5333,16 +5279,17 @@ icon_state = "breakfast_wrap" bitesize = 4 center_of_mass = list("x"=16, "y"=16) - nutriment_desc = list("tortilla" = 6) + nutriment_desc = list("tortilla" = 2, "cheese" = 2) nutriment_amt = 6 + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_DAIRY -/obj/item/reagent_containers/food/snacks/burrito_hell/Initialize() +/obj/item/reagent_containers/food/snacks/breakfast_wrap/Initialize() . = ..() - reagents.add_reagent("protein", 9) - reagents.add_reagent("condensedcapsaicin", 10) //what could possibly go wrong + reagents.add_reagent("protein", 4, list("bacon" = 4)) + reagents.add_reagent("egg", 3, list("scrambled egg" = 3)) /obj/item/reagent_containers/food/snacks/burrito_mystery - name = "mystery meat burrito" + name = "burrito misterioso" desc = "The mystery is, why aren't you BSAing it?" icon = 'icons/obj/food_syn.dmi' icon_state = "burrito_mystery" @@ -5350,10 +5297,11 @@ center_of_mass = list("x"=16, "y"=16) nutriment_desc = list("regret" = 6) nutriment_amt = 6 + nutriment_allergens = ALLERGEN_GRAINS /obj/item/reagent_containers/food/snacks/hatchling_suprise name = "hatchling suprise" - desc = "A poached egg on top of three slices of bacon. A typical breakfast for hungry Unathi children." + desc = "A poached egg on top of three slices of bacon. A typical breakfast for hungry unathi children." icon = 'icons/obj/food_syn.dmi' icon_state = "hatchling_suprise" trash = /obj/item/trash/snack_bowl @@ -5361,20 +5309,23 @@ /obj/item/reagent_containers/food/snacks/hatchling_suprise/Initialize() . = ..() reagents.add_reagent("egg", 2) - reagents.add_reagent("protein", 4) + reagents.add_reagent("protein", 4, list("bacon" = 4)) /obj/item/reagent_containers/food/snacks/red_sun_special name = "red sun special" - desc = "One lousy piece of sausage sitting on melted cheese curds. A popular utilitarian meal for the Unathi of Moghes." + desc = "One lousy piece of sausage sitting on melted cheese curds. A popular utilitarian meal for the unathi of Moghes." icon = 'icons/obj/food_syn.dmi' icon_state = "red_sun_special" + nutriment_amt = 3 + nutriment_desc = list("cheese curds" = 3) + nutriment_allergens = ALLERGEN_DAIRY trash = /obj/item/trash/plate /obj/item/reagent_containers/food/snacks/red_sun_special/Initialize() . = ..() - reagents.add_reagent("protein", 2) + reagents.add_reagent("protein", 2, list("smoked sausage" = 2)) -/obj/item/reagent_containers/food/snacks/riztizkzi_sea + /obj/item/reagent_containers/food/snacks/riztizkzi_sea name = "moghesian sea delight" desc = "Three raw eggs floating in a sea of blood. An authentic replication of an ancient Unathi delicacy." icon = 'icons/obj/food_syn.dmi' @@ -5383,7 +5334,8 @@ /obj/item/reagent_containers/food/snacks/riztizkzi_sea/Initialize() . = ..() - reagents.add_reagent("egg", 4) + reagents.add_reagent("blood", 10, list("congealed blood" = 10)) + reagents.add_reagent("egg", 6, list("raw egg" = 6)) /obj/item/reagent_containers/food/snacks/father_breakfast name = "breakfast of champions" @@ -5394,18 +5346,18 @@ /obj/item/reagent_containers/food/snacks/father_breakfast/Initialize() . = ..() - reagents.add_reagent("egg", 4) - reagents.add_reagent("protein", 6) + reagents.add_reagent("egg", 6) + reagents.add_reagent("protein", 10, list("grilled steak" = 5, "grilled sausage" = 5)) /obj/item/reagent_containers/food/snacks/stuffed_meatball - name = "stuffed meatball" //YES + name = "stuffed meatball" desc = "A meatball loaded with cheese." icon = 'icons/obj/food_syn.dmi' icon_state = "stuffed_meatball" /obj/item/reagent_containers/food/snacks/stuffed_meatball/Initialize() . = ..() - reagents.add_reagent("protein", 4) + reagents.add_reagent("protein", 3, list("seasoned meat")) /obj/item/reagent_containers/food/snacks/egg_pancake name = "meat pancake" @@ -5416,32 +5368,32 @@ /obj/item/reagent_containers/food/snacks/egg_pancake/Initialize() . = ..() - reagents.add_reagent("protein", 6) + reagents.add_reagent("protein", 6, list("meat patty")) reagents.add_reagent("egg", 2) /obj/item/reagent_containers/food/snacks/sliceable/grilled_carp - name = "Njarir Merana Grill" + name = "\improper Njarir Merana Grill" desc = "A well-dressed fish, seared to perfection and adorned with herbs and spices in a traditional Nerahni Tajaran style. Can be sliced into proper serving sizes." icon = 'icons/obj/food_syn.dmi' icon_state = "grilled_carp" slice_path = /obj/item/reagent_containers/food/snacks/grilled_carp_slice slices_num = 6 + nutriment_amt = 6 + nutriment_desc = list("citrus spices" = 6) + nutriment_allergens = ALLERGEN_FRUIT trash = /obj/item/trash/snacktray /obj/item/reagent_containers/food/snacks/sliceable/grilled_carp/Initialize() . = ..() - reagents.add_reagent("seafood", 12) + reagents.add_reagent("seafood", 12, list("grilled fish")) /obj/item/reagent_containers/food/snacks/grilled_carp_slice - name = "korlaaskak slice" + name = "\improper Njarir Merana Grill slice" desc = "A well-dressed fillet of carp, seared to perfection and adorned with herbs and spices." icon = 'icons/obj/food_syn.dmi' icon_state = "grilled_carp_slice" trash = /obj/item/trash/plate - -// SYNNONO MEME FOODS EXPANSION - Credit to Synnono from Aurorastation. Come play here sometime :( - /obj/item/reagent_containers/food/snacks/redcurry name = "red curry" gender = PLURAL @@ -5451,13 +5403,14 @@ trash = /obj/item/trash/snack_bowl filling_color = "#f73333" nutriment_amt = 8 - nutriment_desc = list("savory meat and rice" = 8) + nutriment_desc = list("rice" = 4, "bold spices" = 4) + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_DAIRY center_of_mass = list("x"=16, "y"=8) bitesize = 3 /obj/item/reagent_containers/food/snacks/redcurry/Initialize() . = ..() - reagents.add_reagent("protein", 7) + reagents.add_reagent("protein", 7, list("aromatic meat" = 7)) /obj/item/reagent_containers/food/snacks/greencurry name = "green curry" @@ -5467,14 +5420,15 @@ icon_state = "greencurry" trash = /obj/item/trash/snack_bowl filling_color = "#58b76c" - nutriment_amt = 12 - nutriment_desc = list("tofu and rice" = 12) + nutriment_amt = 7 + nutriment_desc = list("rice" = 2, "very powerful spices" = 3, "sweetness" = 1) + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_DAIRY|ALLERGEN_VEGETABLE center_of_mass = list("x"=16, "y"=8) bitesize = 3 /obj/item/reagent_containers/food/snacks/greencurry/Initialize() . = ..() - reagents.add_reagent("protein", 1) + reagents.add_reagent("tofu", 6, list("spicy tofu" = 6)) reagents.add_reagent("capsaicin", 2) /obj/item/reagent_containers/food/snacks/yellowcurry @@ -5485,15 +5439,12 @@ icon_state = "yellowcurry" trash = /obj/item/trash/snack_bowl filling_color = "#bc9509" - nutriment_amt = 13 - nutriment_desc = list("rice and potatoes" = 13) + nutriment_amt = 15 + nutriment_desc = list("rice" = 4, "mildly spiced potatoes" = 4, "creamy herbs and spices" = 4) + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_DAIRY|ALLERGEN_VEGETABLE center_of_mass = list("x"=16, "y"=8) bitesize = 3 -/obj/item/reagent_containers/food/snacks/yellowcurry/Initialize() - . = ..() - reagents.add_reagent("protein", 2) - /obj/item/reagent_containers/food/snacks/bearburger name = "bearburger" desc = "The solution to your unbearable hunger." @@ -5505,7 +5456,7 @@ /obj/item/reagent_containers/food/snacks/bearburger/Initialize() . = ..() - reagents.add_reagent("protein", 4) //So spawned burgers will not be empty I guess? + reagents.add_reagent("protein", 4, list("bear meat" = 4)) //So spawned burgers will not be empty I guess? /obj/item/reagent_containers/food/snacks/bearchili name = "bear chili" @@ -5517,6 +5468,7 @@ filling_color = "#702708" nutriment_amt = 3 nutriment_desc = list("dark, hearty chili" = 3) + nutriment_allergens = ALLERGEN_VEGETABLE|ALLERGEN_MEAT center_of_mass = list("x"=15, "y"=9) bitesize = 6 @@ -5536,6 +5488,7 @@ filling_color = "#9E673A" nutriment_amt = 6 nutriment_desc = list("hearty stew" = 6) + nutriment_allergens = ALLERGEN_VEGETABLE|ALLERGEN_MEAT center_of_mass = list("x"=16, "y"=5) bitesize = 6 @@ -5554,14 +5507,15 @@ icon_state = "bibimbap" trash = /obj/item/trash/snack_bowl filling_color = "#4f2100" - nutriment_amt = 10 - nutriment_desc = list("egg" = 5, "vegetables" = 5) + nutriment_amt = 12 + nutriment_desc = list("fried egg" = 4, "sauted vegetables" = 4, "spicy gochujang" = 4) + nutriment_allergens = ALLERGEN_VEGETABLE|ALLERGEN_EGGS|ALLERGEN_GRAINS center_of_mass = list("x"=15, "y"=9) bitesize = 4 /obj/item/reagent_containers/food/snacks/bibimbap/Initialize() . = ..() - reagents.add_reagent("protein", 10) + reagents.add_reagent("protein", 8, list("marinated meat" = 8)) /obj/item/reagent_containers/food/snacks/lomein name = "lo mein" @@ -5571,14 +5525,15 @@ icon_state = "lomein" trash = /obj/item/trash/plate filling_color = "#FCEE81" - nutriment_amt = 8 - nutriment_desc = list("noodles" = 6, "sesame sauce" = 2) + nutriment_amt = 10 + nutriment_desc = list("noodles" = 6, "sesame sauce" = 2, "stir-fried vegetables" = 2) + nutriment_allergens = ALLERGEN_VEGETABLE|ALLERGEN_GRAINS //Adding seeds for the sesame description when there's none in the recipe would be cruel. center_of_mass = list("x"=16, "y"=10) bitesize = 2 /obj/item/reagent_containers/food/snacks/lomein/Initialize() . = ..() - reagents.add_reagent("protein", 2) + reagents.add_reagent("protein", 2, list("stir-fried meat" = 2)) /obj/item/reagent_containers/food/snacks/friedrice name = "fried rice" @@ -5589,7 +5544,8 @@ trash = /obj/item/trash/snack_bowl filling_color = "#FFFBDB" nutriment_amt = 7 - nutriment_desc = list("rice" = 7) + nutriment_desc = list("fried rice" = 4, "fried vegetables" = 2, "soy sauce" = 1) + nutriment_allergens = ALLERGEN_VEGETABLE|ALLERGEN_GRAINS|ALLERGEN_BEANS center_of_mass = list("x"=17, "y"=11) bitesize = 2 @@ -5601,12 +5557,13 @@ filling_color = "#E9ADFF" nutriment_amt = 4 nutriment_desc = list("breading" = 4) + nutriment_allergens = ALLERGEN_GRAINS center_of_mass = list("x"=16, "y"=16) bitesize = 3 /obj/item/reagent_containers/food/snacks/chickenfillet/Initialize() . = ..() - reagents.add_reagent("protein", 8) + reagents.add_reagent("protein", 8, list("fried chicken" = 8)) /obj/item/reagent_containers/food/snacks/chickennoodlesoup name = "chicken noodle soup" @@ -5616,13 +5573,14 @@ icon_state = "chickennoodlesoup" filling_color = "#ead90c" nutriment_amt = 6 - nutriment_desc = list("warm soup" = 6) + nutriment_desc = list("bone broth" = 4, "pasta noodles" = 2) + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_MEAT|ALLERGEN_VEGETABLE center_of_mass = list("x"=16, "y"=5) bitesize = 6 /obj/item/reagent_containers/food/snacks/chickennoodlesoup/Initialize() . = ..() - reagents.add_reagent("protein", 4) + reagents.add_reagent("protein", 4, list("chicken")) reagents.add_reagent("water", 5) /obj/item/reagent_containers/food/snacks/chilicheesefries @@ -5633,14 +5591,14 @@ icon_state = "chilicheesefries" trash = /obj/item/trash/plate filling_color = "#EDDD00" - nutriment_amt = 8 - nutriment_desc = list("hearty, cheesy fries" = 8) + nutriment_amt = 10 + nutriment_desc = list("fresh fries" = 5, "cheese sauce" = 5) + nutriment_allergens = ALLERGEN_DAIRY|ALLERGEN_VEGETABLE center_of_mass = list("x"=16, "y"=11) bitesize = 4 /obj/item/reagent_containers/food/snacks/chilicheesefries/Initialize() . = ..() - reagents.add_reagent("protein", 2) reagents.add_reagent("capsaicin", 2) /obj/item/reagent_containers/food/snacks/friedmushroom @@ -5649,14 +5607,12 @@ icon = 'icons/obj/food_syn.dmi' icon_state = "friedmushroom" filling_color = "#EDDD00" - nutriment_amt = 4 - nutriment_desc = list("alcoholic mushrooms" = 4) + nutriment_amt = 6 + nutriment_desc = list("alcoholic mushrooms" = 4, "fried batter" = 2) + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_EGGS|ALLERGEN_FUNGI center_of_mass = list("x"=16, "y"=11) bitesize = 5 -/obj/item/reagent_containers/food/snacks/friedmushroom/Initialize() - . = ..() - reagents.add_reagent("protein", 2) /obj/item/reagent_containers/food/snacks/pisanggoreng name = "pisang goreng" @@ -5667,28 +5623,26 @@ trash = /obj/item/trash/plate filling_color = "#301301" nutriment_amt = 8 - nutriment_desc = list("sweet bananas" = 8) + nutriment_desc = list("sweet bananas" = 6, "fried batter" = 2) + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_EGGS center_of_mass = list("x"=16, "y"=11) bitesize = 3 -/obj/item/reagent_containers/food/snacks/pisanggoreng/Initialize() - . = ..() - reagents.add_reagent("protein", 1) - /obj/item/reagent_containers/food/snacks/meatbun name = "meat and leaf bun" desc = "A soft, fluffy flour bun also known as baozi. This one is filled with a meat and cabbage filling." filling_color = "#DEDEAB" icon = 'icons/obj/food_syn.dmi' icon_state = "meatbun" - nutriment_amt = 5 - nutriment_desc = list("fried meat" = 5) + nutriment_amt = 6 + nutriment_desc = list("fried cabbage" = 2, "lightly spiced seasoning" = 2, "steamed dough" = 2) + nutriment_allergens = ALLERGEN_VEGETABLE|ALLERGEN_GRAINS center_of_mass = list("x"=16, "y"=11) - bitesize = 2 + bitesize = 3 /obj/item/reagent_containers/food/snacks/meatbun/Initialize() . = ..() - reagents.add_reagent("protein", 4) + reagents.add_reagent("protein", 4, list("fried ground meat" = 4)) /obj/item/reagent_containers/food/snacks/spicedmeatbun name = "char sui meat bun" @@ -5696,14 +5650,15 @@ icon = 'icons/obj/food_syn.dmi' icon_state = "meatbun" filling_color = "#edd7d7" - nutriment_amt = 5 - nutriment_desc = list("char sui" = 5) + nutriment_amt = 6 + nutriment_desc = list("char sui seasoning" = 4, "steamed dough" = 2) + nutriment_allergens = ALLERGEN_VEGETABLE|ALLERGEN_GRAINS center_of_mass = list("x"=16, "y"=11) - bitesize = 5 + bitesize = 3 /obj/item/reagent_containers/food/snacks/spicedmeatbun/Initialize() . = ..() - reagents.add_reagent("protein", 3) + reagents.add_reagent("protein", 3, list("fried ground meat" = 3)) /obj/item/reagent_containers/food/snacks/custardbun name = "custard bun" @@ -5711,10 +5666,11 @@ icon = 'icons/obj/food_syn.dmi' icon_state = "meatbun" nutriment_amt = 6 - nutriment_desc = list("egg custard" = 6) + nutriment_desc = list("egg custard" = 4, "steamed dough" = 2) + nutriment_allergens = ALLERGEN_SUGARS|ALLERGEN_GRAINS|ALLERGEN_EGGS filling_color = "#ebedc2" center_of_mass = list("x"=16, "y"=11) - bitesize = 6 + bitesize = 3 /obj/item/reagent_containers/food/snacks/chickenmomo name = "chicken momo" @@ -5725,13 +5681,14 @@ trash = /obj/item/trash/snacktray filling_color = "#edd7d7" nutriment_amt = 9 - nutriment_desc = list("spiced chicken" = 9) + nutriment_desc = list("chili garlic spices" = 6, "steamed dough" = 3) + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_VEGETABLE center_of_mass = list("x"=15, "y"=9) bitesize = 3 /obj/item/reagent_containers/food/snacks/chickenmomo/Initialize() . = ..() - reagents.add_reagent("protein", 6) + reagents.add_reagent("protein", 6, list("chicken mince" = 6)) /obj/item/reagent_containers/food/snacks/veggiemomo name = "veggie momo" @@ -5742,14 +5699,11 @@ trash = /obj/item/trash/snacktray filling_color = "#edd7d7" nutriment_amt = 13 - nutriment_desc = list("spiced vegetables" = 13) + nutriment_desc = list("minced vegetables" = 5, "ginger and herb seasoning" = 5, "steamed dough = 3") + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_VEGETABLE center_of_mass = list("x"=15, "y"=9) bitesize = 3 -/obj/item/reagent_containers/food/snacks/veggiemomo/Initialize() - . = ..() - reagents.add_reagent("protein", 2) - /obj/item/reagent_containers/food/snacks/risotto name = "risotto" gender = PLURAL @@ -5758,15 +5712,12 @@ icon_state = "risotto" trash = /obj/item/trash/snack_bowl filling_color = "#edd7d7" - nutriment_amt = 9 - nutriment_desc = list("savory rice" = 6, "cream" = 3) + nutriment_amt = 10 + nutriment_desc = list("savory rice" = 6, "creamy mushroom" = 4) + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_VEGETABLE|ALLERGEN_FUNGI center_of_mass = list("x"=15, "y"=9) bitesize = 2 -/obj/item/reagent_containers/food/snacks/risotto/Initialize() - . = ..() - reagents.add_reagent("protein", 1) - /obj/item/reagent_containers/food/snacks/risottoballs name = "risotto balls" gender = PLURAL @@ -5775,8 +5726,9 @@ icon_state = "risottoballs" trash = /obj/item/trash/snack_bowl filling_color = "#edd7d7" - nutriment_amt = 1 - nutriment_desc = list("batter" = 1) + nutriment_amt = 12 + nutriment_desc = list("savory rice" = 5, "creamy mushroom" = 5, "fried batter" = 2) + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_VEGETABLE|ALLERGEN_FUNGI center_of_mass = list("x"=15, "y"=9) bitesize = 3 @@ -5787,8 +5739,9 @@ icon_state = "honeytoast" trash = /obj/item/trash/plate filling_color = "#EDE5AD" - nutriment_amt = 1 - nutriment_desc = list("sweet, crunchy bread" = 1) + nutriment_amt = 5 + nutriment_desc = list("toasted bread" = 2, "sweet honey" = 3) + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_SUGARS center_of_mass = list("x"=16, "y"=9) bitesize = 4 @@ -5800,13 +5753,13 @@ trash = /obj/item/trash/plate filling_color = "#FFDF78" nutriment_amt = 1 - nutriment_desc = list("egg" = 1) + nutriment_desc = list("delicate egg whites" = 1) center_of_mass = list("x"=16, "y"=14) bitesize = 2 /obj/item/reagent_containers/food/snacks/poachedegg/Initialize() . = ..() - reagents.add_reagent("protein", 3) + reagents.add_reagent("egg", 3) reagents.add_reagent("blackpepper", 1) /obj/item/reagent_containers/food/snacks/ribplate @@ -5817,13 +5770,13 @@ trash = /obj/item/trash/plate filling_color = "#7A3D11" nutriment_amt = 6 - nutriment_desc = list("barbecue" = 6) + nutriment_desc = list("barbecue seasonings" = 6) center_of_mass = list("x"=16, "y"=13) bitesize = 4 /obj/item/reagent_containers/food/snacks/ribplate/Initialize() . = ..() - reagents.add_reagent("protein", 6) + reagents.add_reagent("protein", 6, list("barbecued meat" = 6)) reagents.add_reagent("triglyceride", 2) reagents.add_reagent("blackpepper", 1) reagents.add_reagent("honey", 5) @@ -5838,14 +5791,11 @@ slice_path = /obj/item/reagent_containers/food/snacks/keylimepieslice slices_num = 5 filling_color = "#F5B951" - nutriment_amt = 16 - nutriment_desc = list("lime" = 12, "graham crackers" = 4) + nutriment_amt = 20 + nutriment_desc = list("zesty lime cream" = 14, "sweet wholewheat crust" = 6) + nutriment_allergens = ALLERGEN_FRUIT|ALLERGEN_DAIRY|ALLERGEN_SUGARS center_of_mass = list("x"=16, "y"=10) -/obj/item/reagent_containers/food/snacks/sliceable/keylimepie/Initialize() - . = ..() - reagents.add_reagent("protein", 4) - /obj/item/reagent_containers/food/snacks/keylimepieslice name = "slice of key lime pie" desc = "A slice of tart pie, with whipped cream on top." @@ -5854,7 +5804,8 @@ trash = /obj/item/trash/plate filling_color = "#F5B951" bitesize = 3 - nutriment_desc = list("lime" = 1) + nutriment_desc = list("zesty lime cream" = 2, "sweet wholewheat crust" = 3) + nutriment_allergens = ALLERGEN_FRUIT|ALLERGEN_DAIRY|ALLERGEN_SUGARS center_of_mass = list("x"=16, "y"=12) /obj/item/reagent_containers/food/snacks/keylimepieslice/filled @@ -5868,14 +5819,11 @@ slice_path = /obj/item/reagent_containers/food/snacks/quicheslice slices_num = 5 filling_color = "#F5B951" - nutriment_amt = 10 - nutriment_desc = list("cheese" = 5, "egg" = 5) + nutriment_amt = 20 + nutriment_desc = list("savory crust" = 5, "cheese" = 5, "baked egg" = 10) + nutriment_allergens = ALLERGEN_EGGS|ALLERGEN_DAIRY|ALLERGEN_GRAINS center_of_mass = list("x"=16, "y"=10) -/obj/item/reagent_containers/food/snacks/sliceable/quiche/Initialize() - . = ..() - reagents.add_reagent("protein", 10) - /obj/item/reagent_containers/food/snacks/quicheslice name = "slice of quiche" desc = "A slice of delicious quiche. Eggy, cheesy goodness." @@ -5884,16 +5832,13 @@ trash = /obj/item/trash/plate filling_color = "#F5B951" bitesize = 3 - nutriment_desc = list("cheesy eggs" = 1) + nutriment_desc = list("savory crust" = 1, "cheese" = 1, "baked egg" = 2) + nutriment_allergens = ALLERGEN_EGGS|ALLERGEN_DAIRY|ALLERGEN_GRAINS center_of_mass = list("x"=16, "y"=12) /obj/item/reagent_containers/food/snacks/quicheslice/filled nutriment_amt = 1 -/obj/item/reagent_containers/food/snacks/quicheslice/filled/Initialize() - . = ..() - reagents.add_reagent("protein", 1) - /obj/item/reagent_containers/food/snacks/sliceable/brownies name = "brownies" gender = PLURAL @@ -5904,15 +5849,12 @@ slices_num = 4 trash = /obj/item/trash/brownies filling_color = "#301301" - nutriment_amt = 8 - nutriment_desc = list("fudge" = 8) + nutriment_amt = 12 + nutriment_desc = list("chocolate fudge" = 8) + nutriment_allergens = ALLERGEN_EGGS|ALLERGEN_SUGARS|ALLERGEN_GRAINS center_of_mass = list("x"=15, "y"=9) bitesize = 2 -/obj/item/reagent_containers/food/snacks/sliceable/brownies/Initialize() - . = ..() - reagents.add_reagent("protein", 2) - /obj/item/reagent_containers/food/snacks/browniesslice name = "brownie" desc = "a dense, decadent chocolate brownie." @@ -5921,16 +5863,13 @@ trash = /obj/item/trash/plate filling_color = "#F5B951" bitesize = 2 - nutriment_desc = list("fudge" = 1) + nutriment_desc = list("chocolate fudge" = 8) + nutriment_allergens = ALLERGEN_EGGS|ALLERGEN_SUGARS|ALLERGEN_GRAINS center_of_mass = list("x"=16, "y"=12) /obj/item/reagent_containers/food/snacks/browniesslice/filled nutriment_amt = 1 -/obj/item/reagent_containers/food/snacks/browniesslice/filled/Initialize() - . = ..() - reagents.add_reagent("protein", 1) - /obj/item/reagent_containers/food/snacks/sliceable/cosmicbrownies name = "cosmic brownies" gender = PLURAL @@ -5941,14 +5880,14 @@ slices_num = 4 trash = /obj/item/trash/brownies filling_color = "#301301" - nutriment_amt = 8 - nutriment_desc = list("fudge" = 8) + nutriment_amt = 10 + nutriment_desc = list("chocolate fudge" = 8, "musky wood" = 2) + nutriment_allergens = ALLERGEN_EGGS|ALLERGEN_SUGARS|ALLERGEN_GRAINS center_of_mass = list("x"=15, "y"=9) bitesize = 3 /obj/item/reagent_containers/food/snacks/sliceable/cosmicbrownies/Initialize() . = ..() - reagents.add_reagent("protein", 2) reagents.add_reagent("ambrosia_extract", 2) reagents.add_reagent("bicaridine", 1) reagents.add_reagent("kelotane", 1) @@ -5962,27 +5901,25 @@ trash = /obj/item/trash/plate filling_color = "#F5B951" bitesize = 3 - nutriment_desc = list("fudge" = 1) + nutriment_desc = list("chocolate fudge" = 8, "musky wood" = 2) + nutriment_allergens = ALLERGEN_EGGS|ALLERGEN_SUGARS|ALLERGEN_GRAINS center_of_mass = list("x"=16, "y"=12) /obj/item/reagent_containers/food/snacks/cosmicbrowniesslice/filled nutriment_amt = 1 -/obj/item/reagent_containers/food/snacks/cosmicbrowniesslice/filled/Initialize() - . = ..() - reagents.add_reagent("protein", 1) - /obj/item/reagent_containers/food/snacks/lasagna name = "lasagna" desc = "Meaty, tomato-y, and ready to eat-y. Favorite of cats." icon = 'icons/obj/food.dmi' icon_state = "lasagna" nutriment_amt = 5 - nutriment_desc = list("tomato" = 4, "meat" = 2) + nutriment_desc = list("pasta" = 4, "roast tomato" = 4, "bechamel sauce" = 2) + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_VEGETABLE|ALLERGEN_FRUIT|ALLERGEN_MEAT /obj/item/reagent_containers/food/snacks/lasagna/Initialize() . = ..() - reagents.add_reagent("protein", 2) //For meaty things. + reagents.add_reagent("protein", 4, list("baked ground meat" = 4)) /obj/item/reagent_containers/food/snacks/gigapuddi name = "Astro-Pudding" @@ -5990,7 +5927,8 @@ icon = 'icons/obj/food.dmi' icon_state = "gigapuddi" nutriment_amt = 20 - nutriment_desc = list("caramel" = 20) + nutriment_desc = list("caramel" = 10, "custard" = 10) + nutriment_allergens = ALLERGEN_EGGS|ALLERGEN_SUGARS bitesize = 2 trash = /obj/item/trash/plate @@ -6012,7 +5950,8 @@ slices_num = 5 w_class = 2 nutriment_amt = 20 - nutriment_desc = list("spongy cake" = 20) + nutriment_desc = list("chocolate cake" = 10, "berry-infused cream" = 10) + nutriment_allergens = ALLERGEN_EGGS|ALLERGEN_SUGARS|ALLERGEN_DAIRY bitesize = 3 trash = /obj/item/trash/tray @@ -6026,6 +5965,8 @@ desc = "A slice of winter magic." icon = 'icons/obj/food.dmi' icon_state = "buche_slice" + nutriment_desc = list("chocolate cake" = 10, "berry-infused cream" = 10) + nutriment_allergens = ALLERGEN_EGGS|ALLERGEN_SUGARS|ALLERGEN_DAIRY trash = /obj/item/trash/plate bitesize = 2 @@ -6037,16 +5978,18 @@ slice_path = /obj/item/reagent_containers/food/snacks/turkeyslice slices_num = 6 w_class = 2 - nutriment_amt = 20 - nutriment_desc = list("turkey" = 20) + nutriment_amt = 5 + nutriment_desc = list("herb stuffing" = 20) + nutriment_allergens = ALLERGEN_VEGETABLE|ALLERGEN_GRAINS bitesize = 5 trash = /obj/item/trash/tray /obj/item/reagent_containers/food/snacks/sliceable/turkey/Initialize() . = ..() + reagents.add_reagent("protein", 20, list("turkey meat" = 20)) reagents.add_reagent("blackpepper", 1) reagents.add_reagent("sodiumchloride", 1) - reagents.add_reagent("cornoil", 1) + reagents.add_reagent("triglyceride", 1) /obj/item/reagent_containers/food/snacks/turkeyslice name = "turkey drumstick" @@ -6136,8 +6079,9 @@ icon = 'icons/obj/food.dmi' icon_state = "cinnamonbun" trash = null - nutriment_amt = 8 - nutriment_desc = list("cinnamon sugar" = 4, "frosting" = 4) + nutriment_amt = 12 + nutriment_desc = list("sweet pastry" = 4, "cinnamon sugar" = 4, "sugar frosting" = 4) + nutriment_allergens = ALLERGEN_SUGARS|ALLERGEN_DAIRY|ALLERGEN_GRAINS bitesize = 1 ////////////////////Candy Vend Items/////////////////////////////////////////////////////////////// @@ -6168,9 +6112,9 @@ trash = /obj/item/trash/namagashi filling_color = "#7D5F46" center_of_mass = list("x"=15, "y"=15) - nutriment_amt = 1 - nutriment_desc = list("candy" = 2, "sweetness" = 2) - bitesize = 2 + nutriment_amt = 10 + nutriment_desc = list("candy" = 2, "sweetness" = 2, "fruit flavouring" = 2) + bitesize = 1 /obj/item/reagent_containers/food/snacks/namagashi/Initialize() . = ..() @@ -6184,12 +6128,12 @@ icon_state = "proteinbar" trash = /obj/item/trash/candy/proteinbar nutriment_amt = 9 - nutriment_desc = list("candy" = 1, "protein" = 8) + nutriment_desc = list("sweetener" = 1, "protein" = 8) bitesize = 6 /obj/item/reagent_containers/food/snacks/candy/proteinbar/Initialize() . = ..() - reagents.add_reagent("protein", 4) + reagents.add_reagent("protein", 4, list("chalk" = 4)) reagents.add_reagent("sugar", 4) /obj/item/reagent_containers/food/snacks/candy/gummy @@ -6200,7 +6144,7 @@ icon_state = "candy_gums" trash = /obj/item/trash/candy/gums nutriment_amt = 5 - nutriment_desc = list("artificial fruit flavour" = 2) + nutriment_desc = list("artificial fruit flavour" = 5) bitesize = 1 /obj/item/reagent_containers/food/snacks/candy/gummy/Initialize() @@ -6215,7 +6159,9 @@ center_of_mass = list("x"=17, "y"=18) nutriment_amt = 5 nutriment_desc = list("sweetness" = 3, "cookie" = 2) + nutriment_allergens = ALLERGEN_SUGARS|ALLERGEN_GRAINS bitesize = 1 + /obj/item/reagent_containers/food/snacks/cookiesnack name = "Carps Ahoy! miniature cookies" desc = "Now 100% carpotoxin free!" @@ -6226,6 +6172,7 @@ filling_color = "#DBC94F" nutriment_amt = 3 nutriment_desc = list("sweetness" = 1, "stale cookie" = 2) + nutriment_allergens = ALLERGEN_SUGARS|ALLERGEN_GRAINS bitesize = 1 /obj/item/reagent_containers/food/snacks/fruitbar @@ -6237,6 +6184,7 @@ trash = /obj/item/trash/candy/fruitbar nutriment_amt = 13 nutriment_desc = list("apricot" = 2, "sugar" = 2, "dates" = 2, "cranberry" = 2, "apple" = 2) + nutriment_allergens = ALLERGEN_SUGARS|ALLERGEN_GRAINS|ALLERGEN_FRUIT bitesize = 6 /obj/item/reagent_containers/food/snacks/fruitbar/Initialize() @@ -6254,6 +6202,7 @@ icon_state = "cb01" nutriment_amt = 4 nutriment_desc = list("stale chocolate" = 2, "nougat" = 1, "caramel" = 1) + nutriment_allergens = ALLERGEN_SUGARS|ALLERGEN_GRAINS w_class = 1 bitesize = 2 @@ -6270,6 +6219,7 @@ icon_state = "cb02" nutriment_amt = 4 nutriment_desc = list("chocolate" = 2, "caramel" = 1, "puffed rice" = 1) + nutriment_allergens = ALLERGEN_SUGARS|ALLERGEN_GRAINS w_class = 1 bitesize = 2 @@ -6334,6 +6284,7 @@ icon_state = "cb06" nutriment_amt = 4 nutriment_desc = list("chocolate" = 2, "coffee" = 1, "vanilla wafer" = 1) + nutriment_allergens = ALLERGEN_SUGARS|ALLERGEN_GRAINS|ALLERGEN_COFFEE w_class = 1 bitesize = 3 @@ -6351,6 +6302,7 @@ icon_state = "cb07" nutriment_amt = 4 nutriment_desc = list("chocolate" = 2, "taro" = 2) + nutriment_allergens = ALLERGEN_SUGARS|ALLERGEN_VEGETABLE w_class = 1 bitesize = 3 @@ -6367,6 +6319,7 @@ icon_state = "cb08" nutriment_amt = 3 nutriment_desc = list("chocolate" = 2, "malt puffs" = 1) + nutriment_allergens = ALLERGEN_SUGARS|ALLERGEN_GRAINS w_class = 1 bitesize = 3 @@ -6383,13 +6336,13 @@ icon_state = "cb09" nutriment_amt = 6 nutriment_desc = list("peanuts" = 3, "condensed milk" = 1, "cashews" = 2) + nutriment_allergens = ALLERGEN_SUGARS|ALLERGEN_SEEDS|ALLERGEN_DAIRY w_class = 1 bitesize = 3 /obj/item/reagent_containers/food/snacks/cb09/Initialize() . = ..() reagents.add_reagent("sugar", 1) - reagents.add_reagent("milk", 1) reagents.add_reagent("peanutoil", 1) /obj/item/reagent_containers/food/snacks/cb10 @@ -6401,6 +6354,7 @@ icon_state = "cb10" nutriment_amt = 5 nutriment_desc = list("chocolate" = 2, "caramel" = 1, "peanuts" = 1, "nougat" = 1) + nutriment_allergens = ALLERGEN_SUGARS|ALLERGEN_SEEDS w_class = 1 bitesize = 3 @@ -6423,6 +6377,7 @@ center_of_mass = list("x"=15, "y"=15) nutriment_amt = 3 nutriment_desc = list("salt" = 1, "chips" = 2) + nutriment_allergens = ALLERGEN_GRAINS bitesize = 1 /obj/item/reagent_containers/food/snacks/chips/bbq @@ -6434,6 +6389,7 @@ trash = /obj/item/trash/chips/bbq nutriment_amt = 3 nutriment_desc = list("salt" = 1, "barbeque sauce" = 2) + nutriment_allergens = ALLERGEN_GRAINS /obj/item/reagent_containers/food/snacks/chips/snv name = "\improper Mike's Salt & Vinegar Chips" @@ -6444,6 +6400,7 @@ trash = /obj/item/trash/chips/snv nutriment_amt = 3 nutriment_desc = list("salt" = 1, "vinegar" = 2) + nutriment_allergens = ALLERGEN_GRAINS /obj/item/reagent_containers/food/snacks/sosjerky name = "Scaredy's Private Reserve Beef Jerky" @@ -6458,7 +6415,7 @@ /obj/item/reagent_containers/food/snacks/sosjerky/Initialize() . =..() - reagents.add_reagent("protein", 8) + reagents.add_reagent("protein", 8, list("dried meat" = 8)) /obj/item/reagent_containers/food/snacks/tuna @@ -6476,7 +6433,7 @@ /obj/item/reagent_containers/food/snacks/tuna/Initialize() . = ..() - reagents.add_reagent("protein", 4) + reagents.add_reagent("seafood", 4, list("dried fish" = 4)) /obj/item/reagent_containers/food/snacks/pistachios name = "pistachios" @@ -6488,6 +6445,7 @@ center_of_mass = list("x"=17, "y"=13) nutriment_desc = list("nuts" = 1) nutriment_amt = 3 + nutriment_allergens = ALLERGEN_SEEDS bitesize = 1 /obj/item/reagent_containers/food/snacks/semki @@ -6500,6 +6458,7 @@ center_of_mass = list("x"=17, "y"=13) nutriment_desc = list("sunflower seeds" = 1) nutriment_amt = 6 + nutriment_allergens = ALLERGEN_SEEDS bitesize = 1 /obj/item/reagent_containers/food/snacks/squid @@ -6510,13 +6469,13 @@ trash = /obj/item/trash/squid filling_color = "#c0a9d7" center_of_mass = list ("x"=15, "y"=9) - nutriment_desc = list("fish" = 1, "salt" = 1) - nutriment_amt = 2 + nutriment_desc = list("salt" = 1) + nutriment_amt = 3 bitesize = 1 /obj/item/reagent_containers/food/snacks/squid/true/Initialize() . = ..() - reagents.add_reagent("protein", 4) + reagents.add_reagent("seafood", 4) /obj/item/reagent_containers/food/snacks/croutons name = "\improper Suhariki" @@ -6527,6 +6486,7 @@ filling_color = "#c6b17f" center_of_mass = list ("x"=15, "y"=9) nutriment_desc = list("bread" = 1, "salt" = 1) + nutriment_allergens = ALLERGEN_GRAINS nutriment_amt = 3 bitesize = 1 @@ -6544,7 +6504,7 @@ /obj/item/reagent_containers/food/snacks/salo/true/Initialize() . = ..() - reagents.add_reagent("protein", 8) + reagents.add_reagent("protein", 8, list("greasy dried meat")) /obj/item/reagent_containers/food/snacks/driedfish name = "\improper Vobla" @@ -6554,13 +6514,13 @@ trash = /obj/item/trash/driedfish filling_color = "#c8a5bb" center_of_mass = list ("x"=15, "y"=9) - nutriment_desc = list("fish" = 1, "salt" = 1) + nutriment_desc = list("salt" = 2) nutriment_amt = 2 bitesize = 1 /obj/item/reagent_containers/food/snacks/driedfish/Initialize() .=..() - reagents.add_reagent("protein", 4) + reagents.add_reagent("seafood", 4) /obj/item/reagent_containers/food/snacks/no_raisin name = "4no Raisins" @@ -6573,20 +6533,7 @@ center_of_mass = list("x"=15, "y"=4) nutriment_desc = list("dried raisins" = 6) nutriment_amt = 6 - -///obj/item/reagent_containers/food/snacks/spacetwinkie (Commented out to replace with packaged version 04/14/2021) -// name = "Spacer Snack Cake" -// icon = 'icons/obj/food_snacks.dmi' -// icon_state = "space_twinkie" -// desc = "Guaranteed to survive longer than you will." -// description_fluff = "Despite Spacer advertisements consistently portraying their snack cakes as life-saving, tear-jerking survival food for spacers in all kinds of dramatic scenarios, the Spacer Snack Cake has been statistically proven to lower survival rates on all missions where it is present." -// filling_color = "#FFE591" -// center_of_mass = list("x"=15, "y"=11) -// bitesize = 2 -// -///obj/item/reagent_containers/food/snacks/spacetwinkie/Initialize() -// . = ..() -// reagents.add_reagent("sugar", 4) + nutriment_allergens = ALLERGEN_FRUIT /obj/item/reagent_containers/food/snacks/cheesiehonkers name = "Cheesie Honkers" @@ -6598,7 +6545,8 @@ filling_color = "#FFA305" center_of_mass = list("x"=15, "y"=9) nutriment_amt = 4 - nutriment_desc = list("cheese" = 5, "chips" = 2) + nutriment_desc = list("cheese" = 5, "corn puffs" = 2) + nutriment_allergens = ALLERGEN_GRAINS bitesize = 2 /obj/item/reagent_containers/food/snacks/syndicake @@ -6612,6 +6560,7 @@ center_of_mass = list("x"=16, "y"=10) nutriment_desc = list("sweetness" = 3, "cake" = 1) nutriment_amt = 4 + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_SUGARS bitesize = 3 /obj/item/reagent_containers/food/snacks/syndicake/Initialize() @@ -6642,6 +6591,7 @@ center_of_mass = list("x"=15, "y"=9) nutriment_desc = list("salt" = 4, "peanut" = 2, "wood?" = 1) nutriment_amt = 5 + nutriment_allergens = ALLERGEN_SEEDS bitesize = 2 /obj/item/reagent_containers/food/snacks/jupiter @@ -6654,6 +6604,7 @@ center_of_mass = list("x"=15, "y"=9) nutriment_desc = list("sweetness" = 4, "vanilla" = 1) nutriment_amt = 5 + nutriment_allergens = ALLERGEN_SUGARS bitesize = 2 /obj/item/reagent_containers/food/snacks/pluto @@ -6678,6 +6629,7 @@ center_of_mass = list("x"=15, "y"=9) nutriment_desc = list("eggs" = 4, "potato" = 4, "mustard" = 2) nutriment_amt = 8 + nutriment_allergens = ALLERGEN_EGGS|ALLERGEN_VEGETABLE|ALLERGEN_SEEDS bitesize = 2 /obj/item/reagent_containers/food/snacks/venus @@ -6690,6 +6642,7 @@ center_of_mass = list("x"=15, "y"=9) nutriment_desc = list("heat" = 4, "burning!" = 1) nutriment_amt = 5 + nutriment_allergens = ALLERGEN_GRAINS bitesize = 2 /obj/item/reagent_containers/food/snacks/venus/Initialize() @@ -6706,6 +6659,7 @@ center_of_mass = list("x"=15, "y"=9) nutriment_desc = list("heat" = 3, "burning!" = 2) nutriment_amt = 3 + nutriment_allergens = ALLERGEN_GRAINS bitesize = 1 /obj/item/reagent_containers/food/snacks/sun_snax/Initialize() @@ -6722,6 +6676,7 @@ center_of_mass = list("x"=15, "y"=9) nutriment_desc = list("fizz" = 4, "sweetness" = 1) nutriment_amt = 5 + nutriment_allergens = ALLERGEN_SUGARS bitesize = 2 /obj/item/reagent_containers/food/snacks/oort/Initialize() @@ -6738,6 +6693,7 @@ center_of_mass = list("x"=15, "y"=9) nutriment_desc = list("salt" = 2, "pretzel" = 3) nutriment_amt = 3 + nutriment_allergens = ALLERGEN_GRAINS bitesize = 1 /obj/item/reagent_containers/food/snacks/hakarl @@ -6751,6 +6707,7 @@ center_of_mass = list("x"=15, "y"=9) nutriment_desc = list("fish" = 2, "salt" = 2, "ammonia" = 1) nutriment_amt = 4 + nutriment_allergens = ALLERGEN_FISH bitesize = 1 ////////////////////weeb_vend (Nippon-tan!)//////////////////////////////////////////////////// @@ -6762,6 +6719,7 @@ desc = "Ancient earth snack food made from balled up rice." nutriment_desc = list("rice" = 4, "sweetness" = 1) nutriment_amt = 5 + nutriment_allergens = ALLERGEN_GRAINS bitesize = 2 /obj/item/reagent_containers/food/snacks/dorayaki @@ -6771,6 +6729,7 @@ desc = "Two small pancake-like patties made from castella wrapped around a filling of sweet azuki bean paste." nutriment_desc = list("cake" = 3, "sweetness" = 2) nutriment_amt = 6 + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_VEGETABLE|ALLERGEN_SUGARS bitesize = 2 /obj/item/reagent_containers/food/snacks/daifuku @@ -6780,6 +6739,7 @@ desc = "Small round mochi stuffed with sweetened red bean paste." nutriment_desc = list("cake" = 2, "sweetness" = 3) nutriment_amt = 6 + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_VEGETABLE bitesize = 2 /obj/item/reagent_containers/food/snacks/weebonuts @@ -6790,6 +6750,7 @@ desc = "A bag of Red Alert! brand spicy nuts. Goes well with your beer!" nutriment_desc = list("nuts" = 4, "spicyness" = 1) nutriment_amt = 5 + nutriment_allergens = ALLERGEN_SEEDS bitesize = 2 /obj/item/reagent_containers/food/snacks/weebonuts/Initialize() @@ -6801,9 +6762,10 @@ icon = 'icons/obj/food_snacks.dmi' icon_state = "wasabi_peas" trash = /obj/item/trash/wasabi_peas - desc = "A bag of Hadokikku brand wasabi peas, a delicious snack imported directly form Sol." + desc = "A bag of Hadokikku brand wasabi peas, a delicious snack most definitely not imported directly from Sol, despite the advertisements." nutriment_desc = list("peas" = 4, "spicyness" = 1) nutriment_amt = 6 + nutriment_allergens = ALLERGEN_VEGETABLE bitesize = 2 /obj/item/reagent_containers/food/snacks/wasabi_peas/Initialize() @@ -6818,6 +6780,7 @@ desc = "A chocolate and sprinkles coated banana. On a stick." nutriment_desc = list("chocolate banana" = 4, "sprinkles" = 1) nutriment_amt = 5 + nutriment_allergens = ALLERGEN_SUGARS|ALLERGEN_FRUIT bitesize = 2 /obj/item/reagent_containers/food/snacks/chocobanana/Initialize() @@ -6832,6 +6795,7 @@ desc = "Sticky rice balls served on a skewer with a crispy rice flour outer layer and a thick red bean paste inner layer." nutriment_desc = list("rice" = 4, "earthy flavor" = 1) nutriment_amt = 5 + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_VEGETABLE bitesize = 2 /obj/item/reagent_containers/food/snacks/hanami_dango @@ -6843,6 +6807,7 @@ description_fluff = "Hanami dango is a traditional Japanese treat that is normally served during Hanami, a tradition dated back as early as the 8th century. Hanami, or cherry blossom viewing, is a spring time celebration that celebrates the cherry blossoms turning of color. It is a time of renewal, of life, and of beauty." nutriment_desc = list("rice" = 4, "earthy flavor" = 1) nutriment_amt = 5 + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_VEGETABLE bitesize = 2 ////////////////////ancient_vend (Hot Food - Old)//////////////////////////////////////////////////// @@ -6868,31 +6833,37 @@ /obj/item/reagent_containers/food/snacks/old/pizza name = "\improper Pizza!" desc = "It's so stale you could probably cut something with the cheese." + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_FUNGI|ALLERGEN_DAIRY icon_state = "ancient_pizza" /obj/item/reagent_containers/food/snacks/old/burger name = "\improper Giga Burger!" desc = "At some point in time this probably looked delicious." + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_FUNGI|ALLERGEN_MEAT icon_state = "ancient_burger" /obj/item/reagent_containers/food/snacks/old/horseburger name = "\improper Horse Burger!" desc = "Even if you were hungry enough to eat a horse, it'd be a bad idea to eat this." + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_FUNGI|ALLERGEN_MEAT icon_state = "ancient_horse_burger" /obj/item/reagent_containers/food/snacks/old/fries name = "\improper Space Fries!" desc = "The salt appears to have preserved these, still stale and gross." + nutriment_allergens = ALLERGEN_FUNGI|ALLERGEN_VEGETABLE icon_state = "ancient_fries" /obj/item/reagent_containers/food/snacks/old/hotdog name = "\improper Space Dog!" desc = "This one is probably only marginally less safe to eat than when it was first created.." + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_FUNGI|ALLERGEN_MEAT icon_state = "ancient_hotdog" /obj/item/reagent_containers/food/snacks/old/taco name = "\improper Taco!" desc = "Interestingly, the shell has gone soft and the contents have gone stale." + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_FUNGI|ALLERGEN_MEAT icon_state = "ancient_taco" //////////////////////Canned Foods - crack open and eat (ADDED 04/11/2021)////////////////////// @@ -6936,12 +6907,12 @@ trash = /obj/item/trash/beef filling_color = "#663300" center_of_mass = list("x"=15, "y"=9) - nutriment_desc = list("beef" = 1) + nutriment_desc = list("corned beef" = 1) bitesize = 2 /obj/item/reagent_containers/food/snacks/canned/beef/Initialize() .=..() - reagents.add_reagent("protein", 4) + reagents.add_reagent("protein", 4, list("corned beef")) reagents.add_reagent("sodiumchloride", 1) /obj/item/reagent_containers/food/snacks/canned/beans @@ -6952,6 +6923,7 @@ filling_color = "#ff6633" center_of_mass = list("x"=15, "y"=9) nutriment_desc = list("beans" = 1, "tomato sauce" = 1) + nutriment_allergens = ALLERGEN_BEANS|ALLERGEN_FRUIT nutriment_amt = 15 bitesize = 2 @@ -6963,7 +6935,8 @@ filling_color = "#003300" center_of_mass = list("x"=15, "y"=9) nutriment_amt = 5 - nutriment_desc = list("soggy" = 1, "vegetable" = 1) + nutriment_desc = list("soggy leaves" = 5) + nutriment_allergens = ALLERGEN_VEGETABLE bitesize = 5 /obj/item/reagent_containers/food/snacks/canned/spinach/Initialize() @@ -6981,13 +6954,13 @@ trash = /obj/item/trash/fishegg filling_color = "#000000" center_of_mass = list("x"=15, "y"=9) - nutriment_desc = list("fish" = 1, "salt" = 1) + nutriment_desc = list("salt" = 1) nutriment_amt = 6 bitesize = 1 /obj/item/reagent_containers/food/snacks/canned/caviar/Initialize() . = ..() - reagents.add_reagent("protein", 5) + reagents.add_reagent("seafood", 5, list("salty fish eggs" = 5)) /obj/item/reagent_containers/food/snacks/canned/caviar/true name = "\improper Authentic Soyuz Caviar" @@ -7012,31 +6985,27 @@ trash = /obj/item/trash/maps filling_color = "#330066" center_of_mass = list("x"=15, "y"=9) - nutriment_desc = list("meat" = 1, "salt" = 1) + nutriment_desc = list("salt" = 3) nutriment_amt = 8 bitesize = 2 /obj/item/reagent_containers/food/snacks/maps/Initialize() . = ..() - reagents.add_reagent("protein", 6) + reagents.add_reagent("protein", 6, list("slimy meat" = 6)) reagents.add_reagent("sodiumchloride", 2) /obj/item/reagent_containers/food/snacks/canned/appleberry name = "\improper Appleberry Bits" icon_state = "appleberry" - desc = "A classic snack favored by Sol astronauts. Made from dried apple-hybidized berries grown on the lunar colonies." + desc = "A classic snack favored by Sol astronauts. Made from dried apple-hybridized berries grown on Venus." trash = /obj/item/trash/appleberry filling_color = "#FFFFFF" center_of_mass = list("x"=15, "y"=9) nutriment_desc = list("apple" = 1, "sweetness" = 1) - nutriment_amt = 8 + nutriment_amt = 10 + nutriment_allergens = ALLERGEN_FRUIT bitesize = 2 -/obj/item/reagent_containers/food/snacks/appleberry/Initialize() - . = ..() - reagents.add_reagent("milk", 8) - - /obj/item/reagent_containers/food/snacks/canned/ntbeans name = "baked beans" icon_state = "ntbeans" @@ -7046,11 +7015,12 @@ center_of_mass = list("x"=15, "y"=9) nutriment_desc = list("beans" = 4) nutriment_amt = 6 + nutriment_allergens = ALLERGEN_BEANS bitesize = 2 /obj/item/reagent_containers/food/snacks/canned/ntbeans/Initialize() . = ..() - reagents.add_reagent("protein", 2) + reagents.add_reagent("protein", 2, list("bacon bits" = 2)) //////////////Packaged Food - break open and eat////////////// @@ -7069,7 +7039,8 @@ filling_color = "#ffffff" center_of_mass = list("x"=15, "y"=9) nutriment_amt = 6 - nutriment_desc = list("sweetness" = 4, "vanilla" = 1) + nutriment_desc = list("stale cake" = 4, "vanilla" = 1) + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_SUGARS bitesize = 2 /obj/item/reagent_containers/food/snacks/packaged/darklunacake @@ -7081,7 +7052,8 @@ filling_color = "#ffffff" center_of_mass = list("x"=15, "y"=9) nutriment_amt = 6 - nutriment_desc = list("sweetness" = 4, "chocolate" = 1) + nutriment_desc = list("stale cake" = 4, "chocolate" = 1) + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_SUGARS bitesize = 2 /obj/item/reagent_containers/food/snacks/packaged/mochicake @@ -7094,6 +7066,7 @@ center_of_mass = list("x"=15, "y"=9) nutriment_amt = 6 nutriment_desc = list("sweetness" = 4, "rice" = 1) + nutriment_allergens = ALLERGEN_VEGETABLE|ALLERGEN_SUGARS bitesize = 2 //////////////Advanced Package Foods////////////// @@ -7108,7 +7081,8 @@ filling_color = "#FFE591" center_of_mass = list("x"=15, "y"=11) nutriment_amt = 4 - nutriment_desc = list("sweetness" = 4, "cake" = 2) + nutriment_desc = list("sweetness" = 4, "stale cake" = 2) + nutriment_allergens = ALLERGEN_GRAINS|ALLERGEN_SUGARS bitesize = 2 /obj/item/reagent_containers/food/snacks/packaged/spacetwinkie/Initialize() @@ -7210,8 +7184,6 @@ . = ..() reagents.add_reagent("sodiumchloride", 1) -//Virgo Stuff - /obj/item/reagent_containers/food/snacks/sliceable/sushi name = "sushi roll" desc = "A whole sushi roll! Slice it up and enjoy with some soy sauce and wasabi." @@ -7220,14 +7192,15 @@ slice_path = /obj/item/reagent_containers/food/snacks/slice/sushi/filled slices_num = 5 bitesize = 5 - nutriment_desc = list("rice" = 5, "fish" = 5) + nutriment_desc = list("rice" = 5, "seaweed" = 5) nutriment_amt = 15 + nutriment_allergens = ALLERGEN_GRAINS /obj/item/reagent_containers/food/snacks/sliceable/sushi/Initialize() . = ..() - reagents.add_reagent("protein", 10) + reagents.add_reagent("seafood", 10, list("fresh fish" = 10)) -/obj/item/reagent_containers/food/snacks/slice/sushi/filled +/obj/item/reagent_containers/food/snacks/slice/sushi name = "piece of sushi" desc = "A slice of a larger sushi roll, ready to devour." icon = 'icons/obj/food_syn.dmi' @@ -7235,7 +7208,7 @@ bitesize = 5 whole_path = /obj/item/reagent_containers/food/snacks/sliceable/sushi -/obj/item/reagent_containers/food/snacks/slice/sushi/filled/filled +/obj/item/reagent_containers/food/snacks/slice/sushi/filled filled = TRUE /obj/item/reagent_containers/food/snacks/goulash @@ -7245,11 +7218,12 @@ icon_state = "goulash" trash = /obj/item/trash/snack_bowl nutriment_amt = 6 - nutriment_desc = list("meat" = 2, "vegetables" = 2, "seasoning" = 5) + nutriment_desc = list("stewed vegetables" = 2, "paprika" = 5) + nutriment_allergens = ALLERGEN_VEGETABLE /obj/item/reagent_containers/food/snacks/goulash/Initialize() . = ..() - reagents.add_reagent("protein", 3) //For meaty things. + reagents.add_reagent("protein", 5, list("stewed meat" = 5)) reagents.add_reagent("water", 5) @@ -7258,13 +7232,13 @@ desc = "Traditional food of the very drunk. The meat is typically cooked on a vertical rotisserie." icon = 'icons/obj/food_syn.dmi' icon_state = "doner_kebab" - nutriment_amt = 5 - nutriment_desc = list("vegetables" = 2, "seasoned meat" = 5) + nutriment_amt = 2 + nutriment_desc = list("crisp salad" = 2) + nutriment_allergens = ALLERGEN_VEGETABLE /obj/item/reagent_containers/food/snacks/donerkebab/Initialize() . = ..() - reagents.add_reagent("protein", 2) //For meaty things. - + reagents.add_reagent("protein", 5, list("seasoned meat" = 5)) /obj/item/reagent_containers/food/snacks/roastbeef name = "roast beef" @@ -7273,12 +7247,10 @@ icon_state = "roastbeef" trash = /obj/item/trash/plate bitesize = 2 - nutriment_amt = 8 - nutriment_desc = list("cooked meat" = 5) /obj/item/reagent_containers/food/snacks/roastbeef/Initialize() . = ..() - reagents.add_reagent("protein", 4) //For meaty things. + reagents.add_reagent("protein", 12, list("roasted meat" = 12)) /obj/item/reagent_containers/food/snacks/reishicup @@ -7289,6 +7261,7 @@ bitesize = 6 nutriment_amt = 3 nutriment_desc = list("chocolate" = 4, "colors" = 2) + nutriment_allergens = ALLERGEN_FUNGI|ALLERGEN_SUGARS /obj/item/reagent_containers/food/snacks/reishicup/Initialize() . = ..() @@ -7326,11 +7299,11 @@ icon_state = "wing" bitesize = 3 nutriment_amt = 2 - nutriment_desc = list("chicken" = 2, "unplacable flavor sauce" = 4) + nutriment_desc = list("unplacable flavor sauce" = 2) /obj/item/reagent_containers/food/snacks/chickenwing/Initialize() . = ..() - reagents.add_reagent("protein", 1) + reagents.add_reagent("protein", 3, list("chicken" = 3)) /obj/item/reagent_containers/food/snacks/hotandsoursoup name = "hot & sour soup" @@ -7341,23 +7314,20 @@ bitesize = 2 nutriment_amt = 6 nutriment_desc = list("spicyness" = 4, "sourness" = 4, "tofu" = 1) + nutriment_allergens = ALLERGEN_FUNGI|ALLERGEN_BEANS|ALLERGEN_VEGETABLE /obj/item/reagent_containers/food/snacks/hotandsoursoup/Initialize() . = ..() - /obj/item/reagent_containers/food/snacks/kitsuneudon name = "kitsune udon" - desc = "A purported favorite of kitsunes in ancient Japanese myth: udon noodles, fried egg, and tofu." + desc = "A purported favorite of kitsunes in ancient japanese myth: udon noodles, fried egg, and tofu." icon = 'icons/obj/food_syn.dmi' icon_state = "kitsuneudon" trash = /obj/item/trash/asian_bowl bitesize = 2 nutriment_amt = 6 - nutriment_desc = list("fried egg" = 2, "egg noodles" = 4) - -/obj/item/reagent_containers/food/snacks/kitsuneudon/Initialize() - . = ..() + nutriment_desc = list("savory daishi broth" = 6) /obj/item/reagent_containers/food/snacks/generalschicken name = "general's chicken" @@ -7367,25 +7337,22 @@ trash = /obj/item/trash/asian_bowl bitesize = 2 nutriment_amt = 6 - nutriment_desc = list("sweet and spicy sauce" = 5, "chicken" = 3) + nutriment_desc = list("sweet and spicy sauce" = 6) /obj/item/reagent_containers/food/snacks/generalschicken/Initialize() . = ..() - reagents.add_reagent("protein", 4) + reagents.add_reagent("protein", 4, list("fried chicken" = 4)) /obj/item/reagent_containers/food/snacks/mammi name = "mämmi" - desc = "Traditional Finnish desert, some like it, others don't. It's drifting in some milk, add sugar!" + desc = "Traditional finnish desert, some like it, others don't. It's drifting in some milk, add sugar!" icon = 'icons/obj/food_syn.dmi' icon_state = "mammi" trash = /obj/item/trash/plate bitesize = 3 - nutriment_amt = 3 - nutriment_desc = list("brothy sweet goodness" = 5) - -/obj/item/reagent_containers/food/snacks/mammi/Initialize() - . = ..() - + nutriment_amt = 8 + nutriment_desc = list("sweet rye pudding" = 3, "orange zest" = 3, "milk" = 2) + nutriment_allergens = ALLERGEN_DAIRY|ALLERGEN_FRUIT|ALLERGEN_GRAINS /obj/item/reagent_containers/food/snacks/lobster name = "raw lobster" desc = "A shifty lobster. You can try eating it, but its shell is extremely tough." @@ -7393,6 +7360,7 @@ bitesize = 0.1 icon_state = "lobster_raw" nutriment_amt = 5 + nutriment_allergens = ALLERGEN_FISH /obj/item/reagent_containers/food/snacks/lobstercooked name = "cooked lobster" @@ -7402,11 +7370,12 @@ trash = /obj/item/trash/plate nutriment_amt = 20 bitesize = 5 - nutriment_desc = list("lemon" = 2, "lobster" = 5, "salad" = 2) + nutriment_desc = list("lemon" = 5, "salad" = 5) + nutriment_allergens = ALLERGEN_FISH|ALLERGEN_FRUIT /obj/item/reagent_containers/food/snacks/lobstercooked/Initialize() . = ..() - reagents.add_reagent("protein", 20) + reagents.add_reagent("seafood", 20, list("lobster meat" = 20)) reagents.add_reagent("tricordrazine", 5) reagents.add_reagent("iron", 5) @@ -7417,6 +7386,7 @@ icon_state = "cuttlefish_raw" bitesize = 10 nutriment_amt = 5 + nutriment_allergens = ALLERGEN_FISH /obj/item/reagent_containers/food/snacks/cuttlefishcooked name = "cooked cuttlefish" @@ -7424,12 +7394,13 @@ icon = 'icons/obj/food_syn.dmi' icon_state = "cuttlefish_cooked" bitesize = 5 - nutriment_amt = 20 - nutriment_desc = list("cuttlefish" = 5, "rubber" = 5, "grease" = 1) + nutriment_amt = 15 + nutriment_desc = list("rubber" = 5, "grease" = 1) + nutriment_allergens = ALLERGEN_FISH /obj/item/reagent_containers/food/snacks/cuttlefishcooked/Initialize() . = ..() - reagents.add_reagent("protein", 10) + reagents.add_reagent("seafood", 15, list("cuttlefish meat" = 15)) /obj/item/reagent_containers/food/snacks/sliceable/monkfish name = "extra large monkfish" @@ -7442,9 +7413,7 @@ slice_path = /obj/item/reagent_containers/food/snacks/monkfishfillet slices_num = 6 trash = /obj/item/reagent_containers/food/snacks/sliceable/monkfishremains - -/obj/item/reagent_containers/food/snacks/sliceable/monkfish/Initialize() - . = ..() + nutriment_allergens = ALLERGEN_FISH /obj/item/reagent_containers/food/snacks/monkfishfillet name = "monkfish fillet" @@ -7452,11 +7421,11 @@ icon = 'icons/obj/food_syn.dmi' icon_state = "monkfish_fillet" bitesize = 3 - nutriment_amt = 5 + nutriment_allergens = ALLERGEN_FISH /obj/item/reagent_containers/food/snacks/monkfishfillet/Initialize() . = ..() - reagents.add_reagent("protein", 1) + reagents.add_reagent("seafood", 5, list("monkfish meat" = 5)) /obj/item/reagent_containers/food/snacks/monkfishcooked name = "seasoned monkfish" @@ -7465,11 +7434,12 @@ icon_state = "monkfish_cooked" bitesize = 4 nutriment_amt = 10 - nutriment_desc = list("fish" = 3, "oil" = 1, "sweet chili" = 3, "spring onion" = 2) + nutriment_desc = list("oil" = 1, "sweet chili" = 3, "spring onion" = 2) + nutriment_allergens = ALLERGEN_FISH /obj/item/reagent_containers/food/snacks/monkfishcooked/Initialize() . = ..() - reagents.add_reagent("protein", 5) + reagents.add_reagent("seafood", 8, list("monkfish meat" = 8)) /obj/item/reagent_containers/food/snacks/sliceable/monkfishremains name = "monkfish remains" @@ -7481,6 +7451,7 @@ nutriment_amt = 10 slice_path = /obj/item/clothing/head/fish slices_num = 1 + nutriment_allergens = ALLERGEN_FISH /obj/item/reagent_containers/food/snacks/sliceable/monkfishremains/Initialize() . = ..() @@ -7492,14 +7463,14 @@ icon = 'icons/obj/food_syn.dmi' icon_state = "sharkmeat_chunk" bitesize = 3 - nutriment_amt = 15 w_class = ITEMSIZE_LARGE slice_path = /obj/item/reagent_containers/food/snacks/carpmeat/fish/sharkmeat slices_num = 5 + nutriment_allergens = ALLERGEN_FISH /obj/item/reagent_containers/food/snacks/sliceable/sharkchunk/Initialize() . = ..() - reagents.add_reagent("protein", 20) + reagents.add_reagent("seafood", 35, list("shark meat" = 20)) /obj/item/reagent_containers/food/snacks/carpmeat/fish/sharkmeat name = "slice of sharkmeat" @@ -7512,7 +7483,7 @@ /obj/item/reagent_containers/food/snacks/carpmeat/fish/sharkmeat/Initialize() . = ..() - reagents.add_reagent("protein", 2) + reagents.add_reagent("seafood", 2, list("shark meat" = 20)) /obj/item/reagent_containers/food/snacks/sharkmeatcooked name = "shark steak" @@ -7523,11 +7494,11 @@ bitesize = 3 nutriment_amt = 5 trash = /obj/item/trash/plate - nutriment_desc = list("manliness" = 1, "fish oil" = 2, "shark" = 2) + nutriment_desc = list("manliness" = 1, "fish oil" = 2) /obj/item/reagent_containers/food/snacks/sharkmeatcooked/Initialize() . = ..() - reagents.add_reagent("protein", 8) + reagents.add_reagent("seafood", 10, list("shark meat" = 10)) /obj/item/reagent_containers/food/snacks/sharkmeatdip name = "hot shark shank" @@ -7537,12 +7508,12 @@ bitesize = 3 nutriment_amt = 5 trash = /obj/item/trash/snack_bowl - nutriment_desc = list("salt" = 1, "fish oil" = 2, "spicy shark" = 2) + nutriment_desc = list("salt" = 1, "fish oil" = 2) /obj/item/reagent_containers/food/snacks/sharkmeatdip/Initialize() . = ..() reagents.add_reagent("capsaicin", 4) - reagents.add_reagent("protein", 4) + reagents.add_reagent("seafood", 6, list("spicy shark meat" = 6)) /obj/item/reagent_containers/food/snacks/sharkmeatcubes name = "shark cubes" @@ -7556,22 +7527,23 @@ /obj/item/reagent_containers/food/snacks/sharkmeatcubes/Initialize() . = ..() - reagents.add_reagent("potatojuice", 30) // for people who want to get fat, FAST. + reagents.add_reagent("seafood", 30, list("rotting fish" = 30)) // for people who want to get fat, FAST. /obj/item/reagent_containers/food/snacks/dynsoup name = "dyn soup" - desc = "An imported Skrellian recipe, with certain substitutions for ingredients not commonly available outside of Skrellian space." + desc = "An imported skrellian recipe, with certain substitions for ingredients not commonly available outside of Skrellian space." icon = 'icons/obj/food_syn.dmi' icon_state = "dynsoup" bitesize = 5 - nutriment_amt = 8 - nutriment_desc = list("peppermint" = 2, "salad" = 4, "hot stew" = 2) + nutriment_amt = 10 + nutriment_desc = list("peppermint" = 2, "leafy greens" = 4, "umami broth" = 2) + nutriment_allergens = ALLERGEN_VEGETABLE /obj/item/reagent_containers/food/snacks/dynsoup/Initialize() . = ..() reagents.add_reagent("water", 5) reagents.add_reagent("dynjuice", 4) - reagents.add_reagent("tomatojuice", 4) + reagents.add_reagent("tomatojuice", 2) /obj/item/reagent_containers/food/snacks/zantiri name = "zantiri" @@ -7579,43 +7551,42 @@ icon = 'icons/obj/food_syn.dmi' icon_state = "zantiri" bitesize = 5 - nutriment_amt = 9 + nutriment_amt = 15 nutriment_desc = list("inky mush" = 5, "crunchy lichen" = 4) + nutriment_allergens = ALLERGEN_VEGETABLE /obj/item/reagent_containers/food/snacks/zantiri/Initialize() . = ..() reagents.add_reagent("water", 6) - reagents.add_reagent("nutriment", 8) /obj/item/reagent_containers/food/snacks/stew/neaera - name = "Neaera stew" + name = "neaera stew" desc = "Neaera meat stewed in a mixture of water and dyn juice, garnished with guami and eki. Often cooked in large batches to feed many teshari pack members." icon = 'icons/obj/food_syn.dmi' icon_state = "neaera_stew" filling_color = "#7C66DD" - nutriment_desc = list("meaty mushroom" = 6, "crunchy lichen" = 6, "peppermint" = 6) + nutriment_amt = 6 + nutriment_desc = list("meaty mushroom", "crunchy lichen" = 6, "peppermint" = 6) + nutriment_allergens = ALLERGEN_VEGETABLE|ALLERGEN_FUNGI|ALLERGEN_MEAT /obj/item/reagent_containers/food/snacks/stew/neaera/Initialize() . = ..() - reagents.add_reagent("nutriment", 4) - reagents.add_reagent("seafood", 6) + reagents.add_reagent("seafood", 6, list("fatty meat" = 6)) reagents.add_reagent("dynjuice", 4) /obj/item/reagent_containers/food/snacks/chipplate/neaeracandy - name = "plate of candied Neaera eyes" - desc = "Candied Neaera eyes shaped into cubes. The mix of savoury and sweet is generally acceptable for most species, although many dislike the dish for its use of eyes." + name = "plate of candied neaera eyes" + desc = "Candied neaera eyes shaped into cubes. The mix of savoury and sweet is generally acceptable for most species, although many dislike the dish for its use of intact eyes." icon_state = "neaera_candied_eyes20" trash = /obj/item/trash/candybowl vendingobject = /obj/item/reagent_containers/food/snacks/neaeracandy - nutriment_desc = list("creamy, fatty meat" = 20) bitesize = 1 unitname = "eye" - nutriment_amt = 20 filling_color = "#7C66DD" /obj/item/reagent_containers/food/snacks/chipplate/neaeracandy/Initialize() . = ..() - reagents.add_reagent("seafood", 20) + reagents.add_reagent("seafood", 20, list("creamy, fatty meat" = 20)) /obj/item/reagent_containers/food/snacks/chipplate/neaeracandy/update_icon() switch(reagents.total_volume) @@ -7631,34 +7602,30 @@ icon_state = "neaera_candied_eyes20" /obj/item/reagent_containers/food/snacks/neaeracandy - name = "candied Neaera eye" - desc = "A candied Neaera eye shaped into a cube. The mix of savoury and sweet is generally acceptable for most species, although many dislike the dish for its use of eyes." + name = "candied neaera eye" + desc = "A candied neaera eye shaped into a cube. The mix of savoury and sweet is generally acceptable for most species, although many dislike the dish for its use of eyes." icon = 'icons/obj/food_syn.dmi' icon_state = "neaera_candied_eye" - nutriment_desc = list("creamy, fatty meat" = 3) bitesize = 2 - nutriment_amt = 3 filling_color = "#7C66DD" /obj/item/reagent_containers/food/snacks/neaeracandy/Initialize() . = ..() - reagents.add_reagent("seafood", 3) + reagents.add_reagent("seafood", 3, list("creamy, fatty meat" = 3)) /obj/item/reagent_containers/food/snacks/neaerakabob - name = "Neaera-kabob" + name = "neaera-kabob" desc = "Neaera meat and giblets that have been cooked on a skewer." icon = 'icons/obj/food_syn.dmi' icon_state = "neaera_skewer" trash = /obj/item/stack/rods filling_color = "#7C66DD" center_of_mass = list("x"=17, "y"=15) - nutriment_desc = list("fatty meat" = 2) - nutriment_amt = 4 bitesize = 2 /obj/item/reagent_containers/food/snacks/neaeracandy/Initialize() . = ..() - reagents.add_reagent("seafood", 4) + reagents.add_reagent("seafood", 4, list("fatty meat" = 2)) /obj/item/reagent_containers/food/snacks/lortl name = "lortl" @@ -7668,6 +7635,7 @@ bitesize = 2 nutriment_amt = 2 nutriment_desc = list("dried fruit" = 2) + nutriment_allergens = ALLERGEN_FRUIT /obj/item/reagent_containers/food/snacks/lortl/Initialize() . = ..() @@ -7690,31 +7658,34 @@ icon_state = "qalozyn_boiled" nutriment_amt = 4 nutriment_desc = list("sweet turnips" = 4) + nutriment_allergens = ALLERGEN_VEGETABLE bitesize = 2 filling_color = "#7C66DD" /obj/item/reagent_containers/food/snacks/garani name = "garani" icon = 'icons/obj/food_syn.dmi' - desc = "Neaera liver stuffed with boiled qa'lozyn and fried in oil. A popular light meal for Teshari." + desc = "Neaera liver stuffed with boiled qa'lozyn and fried in oil. A popular light meal for teshari." icon_state = "garani" - nutriment_amt = 8 - nutriment_desc = list("fatty meat" = 4, "sweet turnips" = 4) + nutriment_amt = 4 + nutriment_desc = list("sweet turnips" = 4) + nutriment_allergens = ALLERGEN_FRUIT bitesize = 3 filling_color = "#7C66DD" /obj/item/reagent_containers/food/snacks/ganami/Initialize() . = ..() - reagents.add_reagent("seafood", 4) + reagents.add_reagent("seafood", 4, list("fatty meat" = 4)) /obj/item/reagent_containers/food/snacks/qazal_dough name = "qa'zal dough" icon = 'icons/obj/food_syn.dmi' - desc = "A coarse, stretchy, Skrellian dough made from qa'zal flour and ga'uli juice in a striking purple color." + desc = "A coarse, stretchy, skrellian dough made from qa'zal flour and ga'uli juice in a striking purple color." icon_state = "qazal_dough" bitesize = 2 nutriment_amt = 3 nutriment_desc = list("minty dough" = 3) + nutriment_allergens = ALLERGEN_FRUIT //It's not a grain. Skrell might not even HAVE grains for all we know! filling_color = "#B97BD9" /obj/item/reagent_containers/food/snacks/qazal_dough/attackby(obj/item/W as obj, mob/user as mob) @@ -7731,6 +7702,7 @@ bitesize = 2 nutriment_amt = 3 nutriment_desc = list("minty dough" = 3) + nutriment_allergens = ALLERGEN_FRUIT slice_path = /obj/item/reagent_containers/food/snacks/qazal_doughstrip slices_num = 3 filling_color = "#B97BD9" @@ -7743,6 +7715,7 @@ bitesize = 2 nutriment_amt = 3 nutriment_desc = list("minty pasta" = 1) + nutriment_allergens = ALLERGEN_FRUIT filling_color = "#B97BD9" /obj/item/reagent_containers/food/snacks/sliceable/qazal_bread @@ -7753,6 +7726,7 @@ nutriment_amt = 20 slices_num = 5 nutriment_desc = list("minty bread" = 5) + nutriment_allergens = ALLERGEN_FRUIT slice_path = /obj/item/reagent_containers/food/snacks/slice/qazal_bread_slice filling_color = "#B97BD9" @@ -7763,6 +7737,7 @@ icon_state = "qazal_bread_slice" whole_path = /obj/item/reagent_containers/food/snacks/sliceable/qazal_bread nutriment_desc = list("minty bread" = 1) + nutriment_allergens = ALLERGEN_FRUIT filling_color = "#B97BD9" /obj/item/reagent_containers/food/snacks/slice/qazal_bread_slice/filled @@ -7776,6 +7751,7 @@ nutriment_amt = 8 bitesize = 1 nutriment_desc = list("minty flatbread" = 1) + nutriment_allergens = ALLERGEN_FRUIT filling_color = "#B97BD9" /obj/item/reagent_containers/food/snacks/baked_gauli @@ -7785,6 +7761,7 @@ icon_state = "baked_gauli" nutriment_amt = 4 nutriment_desc = list("zesty mintyness" = 1) + nutriment_allergens = ALLERGEN_FRUIT filling_color = "#B97BD9" /obj/item/reagent_containers/food/snacks/baked_kirani @@ -7794,6 +7771,7 @@ icon_state = "baked_kirani" nutriment_amt = 4 nutriment_desc = list("crispy sweetness" = 2, "caramelized jelly" = 2) + nutriment_allergens = ALLERGEN_FRUIT|ALLERGEN_SUGARS filling_color = "#993C5C" /obj/item/reagent_containers/food/snacks/stuffed_gauli @@ -7802,6 +7780,7 @@ icon = 'icons/obj/food_syn.dmi' icon_state = "stuffed_gauli_pod" nutriment_amt = 4 + nutriment_allergens = ALLERGEN_FRUIT bitesize = 1 nutriment_desc = list("meat" = 1, "sweet kirani" = 1, "minty ga'uli" = 1) @@ -7817,6 +7796,7 @@ nutriment_amt = 8 trash = /obj/item/trash/snack_bowl bitesize = 1 + nutriment_allergens = ALLERGEN_FRUIT|ALLERGEN_SUGARS nutriment_desc = list("minty qa'zal" = 1, "sweet kirani jelly" = 1) /obj/item/reagent_containers/food/snacks/kirani_stew/Initialize() @@ -7831,6 +7811,7 @@ trash = /obj/item/trash/snack_bowl nutriment_amt = 8 bitesize = 1 + nutriment_allergens = ALLERGEN_FRUIT|ALLERGEN_SUGARS nutriment_desc = list("chewy qa'zal noodles" = 1, "minty gu'ali juice" = 1, "sweet kirani jelly" = 1) /obj/item/reagent_containers/food/snacks/kirani_jellypuff @@ -7838,6 +7819,7 @@ desc = "A piece of qa'zal bread containing a kirani jelly filling and sprinkled with qa'zal flour. Just one will never be enough." icon = 'icons/obj/food_syn.dmi' icon_state = "kirani_jellypuff" + nutriment_allergens = ALLERGEN_FRUIT|ALLERGEN_SUGARS nutriment_amt = 8 bitesize = 2 nutriment_desc = list("puffed minty qa'zal bread" = 1, "super-sweet kirani jelly" = 1) diff --git a/code/modules/food/food/snacks/meat.dm b/code/modules/food/food/snacks/meat.dm index f61a5d7ad5..1acd3c1f56 100644 --- a/code/modules/food/food/snacks/meat.dm +++ b/code/modules/food/food/snacks/meat.dm @@ -66,6 +66,6 @@ /obj/item/reagent_containers/food/snacks/meat/neaera/Initialize() . = ..() - reagents.add_reagent("protein", 3) - reagents.add_reagent("seafood", 3) - reagents.add_reagent("triglyceride", 2) \ No newline at end of file + reagents.add_reagent("protein", 3, list("fainty fungal meat" = 3)) + reagents.add_reagent("seafood", 3, list("fainty fungal meat" = 3)) + reagents.add_reagent("triglyceride", 2) diff --git a/code/modules/food/recipes_fryer.dm b/code/modules/food/recipes_fryer.dm index 3f3c075f47..bbb8011ec0 100644 --- a/code/modules/food/recipes_fryer.dm +++ b/code/modules/food/recipes_fryer.dm @@ -3,6 +3,7 @@ items = list( /obj/item/reagent_containers/food/snacks/rawsticks ) + reagent_mix = RECIPE_REAGENT_REPLACE //No raw tater result = /obj/item/reagent_containers/food/snacks/fries /datum/recipe/cheesyfries @@ -11,6 +12,7 @@ /obj/item/reagent_containers/food/snacks/fries, /obj/item/reagent_containers/food/snacks/cheesewedge, ) + reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product result = /obj/item/reagent_containers/food/snacks/cheesyfries /datum/recipe/jpoppers @@ -39,6 +41,7 @@ coating = /datum/reagent/nutriment/coating/batter fruit = list("onion" = 1) result = /obj/item/reagent_containers/food/snacks/onionrings + reagent_mix = RECIPE_REAGENT_REPLACE //So it doesn't taste of onions and fried onions //Meaty Recipes //==================== @@ -49,6 +52,7 @@ /obj/item/reagent_containers/food/snacks/dough, /obj/item/reagent_containers/food/snacks/carpmeat ) + reagent_mix = RECIPE_REAGENT_REPLACE //No Dough result = /obj/item/reagent_containers/food/snacks/cubancarp /datum/recipe/batteredsausage @@ -94,6 +98,7 @@ result = /obj/item/reagent_containers/food/snacks/friedmushroom /datum/recipe/fishfingers + appliance = FRYER items = list( /obj/item/reagent_containers/food/snacks/carpmeat, ) @@ -128,6 +133,7 @@ items = list( /obj/item/reagent_containers/food/snacks/doughslice ) + reagent_mix = RECIPE_REAGENT_REPLACE //No Dough result = /obj/item/reagent_containers/food/snacks/donut/plain/jelly result_quantity = 2 @@ -152,6 +158,7 @@ items = list( /obj/item/reagent_containers/food/snacks/doughslice ) + reagent_mix = RECIPE_REAGENT_REPLACE //No Dough result = /obj/item/reagent_containers/food/snacks/donut/plain result_quantity = 2 @@ -212,4 +219,4 @@ /obj/item/organ/internal/liver/neaera ) result = /obj/item/reagent_containers/food/snacks/garani - reagent_mix = RECIPE_REAGENT_REPLACE \ No newline at end of file + reagent_mix = RECIPE_REAGENT_REPLACE diff --git a/code/modules/food/recipes_grill.dm b/code/modules/food/recipes_grill.dm index c404364e50..0d210db195 100644 --- a/code/modules/food/recipes_grill.dm +++ b/code/modules/food/recipes_grill.dm @@ -194,6 +194,7 @@ /obj/item/reagent_containers/food/snacks/cheesewedge, /obj/item/reagent_containers/food/snacks/boiledegg, ) + reagent_mix = RECIPE_REAGENT_REPLACE //No Dough result = /obj/item/reagent_containers/food/snacks/superbiteburger /datum/recipe/slimeburger @@ -228,7 +229,7 @@ /obj/item/reagent_containers/food/snacks/bacon, /obj/item/reagent_containers/food/snacks/bacon ) - result = /obj/item/reagent_containers/food/snacks/burger/bacon + result = /obj/item/reagent_containers/food/snacks/baconburger /datum/recipe/omelette appliance = GRILL @@ -237,7 +238,6 @@ /obj/item/reagent_containers/food/snacks/cheesewedge, ) reagents = list("egg" = 6) - reagent_mix = RECIPE_REAGENT_REPLACE result = /obj/item/reagent_containers/food/snacks/omelette /datum/recipe/omurice @@ -330,4 +330,5 @@ /datum/recipe/qazalflatbread appliance = GRILL items = list(/obj/item/reagent_containers/food/snacks/sliceable/qazal_flatdough) - result = /obj/item/reagent_containers/food/snacks/grilled_qazal_flatbread \ No newline at end of file + reagent_mix = RECIPE_REAGENT_REPLACE //No Dough + result = /obj/item/reagent_containers/food/snacks/grilled_qazal_flatbread diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm index 10eb52293a..b191f72bc9 100644 --- a/code/modules/food/recipes_microwave.dm +++ b/code/modules/food/recipes_microwave.dm @@ -28,7 +28,7 @@ I said no! /datum/recipe/boiledegg reagents = list("water" = 5) - reagent_mix = RECIPE_REAGENT_REPLACE + reagent_mix = RECIPE_REAGENT_REPLACE //No water items = list( /obj/item/reagent_containers/food/snacks/egg ) @@ -48,6 +48,7 @@ I said no! /obj/item/reagent_containers/food/snacks/dough, /obj/item/reagent_containers/food/snacks/meatball ) + reagent_mix = RECIPE_REAGENT_REPLACE //No Dough result = /obj/item/reagent_containers/food/snacks/donkpocket //SPECIAL /datum/recipe/donkpocket/proc/warm_up(var/obj/item/reagent_containers/food/snacks/donkpocket/being_cooked) @@ -121,6 +122,7 @@ I said no! /datum/recipe/loadedbakedpotato fruit = list("potato" = 1) items = list(/obj/item/reagent_containers/food/snacks/cheesewedge) + reagent_mix = RECIPE_REAGENT_REPLACE //No raw tater result = /obj/item/reagent_containers/food/snacks/loadedbakedpotato /datum/recipe/microchips @@ -128,6 +130,7 @@ I said no! items = list( /obj/item/reagent_containers/food/snacks/rawsticks ) + reagent_mix = RECIPE_REAGENT_REPLACE //No raw tater result = /obj/item/reagent_containers/food/snacks/microchips /datum/recipe/bangersandmash @@ -135,6 +138,7 @@ I said no! /obj/item/reagent_containers/food/snacks/mashedpotato, /obj/item/reagent_containers/food/snacks/sausage, ) + reagent_mix = RECIPE_REAGENT_REPLACE //No raw tater result = /obj/item/reagent_containers/food/snacks/bangersandmash /datum/recipe/cheesymash @@ -161,6 +165,7 @@ I said no! /obj/item/reagent_containers/food/snacks/doughslice, /obj/item/paper, ) + reagent_mix = RECIPE_REAGENT_REPLACE //No Dough result = /obj/item/reagent_containers/food/snacks/fortunecookie /datum/recipe/syntisteak @@ -195,6 +200,7 @@ I said no! /datum/recipe/nettlesoup fruit = list("nettle" = 1, "potato" = 1) reagents = list("water" = 10, "egg" = 3) + reagent_mix = RECIPE_REAGENT_REPLACE //Denature that nettle result = /obj/item/reagent_containers/food/snacks/nettlesoup /datum/recipe/wishsoup @@ -245,6 +251,7 @@ I said no! /obj/item/reagent_containers/food/snacks/cheesewedge ) fruit = list("tomato" = 1, "lettuce" = 1) + reagent_mix = RECIPE_REAGENT_REPLACE //Simplify result = /obj/item/reagent_containers/food/snacks/clubsandwich /datum/recipe/tomatosoup @@ -258,6 +265,7 @@ I said no! /obj/item/reagent_containers/food/snacks/dough, /obj/item/reagent_containers/food/snacks/dough, ) + reagent_mix = RECIPE_REAGENT_REPLACE //No Dough result = /obj/item/reagent_containers/food/snacks/rofflewaffles /datum/recipe/stew @@ -329,7 +337,7 @@ I said no! result = /obj/item/reagent_containers/food/snacks/meatballspagetti /datum/recipe/spesslaw - reagents = list("water" = 5) + reagents = list("water" = 5, "flour" = 5) items = list( /obj/item/reagent_containers/food/snacks/spagetti, /obj/item/reagent_containers/food/snacks/meatball, @@ -394,6 +402,7 @@ I said no! /obj/item/reagent_containers/food/snacks/egg, /obj/item/reagent_containers/food/snacks/chocolatebar, ) + reagent_mix = RECIPE_REAGENT_REPLACE //No actual egg?? result = /obj/item/reagent_containers/food/snacks/chocolateegg /datum/recipe/sausage @@ -487,6 +496,7 @@ I said no! /obj/item/reagent_containers/food/snacks/spreads ) fruit = list("potato" = 1) + reagent_mix = RECIPE_REAGENT_REPLACE //So it doesn't taste like potato and mashed potato result = /obj/item/reagent_containers/food/snacks/mashedpotato /datum/recipe/icecreamsandwich @@ -581,6 +591,7 @@ I said no! /obj/item/reagent_containers/food/snacks/dough ) reagents = list("sugar" = 5, "egg" = 3) + reagent_mix = RECIPE_REAGENT_REPLACE //No Dough result = /obj/item/reagent_containers/food/snacks/sugarcookie /datum/recipe/berrymuffin @@ -589,6 +600,7 @@ I said no! /obj/item/reagent_containers/food/snacks/dough ) fruit = list("berries" = 1) + reagent_mix = RECIPE_REAGENT_REPLACE //No Dough result = /obj/item/reagent_containers/food/snacks/berrymuffin/berry /datum/recipe/poisonberrymuffin @@ -597,6 +609,7 @@ I said no! /obj/item/reagent_containers/food/snacks/dough ) fruit = list("poisonberries" = 1) + reagent_mix = RECIPE_REAGENT_REPLACE //No Dough result = /obj/item/reagent_containers/food/snacks/berrymuffin/poison /datum/recipe/ghostmuffin @@ -606,6 +619,7 @@ I said no! /obj/item/ectoplasm ) fruit = list("berries" = 1) + reagent_mix = RECIPE_REAGENT_REPLACE //No Dough result = /obj/item/reagent_containers/food/snacks/ghostmuffin/berry /datum/recipe/poisonghostmuffin @@ -615,6 +629,7 @@ I said no! /obj/item/ectoplasm ) fruit = list("poisonberries" = 1) + reagent_mix = RECIPE_REAGENT_REPLACE //No Dough result = /obj/item/reagent_containers/food/snacks/ghostmuffin/poison /datum/recipe/eggroll @@ -667,6 +682,7 @@ I said no! ) result = /obj/item/reagent_containers/food/snacks/bagelplain + /datum/recipe/bagelsunflower reagents = list("water" = 5) items = list( @@ -706,6 +722,7 @@ I said no! /obj/item/fuel_assembly/supermatter ) result = /obj/item/reagent_containers/food/snacks/bageleverything + reagent_mix = RECIPE_REAGENT_REPLACE //Unfathomable /datum/recipe/bageltwo reagents = list("water" = 5) @@ -884,6 +901,7 @@ I said no! /obj/item/reagent_containers/food/snacks/meatball ) reagents = list("spacespice" = 1) + reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product result = /obj/item/reagent_containers/food/snacks/burrito /datum/recipe/burrito_vegan @@ -891,15 +909,17 @@ I said no! /obj/item/reagent_containers/food/snacks/tortilla, /obj/item/reagent_containers/food/snacks/tofu ) + reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product result = /obj/item/reagent_containers/food/snacks/burrito_vegan -/datum/recipe/burrito_cheese +/datum/recipe/burrito_cheese // WITH cheese items = list( /obj/item/reagent_containers/food/snacks/tortilla, /obj/item/reagent_containers/food/snacks/meatball, /obj/item/reagent_containers/food/snacks/meatball, /obj/item/reagent_containers/food/snacks/cheesewedge ) + reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product result = /obj/item/reagent_containers/food/snacks/burrito_cheese /datum/recipe/burrito_cheese_spicy @@ -909,6 +929,7 @@ I said no! /obj/item/reagent_containers/food/snacks/cheesewedge, /obj/item/reagent_containers/food/snacks/cheesewedge, ) + reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product result = /obj/item/reagent_containers/food/snacks/burrito_cheese_spicy /datum/recipe/burrito_hell @@ -930,15 +951,17 @@ I said no! /obj/item/reagent_containers/food/snacks/cutlet, /obj/item/reagent_containers/food/snacks/cutlet ) + reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product result = /obj/item/reagent_containers/food/snacks/meatburrito -/datum/recipe/cheeseburrito +/datum/recipe/cheeseburrito // JUST cheese fruit = list("soybeans" = 1) items = list( /obj/item/reagent_containers/food/snacks/tortilla, /obj/item/reagent_containers/food/snacks/cheesewedge, /obj/item/reagent_containers/food/snacks/cheesewedge ) + reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product result = /obj/item/reagent_containers/food/snacks/cheeseburrito /datum/recipe/fuegoburrito @@ -946,6 +969,7 @@ I said no! items = list( /obj/item/reagent_containers/food/snacks/tortilla ) + reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product result = /obj/item/reagent_containers/food/snacks/fuegoburrito /datum/recipe/breakfast_wrap @@ -985,6 +1009,7 @@ I said no! /obj/item/reagent_containers/food/snacks/cheesewedge ) + reagent_mix = RECIPE_REAGENT_REPLACE //Curdle that baby result = /obj/item/reagent_containers/food/snacks/red_sun_special /datum/recipe/hatchling_suprise @@ -1004,6 +1029,7 @@ I said no! /obj/item/reagent_containers/food/snacks/egg ) reagents = list("blood" = 15) + reagent_mix = RECIPE_REAGENT_REPLACE //Keep the eggs raw result = /obj/item/reagent_containers/food/snacks/riztizkzi_sea /datum/recipe/father_breakfast @@ -1012,6 +1038,7 @@ I said no! /obj/item/reagent_containers/food/snacks/meatsteak ) reagents = list("egg" = 6) + reagent_mix = RECIPE_REAGENT_REPLACE //No point doubling everything! result = /obj/item/reagent_containers/food/snacks/father_breakfast /datum/recipe/stuffed_meatball @@ -1029,6 +1056,7 @@ I said no! /obj/item/reagent_containers/food/snacks/meatball ) reagents = list("egg" = 6) + reagent_mix = RECIPE_REAGENT_REPLACE //No point doubling everything! result = /obj/item/reagent_containers/food/snacks/egg_pancake /datum/recipe/bacon_stick @@ -1052,6 +1080,7 @@ I said no! /obj/item/reagent_containers/food/snacks/friedegg, /obj/item/reagent_containers/food/snacks/cheesewedge ) + reagent_mix = RECIPE_REAGENT_REPLACE //Simplify... result = /obj/item/reagent_containers/food/snacks/nt_muffin /datum/recipe/fish_taco @@ -1070,6 +1099,7 @@ I said no! /obj/item/reagent_containers/food/snacks/bacon, /obj/item/reagent_containers/food/snacks/bacon ) + reagent_mix = RECIPE_REAGENT_REPLACE //Simplify the result result = /obj/item/reagent_containers/food/snacks/blt /datum/recipe/gigapuddi @@ -1143,6 +1173,7 @@ I said no! items = list( /obj/item/reagent_containers/food/snacks/tofu ) + reagent_mix = RECIPE_REAGENT_REPLACE //Simplify the result result = /obj/item/reagent_containers/food/snacks/hotandsoursoup /datum/recipe/kitsuneudon @@ -1156,6 +1187,7 @@ I said no! /datum/recipe/mammi fruit = list("orange" = 1) reagents = list("water" = 10, "flour" = 10, "milk" = 5, "sodiumchloride" = 1) + reagent_mix = RECIPE_REAGENT_REPLACE //Cook off that flour result = /obj/item/reagent_containers/food/snacks/mammi diff --git a/code/modules/food/recipes_oven.dm b/code/modules/food/recipes_oven.dm index 942856fb24..f42f82ee18 100644 --- a/code/modules/food/recipes_oven.dm +++ b/code/modules/food/recipes_oven.dm @@ -3,6 +3,7 @@ items = list( /obj/item/reagent_containers/food/snacks/rawsticks ) + reagent_mix = RECIPE_REAGENT_REPLACE //No raw tater result = /obj/item/reagent_containers/food/snacks/ovenchips //Roasts @@ -40,6 +41,7 @@ /obj/item/reagent_containers/food/snacks/meat/chicken, /obj/item/reagent_containers/food/snacks/stuffing ) + reagent_mix = RECIPE_REAGENT_REPLACE //Turkeyfy result = /obj/item/reagent_containers/food/snacks/sliceable/turkey /datum/recipe/tofurkey @@ -81,6 +83,7 @@ /obj/item/reagent_containers/food/snacks/dough, /obj/item/reagent_containers/food/snacks/dough ) + reagent_mix = RECIPE_REAGENT_REPLACE //No Dough reagents = list("sodiumchloride" = 1, "yeast" = 5) result = /obj/item/reagent_containers/food/snacks/sliceable/bread @@ -91,6 +94,7 @@ /obj/item/reagent_containers/food/snacks/dough, /obj/item/reagent_containers/food/snacks/dough ) + reagent_mix = RECIPE_REAGENT_REPLACE //No Dough result = /obj/item/reagent_containers/food/snacks/baguette @@ -107,6 +111,7 @@ /obj/item/reagent_containers/food/snacks/cheesewedge, /obj/item/reagent_containers/food/snacks/cheesewedge ) + reagent_mix = RECIPE_REAGENT_REPLACE //No Dough result = /obj/item/reagent_containers/food/snacks/sliceable/tofubread @@ -118,6 +123,7 @@ /obj/item/reagent_containers/food/snacks/cheesewedge, /obj/item/reagent_containers/food/snacks/cheesewedge ) + reagent_mix = RECIPE_REAGENT_REPLACE //No Dough result = /obj/item/reagent_containers/food/snacks/sliceable/creamcheesebread /datum/recipe/flatbread @@ -125,6 +131,7 @@ items = list( /obj/item/reagent_containers/food/snacks/sliceable/flatdough ) + reagent_mix = RECIPE_REAGENT_REPLACE //No Dough result = /obj/item/reagent_containers/food/snacks/flatbread /datum/recipe/tortilla @@ -133,6 +140,7 @@ items = list( /obj/item/reagent_containers/food/snacks/sliceable/flatdough ) + reagent_mix = RECIPE_REAGENT_REPLACE //No Dough result = /obj/item/reagent_containers/food/snacks/tortilla /datum/recipe/meatbread @@ -148,6 +156,7 @@ /obj/item/reagent_containers/food/snacks/cheesewedge, /obj/item/reagent_containers/food/snacks/cheesewedge ) + reagent_mix = RECIPE_REAGENT_REPLACE //No Dough result = /obj/item/reagent_containers/food/snacks/sliceable/meatbread /datum/recipe/syntibread @@ -163,6 +172,7 @@ /obj/item/reagent_containers/food/snacks/cheesewedge, /obj/item/reagent_containers/food/snacks/cheesewedge ) + reagent_mix = RECIPE_REAGENT_REPLACE //No Dough result = /obj/item/reagent_containers/food/snacks/sliceable/meatbread /datum/recipe/xenomeatbread @@ -178,6 +188,7 @@ /obj/item/reagent_containers/food/snacks/cheesewedge, /obj/item/reagent_containers/food/snacks/cheesewedge ) + reagent_mix = RECIPE_REAGENT_REPLACE //No Dough result = /obj/item/reagent_containers/food/snacks/sliceable/xenomeatbread /datum/recipe/bananabread @@ -189,6 +200,7 @@ /obj/item/reagent_containers/food/snacks/dough, /obj/item/reagent_containers/food/snacks/dough ) + reagent_mix = RECIPE_REAGENT_REPLACE //No Dough result = /obj/item/reagent_containers/food/snacks/sliceable/bananabread @@ -197,6 +209,7 @@ items = list( /obj/item/reagent_containers/food/snacks/dough ) + reagent_mix = RECIPE_REAGENT_REPLACE //No Dough result = /obj/item/reagent_containers/food/snacks/bun //Predesigned pies @@ -208,6 +221,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/flatdough, /obj/item/reagent_containers/food/snacks/meat ) + reagent_mix = RECIPE_REAGENT_REPLACE //No Dough result = /obj/item/reagent_containers/food/snacks/meatpie /datum/recipe/tofupie @@ -216,6 +230,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/flatdough, /obj/item/reagent_containers/food/snacks/tofu ) + reagent_mix = RECIPE_REAGENT_REPLACE //No Dough result = /obj/item/reagent_containers/food/snacks/tofupie /datum/recipe/xemeatpie @@ -224,6 +239,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/flatdough, /obj/item/reagent_containers/food/snacks/xenomeat ) + reagent_mix = RECIPE_REAGENT_REPLACE //No Dough result = /obj/item/reagent_containers/food/snacks/xemeatpie /datum/recipe/pie @@ -231,6 +247,7 @@ fruit = list("banana" = 1) reagents = list("sugar" = 5) items = list(/obj/item/reagent_containers/food/snacks/sliceable/flatdough) + reagent_mix = RECIPE_REAGENT_REPLACE //No Dough result = /obj/item/reagent_containers/food/snacks/pie /datum/recipe/cherrypie @@ -240,24 +257,28 @@ items = list( /obj/item/reagent_containers/food/snacks/sliceable/flatdough ) + reagent_mix = RECIPE_REAGENT_REPLACE //No Dough result = /obj/item/reagent_containers/food/snacks/cherrypie /datum/recipe/amanita_pie appliance = OVEN reagents = list("amatoxin" = 5) items = list(/obj/item/reagent_containers/food/snacks/sliceable/flatdough) + reagent_mix = RECIPE_REAGENT_REPLACE //No Dough result = /obj/item/reagent_containers/food/snacks/amanita_pie /datum/recipe/plump_pie appliance = OVEN fruit = list("plumphelmet" = 1) items = list(/obj/item/reagent_containers/food/snacks/sliceable/flatdough) + reagent_mix = RECIPE_REAGENT_REPLACE //No Dough result = /obj/item/reagent_containers/food/snacks/plump_pie /datum/recipe/applepie appliance = OVEN fruit = list("apple" = 1) items = list(/obj/item/reagent_containers/food/snacks/sliceable/flatdough) + reagent_mix = RECIPE_REAGENT_REPLACE //No Dough result = /obj/item/reagent_containers/food/snacks/applepie /datum/recipe/pumpkinpie @@ -265,6 +286,7 @@ fruit = list("pumpkin" = 1) reagents = list("sugar" = 5) items = list(/obj/item/reagent_containers/food/snacks/sliceable/flatdough) + reagent_mix = RECIPE_REAGENT_REPLACE //No Dough result = /obj/item/reagent_containers/food/snacks/sliceable/pumpkinpie /datum/recipe/appletart @@ -346,6 +368,7 @@ appliance = OVEN fruit = list("berries" = 2) reagents = list("milk" = 5, "flour" = 15, "cream" = 10, "coco" = 5, "egg" = 6) + reagent_mix = RECIPE_REAGENT_REPLACE //No Dough result = /obj/item/reagent_containers/food/snacks/sliceable/buchedenoel /datum/recipe/cinnamonbun @@ -354,6 +377,7 @@ items = list( /obj/item/reagent_containers/food/snacks/dough ) + reagent_mix = RECIPE_REAGENT_REPLACE //No Dough result = /obj/item/reagent_containers/food/snacks/cinnamonbun result_quantity = 4 @@ -370,6 +394,7 @@ /obj/item/reagent_containers/food/snacks/cheesewedge, /obj/item/reagent_containers/food/snacks/cheesewedge ) + reagent_mix = RECIPE_REAGENT_REPLACE //No Dough result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/margherita /datum/recipe/meatpizza @@ -382,6 +407,7 @@ /obj/item/reagent_containers/food/snacks/meat, /obj/item/reagent_containers/food/snacks/cheesewedge ) + reagent_mix = RECIPE_REAGENT_REPLACE //No Dough result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/meatpizza /datum/recipe/syntipizza @@ -394,6 +420,7 @@ /obj/item/reagent_containers/food/snacks/meat/syntiflesh, /obj/item/reagent_containers/food/snacks/cheesewedge ) + reagent_mix = RECIPE_REAGENT_REPLACE //No Dough result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/meatpizza /datum/recipe/mushroompizza @@ -403,7 +430,6 @@ /obj/item/reagent_containers/food/snacks/sliceable/flatdough, /obj/item/reagent_containers/food/snacks/cheesewedge ) - reagent_mix = RECIPE_REAGENT_REPLACE //No vomit taste in finished product from chanterelles result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/mushroompizza @@ -414,6 +440,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/flatdough, /obj/item/reagent_containers/food/snacks/cheesewedge ) + reagent_mix = RECIPE_REAGENT_REPLACE //No Dough result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza /datum/recipe/pineapplepizza @@ -425,6 +452,7 @@ /obj/item/reagent_containers/food/snacks/pineapple_ring, /obj/item/reagent_containers/food/snacks/pineapple_ring ) + reagent_mix = RECIPE_REAGENT_REPLACE //No Dough result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/pineapple //Spicy @@ -446,7 +474,7 @@ appliance = OVEN reagents = list("milk" = 5, "flour" = 15, "sugar" = 15, "egg" = 9, "vanilla" = 1) result = /obj/item/reagent_containers/food/snacks/sliceable/plaincake - reagent_mix = RECIPE_REAGENT_REPLACE + reagent_mix = RECIPE_REAGENT_REPLACE // No flour, egg etc. /datum/recipe/cake/carrot appliance = OVEN @@ -517,6 +545,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/flatdough, /obj/item/reagent_containers/food/snacks/sliceable/flatdough ) + reagent_mix = RECIPE_REAGENT_REPLACE //No Dough result = /obj/item/reagent_containers/food/snacks/pancakes /datum/recipe/pancakes/berry @@ -541,6 +570,7 @@ /obj/item/reagent_containers/food/snacks/dough ) reagents = list("milk" = 5, "egg" = 3,"honey" = 5) + reagent_mix = RECIPE_REAGENT_REPLACE //No Dough result = /obj/item/reagent_containers/food/snacks/honeybun //Bacon @@ -565,6 +595,7 @@ /obj/item/reagent_containers/food/snacks/meatball, /obj/item/reagent_containers/food/snacks/cheesewedge ) + reagent_mix = RECIPE_REAGENT_REPLACE //No Dough result = /obj/item/reagent_containers/food/snacks/meat_pocket result_quantity = 2 @@ -579,6 +610,7 @@ /obj/item/reagent_containers/food/snacks/bacon, /obj/item/reagent_containers/food/snacks/bacon ) + reagent_mix = RECIPE_REAGENT_REPLACE //No Dough result = /obj/item/reagent_containers/food/snacks/bacon_flatbread /datum/recipe/truffle @@ -733,7 +765,7 @@ /obj/item/reagent_containers/food/snacks/dough, /obj/item/organ/internal/eyes/neaera ) - result = /obj/item/reagent_containers/food/snacks/neaeracandy + result = /obj/item/reagent_containers/food/snacks/chipplate/neaeracandy result_quantity = 6 reagent_mix = RECIPE_REAGENT_REPLACE @@ -792,4 +824,4 @@ ) reagents = list("kirani_jelly" = 5, "qazal_flour" = 5) reagent_mix = RECIPE_REAGENT_REPLACE - result = /obj/item/reagent_containers/food/snacks/kirani_jellypuff \ No newline at end of file + result = /obj/item/reagent_containers/food/snacks/kirani_jellypuff diff --git a/code/modules/mob/living/carbon/taste.dm b/code/modules/mob/living/carbon/taste.dm index bd0fbccfd4..3b11614e2b 100644 --- a/code/modules/mob/living/carbon/taste.dm +++ b/code/modules/mob/living/carbon/taste.dm @@ -33,7 +33,7 @@ calculate text size per text. for(var/datum/reagent/R in reagent_list) if(!R.taste_mult) continue - if(R.id == "nutriment") //this is ugly but apparently only nutriment (not subtypes) has taste data TODO figure out why + if(istype(R, /datum/reagent/nutriment)) var/list/taste_data = R.get_data() for(var/taste in taste_data) if(taste in tastes) @@ -63,4 +63,4 @@ calculate text size per text. intensity_desc = "the strong flavor of" out += "[intensity_desc] [taste_desc]" - return english_list(out, "something indescribable") \ No newline at end of file + return english_list(out, "something indescribable") diff --git a/code/modules/reagents/reactions/instant/food.dm b/code/modules/reagents/reactions/instant/food.dm index c7540e2a40..d19ea24ade 100644 --- a/code/modules/reagents/reactions/instant/food.dm +++ b/code/modules/reagents/reactions/instant/food.dm @@ -1,19 +1,19 @@ /decl/chemical_reaction/instant/food/hot_ramen - name = "Hot Ramen" + name = "hot ramen" id = "hot_ramen" result = "hot_ramen" required_reagents = list("water" = 1, "dry_ramen" = 3) result_amount = 3 /decl/chemical_reaction/instant/food/hell_ramen - name = "Hell Ramen" + name = "hell ramen" id = "hell_ramen" result = "hell_ramen" required_reagents = list("capsaicin" = 1, "hot_ramen" = 6) result_amount = 6 /decl/chemical_reaction/instant/food/tofu - name = "Tofu" + name = "tofu" id = "tofu" result = null required_reagents = list("soymilk" = 10) @@ -27,7 +27,7 @@ return /decl/chemical_reaction/instant/food/chocolate_bar - name = "Chocolate Bar" + name = "chocolate bar" id = "chocolate_bar" result = null required_reagents = list("soymilk" = 2, "coco" = 2, "sugar" = 2) @@ -40,7 +40,7 @@ return /decl/chemical_reaction/instant/food/chocolate_bar2 - name = "Chocolate Bar" + name = "chocolate bar" id = "chocolate_bar" result = null required_reagents = list("milk" = 2, "coco" = 2, "sugar" = 2) @@ -53,28 +53,28 @@ return /decl/chemical_reaction/instant/food/soysauce - name = "Soy Sauce" + name = "soy sauce" id = "soysauce" result = "soysauce" required_reagents = list("soymilk" = 4, "sacid" = 1) result_amount = 5 /decl/chemical_reaction/instant/food/ketchup - name = "Ketchup" + name = "ketchup" id = "ketchup" result = "ketchup" required_reagents = list("tomatojuice" = 2, "water" = 1, "sugar" = 1) result_amount = 4 /decl/chemical_reaction/instant/food/barbecue - name = "Barbeque Sauce" + name = "barbeque sauce" id = "barbecue" result = "barbecue" required_reagents = list("tomatojuice" = 2, "applejuice" = 1, "sugar" = 1, "spacespice" = 1) result_amount = 4 /decl/chemical_reaction/instant/food/peanutbutter - name = "Peanut Butter" + name = "peanut butter" id = "peanutbutter" result = "peanutbutter" required_reagents = list("peanutoil" = 2, "sugar" = 1, "sodiumchloride" = 1) @@ -89,7 +89,7 @@ result_amount = 15 /decl/chemical_reaction/instant/food/cheesewheel - name = "Cheesewheel" + name = "cheesewheel" id = "cheesewheel" result = null required_reagents = list("milk" = 40) @@ -103,7 +103,7 @@ return /decl/chemical_reaction/instant/food/meatball - name = "Meatball" + name = "meatball" id = "meatball" result = null required_reagents = list("protein" = 3, "flour" = 5) @@ -116,7 +116,7 @@ return /decl/chemical_reaction/instant/food/dough - name = "Dough" + name = "dough" id = "dough" result = null required_reagents = list("egg" = 3, "flour" = 10) @@ -130,7 +130,7 @@ return /decl/chemical_reaction/instant/food/syntiflesh - name = "Syntiflesh" + name = "syntiflesh" id = "syntiflesh" result = null required_reagents = list("blood" = 5, "clonexadone" = 5) @@ -149,28 +149,28 @@ */ /decl/chemical_reaction/instant/food/coating/batter - name = "Batter" + name = "batter" id = "batter" result = "batter" required_reagents = list("egg" = 3, "flour" = 10, "water" = 5, "sodiumchloride" = 2) result_amount = 20 /decl/chemical_reaction/instant/food/coating/beerbatter - name = "Beer Batter" + name = "beer batter" id = "beerbatter" result = "beerbatter" required_reagents = list("egg" = 3, "flour" = 10, "beer" = 5, "sodiumchloride" = 2) result_amount = 20 /decl/chemical_reaction/instant/food/browniemix - name = "Brownie Mix" + name = "brownie mix" id = "browniemix" result = "browniemix" required_reagents = list("flour" = 5, "coco" = 5, "sugar" = 5) result_amount = 15 /decl/chemical_reaction/instant/food/butter - name = "Butter" + name = "butter" id = "butter" result = null required_reagents = list("cream" = 20, "sodiumchloride" = 1) diff --git a/code/modules/reagents/reagents/food_drinks.dm b/code/modules/reagents/reagents/food_drinks.dm index 65f1da4c7f..0b3b724bf6 100644 --- a/code/modules/reagents/reagents/food_drinks.dm +++ b/code/modules/reagents/reagents/food_drinks.dm @@ -27,13 +27,13 @@ else initialize_data(newdata) - //cull all tastes below 10% of total + //cull all tastes below 5% of total var/totalFlavor = 0 for(var/taste in data) totalFlavor += data[taste] if(totalFlavor) //Let's not divide by zero for things w/o taste for(var/taste in data) - if(data[taste]/totalFlavor < 0.1) + if(data[taste]/totalFlavor < 0.05) data -= taste #define ANIMAL_NUTRITION_MULTIPLIER 0.5 @@ -269,7 +269,7 @@ /datum/reagent/nutriment/protein // Bad for Skrell! name = "animal protein" id = "protein" - taste_description = "some sort of meat" + taste_description = "umami" color = "#440000" allergen_type = ALLERGEN_MEAT //"Animal protein" implies it comes from animals, therefore meat. @@ -713,7 +713,7 @@ name = "Capsaicin Oil" id = "capsaicin" description = "This is what makes chilis hot." - taste_description = "hot peppers" + taste_description = "spiciness" taste_mult = 1.5 reagent_state = LIQUID ingest_met = REM @@ -1097,6 +1097,7 @@ reagent_state = LIQUID color = "#ff2424" strength = 10 + allergen_type = ALLERGEN_MEAT //It's meat. /datum/reagent/toxin/plantcolony name = "A colony of plant cells" @@ -1106,6 +1107,7 @@ reagent_state = LIQUID color = "#7ce01f" strength = 10 + allergen_type = ALLERGEN_VEGETABLE //It's plant. /datum/reagent/drink/juice/potato name = "Potato Juice" diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index 69ee3dcf085281d0a34239cfbcce2ec2dd5780a7..8d546d61ca23c6084e73a100663d33c253155924 100644 GIT binary patch delta 1826 zcmV+-2i^FWkqeiR3$R538QQToNy1Dx>?H^$uaaa-kJTAUHtSUL2)L780xb{c`pBFo zkfoHQVC-Ql0-2MV0wy8UKq#0ivN2a!%F4!EC9*+*TD|oPN=Ib&dkMQJddKavli>nl z5nSe?#~Q`8V{l0{A^o;efFhGr11}C#BjVX{DebdmM@kfsv6GPl9AN!nPHEDP2C2mY zy&dWkYa82&b0j@Et2mXZufuRgVDs7xxmo}1*J-Ih!4`U8=gw@GuP1Gl&8v#dOjtBLabs+P*ux8kJeF7NRN{Z1Q&nFNTJ_bJ$8e2&W3h6 zmJ7EtL2n&ai)NX60bF%Yg_CC|Vd3S3qIO8uqNUyD8mr-B>5R47#X9b@v!1miU_VmL z1SI-%TndJPuE3Bi_eh%UZ2+1#Bkd{pn#XomMll!22MopNxKL{U{Aiz_3Cgk$Wal|& z;PgJ=5`m)VK(~LB?gQD*K@Vg*;Xm41sJ*NQxLv=zPy&B7GNq#Asbe2Yd(R$lJc*8$HFqUdC}6!6Tl!P>qXoi(PBjJ0`<(<(IlYr;w?5uWv>Pz*C4fH2 zJBjv1=zEFwmFRnk_T}h%iS{+=t3-BI^P&};C6=t-toEE*3b+a*dIb|Kx`EB*NaVZ`Zf$?Rxw1 zs84m}krMC*=tO==GVu=5?`Ub_=Ou8>GyxX zzyl$5qz!?*K<%Pv15=ESJM@Y38y@~b#yZP=$HpK}@)_tdDGC$_V|8Nkb5z3wJX68Q zB16Tmkgd5OUj_yyPSinK6`2Y> zr8)Q#uws-8_b~s!&P@fnZJVFgL*sg2=O*0dyW`6al&x^Df4|Od3J%3FK5F8$kAfotr>*uo*SA$WTGljFQWz?EPst*j#_#uQ%6U z*PH9R_2&Ba<-c$1oAu50m-Wr{&3beF>w0tj?S=UI^5^^Y&HCp0qz2ECoda#uPWI@G zdh5}J7uRDM(g6g6@RSRu>HO`+*AL_CX$;$OkKOx7uo99DKn}(}mPt$Kt!Lya(LQm1 z!~yl;c>-R?k5V#K+e5FpAf-!|3A51C)V_{=w1Exqpi7*6 zWU=i=VkTGeNIOno|L#-+sePL0b-` z14H=%A0=g8E(B#O2ORrY>_9{7c!06vXmC=~)y<~;O~*`rYj+iA@DA0uMKyv7vG4&6 zc_x7&&mb`583cwrgP=leVmd_zU+GSffmgdzWZ)I=6d8EcJ4FUv`Az}vJaaXKPsJ;Z zdI35WuQ2Kj;8Yx0;BX~OHte8(VdFr8uOYOns#Oa9vikkc-&Vi<@#FHp_P5sJ{9NvH QgFOm|JqiK0JqiL^zRSOpUH||9 delta 1826 zcmV+-2i^FWkqeiR3$R538Gz%$S&wNwY$gaMuaaa-kJTAUHtSUL2>6p;0xb^*`^cOp zkfoHQVC-Qp0;!Xl0wy8VKq#0jvN2a!&dSDIC9*+*TD|oPYDZ-DdkMQJddKa
  • nl z5nkq^#~Q`8V{l0{Aq}@ufGU$z11}DgBjVX{DebdmM@kfsvXhYm9AFJ%PHEDP2C2mY z%^m6!Ya82&b0j@Et2mXZufuRgVDs7yxmo}1*J-Ih!4`U8=gw@GuP1$#&8v#dE(OCtTVP0*dnC>FHUQn5k@ggP&11VQqnHci1BPOBTqw1Fezece1ZCL=vh$oX zaC#qbi9k_wpxb{*_knEZpa-&@@E>h0)LzyD+^%0C&{gr->g9*IFkhMIQV zUe;XdFd!OxD}jTzeLJtkfGZn~7N9N3+ z4HB#bD1m<(nNm^m)Ul7Hy=Mn!A!J6tLckE&VC`(E?#Xrz-XM0H= z2D@za?pzJ~j>Q!A?CKLxK7T_o^(ZqU37$W-N~>!#u*Hs4|R-9WHV|;lo;CqT9IMLkDR75 zo=<-%?@n8|cQ1X{`TyJX_VxESogT@WcHB9dI9&n0{Z0a?oZd;aTOaQw+6|cZ5~a5=&NamRPcav&51WoF$g5;4INzK~Fk> z``A$?6VBE|7o(IMrL4ZMw)g9s+tUjYV-0`B+V^MDj9)L$-?MytLo!l~)BjZ?1;Yu` zxVhfmt-;?u{$Z->5$OQv5q%9`u(sfgb$zNn7Ym$ZxyH!Je{#cn5@B!Gx9i*WcD?<0 z)Tg@gNC|iY^rUUE!L+ToeYN6#eY?J2-+r#;lb?V8s%pD_^XubbiLX#z{KAcl^!tBb z;DL}j(uP1@pmtHTfhk7E9s0)k4G(`JW1Z!`V`Gpv`3!WK6a@-|u{tsNIjUg-o~dAD zk)dMb;j0Ub&e8Uq{uds6M{Yd@a59c4rrJ<)R)edEtM%ggX#sz{&n?n!9G!R*=+W<7 z3V-as06#hxhCgwTg~kBIdnp{wquYOv-$ZQQAF>}mlsN1O$ktqtPXhxJC+Z-ricE!` z(j0sVSTV|ldzgP<=cWSPw#{$rp>aL1a}#d!Ua-v?q!6rCS49E(vT2mkOS|DSe>;Tj z<{4E|iU3`Uc^6}!CXFEX1ac~o4Iul#&P^aY*o>N5WT+r&M#<$<_Wm>+Y_5Or*PH9F z>&^AudUJjI^53`h&HCp0%lhW}X1%%ob-lU%_CkDp`SbnyW_@#gQiJEn&Ve>+Cwp{8 zz4hqAi|err=>UR3c*=#-bpCeZ>xc36G=}ZC$L@V3SP97nAO~X~%cLdr)-!UIXrH)0 z;(+?_JOQucM=6;qavF>4F;ag~Qmla++Lu?c?V;CPkkTc~gjwimYG21b+Q0^Q&?U}3 zve8v zY`Lcx9nv2^q1)Z3LK?WjuWUrslq_)HuPFsaVKycSuvo{F7ScLO;7NarZ@*!tpe={e zfua0>kCHMk7lN{t1CD(xcA%kkJiyp-G&rg0>Sojareh|*wY!Qlc!z4-q8dSkSona3 zJd?nXXAl_j3<5)*K~Nz!F`XiVuXLx#z^mOUGVqFbiVVE!og#y-e5ZhSp1B&rr{a}H zy#SqxR~YpMa4L>0a5yC<8+On?v2h^5*AUuO)hY#lS^fU!Z>!(__;LAP*^k#c*|{P~ QgFOm|JqiK0JqiL^zRH1`Qvd(}