We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 5cc3bf7 commit df1f9aeCopy full SHA for df1f9ae
2 files changed
code/mob/living/object.dm
@@ -408,7 +408,9 @@
408
if (BOUNDS_DIST(holder.target, holder.owner))
409
holder.move_to(holder.target)
410
else
411
- if(!ON_COOLDOWN(holder.owner, "livingobj_click_delay", holder.owner.combat_click_delay))
+ var/obj/item/equipped = holder.owner.equipped()
412
+ var/delay = max(holder.owner.combat_click_delay, equipped.click_delay)
413
+ if(!ON_COOLDOWN(holder.owner, "livingobj_click_delay", delay))
414
var/atom/movable/thing_to_attack = holder.target
415
if (isobj(thing_to_attack.loc))
416
thing_to_attack = thing_to_attack.loc
strings/changelog.txt
@@ -1,5 +1,7 @@
1
2
(t)sat feb 21 26
3
+(u)LeahTheTech
4
+(+)Possessed objects now respect item specific click delays.
5
(u)glowbold
6
(p)25933
7
(e)⚖🧛🐁|C-Balance, A-Gamemodes, A-Critters
0 commit comments