From 917aa726eb96b2e13031a4992f0f48b8d71e2bec Mon Sep 17 00:00:00 2001 From: Verkister Date: Sat, 7 Nov 2020 16:38:51 +0200 Subject: [PATCH] Merge pull request #9279 from ShadowLarkens/revert-8742-bellyitemfix Revert "Fix unintended inbelly item interactions caused by copypaste" --- code/_onclick/click.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index 98f6023e7d..6a4579f191 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -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())