From 64795c035171b1a531ae8e81f7339acca6bb4669 Mon Sep 17 00:00:00 2001 From: Regory Date: Wed, 20 Aug 2014 20:47:31 -0400 Subject: [PATCH 1/3] Flat Dough + Kitchen Knife = Dough Slice Fixes flat dough so that kitchen knives make Dough Slices instead of Kitchen Knife Personal Pizza. NOT YET TESTED --- code/modules/food/customizables.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/modules/food/customizables.dm b/code/modules/food/customizables.dm index 75f7eb9306d..749f2c9c5b6 100644 --- a/code/modules/food/customizables.dm +++ b/code/modules/food/customizables.dm @@ -9,9 +9,10 @@ qdel(src) /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough/attackby(obj/item/W as obj, mob/user as mob) - var/obj/item/weapon/reagent_containers/food/snacks/customizable/pizza/S = new(get_turf(user)) - S.attackby(W,user) - qdel(src) + if(!istype(W, /obj/item/weapon/kitchenknife)) //Ignore this if object is kitchen knife - make dough slices instead of kitchen knife pizza + var/obj/item/weapon/reagent_containers/food/snacks/customizable/pizza/S = new(get_turf(user)) + S.attackby(W,user) + qdel(src) /obj/item/weapon/reagent_containers/food/snacks/boiledspagetti/attackby(obj/item/W as obj, mob/user as mob) From 0f0153915cf6524d4be7cb22cf1b594c3d5f2949 Mon Sep 17 00:00:00 2001 From: Regory Date: Sat, 23 Aug 2014 13:53:55 -0400 Subject: [PATCH 2/3] Fixed and Tested Flat Dough Bugfix Tested. Flat dough makes dough slices when cut with knife. --- code/modules/food/customizables.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/food/customizables.dm b/code/modules/food/customizables.dm index 749f2c9c5b6..af685e06d8a 100644 --- a/code/modules/food/customizables.dm +++ b/code/modules/food/customizables.dm @@ -13,6 +13,8 @@ var/obj/item/weapon/reagent_containers/food/snacks/customizable/pizza/S = new(get_turf(user)) S.attackby(W,user) qdel(src) + else //It's a kitchen knife. Go do the parent proc (slicing) + ..(W, user) /obj/item/weapon/reagent_containers/food/snacks/boiledspagetti/attackby(obj/item/W as obj, mob/user as mob) From a9f35a41fb41e05cf529dbee5f3bb3511b5aaac5 Mon Sep 17 00:00:00 2001 From: Regory Date: Sat, 23 Aug 2014 16:55:30 -0400 Subject: [PATCH 3/3] Changed ..() For readability. --- code/modules/food/customizables.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/food/customizables.dm b/code/modules/food/customizables.dm index af685e06d8a..29f5ad2eed8 100644 --- a/code/modules/food/customizables.dm +++ b/code/modules/food/customizables.dm @@ -14,7 +14,7 @@ S.attackby(W,user) qdel(src) else //It's a kitchen knife. Go do the parent proc (slicing) - ..(W, user) + ..() /obj/item/weapon/reagent_containers/food/snacks/boiledspagetti/attackby(obj/item/W as obj, mob/user as mob)