From 856b32009171205c758c21f30b950764ec6edff6 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sat, 2 Mar 2019 20:52:07 -0500 Subject: [PATCH 1/3] Fixes Newspapers --- code/modules/vore/eating/simple_animal_vr.dm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/code/modules/vore/eating/simple_animal_vr.dm b/code/modules/vore/eating/simple_animal_vr.dm index faf51a1374c..e475a70396a 100644 --- a/code/modules/vore/eating/simple_animal_vr.dm +++ b/code/modules/vore/eating/simple_animal_vr.dm @@ -49,21 +49,21 @@ if(confirm == "Disable") vore_selected.digest_mode = DM_HOLD -/* + /mob/living/simple_mob/attackby(var/obj/item/O, var/mob/user) - if (istype(O, /obj/item/weapon/newspaper) && !(ckey || (hostile && faction != user.faction)) && isturf(user.loc)) - if (retaliate && prob(vore_pounce_chance/2)) // This is a gamble! + if (istype(O, /obj/item/weapon/newspaper) && !(ckey || (ai_holder.hostile && faction != user.faction)) && isturf(user.loc)) + if (ai_holder.retaliate && prob(vore_pounce_chance/2)) // This is a gamble! user.Weaken(5) //They get tackled anyway whether they're edible or not. user.visible_message("\the [user] swats \the [src] with \the [O] and promptly gets tackled!!") if (will_eat(user)) - stop_automated_movement = 1 + //stop_automated_movement = 1 //VOREStation AI Temporary Removal animal_nom(user) update_icon() - stop_automated_movement = 0 - else if (!target_mob) // no using this to clear a retaliate mob's target - target_mob = user //just because you're not tasty doesn't mean you get off the hook. A swat for a swat. - AttackTarget() - LoseTarget() // only make one attempt at an attack rather than going into full rage mode + //stop_automated_movement = 0 //VORESTation AI Temporary Removal + else if (!ai_holder.target) // no using this to clear a retaliate mob's target + ai_holder.target = user //just because you're not tasty doesn't mean you get off the hook. A swat for a swat. + //AttackTarget() //VOREStation AI Temporary Removal + //LoseTarget() // only make one attempt at an attack rather than going into full rage mode else user.visible_message("\the [user] swats \the [src] with \the [O]!!") release_vore_contents() @@ -74,5 +74,5 @@ if(src && L) prey_excludes -= L else - ..() */ //VORESTATION AI TEMPORARY REMOVAL + ..() From 66c35a6d6db1d05f1f8ef8372621393c6a66c8f8 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 3 Mar 2019 07:28:28 -0500 Subject: [PATCH 2/3] More Fixes --- code/modules/mob/living/simple_mob/simple_mob_vr.dm | 4 ++-- code/modules/vore/eating/simple_animal_vr.dm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/simple_mob/simple_mob_vr.dm b/code/modules/mob/living/simple_mob/simple_mob_vr.dm index 7767f96c920..510a302a788 100644 --- a/code/modules/mob/living/simple_mob/simple_mob_vr.dm +++ b/code/modules/mob/living/simple_mob/simple_mob_vr.dm @@ -227,10 +227,10 @@ if(tmob.canmove && prob(vore_pounce_chance)) //if they'd pounce for other noms, pounce for these too, otherwise still try and eat them if they hold still tmob.Weaken(5) tmob.visible_message("\the [src] [vore_bump_emote] \the [tmob]!!") - //stop_automated_movement = 1 //VORESTATION AI TEMPORARY REMOVAL + set_AI_busy(TRUE) animal_nom(tmob) update_icon() - //stop_automated_movement = 0 //VORESTATION AI TEMPORARY REMOVAL + set_AI_busy(FALSE) ..() /* //Was replaced with suitable_turf_type, but that can be done later. //VORESTATION AI TEMPORARY REMOVAL // Checks to see if mob doesn't like this kind of turf diff --git a/code/modules/vore/eating/simple_animal_vr.dm b/code/modules/vore/eating/simple_animal_vr.dm index e475a70396a..5ebf7d35074 100644 --- a/code/modules/vore/eating/simple_animal_vr.dm +++ b/code/modules/vore/eating/simple_animal_vr.dm @@ -56,10 +56,10 @@ user.Weaken(5) //They get tackled anyway whether they're edible or not. user.visible_message("\the [user] swats \the [src] with \the [O] and promptly gets tackled!!") if (will_eat(user)) - //stop_automated_movement = 1 //VOREStation AI Temporary Removal + set_AI_busy(TRUE) animal_nom(user) update_icon() - //stop_automated_movement = 0 //VORESTation AI Temporary Removal + set_AI_busy(FALSE) else if (!ai_holder.target) // no using this to clear a retaliate mob's target ai_holder.target = user //just because you're not tasty doesn't mean you get off the hook. A swat for a swat. //AttackTarget() //VOREStation AI Temporary Removal From cd5899b6d392afbe2e035f70ce2a24b4fa8648ae Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 3 Mar 2019 07:43:04 -0500 Subject: [PATCH 3/3] Fixes mobs falling off aerostat --- .../mob/living/simple_mob/simple_mob_vr.dm | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/code/modules/mob/living/simple_mob/simple_mob_vr.dm b/code/modules/mob/living/simple_mob/simple_mob_vr.dm index 510a302a788..4f802fdbb09 100644 --- a/code/modules/mob/living/simple_mob/simple_mob_vr.dm +++ b/code/modules/mob/living/simple_mob/simple_mob_vr.dm @@ -232,16 +232,13 @@ update_icon() set_AI_busy(FALSE) ..() -/* //Was replaced with suitable_turf_type, but that can be done later. //VORESTATION AI TEMPORARY REMOVAL -// Checks to see if mob doesn't like this kind of turf -/mob/living/simple_mob/avoid_turf(var/turf/turf) - //So we only check if the parent didn't find anything terrible - if((. = ..(turf))) - return . - if(istype(turf,/turf/unsimulated/floor/sky)) - return TRUE //Mobs aren't that stupid, probably -*/ +// Checks to see if mob doesn't like this kind of turf +/mob/living/simple_mob/IMove(newloc) + if(istype(newloc,/turf/unsimulated/floor/sky)) + return MOVEMENT_FAILED //Mobs aren't that stupid, probably + return ..() // Procede as normal. + //Grab = Nomf /mob/living/simple_mob/UnarmedAttack(var/atom/A, var/proximity) . = ..()