From cf29fdd8e1528daf21d0add63bb4b14c39538731 Mon Sep 17 00:00:00 2001 From: PKPenguin321 Date: Wed, 24 Feb 2016 18:15:13 -0800 Subject: [PATCH 1/2] sharpening blocks hotfix makes things that are IS_SHARP_ACCURATE sharpenable, as well as things that are just IS_SHARP makes sharpness not change unless it's a super-sharpening block --- code/game/objects/items/weapons/sharpener.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/weapons/sharpener.dm b/code/game/objects/items/weapons/sharpener.dm index 362689d6284..f3623bcaa7b 100644 --- a/code/game/objects/items/weapons/sharpener.dm +++ b/code/game/objects/items/weapons/sharpener.dm @@ -17,7 +17,7 @@ if(I.force >= max || I.throwforce >= max)//no esword sharpening user << "[I] is much too powerful to sharpen further." return - if(requires_sharpness && I.sharpness != IS_SHARP) + if(requires_sharpness && !I.sharpness) user << "You can only sharpen items that are already sharp, such as knives." return if(istype(I, /obj/item/weapon/twohanded))//some twohanded items should still be sharpenable, but handle force differently. therefore i need this stuff @@ -36,7 +36,8 @@ user << "[I] has already been refined before. It cannot be sharpened further." return user.visible_message("[user] sharpens [I] with [src]!", "You sharpen [I], making it much more deadly than before.") - I.sharpness = IS_SHARP//this is only kept here because of super sharpening blocks, it wont do anything with standard since objects should already be sharp + if(!requires_sharpness) + I.sharpness = IS_SHARP I.force = Clamp(I.force + increment, 0, max) I.throwforce = Clamp(I.throwforce + increment, 0, max) I.name = "[prefix] [I.name]" @@ -50,4 +51,4 @@ increment = 200 max = 200 prefix = "super-sharpened" - requires_sharpness = 0 \ No newline at end of file + requires_sharpness = 0 From 04b4955c2eb78ed29bdd51f32e4fd011e91aa898 Mon Sep 17 00:00:00 2001 From: PKPenguin321 Date: Wed, 24 Feb 2016 18:20:46 -0800 Subject: [PATCH 2/2] better fix for sharpness override part thanks kaze --- code/game/objects/items/weapons/sharpener.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/sharpener.dm b/code/game/objects/items/weapons/sharpener.dm index f3623bcaa7b..486fe014eec 100644 --- a/code/game/objects/items/weapons/sharpener.dm +++ b/code/game/objects/items/weapons/sharpener.dm @@ -37,7 +37,7 @@ return user.visible_message("[user] sharpens [I] with [src]!", "You sharpen [I], making it much more deadly than before.") if(!requires_sharpness) - I.sharpness = IS_SHARP + I.sharpness = IS_SHARP_ACCURATE I.force = Clamp(I.force + increment, 0, max) I.throwforce = Clamp(I.throwforce + increment, 0, max) I.name = "[prefix] [I.name]"