From 7635de30209df0512d0609faa041f3827ed8daa1 Mon Sep 17 00:00:00 2001 From: Chakirski Date: Sun, 10 Jul 2016 18:22:32 -0500 Subject: [PATCH] Sliceable cutlets are sliceable not sliceable --- code/modules/food/recipes_grill.dm | 2 +- .../mob/living/carbon/human/interactive/functions.dm | 4 ++-- code/modules/reagents/reagent_containers/food/snacks.dm | 2 +- .../modules/reagents/reagent_containers/food/snacks/meat.dm | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/modules/food/recipes_grill.dm b/code/modules/food/recipes_grill.dm index ba0029e1f96..4c459b737ff 100644 --- a/code/modules/food/recipes_grill.dm +++ b/code/modules/food/recipes_grill.dm @@ -91,7 +91,7 @@ /datum/recipe/grill/cutlet items = list( - /obj/item/weapon/reagent_containers/food/snacks/sliceable/rawcutlet + /obj/item/weapon/reagent_containers/food/snacks/rawcutlet ) result = /obj/item/weapon/reagent_containers/food/snacks/cutlet diff --git a/code/modules/mob/living/carbon/human/interactive/functions.dm b/code/modules/mob/living/carbon/human/interactive/functions.dm index 1e3fad0617c..2625b471bd2 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/sliceable/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) + 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() @@ -514,7 +514,7 @@ // Process tool-based ingredients var/obj/item/weapon/reagent_containers/food/snacks/dough/D = locate() in rangeCheck var/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough/FD = locate() in rangeCheck - var/obj/item/weapon/reagent_containers/food/snacks/sliceable/rawcutlet/RC = locate() in rangeCheck + var/obj/item/weapon/reagent_containers/food/snacks/rawcutlet/RC = locate() in rangeCheck 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 diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 937bc455334..3d177bac942 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -2708,7 +2708,7 @@ ..() reagents.add_reagent("nutriment", 1) -/obj/item/weapon/reagent_containers/food/snacks/sliceable/rawcutlet +/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' diff --git a/code/modules/reagents/reagent_containers/food/snacks/meat.dm b/code/modules/reagents/reagent_containers/food/snacks/meat.dm index e9057483bc5..2572c42c69d 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/meat.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/meat.dm @@ -14,9 +14,9 @@ istype(W, /obj/item/weapon/kitchen/knife) || \ istype(W, /obj/item/weapon/scalpel) \ ) - new /obj/item/weapon/reagent_containers/food/snacks/sliceable/rawcutlet(src) - new /obj/item/weapon/reagent_containers/food/snacks/sliceable/rawcutlet(src) - new /obj/item/weapon/reagent_containers/food/snacks/sliceable/rawcutlet(src) + new /obj/item/weapon/reagent_containers/food/snacks/rawcutlet(src) + new /obj/item/weapon/reagent_containers/food/snacks/rawcutlet(src) + new /obj/item/weapon/reagent_containers/food/snacks/rawcutlet(src) to_chat(user, "You cut the meat in thin strips.") qdel(src) else