Skip to content

Commit df1f9ae

Browse files
possessed item click delay fix
1 parent 5cc3bf7 commit df1f9ae

2 files changed

Lines changed: 5 additions & 1 deletion

File tree

code/mob/living/object.dm

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,9 @@
408408
if (BOUNDS_DIST(holder.target, holder.owner))
409409
holder.move_to(holder.target)
410410
else
411-
if(!ON_COOLDOWN(holder.owner, "livingobj_click_delay", holder.owner.combat_click_delay))
411+
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))
412414
var/atom/movable/thing_to_attack = holder.target
413415
if (isobj(thing_to_attack.loc))
414416
thing_to_attack = thing_to_attack.loc

strings/changelog.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11

22
(t)sat feb 21 26
3+
(u)LeahTheTech
4+
(+)Possessed objects now respect item specific click delays.
35
(u)glowbold
46
(p)25933
57
(e)⚖🧛🐁|C-Balance, A-Gamemodes, A-Critters

0 commit comments

Comments
 (0)