From 0af399e3f97f2e82cf69d7410381eb556bb44242 Mon Sep 17 00:00:00 2001 From: Crosarius <30341877+Crosarius@users.noreply.github.com> Date: Thu, 16 May 2024 03:09:56 +1000 Subject: [PATCH] Moghresian Meat & Unathi Food Nutrition Improvement (#19135) This PR creates a new subtype of meat, "moghresian meat", specific to animals which are located in Uueoa-Esa. It also adds "synthetic" blood to the biogenerator, for use in the many recipes which require blood (I did this because it's actually impossible to get blood from cows, chickens, etc - turns out you can't draw blood frim simplemobs, and people have been either using their own blood, or making monkey cubes and drawing blood from them, which is WEIRD. Mechanically the "synthetic" blood is just generic blood. I have no idea if vampires can abuse this, but it should be no different from them making monkey cubes in the biogenerator and eating them, so... hopefully that's ok?) ~I have also done a once-over on the reagent values of all the food in the Unathi foods dm, and fixed the reagent value for them. Some foods had far fewer reagents than their constituent ingredients, which bothered me. I also fixed their flavours so you get nicer messages instead of "some sort of protein" I noticed that this food reagent issue is actually prevalent in ALL the food .DMs. A good example of this is Black Eye Gumbo, which has no reagents listed. It can be eaten in a single bite and tastes like nothing, and cannot be ground. I think that some people have added foods under the impression that the reagents of the ingredients are added by the cooking process, when this doesn't actually seem to be the case. I fixed this just for the Unathi foods, but I don't have the time to go through them all.~ EDIT: Turns out the reagent thing was a red-herring caused by adminspawning food. Fixed now! --- code/game/machinery/biogenerator.dm | 5 +++ .../recipes/cultural/recipes_unathi.dm | 10 ++--- .../living/simple_animal/friendly/moghes.dm | 14 +++---- .../living/simple_animal/hostile/moghes.dm | 10 ++--- .../reagent_containers/food/condiment.dm | 5 +++ .../food/snacks/cultural/unathi.dm | 41 +++++++++++++------ .../reagent_containers/food/snacks/meat.dm | 4 ++ html/changelogs/Crosarius-unathifood.yml | 9 ++++ 8 files changed, 68 insertions(+), 30 deletions(-) create mode 100644 html/changelogs/Crosarius-unathifood.yml diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm index b96ed33550c..295d617d1fd 100644 --- a/code/game/machinery/biogenerator.dm +++ b/code/game/machinery/biogenerator.dm @@ -94,6 +94,11 @@ name = "Universal Enzyme (50u)" object = /obj/item/reagent_containers/food/condiment/enzyme +/singleton/biorecipe/food/blood + name = "Synthetic Blood (50u)" + object = /obj/item/reagent_containers/food/condiment/blood + cost = 100 + /* FERTILIZER */ diff --git a/code/modules/cooking/recipes/cultural/recipes_unathi.dm b/code/modules/cooking/recipes/cultural/recipes_unathi.dm index 0753a09113d..dcc75fee6cc 100644 --- a/code/modules/cooking/recipes/cultural/recipes_unathi.dm +++ b/code/modules/cooking/recipes/cultural/recipes_unathi.dm @@ -137,7 +137,7 @@ fruit = list("lime" = 1) reagents = list(/singleton/reagent/sodiumchloride = 1) items = list( - /obj/item/reagent_containers/food/snacks/dwellermeat, + /obj/item/reagent_containers/food/snacks/meat/moghes, /obj/item/reagent_containers/food/snacks/egg ) result = /obj/item/reagent_containers/food/snacks/razirnoodles @@ -155,8 +155,7 @@ fruit = list("gukhe" = 1) reagents = list(/singleton/reagent/spacespice = 1) items = list( - /obj/item/reagent_containers/food/snacks/rawcutlet, - /obj/item/reagent_containers/food/snacks/rawcutlet + /obj/item/reagent_containers/food/snacks/meat/moghes, ) result = /obj/item/reagent_containers/food/snacks/stokkebab @@ -174,7 +173,8 @@ fruit = list("aghrassh nut" = 1) reagents = list(/singleton/reagent/sodiumchloride = 3, /singleton/reagent/blackpepper = 3, /singleton/reagent/nutriment/coco = 3, /singleton/reagent/spacespice = 1) items = list( - /obj/item/reagent_containers/food/snacks/egg + /obj/item/reagent_containers/food/snacks/egg, + /obj/item/reagent_containers/food/snacks/meat/moghes ) result = /obj/item/reagent_containers/food/snacks/aghrasshcake @@ -183,7 +183,7 @@ fruit = list("aghrassh nut" = 1, "tomato" = 1) reagents = list(/singleton/reagent/blackpepper = 2, /singleton/reagent/nutriment/protein/egg = 6) items = list( - /obj/item/reagent_containers/food/snacks/meat + /obj/item/reagent_containers/food/snacks/meat/moghes ) result = /obj/item/reagent_containers/food/snacks/sliceable/eyebowl reagent_mix = RECIPE_REAGENT_REPLACE diff --git a/code/modules/mob/living/simple_animal/friendly/moghes.dm b/code/modules/mob/living/simple_animal/friendly/moghes.dm index 594344315c2..70e4a06fd67 100644 --- a/code/modules/mob/living/simple_animal/friendly/moghes.dm +++ b/code/modules/mob/living/simple_animal/friendly/moghes.dm @@ -27,8 +27,8 @@ brush = /obj/item/reagent_containers/glass/rag butchering_products = list(/obj/item/stack/material/animalhide/lizard = 6) - meat_type = /obj/item/reagent_containers/food/snacks/meat - meat_amount = 4 + meat_type = /obj/item/reagent_containers/food/snacks/meat/moghes + meat_amount = 20 vehicle_version = /obj/vehicle/animal/threshbeast natural_armor = list( melee = ARMOR_MELEE_MEDIUM, @@ -76,8 +76,8 @@ brush = /obj/item/reagent_containers/glass/rag butchering_products = list(/obj/item/stack/material/animalhide/lizard = 10) - meat_type = /obj/item/reagent_containers/food/snacks/meat - meat_amount = 6 + meat_type = /obj/item/reagent_containers/food/snacks/meat/moghes + meat_amount = 30 vehicle_version = /obj/vehicle/animal/hegeranzi natural_armor = list( //big tough war beast, has some more armor particularly against bullets and melee melee = ARMOR_MELEE_MAJOR, @@ -124,8 +124,8 @@ brush = /obj/item/reagent_containers/glass/rag speed = -1 butchering_products = list(/obj/item/stack/material/animalhide/lizard = 4) - meat_type = /obj/item/reagent_containers/food/snacks/meat - meat_amount = 3 + meat_type = /obj/item/reagent_containers/food/snacks/meat/moghes + meat_amount = 16 /mob/living/simple_animal/miervesh name = "miervesh" @@ -151,7 +151,7 @@ attacktext = "swatted" flying = TRUE butchering_products = list(/obj/item/stack/material/animalhide = 1) - meat_type = /obj/item/reagent_containers/food/snacks/meat + meat_type = /obj/item/reagent_containers/food/snacks/meat/moghes meat_amount = 1 var/chosen_icon diff --git a/code/modules/mob/living/simple_animal/hostile/moghes.dm b/code/modules/mob/living/simple_animal/hostile/moghes.dm index 6ad6739051d..4ae4e94442e 100644 --- a/code/modules/mob/living/simple_animal/hostile/moghes.dm +++ b/code/modules/mob/living/simple_animal/hostile/moghes.dm @@ -12,8 +12,8 @@ emote_sounds = list('sound/effects/creatures/monstergrowl.ogg') turns_per_move = 5 speak_chance = 5 - meat_type = /obj/item/reagent_containers/food/snacks/meat - meat_amount = 10 + meat_type = /obj/item/reagent_containers/food/snacks/meat/moghes + meat_amount = 40 organ_names = list("chest", "lower body", "left arm", "right arm", "left leg", "right leg", "head") response_help = "pets" response_disarm = "shoves" @@ -130,9 +130,9 @@ environment_smash = 1 flying = TRUE - butchering_products = list(/obj/item/stack/material/animalhide/lizard = 1) - meat_type = /obj/item/reagent_containers/food/snacks/meat - meat_amount = 2 + butchering_products = list(/obj/item/stack/material/animalhide/lizard = 1, /obj/item/reagent_containers/food/snacks/meat/bat = 2) + meat_type = /obj/item/reagent_containers/food/snacks/meat/moghes + meat_amount = 10 var/shriek_time = 0 /mob/living/simple_animal/hostile/shrieker/proc/shriek(turf/T, mob/living/M) diff --git a/code/modules/reagents/reagent_containers/food/condiment.dm b/code/modules/reagents/reagent_containers/food/condiment.dm index ee016a7cd94..08a3c015a08 100644 --- a/code/modules/reagents/reagent_containers/food/condiment.dm +++ b/code/modules/reagents/reagent_containers/food/condiment.dm @@ -288,6 +288,11 @@ name = "cocoa powder" reagents_to_add = list(/singleton/reagent/nutriment/coco = 50) +/obj/item/reagent_containers/food/condiment/blood + fixed_state = TRUE + name = "synthetic blood" + reagents_to_add = list(/singleton/reagent/blood = 50) + //MRE condiments and drinks. /obj/item/reagent_containers/food/condiment/small/packet diff --git a/code/modules/reagents/reagent_containers/food/snacks/cultural/unathi.dm b/code/modules/reagents/reagent_containers/food/snacks/cultural/unathi.dm index e01349eff66..a350def8522 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/cultural/unathi.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/cultural/unathi.dm @@ -5,6 +5,7 @@ icon_state = "chilied_eggs" trash = /obj/item/trash/snack_bowl reagents_to_add = list(/singleton/reagent/nutriment/protein/egg = 6, /singleton/reagent/nutriment/protein = 2) + reagent_data = list(/singleton/reagent/nutriment/protein = list("meaty chili" = 6)) filling_color = "#FC5647" /obj/item/reagent_containers/food/snacks/hatchling_suprise @@ -14,15 +15,17 @@ icon_state = "hatchling_suprise" trash = /obj/item/trash/snack_bowl reagents_to_add = list(/singleton/reagent/nutriment/protein/egg = 2, /singleton/reagent/nutriment/protein = 4) + reagent_data = list(/singleton/reagent/nutriment/protein = list("bacon" = 4)) filling_color = "#FC5647" /obj/item/reagent_containers/food/snacks/red_sun_special name = "red sun special" - desc = "One lousey piece of sausage sitting on melted cheese curds. A cheap meal for the Unathi peasants of Moghes." + desc = "A sausage floating in a bowl of melted cheese. A cheap meal for the Unathi peasants of Moghes." icon = 'icons/obj/item/reagent_containers/food/cultural/unathi.dmi' icon_state = "red_sun_special" trash = /obj/item/trash/plate reagents_to_add = list(/singleton/reagent/nutriment/protein = 2) + reagent_data = list(/singleton/reagent/nutriment/protein = list("sausage" = 6)) filling_color = "#FC5647" /obj/item/reagent_containers/food/snacks/riztizkzi_sea @@ -31,7 +34,8 @@ icon = 'icons/obj/item/reagent_containers/food/cultural/unathi.dmi' icon_state = "riztizkzi_sea" trash = /obj/item/trash/snack_bowl - reagents_to_add = list(/singleton/reagent/nutriment/protein/egg = 4) + reagents_to_add = list(/singleton/reagent/nutriment/protein = 15) + reagent_data = list(/singleton/reagent/nutriment/protein = list("blood" = 15)) filling_color = "#FC5647" /obj/item/reagent_containers/food/snacks/father_breakfast @@ -41,6 +45,7 @@ icon_state = "father_breakfast" trash = /obj/item/trash/plate reagents_to_add = list(/singleton/reagent/nutriment/protein/egg = 4, /singleton/reagent/nutriment/protein = 6) + reagent_data = list(/singleton/reagent/nutriment/protein = list("sausage" = 6, "steak" = 6)) filling_color = "#FC5647" /obj/item/reagent_containers/food/snacks/stuffed_meatball @@ -49,6 +54,7 @@ icon = 'icons/obj/item/reagent_containers/food/cultural/unathi.dmi' icon_state = "stuffed_meatball" reagents_to_add = list(/singleton/reagent/nutriment/protein = 4) + reagent_data = list(/singleton/reagent/nutriment/protein = list("meat" = 3)) filling_color = "#FC5647" /obj/item/reagent_containers/food/snacks/egg_pancake @@ -58,6 +64,7 @@ icon_state = "egg_pancake" trash = /obj/item/trash/tray reagents_to_add = list(/singleton/reagent/nutriment/protein = 6, /singleton/reagent/nutriment/protein/egg = 2) + reagent_data = list(/singleton/reagent/nutriment/protein = list("meat" = 9)) filling_color = "#FFFA6b" /obj/item/reagent_containers/food/snacks/sliceable/grilled_carp @@ -71,6 +78,7 @@ filling_color = "#FFA8E5" reagents_to_add = list(/singleton/reagent/nutriment/protein/seafood = 12) + reagent_data = list(/singleton/reagent/nutriment/protein = list("tangy grilled fish" = 18)) /obj/item/reagent_containers/food/snacks/grilled_carp_slice name = "korlaaskak slice" @@ -104,6 +112,7 @@ icon = 'icons/obj/item/reagent_containers/food/cultural/unathi.dmi' icon_state = "bacon_stick" reagents_to_add = list(/singleton/reagent/nutriment/protein = 3, /singleton/reagent/nutriment/protein/egg = 1) + reagent_data = list(/singleton/reagent/nutriment/protein = list("bacon" = 3)) filling_color = "#FFFEE8" /obj/item/reagent_containers/food/snacks/batwings @@ -112,6 +121,7 @@ icon = 'icons/obj/item/reagent_containers/food/cultural/unathi.dmi' icon_state = "batwings" reagents_to_add = list(/singleton/reagent/nutriment/protein = 3, /singleton/reagent/nutriment/triglyceride = 2, /singleton/reagent/capsaicin = 5) + reagent_data = list(/singleton/reagent/nutriment/protein = list("decadent wing meat" = 3)) bitesize = 4 trash = /obj/item/trash/plate @@ -150,8 +160,8 @@ desc = "While this dish appears to be noodles at a glance, it is in fact thin strips of meat coated in an egg based sauce, topped with sliced limes. An authentic variant of this is commonly eaten in and around Razir." icon = 'icons/obj/item/reagent_containers/food/cultural/unathi.dmi' icon_state = "razirnoodles" - reagents_to_add = list(/singleton/reagent/nutriment = 3, /singleton/reagent/nutriment/protein/seafood = 8, /singleton/reagent/nutriment/protein/egg = 3, /singleton/reagent/hyperzine = 5, /singleton/reagent/acid/polyacid = 3) - reagent_data = list(/singleton/reagent/nutriment = list("molten heat" = 3, "slippery noodles" = 3)) + reagents_to_add = list(/singleton/reagent/nutriment = 3, /singleton/reagent/nutriment/protein = 6, /singleton/reagent/nutriment/triglyceride = 2, /singleton/reagent/nutriment/protein/egg = 3) + reagent_data = list(/singleton/reagent/nutriment = list("molten heat" = 3), /singleton/reagent/nutriment/protein = list("meaty noodles" = 3)) bitesize = 10 trash = /obj/item/trash/plate @@ -160,17 +170,17 @@ desc = "Reddish, and extremely smooth, chocolate pudding, rich in iron!" icon = 'icons/obj/item/reagent_containers/food/cultural/unathi.dmi' icon_state = "sintapudding" - reagents_to_add = list(/singleton/reagent/nutriment = 1, /singleton/reagent/nutriment/protein = 1, /singleton/reagent/blood = 6, /singleton/reagent/nutriment/coco = 3) - reagent_data = list(/singleton/reagent/nutriment = list("iron" = 3)) + reagents_to_add = list(/singleton/reagent/nutriment = 1, /singleton/reagent/nutriment/protein = 15, /singleton/reagent/nutriment/coco = 3) + reagent_data = list(/singleton/reagent/nutriment = list("rich chocolate" = 15), /singleton/reagent/nutriment/protein = list("blood" = 15)) bitesize = 6 /obj/item/reagent_containers/food/snacks/stokkebab name = "stok skewers" - desc = "Two hearty skewers of seared meat, glazed in a tangy spice. A popular Skalamar street food - despite the name, it can be made with just about any meat." + desc = "Two hearty skewers of seared Moghean meat, glazed in a tangy spice. A popular Skalamar street food." icon = 'icons/obj/item/reagent_containers/food/cultural/unathi.dmi' icon_state = "stok-skewers" - reagents_to_add = list(/singleton/reagent/nutriment = 1, /singleton/reagent/nutriment/protein = 2, /singleton/reagent/capsaicin = 2) - reagent_data = list(/singleton/reagent/nutriment = list("tangy and gamey meat" = 3)) + reagents_to_add = list(/singleton/reagent/nutriment/protein = 6, /singleton/reagent/nutriment/triglyceride = 2, /singleton/reagent/capsaicin = 2) + reagent_data = list(/singleton/reagent/nutriment/protein = list("tangy and gamey meat" = 6)) bitesize = 3 /obj/item/reagent_containers/food/snacks/gukhefish @@ -179,7 +189,7 @@ icon = 'icons/obj/item/reagent_containers/food/cultural/unathi.dmi' icon_state = "gukhe-fish" reagents_to_add = list(/singleton/reagent/nutriment = 1, /singleton/reagent/nutriment/protein/seafood = 6, /singleton/reagent/capsaicin = 2, /singleton/reagent/sodiumchloride = 2) - reagent_data = list(/singleton/reagent/nutriment = list("tangy fish" = 3, "bitter gukhe" = 3)) + reagent_data = list(/singleton/reagent/nutriment = list("bitter gukhe" = 3), /singleton/reagent/nutriment/protein/seafood = list("tangy fish" = 6)) bitesize = 5 /obj/item/reagent_containers/food/snacks/aghrasshcake @@ -188,7 +198,7 @@ icon = 'icons/obj/item/reagent_containers/food/cultural/unathi.dmi' icon_state = "aghrassh-cake" reagents_to_add = list(/singleton/reagent/nutriment = 3, /singleton/reagent/nutriment/protein = 8, /singleton/reagent/nutriment/coco = 3, /singleton/reagent/blackpepper = 3) - reagent_data = list(/singleton/reagent/nutriment = list("aghrassh nuts" = 3, "mealy paste" = 3)) + reagent_data = list(/singleton/reagent/nutriment = list("aghrassh nuts" = 3, "mealy paste" = 3), /singleton/reagent/nutriment/protein = list("ground meat" = 8)) bitesize = 5 /obj/item/reagent_containers/food/snacks/sliceable/eyebowl @@ -197,8 +207,13 @@ icon = 'icons/obj/item/reagent_containers/food/cultural/unathi.dmi' icon_state = "eyebowl" trash = /obj/item/trash/custard_bowl - reagents_to_add = list(/singleton/reagent/nutriment = 3, /singleton/reagent/nutriment/protein = 12, /singleton/reagent/blackpepper = 2) - reagent_data = list(/singleton/reagent/nutriment = list("aghrassh nuts" = 3, "zesty tomatoes" = 5)) + reagents_to_add = list( + /singleton/reagent/nutriment = 3, + /singleton/reagent/nutriment/protein = 12, + /singleton/reagent/nutriment/triglyceride = 2, + /singleton/reagent/blackpepper = 2 + ) + reagent_data = list(/singleton/reagent/nutriment/protein = list("zesty ground meat" = 12)) bitesize = 5 drop_sound = 'sound/items/drop/glass.ogg' pickup_sound = 'sound/items/pickup/glass.ogg' diff --git a/code/modules/reagents/reagent_containers/food/snacks/meat.dm b/code/modules/reagents/reagent_containers/food/snacks/meat.dm index 7e8daf8baa4..6ba779aa3bc 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/meat.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/meat.dm @@ -185,6 +185,10 @@ day Adhomai needs their resources less thanks to synthetic fabric and more efficient food sources, both the meat and the fur of the nav'twir has become an export of the Adhomai \ people. In the olden days, carved nav'twir antlers were used as decoration for pelts and armors." +/obj/item/reagent_containers/food/snacks/meat/moghes + name = "moghresian meat" + desc = "A slab of meat from an animal native to Moghes." + /obj/item/reagent_containers/food/snacks/meat/rat name = "rat meat" icon_state = "chickenbreast" diff --git a/html/changelogs/Crosarius-unathifood.yml b/html/changelogs/Crosarius-unathifood.yml new file mode 100644 index 00000000000..d5232e871c3 --- /dev/null +++ b/html/changelogs/Crosarius-unathifood.yml @@ -0,0 +1,9 @@ +author: Crosarius + +delete-after: True + +changes: + - rscadd: "Adds Moghresian Meat, obtainable by butchering Moghresian animals (otztek, threshbeast, etc)" + - rscadd: "Adds 'synthetic blood' to the biogenerator, for use in food/drink recipies that require blood." + - qol: "Some small tweaks to reagents_to_add of some Unathi foods." + - qol: "Changes some Unathi cultural foods to use Moghresian Meat instead of normal meat"