From 3e2c8c19d1df8f8a487327ad44a1868888f23794 Mon Sep 17 00:00:00 2001 From: Sinestia <40812746+Sinestia@users.noreply.github.com> Date: Sun, 7 Aug 2022 10:13:25 -0500 Subject: [PATCH] Attempts to Fix 18730, Neckgrab stuns are made much more reasonable (#18733) * do the rest of the pull request * Revert "do the rest of the pull request" This reverts commit 42baeececd69db6c60dc31b3d525070d001a5927. * SetStunned() instead * Stun is now set to 3 seconds each --- 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 4441b70b2dd..283cbec97bd 100644 --- a/code/modules/mob/mob_grab.dm +++ b/code/modules/mob/mob_grab.dm @@ -259,7 +259,7 @@ affecting.LAssailant = assailant hud.icon_state = "kill" hud.name = "kill" - affecting.Stun(20 SECONDS) //10 ticks of ensured grab + affecting.Stun(3 SECONDS) // Ensures the grab is able to be secured else if(state < GRAB_UPGRADING) assailant.visible_message("[assailant] starts to tighten [assailant.p_their()] grip on [affecting]'s neck!") hud.icon_state = "kill1"