diff --git a/code/modules/chemistry/tools/food_and_drink.dm b/code/modules/chemistry/tools/food_and_drink.dm index ab0bdfd88ff52..0379e061922ae 100644 --- a/code/modules/chemistry/tools/food_and_drink.dm +++ b/code/modules/chemistry/tools/food_and_drink.dm @@ -17,7 +17,8 @@ ABSTRACT_TYPE(/obj/item/reagent_containers/food) var/doants = TRUE //! Will ants spawn to eat this food if it's on the floor var/tmp/made_ants = FALSE //! Has this food already spawned ants var/ant_amnt = 5 //! How many ants are added to food / how much reagents removed? - var/sliceable = FALSE //! Can this food be sliced with a knife + var/sliceable = FALSE //! Can this food be sliced + var/slice_tools = TOOL_CUTTING | TOOL_SAWING //! Which tools can be used to slice this food var/slice_product = null //! Type to spawn when we slice this food var/slice_amount = 1 //! How many slices to spawn after slicing var/slice_inert = FALSE //! If the food is inert while slicing (ie chemical reactions won't occur) @@ -104,9 +105,9 @@ ABSTRACT_TYPE(/obj/item/reagent_containers/food) else M.HealDamage("All", healing, healing) - //slicing food can be done here using sliceable == TRUE, slice_amount, and slice_product + //slicing food can be done here using sliceable == TRUE, slice_amount and slice_product; slice_tools can be overridden if needed (e.g. snipping food) attackby(obj/item/W, mob/user) - if (src.sliceable && istool(W, TOOL_CUTTING | TOOL_SAWING)) + if (src.sliceable && istool(W, slice_tools)) if(user.bioHolder.HasEffect("clumsy") && prob(50)) user.visible_message(SPAN_ALERT("[user] fumbles and jabs [himself_or_herself(user)] in the eye with [W].")) user.change_eye_blurry(5) diff --git a/code/modules/food_and_drink/pizza.dm b/code/modules/food_and_drink/pizza.dm index 66422d4a1b94c..b56699e2f0de1 100644 --- a/code/modules/food_and_drink/pizza.dm +++ b/code/modules/food_and_drink/pizza.dm @@ -309,6 +309,7 @@ ABSTRACT_TYPE(/obj/item/reagent_containers/food/snacks/pizza) slice_amount = 6 sliceable = TRUE slice_product = /obj/item/reagent_containers/food/snacks/pizzaslice + slice_tools = TOOL_SNIPPING | TOOL_CUTTING | TOOL_SAWING initial_volume = 60 // 40 units will be available to stuff the crust custom_food = FALSE initial_reagents = list("bread" = 20)