From e8fb990a5bc1f3e04f5aee5ec47bc4e20b50a110 Mon Sep 17 00:00:00 2001
From: Tigercat2000 <nick.pilant2@gmail.com>
Date: Mon, 16 Mar 2015 03:11:22 +0100
Subject: [PATCH] Properly integrate and stoof

---
 code/modules/mob/mob_grab.dm | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm
index 978ac86cefa..54c3accb3ef 100644
--- a/code/modules/mob/mob_grab.dm
+++ b/code/modules/mob/mob_grab.dm
@@ -189,23 +189,14 @@
 		s_click(hud)
 		return
 	if(M == assailant && state >= GRAB_AGGRESSIVE)
-		if( (ishuman(user) && (FAT in user.mutations) && iscarbon(affecting) ) || ( isalien(user) && iscarbon(affecting) ) || ( istype(user,/mob/living/carbon/human/kidan) && istype(affecting,/mob/living/carbon/monkey/diona) ) || ( istype(user,/mob/living/carbon/human/tajaran) && istype(affecting,/mob/living/simple_animal/mouse) ) )
+		if( (ishuman(user) && (FAT in user.mutations) && iscarbon(affecting) ) || ( isalien(user) && iscarbon(affecting) ) || ( istype(user,/mob/living/carbon/human/kidan) && istype(affecting,/mob/living/carbon/monkey/diona) ) || ( ishuman(user) && user.get_species() == "Tajaran"  && istype(affecting,/mob/living/simple_animal/mouse) ) )
 			var/mob/living/carbon/attacker = user
-			if(istype(affecting,/mob/living/simple_animal/mouse))
-				user.visible_message("<span class='danger'>[user] is attempting to devour \the [affecting]!</span>")
-				if(!do_mob(user, affecting)||!do_after(user, 30)) return //Mice are easy to eat.
-				user.visible_message("<span class='danger'>[user] devours \the [affecting]!</span>")
-				affecting.loc = user
-				attacker.stomach_contents.Add(affecting)
-				del(src)
-				return
-
-			user.visible_message("<span class='danger'>[user] is attempting to devour [affecting]!</span>")
-			if(istype(user, /mob/living/carbon/alien/humanoid/hunter))
+			user.visible_message("<span class='danger'>[user] is attempting to devour \the [affecting]!</span>")
+			if(istype(user, /mob/living/carbon/alien/humanoid/hunter) || istype(affecting, /mob/living/simple_animal/mouse)) //mice are easy to eat
 				if(!do_mob(user, affecting)||!do_after(user, 30)) return
 			else
 				if(!do_mob(user, affecting)||!do_after(user, 100)) return
-			user.visible_message("<span class='danger'>[user] devours [affecting]!</span>")
+			user.visible_message("<span class='danger'>[user] devours \the [affecting]!</span>")
 			affecting.loc = user
 			attacker.stomach_contents.Add(affecting)
 			del(src)