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

Merge pull request #9279 from ShadowLarkens/revert-8742-bellyitemfix

Browse Source 
Revert "Fix unintended inbelly item interactions caused by copypaste"
This commit is contained in:
Verkister
2020-11-07 16:38:51 +02:00
committed by Chompstation Bot
parent 2fda5bc91f
commit 917aa726eb
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/_onclick/click.dm
View File

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