From ddb82955b5859d44f8d252eb261ae8e4a280d0f7 Mon Sep 17 00:00:00 2001 From: Mechoid Date: Thu, 10 Nov 2022 22:49:56 -0800 Subject: [PATCH 1/3] Naming Food & Blood Cakes --- code/modules/food/food.dm | 21 ++++++++++++++++++- .../kitchen/cooking_machines/_appliance.dm | 11 ++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/code/modules/food/food.dm b/code/modules/food/food.dm index f34db732e7..f52a1032bc 100644 --- a/code/modules/food/food.dm +++ b/code/modules/food/food.dm @@ -7,11 +7,30 @@ /obj/item/weapon/reagent_containers/food possible_transfer_amounts = null volume = 50 //Sets the default container amount for all food items. - var/filling_color = "#FFFFFF" //Used by sandwiches. + description_info = "Food can use the Rename Food verb in the Object Tab to rename it." + var/filling_color = "#FFFFFF" //Used by sandwiches and custom food. drop_sound = 'sound/items/drop/food.ogg' pickup_sound = 'sound/items/pickup/food.ogg' +<<<<<<< HEAD /obj/item/weapon/reagent_containers/food/Initialize() +======= +/obj/item/reagent_containers/food/verb/change_name() + set name = "Rename Food" + set category = "Object" + set src in view(0) + + handle_name_change(usr) + +/obj/item/reagent_containers/food/proc/handle_name_change(var/mob/living/user) + var/n_name = sanitizeSafe(input(user, "What would you like to name \the [src]? Leave blank to reset.", "Food Naming", null) as text, MAX_NAME_LEN) + if(!n_name) + n_name = initial(name) + + name = n_name + +/obj/item/reagent_containers/food/Initialize() +>>>>>>> c970f844451... Naming Food & Blood Cakes (#8817) . = ..() if (center_of_mass.len && !pixel_x && !pixel_y) src.pixel_x = rand(-6.0, 6) //Randomizes postion diff --git a/code/modules/food/kitchen/cooking_machines/_appliance.dm b/code/modules/food/kitchen/cooking_machines/_appliance.dm index 8847e99580..9c15139fba 100644 --- a/code/modules/food/kitchen/cooking_machines/_appliance.dm +++ b/code/modules/food/kitchen/cooking_machines/_appliance.dm @@ -489,6 +489,10 @@ var/list/cooktypes = list() var/datum/reagents/buffer = new /datum/reagents(1000) var/totalcolour + var/reagents_determine_color + + if(!LAZYLEN(CI.container.contents)) // It's possible to make something, such as a cake in the oven, with only reagents. This stops them from being grey and sad. + reagents_determine_color = TRUE for (var/obj/item/I in CI.container) var/obj/item/weapon/reagent_containers/food/snacks/S @@ -527,6 +531,13 @@ buffer.trans_to_holder(result.reagents, buffer.total_volume) //trans_to doesn't handle food items well, so //just call trans_to_holder instead + // Reagent-only foods. + if(reagents_determine_color) + totalcolour = result.reagents.get_color() + + for(var/datum/reagent/reag in result.reagents.reagent_list) + words |= text2list(reag.name, " ") + //Filling overlay var/image/I = image(result.icon, "[result.icon_state]_filling") I.color = totalcolour From e72e8116c38f203f732728dd9e835afebe4e3030 Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Sun, 4 Dec 2022 06:56:50 +1000 Subject: [PATCH 2/3] Update food.dm --- code/modules/food/food.dm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/code/modules/food/food.dm b/code/modules/food/food.dm index f52a1032bc..7db45da8b0 100644 --- a/code/modules/food/food.dm +++ b/code/modules/food/food.dm @@ -12,25 +12,21 @@ drop_sound = 'sound/items/drop/food.ogg' pickup_sound = 'sound/items/pickup/food.ogg' -<<<<<<< HEAD -/obj/item/weapon/reagent_containers/food/Initialize() -======= -/obj/item/reagent_containers/food/verb/change_name() +/obj/item/weapon/reagent_containers/food/verb/change_name() set name = "Rename Food" set category = "Object" set src in view(0) handle_name_change(usr) -/obj/item/reagent_containers/food/proc/handle_name_change(var/mob/living/user) +/obj/item/weapon/reagent_containers/food/proc/handle_name_change(var/mob/living/user) var/n_name = sanitizeSafe(input(user, "What would you like to name \the [src]? Leave blank to reset.", "Food Naming", null) as text, MAX_NAME_LEN) if(!n_name) n_name = initial(name) name = n_name -/obj/item/reagent_containers/food/Initialize() ->>>>>>> c970f844451... Naming Food & Blood Cakes (#8817) +/obj/item/weapon/reagent_containers/food/Initialize() . = ..() if (center_of_mass.len && !pixel_x && !pixel_y) src.pixel_x = rand(-6.0, 6) //Randomizes postion From f842f39c77a2a2eea86bb1117b6001745f880651 Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Sun, 4 Dec 2022 07:06:05 +1000 Subject: [PATCH 3/3] Update food.dm --- code/modules/food/food.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/food/food.dm b/code/modules/food/food.dm index 7db45da8b0..87fc548ac5 100644 --- a/code/modules/food/food.dm +++ b/code/modules/food/food.dm @@ -20,6 +20,9 @@ handle_name_change(usr) /obj/item/weapon/reagent_containers/food/proc/handle_name_change(var/mob/living/user) + if(user.stat == DEAD || !(ishuman(user) || isrobot(user))) + to_chat(user, SPAN_WARNING("You can't cook!")) + return var/n_name = sanitizeSafe(input(user, "What would you like to name \the [src]? Leave blank to reset.", "Food Naming", null) as text, MAX_NAME_LEN) if(!n_name) n_name = initial(name)