Merge pull request #407 from Regory/quick-fixes

Fix for making Dough Slices
This commit is contained in:
ZomgPonies
2014-08-30 07:29:32 -04:00
+6 -3
View File
@@ -9,9 +9,12 @@
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)
else //It's a kitchen knife. Go do the parent proc (slicing)
..()
/obj/item/weapon/reagent_containers/food/snacks/boiledspagetti/attackby(obj/item/W as obj, mob/user as mob)