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

Merge pull request #8742 from Heroman3003/bellyitemfix

Browse Source 
Fix unintended inbelly item interactions caused by copypaste
This commit is contained in:
Novacat
2020-08-20 18:54:24 -04:00
committed by GitHub
parent 283db98f36 9df463f53a
commit c600245864
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/_onclick/click.dm
View File

@@ -111,12 +111,11 @@
trigger_aiming(TARGET_CAN_CLICK)
return 1
// VOREStation Addition Start: inbelly item interaction
// VOREStation Addition Start: inbelly interaction
if(isbelly(loc) && (loc == A.loc))
if(W)
var/resolved = W.resolve_attackby(A,src)
if(!resolved && A && W)
W.afterattack(A, src, 1, params) // 1: clicking something Adjacent
to_chat(src, "The firm confines prevent that kind of dexterity!") //Only hand-based interactions in bellies
return
else
if(ismob(A)) // No instant mob attacking
setClickCooldown(get_attack_speed())