From 7cfcbdc8b68aac053007d4650293ae729145597e Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Tue, 26 Oct 2021 01:02:48 -0500 Subject: [PATCH 1/2] i can't pummel in peace --- code/modules/mob/mob_grab.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm index 3ca22757826..b45d5d1ad71 100644 --- a/code/modules/mob/mob_grab.dm +++ b/code/modules/mob/mob_grab.dm @@ -178,8 +178,9 @@ //VOREStation Edit if(BP_HEAD) if(force_down) - if(announce) - assailant.visible_message("[assailant] sits on [target]'s face!") + if(user.a_intent != I_GRAB || user.a_intent != I_HURT) + if(announce) + assailant.visible_message("[assailant] sits on [target]'s face!") //VOREStation Edit End /obj/item/weapon/grab/attack_self() From 2e1b6b34060684957b312b89d3a07ae188070690 Mon Sep 17 00:00:00 2001 From: Hatterhat <31829017+Hatterhat@users.noreply.github.com> Date: Wed, 27 Oct 2021 11:47:35 -0500 Subject: [PATCH 2/2] THE webedit --- code/modules/mob/mob_grab.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm index b45d5d1ad71..1322f5be98f 100644 --- a/code/modules/mob/mob_grab.dm +++ b/code/modules/mob/mob_grab.dm @@ -178,7 +178,7 @@ //VOREStation Edit if(BP_HEAD) if(force_down) - if(user.a_intent != I_GRAB || user.a_intent != I_HURT) + if(user.a_intent == I_HELP) if(announce) assailant.visible_message("[assailant] sits on [target]'s face!") //VOREStation Edit End