From ae7ce39f622e1a1534e82de90212c3eb3a49b909 Mon Sep 17 00:00:00 2001 From: Poojawa Date: Sat, 20 Apr 2019 23:28:43 -0500 Subject: [PATCH 1/3] aaaAAAAaaaa --- code/modules/mob/living/simple_animal/hostile/hostile.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index ec858fdff5..77b434c74a 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -352,6 +352,8 @@ vore_attack(src,L,src) else return L.attack_animal(src) + else + return L.attack_animal(src) //literally every single fucking one of these need this I guess. else return target.attack_animal(src) From b524c6741d2f67bb42497296a8bc4ce41d7705fe Mon Sep 17 00:00:00 2001 From: Poojawa Date: Sun, 21 Apr 2019 01:56:45 -0500 Subject: [PATCH 2/3] double checking my work --- .../mob/living/simple_animal/hostile/hostile.dm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index 77b434c74a..2dec479809 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -345,15 +345,18 @@ /mob/living/simple_animal/hostile/proc/AttackingTarget() in_melee = TRUE - if(isliving(target)) + if(vore_active) + if(isliving(target)) var/mob/living/L = target - if(L.Adjacent(src) && vore_active && L.devourable) // aggressive check to ensure vore attacks can be made - if(prob(voracious_chance)) - vore_attack(src,L,src) + if(L.Adjacent(src) && L.devourable) // aggressive check to ensure vore attacks can be made + if(prob(voracious_chance)) + vore_attack(src,L,src) + else + return L.attack_animal(src) else - return L.attack_animal(src) + return L.attack_animal(src) //literally every single fucking one of these need this I guess. else - return L.attack_animal(src) //literally every single fucking one of these need this I guess. + return target.attack_animal(src) else return target.attack_animal(src) From fe1692eef38a5b165722d8076a35a8bdde0c3027 Mon Sep 17 00:00:00 2001 From: Poojawa Date: Sun, 21 Apr 2019 01:57:12 -0500 Subject: [PATCH 3/3] t a b --- code/modules/mob/living/simple_animal/hostile/hostile.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index 2dec479809..a70ca2a8e6 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -347,7 +347,7 @@ in_melee = TRUE if(vore_active) if(isliving(target)) - var/mob/living/L = target + var/mob/living/L = target if(L.Adjacent(src) && L.devourable) // aggressive check to ensure vore attacks can be made if(prob(voracious_chance)) vore_attack(src,L,src)