Properly integrate and stoof

This commit is contained in:
Tigercat2000
2015-03-16 03:11:22 +01:00
parent 6d594204a3
commit e8fb990a5b
+4 -13
View File
@@ -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)