mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-23 05:00:55 +01:00
Fixes COMSIG_LIVING_EARLY_UNARMED_ATTACK arguments (#80783)
## About The Pull Request Fixes #80566 Fixes the wrong arguments being passed to `COMSIG_LIVING_EARLY_UNARMED_ATTACK`. It now properly receives the proximity flag. Changes clicking with handcuffs to no longer always assume no proximity. Replaces some checks for hands blocked to some checks for `can_unarmed_attack` (which, currently, JUST checks for hands blocked, but this is good for future reasons, just in case) ## Changelog 🆑 Melbert fix: Strong arm implant users can shove more correctly. /🆑
This commit is contained in:
@@ -321,15 +321,18 @@
|
||||
INVOKE_ASYNC(weapon, TYPE_PROC_REF(/obj/item, attack), stabbed_carbon, src)
|
||||
stabbed_carbon.Knockdown(2 SECONDS)
|
||||
|
||||
/mob/living/basic/bot/cleanbot/proc/pre_attack(mob/living/source, atom/target)
|
||||
/mob/living/basic/bot/cleanbot/proc/pre_attack(mob/living/source, atom/target, proximity, modifiers)
|
||||
SIGNAL_HANDLER
|
||||
|
||||
if(!proximity || !can_unarmed_attack())
|
||||
return NONE
|
||||
|
||||
if(is_type_in_typecache(target, huntable_pests) && !isnull(our_mop))
|
||||
INVOKE_ASYNC(our_mop, TYPE_PROC_REF(/obj/item, melee_attack_chain), src, target)
|
||||
return COMPONENT_CANCEL_ATTACK_CHAIN
|
||||
|
||||
if(!iscarbon(target) && !is_type_in_typecache(target, huntable_trash))
|
||||
return
|
||||
return NONE
|
||||
|
||||
visible_message(span_danger("[src] sprays hydrofluoric acid at [target]!"))
|
||||
playsound(src, 'sound/effects/spray2.ogg', 50, TRUE, -6)
|
||||
|
||||
Reference in New Issue
Block a user