From 20f0763a23a3ecd536b180cc805f8b44d788fd3d Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sat, 14 Oct 2023 16:31:26 +0200 Subject: [PATCH] [MIRROR] Fixes Monkey's Delight recipe no good boy point [MDB IGNORE] (#24331) * Fixes Monkey's Delight recipe no good boy point (#78972) Fixes onkeys delight recipe ti had salt and water but you cant do that now it turns into aslt water this pr is untestsed iots not this is monkey abuse :cl: fix: Fixes Monkey's Delight recipe /:cl: * Fixes Monkey's Delight recipe no good boy point * Update paper.dm --------- Co-authored-by: carlarctg <53100513+carlarctg@users.noreply.github.com> Co-authored-by: Giz <13398309+vinylspiders@users.noreply.github.com> --- code/modules/food_and_drinks/recipes/soup_mixtures.dm | 10 +++++----- .../customization/modules/clothing/masks/paper.dm | 10 ++++++++++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/code/modules/food_and_drinks/recipes/soup_mixtures.dm b/code/modules/food_and_drinks/recipes/soup_mixtures.dm index ad2caa84ca6..b35bc128d32 100644 --- a/code/modules/food_and_drinks/recipes/soup_mixtures.dm +++ b/code/modules/food_and_drinks/recipes/soup_mixtures.dm @@ -85,7 +85,7 @@ if(!length(required_ingredients)) return - // If a food item is supposed to be made, remove relevant ingredients from the pot, then make the item + // If a food item is supposed to be made, remove relevant ingredients from the pot, then make the item if(!isnull(resulting_food_path)) var/list/tracked_ingredients LAZYINITLIST(tracked_ingredients) @@ -112,7 +112,7 @@ for(var/reagent_path as anything in required_reagents) holder.add_reagent(reagent_path,(required_reagents[reagent_path])*(created_volume-ingredient_max_multiplier)) - + // This only happens if we're being instant reacted so let's just skip to what we really want if(isnull(reaction)) testing("Soup reaction of type [type] instant reacted, cleaning up.") @@ -851,9 +851,9 @@ /datum/chemical_reaction/food/soup/monkey required_reagents = list( - /datum/reagent/water = 25, + /datum/reagent/water = 20, /datum/reagent/consumable/flour = 5, - /datum/reagent/consumable/salt = 5, + /datum/reagent/water/salt = 10, /datum/reagent/consumable/blackpepper = 5, ) required_ingredients = list( @@ -2103,7 +2103,7 @@ name = "\improper Hong Kong macaroni soup" icon = 'icons/obj/food/martian.dmi' icon_state = "hong_kong_macaroni" - drink_type = MEAT | VEGETABLES | GRAIN + drink_type = MEAT | VEGETABLES | GRAIN /datum/chemical_reaction/food/soup/hong_kong_macaroni required_reagents = list( diff --git a/modular_skyrat/modules/customization/modules/clothing/masks/paper.dm b/modular_skyrat/modules/customization/modules/clothing/masks/paper.dm index 97b52485b4b..b687346fba5 100644 --- a/modular_skyrat/modules/customization/modules/clothing/masks/paper.dm +++ b/modular_skyrat/modules/customization/modules/clothing/masks/paper.dm @@ -50,7 +50,17 @@ /obj/item/clothing/mask/paper/reskin_obj(mob/user) . = ..() +<<<<<<< HEAD user.update_worn_mask() +======= + + var/mob/living/carbon/carbon_user + if(iscarbon(user)) + carbon_user = user + if(carbon_user && carbon_user.wear_mask == src) + carbon_user.update_worn_mask() + +>>>>>>> e4894f93571 ([MIRROR] Fixes Monkey's Delight recipe no good boy point [MDB IGNORE] (#24331)) current_skin = null //so we can infinitely reskin /obj/item/clothing/mask/paper/proc/adjust_mask(mob/living/carbon/human/user)