From afb5819c32239044b1324ead172da967c2a009dd Mon Sep 17 00:00:00 2001 From: Atermonera Date: Sat, 8 Aug 2020 20:53:30 -0700 Subject: [PATCH] Tweak to kitchen machinery: --- .../food/kitchen/cooking_machines/_appliance.dm | 2 ++ .../food/kitchen/cooking_machines/container.dm | 6 +++--- code/modules/food/kitchen/cooking_machines/oven.dm | 1 + code/modules/reagents/Chemistry-Machinery.dm | 11 +++++++++++ 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/code/modules/food/kitchen/cooking_machines/_appliance.dm b/code/modules/food/kitchen/cooking_machines/_appliance.dm index 61666aacff..d8c4e761ca 100644 --- a/code/modules/food/kitchen/cooking_machines/_appliance.dm +++ b/code/modules/food/kitchen/cooking_machines/_appliance.dm @@ -583,6 +583,7 @@ var/obj/item/thing var/delete = 1 var/status = CI.container.check_contents() + if (status == 1)//If theres only one object in a container then we extract that thing = locate(/obj/item) in CI.container delete = 0 @@ -596,6 +597,7 @@ qdel(CI) else CI.reset()//reset instead of deleting if the container is left inside + user.visible_message("\The [user] remove \the [thing] from \the [src].") /obj/machinery/appliance/proc/cook_mob(var/mob/living/victim, var/mob/user) return diff --git a/code/modules/food/kitchen/cooking_machines/container.dm b/code/modules/food/kitchen/cooking_machines/container.dm index 2ebb2ed7f0..d650a2266e 100644 --- a/code/modules/food/kitchen/cooking_machines/container.dm +++ b/code/modules/food/kitchen/cooking_machines/container.dm @@ -145,7 +145,7 @@ /obj/item/weapon/reagent_containers/cooking_container/oven name = "oven dish" shortname = "shelf" - desc = "Put ingredients in this; designed for use with an oven. Warranty void if used incorrectly." + desc = "Put ingredients in this; designed for use with an oven. Warranty void if used incorrectly. Alt click to remove contents." icon_state = "ovendish" max_space = 30 max_reagents = 120 @@ -162,11 +162,11 @@ /obj/item/weapon/reagent_containers/cooking_container/fryer name = "fryer basket" shortname = "basket" - desc = "Put ingredients in this; designed for use with a deep fryer. Warranty void if used incorrectly." + desc = "Put ingredients in this; designed for use with a deep fryer. Warranty void if used incorrectly. Alt click to remove contents." icon_state = "basket" /obj/item/weapon/reagent_containers/cooking_container/grill name = "grill rack" shortname = "rack" - desc = "Put ingredients 'in'/on this; designed for use with a grill. Warranty void if used incorrectly." + desc = "Put ingredients 'in'/on this; designed for use with a grill. Warranty void if used incorrectly. Alt click to remove contents." icon_state = "grillrack" \ No newline at end of file diff --git a/code/modules/food/kitchen/cooking_machines/oven.dm b/code/modules/food/kitchen/cooking_machines/oven.dm index c195f937c9..72780aa62c 100644 --- a/code/modules/food/kitchen/cooking_machines/oven.dm +++ b/code/modules/food/kitchen/cooking_machines/oven.dm @@ -86,6 +86,7 @@ cooking = FALSE playsound(src, 'sound/machines/hatch_open.ogg', 20, 1) + to_chat(user, "You [open? "close":"open"] the oven door") update_icon() /obj/machinery/appliance/cooker/oven/proc/manip(var/obj/item/I) diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index 1b1964a79b..4b3c4b2d9c 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -663,9 +663,20 @@ return options["examine"] = radial_examine +<<<<<<< HEAD // if there is no power or it's broken, the procs will fail but the buttons will still show if(length(holdingitems)) options["grind"] = radial_grind +======= + if (usr.stat != 0) + return + if (!beaker) + return + beaker.loc = src.loc + beaker = null + visible_message("\The [usr] remove the container from \the [src].") + update_icon() +>>>>>>> 864135b... Merge pull request #7425 from lbnesquik/Kot-Cooking-tweak var/choice