Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TG Mirror] Fixes Monkey's Delight recipe no good boy point [MDB IGNORE] #65

Closed
wants to merge 1 commit into from
Closed

[TG Mirror] Fixes Monkey's Delight recipe no good boy point [MDB IGNORE] #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions code/modules/food_and_drinks/recipes/soup_mixtures.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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.")
Expand Down Expand 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(
Expand Down Expand Up @@ -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(
Expand Down
10 changes: 10 additions & 0 deletions modular_skyrat/modules/customization/modules/clothing/masks/paper.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down