cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 14:39:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes COMSIG_LIVING_EARLY_UNARMED_ATTACK arguments (#80783)

Browse Source 
## 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:
MrMelbert
2024-01-05 18:08:06 +00:00
committed by GitHub
parent 6db9e0d39d
commit d5c547e459
11 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/basic/pets/cat/cat.dm
+6 -3
View File
@@ -73,9 +73,12 @@
/mob/living/basic/pet/cat/proc/pre_unarmed_attack(mob/living/hitter, atom/target, proximity, modifiers)
SIGNAL_HANDLER
if(istype(target, /obj/machinery/oven/range))
target.attack_hand(src)
return COMPONENT_CANCEL_ATTACK_CHAIN
if(!proximity || !can_unarmed_attack())
return NONE
if(!istype(target, /obj/machinery/oven/range))
return NONE
target.attack_hand(src)
return COMPONENT_CANCEL_ATTACK_CHAIN
/mob/living/basic/pet/cat/Exited(atom/movable/gone, direction)
. = ..()