diff --git a/code/game/objects/items/sharpener.dm b/code/game/objects/items/sharpener.dm index b90a5b155a6..c221608024a 100644 --- a/code/game/objects/items/sharpener.dm +++ b/code/game/objects/items/sharpener.dm @@ -18,7 +18,7 @@ if(I.force >= max || I.throwforce >= max)//no esword sharpening to_chat(user, "[I] is much too powerful to sharpen further!") return - if(requires_sharpness && !I.sharpness) + if(requires_sharpness && !I.is_sharp()) to_chat(user, "You can only sharpen items that are already sharp, such as knives!") return if(istype(I, /obj/item/melee/transforming/energy)) diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index f786ed3074a..d3bca881865 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -14,7 +14,7 @@ /obj/structure/flora/tree/attackby(obj/item/W, mob/user, params) if(log_amount && (!(flags_1 & NODECONSTRUCT_1))) - if(W.sharpness && W.force > 0) + if(W.is_sharp() && W.force > 0) if(W.hitsound) playsound(get_turf(src), W.hitsound, 100, 0, 0) user.visible_message("[user] begins to cut down [src] with [W].","You begin to cut down [src] with [W].", "You hear the sound of sawing.") diff --git a/code/game/turfs/simulated/wall/mineral_walls.dm b/code/game/turfs/simulated/wall/mineral_walls.dm index 333146a5462..0d269bce75d 100644 --- a/code/game/turfs/simulated/wall/mineral_walls.dm +++ b/code/game/turfs/simulated/wall/mineral_walls.dm @@ -133,7 +133,7 @@ canSmoothWith = list(/turf/closed/wall/mineral/wood, /obj/structure/falsewall/wood, /turf/closed/wall/mineral/wood/nonmetal) /turf/closed/wall/mineral/wood/attackby(obj/item/W, mob/user) - if(W.sharpness && W.force) + if(W.is_sharp() && W.force) var/duration = (48/W.force) * 2 //In seconds, for now. if(istype(W, /obj/item/hatchet) || istype(W, /obj/item/twohanded/fireaxe)) duration /= 4 //Much better with hatchets and axes. diff --git a/code/modules/hydroponics/grown/towercap.dm b/code/modules/hydroponics/grown/towercap.dm index e5cba0e2087..570e11d2f79 100644 --- a/code/modules/hydroponics/grown/towercap.dm +++ b/code/modules/hydroponics/grown/towercap.dm @@ -50,7 +50,7 @@ /obj/item/reagent_containers/food/snacks/grown/wheat)) /obj/item/grown/log/attackby(obj/item/W, mob/user, params) - if(W.sharpness) + if(W.is_sharp()) user.show_message("You make [plank_name] out of \the [src]!", 1) var/seed_modifier = 0 if(seed) diff --git a/code/modules/mining/lavaland/ash_flora.dm b/code/modules/mining/lavaland/ash_flora.dm index 260fe88a53d..2da3df26d7c 100644 --- a/code/modules/mining/lavaland/ash_flora.dm +++ b/code/modules/mining/lavaland/ash_flora.dm @@ -58,7 +58,7 @@ harvested = FALSE /obj/structure/flora/ash/attackby(obj/item/W, mob/user, params) - if(!harvested && needs_sharp_harvest && W.sharpness) + if(!harvested && needs_sharp_harvest && W.is_sharp()) user.visible_message("[user] starts to harvest from [src] with [W].","You begin to harvest from [src] with [W].") if(do_after(user, harvest_time, target = src)) harvest(user) diff --git a/code/modules/surgery/bodyparts/bodyparts.dm b/code/modules/surgery/bodyparts/bodyparts.dm index 3e00349c829..1caaa1f0c2d 100644 --- a/code/modules/surgery/bodyparts/bodyparts.dm +++ b/code/modules/surgery/bodyparts/bodyparts.dm @@ -96,7 +96,7 @@ ..() /obj/item/bodypart/attackby(obj/item/W, mob/user, params) - if(W.sharpness) + if(W.is_sharp()) add_fingerprint(user) if(!contents.len) to_chat(user, "There is nothing left inside [src]!")