Merge pull request #4815 from Novacat/nova-aifixes

Fixes Newspapers

code/modules/mob/living/simple_mob/simple_mob_vr.dm

@@ -227,21 +227,18 @@
 			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("<span class='danger'>\the [src] [vore_bump_emote] \the [tmob]!</span>!")
-			//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
-/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))
+// Checks to see if mob doesn't like this kind of turf
-		return TRUE //Mobs aren't that stupid, probably
+/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)
 	. = ..()

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 (istype(O, /obj/item/weapon/newspaper) && !(ckey || (ai_holder.hostile && faction != user.faction)) && isturf(user.loc))
-		if (retaliate && prob(vore_pounce_chance/2)) // This is a gamble!
+		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("<span class='danger'>\the [user] swats \the [src] with \the [O] and promptly gets tackled!</span>!")
 			if (will_eat(user))
-				stop_automated_movement = 1
+				set_AI_busy(TRUE)
 				animal_nom(user)
 				update_icon()
-				stop_automated_movement = 0
+				set_AI_busy(FALSE)
-			else if (!target_mob) // no using this to clear a retaliate mob's target
+			else if (!ai_holder.target) // 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.
+				ai_holder.target = user //just because you're not tasty doesn't mean you get off the hook. A swat for a swat.
-				AttackTarget()
+				//AttackTarget() //VOREStation AI Temporary Removal
-				LoseTarget() // only make one attempt at an attack rather than going into full rage mode
+				//LoseTarget() // only make one attempt at an attack rather than going into full rage mode
 		else
 			user.visible_message("<span class='info'>\the [user] swats \the [src] with \the [O]!</span>!")
 			release_vore_contents()
@@ -74,5 +74,5 @@
 						if(src && L)
 							prey_excludes -= L
 	else
-		..() */ //VORESTATION AI TEMPORARY REMOVAL
+		..()