diff --git a/code/defines/mob/simple_animal/corgi.dm b/code/defines/mob/simple_animal/corgi.dm index ee07f6427d6..f86729daec0 100644 --- a/code/defines/mob/simple_animal/corgi.dm +++ b/code/defines/mob/simple_animal/corgi.dm @@ -329,7 +329,7 @@ dir = i sleep(1) -/obj/item/weapon/reagent_containers/food/snacks/meat/corgi +/obj/item/weapon/reagent_containers/food/snacks/sliceable/meat/corgi name = "Corgi meat" desc = "Tastes like... well you know..." diff --git a/code/game/machinery/kitchen/juicer.dm b/code/game/machinery/kitchen/juicer.dm index c329a4a883b..0a32cd32242 100644 --- a/code/game/machinery/kitchen/juicer.dm +++ b/code/game/machinery/kitchen/juicer.dm @@ -21,6 +21,8 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/lime = "limejuice", /obj/item/weapon/reagent_containers/food/snacks/watermelonslice = "watermelonjuice", /obj/item/weapon/reagent_containers/food/snacks/grown/poisonberries = "poisonberryjuice", + /obj/item/weapon/reagent_containers/food/snacks/grown/grapes = "grapejuice", + /obj/item/weapon/reagent_containers/food/snacks/grown/greengrapes = "grapejuice", ) /obj/machinery/juicer/New() diff --git a/code/modules/chemical/Chemistry-Reagents.dm b/code/modules/chemical/Chemistry-Reagents.dm index df748a5ab2c..e2566516f6e 100644 --- a/code/modules/chemical/Chemistry-Reagents.dm +++ b/code/modules/chemical/Chemistry-Reagents.dm @@ -2131,6 +2131,20 @@ datum ..() return + grapejuice + name = "Grape Juice" + id = "grapejuice" + description = "A tasty, purple juice made from grapes." + reagent_state = LIQUID + nutriment_factor = 1 * REAGENTS_METABOLISM + color = "#333386" // rgb: 51, 51, 134 + + on_mob_life(var/mob/living/M as mob) + if(!M) M = holder.my_atom + M:nutrition += nutriment_factor + ..() + return + berryjuice name = "Berry Juice" id = "berryjuice" diff --git a/code/modules/chemical/Chemistry-Recipes.dm b/code/modules/chemical/Chemistry-Recipes.dm index a403d17e01c..8ec84a262ad 100644 --- a/code/modules/chemical/Chemistry-Recipes.dm +++ b/code/modules/chemical/Chemistry-Recipes.dm @@ -969,7 +969,7 @@ datum name = "Wine" id = "wine" result = "wine" - required_reagents = list("berryjuice" = 10) + required_reagents = list("grapejuice" = 10) required_catalysts = list("enzyme" = 5) result_amount = 10 diff --git a/code/modules/chemical/Chemistry-Tools.dm b/code/modules/chemical/Chemistry-Tools.dm index da586839b8d..0e5a77a8b00 100644 --- a/code/modules/chemical/Chemistry-Tools.dm +++ b/code/modules/chemical/Chemistry-Tools.dm @@ -1518,12 +1518,9 @@ inaccurate = 1 else if(W.w_class <= 2 && istype(src,/obj/item/weapon/reagent_containers/food/snacks/sliceable)) user << "\red You slip [W] inside [src]." - user.u_equip(W) - if ((user.client && user.s_active != src)) - user.client.screen -= W - W.dropped(user) + user.drop_item() + W.loc = src add_fingerprint(user) - contents += W return else return 1 diff --git a/code/modules/food/food.dm b/code/modules/food/food.dm index e6d2c0dc642..c5a2f62e054 100644 --- a/code/modules/food/food.dm +++ b/code/modules/food/food.dm @@ -799,6 +799,8 @@ desc = "A piece of hot spicy meat." icon_state = "meatstake" trash = "plate" + slice_path = /obj/item/weapon/reagent_containers/food/snacks/cutlet + slices_num = 3 New() ..() reagents.add_reagent("nutriment", 4) @@ -806,6 +808,18 @@ reagents.add_reagent("blackpepper", 1) bitesize = 3 +/obj/item/weapon/reagent_containers/food/snacks/sliceable/cookedmeat + name = "Simple, cooked meat" + desc = "A chunk of meat." + icon_state = "meatstake" + trash = "plate" + slice_path = /obj/item/weapon/reagent_containers/food/snacks/cutlet + slices_num = 3 + New() + ..() + reagents.add_reagent("nutriment", 3) + bitesize = 3 + /obj/item/weapon/reagent_containers/food/snacks/spacylibertyduff name = "Spacy Liberty Duff" desc = "Jello gelatin, from Alfred Hubbard's cookbook" diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm index d5922514f52..7060477a596 100644 --- a/code/modules/food/recipes_microwave.dm +++ b/code/modules/food/recipes_microwave.dm @@ -461,6 +461,12 @@ ) result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/meatsteak +/datum/recipe/cookedmeat + items = list( + /obj/item/weapon/reagent_containers/food/snacks/sliceable/meat + ) + result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/cookedmeat + /datum/recipe/syntisteak reagents = list("sodiumchloride" = 1, "blackpepper" = 1) items = list(