diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index 9437da8f8cb..a42123ea9f2 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -228,7 +228,7 @@ add_fingerprint(user) return - if (has_edge(W)) + if (W.is_sharp()) if (!can_slice_here) to_chat(user, "You cannot slice \the [src] here! You need a table or at least a tray to do it.") return diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index c2a2d9fb343..19020934933 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -184,14 +184,14 @@ pocell.charge = pocell.maxcharge qdel(src) return - else if(W.sharp) + else if(W.is_sharp()) if(seed.kitchen_tag == "pumpkin") // Ugggh these checks are awful. user.show_message("You carve a face into [src]!", 1) new /obj/item/clothing/head/pumpkinhead (user.loc) qdel(src) return else if(seed.chems) - if(((W.sharp && W.edge) || CHECK_MULTIPLE_BITFIELDS(W.damage_mode, DAMAGE_MODE_SHARP | DAMAGE_MODE_EDGE)) && !isnull(seed.chems["woodpulp"])) + if((W.is_sharp() && W.is_edge()) && !isnull(seed.chems["woodpulp"])) user.show_message("You make planks out of \the [src]!", 1) playsound(loc, 'sound/effects/woodcutting.ogg', 50, 1) var/flesh_colour = seed.get_trait(TRAIT_FLESH_COLOUR)