diff --git a/code/game/machinery/bots/secbot.dm b/code/game/machinery/bots/secbot.dm
index c0bb714e9a..0626a7533f 100644
--- a/code/game/machinery/bots/secbot.dm
+++ b/code/game/machinery/bots/secbot.dm
@@ -671,7 +671,7 @@ Auto Patrol: []"},
 			if(istype(C, /mob/living/carbon/human))
 				src.threatlevel = src.assess_perp(C, idcheck, check_records, check_arrest)
 
-		else if(istype(M, /mob/living/simple_animal/hostile))
+		else if(istype(M, /mob/living/simple_animal/hostile) && !istype(M, /mob/living/simple_animal/hostile/retaliate))
 			if(M.stat == DEAD)
 				continue
 			else
diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
index ca0b4e173a..6a9eb67eca 100644
--- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
+++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
@@ -49,12 +49,16 @@
 			var/obj/effect/plant/SV = locate() in loc
 			SV.die_off(1)
 
+		if(locate(/obj/machinery/portable_atmospherics/hydroponics/soil/invisible) in loc)
+			var/obj/machinery/portable_atmospherics/hydroponics/soil/invisible/SP = locate() in loc
+			del(SP)
+
 		if(!pulledby)
-			for(var/direction in shuffle(list(1,2,4,8,5,6,9,10)))
-				var/step = get_step(src, direction)
-				if(step)
-					if(locate(/obj/effect/plant) in step)
-						Move(step)
+			var/obj/effect/plant/food
+			food = locate(/obj/effect/plant) in oview(5,loc)	
+			if(food)
+				var/step = get_step_to(src, food, 0) 	
+				Move(step)
 
 /mob/living/simple_animal/hostile/retaliate/goat/Retaliate()
 	..()