diff --git a/code/modules/food/recipes_grill.dm b/code/modules/food/recipes_grill.dm index 0c3c81078df..4c459b737ff 100644 --- a/code/modules/food/recipes_grill.dm +++ b/code/modules/food/recipes_grill.dm @@ -1,6 +1,12 @@ // /datum/recipe/grill +/datum/recipe/grill/bacon + items = list( + /obj/item/weapon/reagent_containers/food/snacks/raw_bacon, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/bacon + /datum/recipe/grill/telebacon items = list( /obj/item/weapon/reagent_containers/food/snacks/meat, @@ -214,4 +220,4 @@ /obj/item/weapon/reagent_containers/food/snacks/boiledrice, /obj/item/weapon/reagent_containers/food/snacks/catfishmeat, ) - result = /obj/item/weapon/reagent_containers/food/snacks/sushi_Tai \ No newline at end of file + result = /obj/item/weapon/reagent_containers/food/snacks/sushi_Tai diff --git a/code/modules/mob/living/carbon/human/interactive/functions.dm b/code/modules/mob/living/carbon/human/interactive/functions.dm index 41d16e18eb8..e3fe0e7ad3b 100644 --- a/code/modules/mob/living/carbon/human/interactive/functions.dm +++ b/code/modules/mob/living/carbon/human/interactive/functions.dm @@ -442,7 +442,7 @@ var/static/list/customableTypes = list(/obj/item/weapon/reagent_containers/food/snacks/customizable,/obj/item/weapon/reagent_containers/food/snacks/breadslice,/obj/item/weapon/reagent_containers/food/snacks/bun,/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough,/obj/item/weapon/reagent_containers/food/snacks/boiledspagetti,/obj/item/trash/plate,/obj/item/trash/bowl) - var/static/list/rawtypes = list(/obj/item/weapon/reagent_containers/food/snacks/grown, /obj/item/weapon/reagent_containers/food/snacks/rawcutlet, /obj/item/weapon/reagent_containers/food/snacks/rawmeatball, /obj/item/weapon/reagent_containers/food/snacks/rawsticks, /obj/item/weapon/reagent_containers/food/snacks/salmonmeat, /obj/item/weapon/reagent_containers/food/snacks/carpmeat, /obj/item/weapon/reagent_containers/food/snacks/catfishmeat, /obj/item/weapon/reagent_containers/food/snacks/spagetti, /obj/item/weapon/reagent_containers/food/snacks/dough_ball, /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough, /obj/item/weapon/reagent_containers/food/snacks/doughslice, /obj/item/weapon/reagent_containers/food/snacks/meat, /obj/item/weapon/reagent_containers/food/snacks/boiledrice, /obj/item/weapon/reagent_containers/food/snacks/cheesewedge) + var/static/list/rawtypes = list(/obj/item/weapon/reagent_containers/food/snacks/grown, /obj/item/weapon/reagent_containers/food/snacks/rawcutlet, /obj/item/weapon/reagent_containers/food/snacks/rawmeatball, /obj/item/weapon/reagent_containers/food/snacks/rawsticks, /obj/item/weapon/reagent_containers/food/snacks/salmonmeat, /obj/item/weapon/reagent_containers/food/snacks/carpmeat, /obj/item/weapon/reagent_containers/food/snacks/catfishmeat, /obj/item/weapon/reagent_containers/food/snacks/spagetti, /obj/item/weapon/reagent_containers/food/snacks/dough_ball, /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough, /obj/item/weapon/reagent_containers/food/snacks/doughslice, /obj/item/weapon/reagent_containers/food/snacks/meat, /obj/item/weapon/reagent_containers/food/snacks/boiledrice, /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, /obj/item/weapon/reagent_containers/food/snacks/raw_bacon) try var/list/allContents = getAllContents() @@ -518,6 +518,7 @@ var/obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesewheel/CW = locate() in rangeCheck var/obj/item/weapon/reagent_containers/food/snacks/grown/potato/PO = locate() in rangeCheck var/obj/item/weapon/reagent_containers/food/snacks/meat/ME = locate() in rangeCheck + var/obj/item/weapon/reagent_containers/food/snacks/raw_bacon/RB = locate() in rangeCheck if(D) TARGET = D @@ -561,6 +562,13 @@ sleep(get_dist(src, ME)) ME.attackby(KK, src) foundCookable = 1 + else if(RB) + TARGET = RB + if(prob(50)) + tryWalk(get_turf(RB)) + sleep(get_dist(src, RB)) + RB.attackby(KK, src) + foundCookable = 1 // refresh allContents = getAllContents() diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 92f43cd38b3..c8819cfe071 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -1578,6 +1578,27 @@ reagents.add_reagent("tomatojuice", 2) bitesize = 5 +/obj/item/weapon/reagent_containers/food/snacks/raw_bacon + name = "raw bacon" + desc = "It's fleshy and pink!" + icon_state = "raw_bacon" + bitesize = 2 + New() + ..() + reagents.add_reagent("nutriment", 1) + reagents.add_reagent("porktonium", 10) + +/obj/item/weapon/reagent_containers/food/snacks/bacon + name = "bacon" + desc = "It looks juicy and tastes amazing!" + icon_state = "bacon2" + bitesize = 2 + New() + ..() + reagents.add_reagent("nutriment", 4) + reagents.add_reagent("porktonium", 10) + reagents.add_reagent("msg", 4) + /obj/item/weapon/reagent_containers/food/snacks/telebacon name = "Tele Bacon" @@ -2687,6 +2708,23 @@ ..() reagents.add_reagent("nutriment", 1) +/obj/item/weapon/reagent_containers/food/snacks/rawcutlet + name = "raw cutlet" + desc = "A thin piece of raw meat." + icon = 'icons/obj/food/food_ingredients.dmi' + icon_state = "rawcutlet" + bitesize = 1 + New() + ..() + reagents.add_reagent("protein", 1) + attackby(obj/item/weapon/W, mob/user, params) + if(istype(W,/obj/item/weapon/kitchen/knife)) + user.visible_message( \ + "[user] cuts the raw cutlet with the knife!", \ + "You cut the raw cutlet with your knife!" \ + ) + new /obj/item/weapon/reagent_containers/food/snacks/raw_bacon(src.loc) + qdel(src) /////////////////////////////////////////////////PIZZA//////////////////////////////////////// @@ -3269,16 +3307,6 @@ ..() reagents.add_reagent("nutriment", 7) -/obj/item/weapon/reagent_containers/food/snacks/rawcutlet - name = "raw cutlet" - desc = "A thin piece of raw meat." - icon = 'icons/obj/food/food_ingredients.dmi' - icon_state = "rawcutlet" - bitesize = 1 - New() - ..() - reagents.add_reagent("protein", 1) - /obj/item/weapon/reagent_containers/food/snacks/cutlet name = "cutlet" desc = "A tasty meat slice." @@ -3361,4 +3389,4 @@ New() ..() reagents.add_reagent("nutriment", 6) - bitesize = 2 \ No newline at end of file + bitesize = 2 diff --git a/code/modules/reagents/reagent_containers/food/snacks/meat.dm b/code/modules/reagents/reagent_containers/food/snacks/meat.dm index dc9999a7f4c..2572c42c69d 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/meat.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/meat.dm @@ -51,4 +51,4 @@ desc = "Taste like bacon." New() ..() - reagents.add_reagent("porktonium", 10) \ No newline at end of file + reagents.add_reagent("porktonium", 10) diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi index b2ff355592b..4e6e07de79a 100644 Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ