Skip to content

Commit

Permalink
Fixes attack equip element passing incorrect args (tgstation#70895)
Browse files Browse the repository at this point in the history
* Fixes attack equip incorrect args

* These will never run
  • Loading branch information
MrMelbert authored Oct 31, 2022
1 parent 7fc33b4 commit 993c9a3
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions code/datums/elements/attack_equip.dm
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
if(!attire.compare_zone_to_item_slot(targeted_zone))
return

if(attire.mob_can_equip(target, user, attire.slot_flags, disable_warning = TRUE, bypass_equip_delay_self = TRUE))
if(attire.mob_can_equip(target, attire.slot_flags, disable_warning = TRUE, bypass_equip_delay_self = TRUE))
INVOKE_ASYNC(src, .proc/equip, attire, sharp_dresser, user)
return COMPONENT_CANCEL_ATTACK_CHAIN

Expand All @@ -44,9 +44,6 @@
if(!do_mob(user, sharp_dresser, equip_time))
return

if(QDELETED(src) || QDELETED(sharp_dresser))
return

if(!user.Adjacent(sharp_dresser)) // Due to teleporting shenanigans
user.put_in_hands(attire)
return
Expand Down

0 comments on commit 993c9a3

Please sign in to comment.