cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16769 from MadmanMartian/misc_TK_fixes

Browse Source 
Misc TK fixes
This commit is contained in:
Rob Nelson
2017-12-16 21:39:01 -08:00
committed by GitHub
parent 2f368edb53 f1e724b4aa
commit 57d2454cbc
4 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/_onclick/other_mobs.dm
View File

@@ -48,7 +48,7 @@
delayNextAttack(10)
if(src.can_use_hand())
A.attack_hand(src, params)
A.attack_hand(src, params, proximity)
else
A.attack_stump(src, params)
@@ -56,14 +56,14 @@
Move(A, get_dir(src,A))
delayNextMove(movement_delay()*3,additive=1)
/atom/proc/attack_hand(mob/user as mob, params)
/atom/proc/attack_hand(mob/user as mob, params, var/proximity)
return
//called when we try to click but have no hand
//good for general purposes
/atom/proc/attack_stump(mob/user as mob, params)
/atom/proc/attack_stump(mob/user as mob, params, var/proximity)
if(!requires_dexterity(user))
attack_hand(user) //if the object doesn't need dexterity, we can use our stump
attack_hand(user, params, proximity) //if the object doesn't need dexterity, we can use our stump
else
to_chat(user, "Your [user.get_index_limb_name(user.active_hand)] is not fine enough for this action.")