From 7a55bca0544a6f983bc381f39210f92be9213810 Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Sun, 5 May 2019 13:23:31 +0200 Subject: [PATCH] can't eat while buckled --- code/modules/mob/mob_grab.dm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm index cac5581b3ef..a4a52d4ef1e 100644 --- a/code/modules/mob/mob_grab.dm +++ b/code/modules/mob/mob_grab.dm @@ -387,10 +387,19 @@ if(M == assailant && state >= GRAB_AGGRESSIVE) //no eatin unless you have an agressive grab if(checkvalid(user, affecting)) //wut var/mob/living/carbon/attacker = user + + if(affecting.buckled) + to_chat(user, "[affecting] is buckled!") + return + user.visible_message("[user] is attempting to devour \the [affecting]!") if(!do_after(user, checktime(user, affecting), target = affecting)) return + if(affecting.buckled) + to_chat(user, "[affecting] is buckled!") + return + user.visible_message("[user] devours \the [affecting]!") if(affecting.mind) add_attack_logs(attacker, affecting, "Devoured")