From 6a49c04a6c3854ca469329d80eb83c7981bb5ff8 Mon Sep 17 00:00:00 2001
From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date: Sun, 21 Jan 2024 16:27:01 -0500
Subject: [PATCH] fix eswords / cleaving saws not being sharpenable (#23779)
* fix eswords / cleaving saws not being sharpenable
* need that
* ok cut that out so it works again
* extra bracket
---
code/game/objects/items/weapons/whetstone.dm | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/code/game/objects/items/weapons/whetstone.dm b/code/game/objects/items/weapons/whetstone.dm
index 23df94c2cf5..eea0f7621fb 100644
--- a/code/game/objects/items/weapons/whetstone.dm
+++ b/code/game/objects/items/weapons/whetstone.dm
@@ -31,11 +31,9 @@
if((signal_out & COMPONENT_BLOCK_SHARPEN_ALREADY) || (I.force > initial(I.force) && !(signal_out & COMPONENT_SHARPEN_APPLIED))) //No sharpening stuff twice
to_chat(user, "[I] has already been refined before. It cannot be sharpened further!")
return
- if(!(signal_out & COMPONENT_SHARPEN_APPLIED)) //If the item has a relevant component and COMPONENT_BLOCK_SHARPEN_APPLIED is returned, the item only gets the throw force increase
- I.force = clamp(I.force + increment, 0, max)
if(istype(I, /obj/item/melee/energy))
var/obj/item/melee/energy/E = I
- if(E.force_on > initial(E.force_on) || (E.force > initial(E.force)))
+ if(E.force_on > initial(E.force_on))
to_chat(user, "[E] is much too powerful to sharpen further!")
return
E.throwforce_on = clamp(E.throwforce_on + increment, 0, max)
@@ -43,6 +41,9 @@
E.force_on = clamp(E.force_on + increment, 0, max)
E.force_off = clamp(E.force_off + increment, 0, max)
+ if(!(signal_out & COMPONENT_SHARPEN_APPLIED)) //If the item has a relevant component and COMPONENT_BLOCK_SHARPEN_APPLIED is returned, the item only gets the throw force increase
+ I.force = clamp(I.force + increment, 0, max)
+
user.visible_message("[user] sharpens [I] with [src]!", "You sharpen [I], making it much more deadly than before.")
if(!requires_sharpness)
set_sharpness(TRUE)