cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 13:10:02 +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/guardian/guardian_types/explosive.dm
+1 -1
View File
@@ -22,7 +22,7 @@
return ..()
/mob/living/basic/guardian/explosive/UnarmedAttack(atom/attack_target, proximity_flag, list/modifiers)
if(LAZYACCESS(modifiers, RIGHT_CLICK) && proximity_flag && isobj(attack_target))
if(LAZYACCESS(modifiers, RIGHT_CLICK) && proximity_flag && isobj(attack_target) && can_unarmed_attack())
bomb.Trigger(target = attack_target)
return
return ..()
code/modules/mob/living/basic/guardian/guardian_types/gravitokinetic.dm
+1 -1
View File
@@ -57,7 +57,7 @@
return TRUE
/mob/living/basic/guardian/gravitokinetic/UnarmedAttack(atom/attack_target, proximity_flag, list/modifiers)
if (LAZYACCESS(modifiers, RIGHT_CLICK) && proximity_flag && !gravity_targets[attack_target])
if (LAZYACCESS(modifiers, RIGHT_CLICK) && proximity_flag && !gravity_targets[attack_target] && can_unarmed_attack())
slam_turf(attack_target)
return
return ..()