diff --git a/code/game/objects/structures/crates_lockers/largecrate.dm b/code/game/objects/structures/crates_lockers/largecrate.dm
index 9a0b1b3ef7a..c13aafb5927 100644
--- a/code/game/objects/structures/crates_lockers/largecrate.dm
+++ b/code/game/objects/structures/crates_lockers/largecrate.dm
@@ -58,7 +58,7 @@
 
 /obj/structure/largecrate/chick/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if(istype(W, /obj/item/weapon/crowbar))
-		var/num = rand(4,12)
-		for(var/i=0,i<num,i++)
+		var/num = rand(4, 6)
+		for(var/i = 0, i < num, i++)
 			new /mob/living/simple_animal/chick(loc)
 	..()
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 d398a483f5b..7c504d3eb0f 100644
--- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
+++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
@@ -17,7 +17,7 @@
 	response_help  = "pets the"
 	response_disarm = "gently pushes aside the"
 	response_harm   = "kicks the"
-	faction = "neutral"
+	faction = "goat"
 	attacktext = "kicks"
 	health = 40
 	melee_damage_lower = 1
@@ -31,23 +31,26 @@
 
 /mob/living/simple_animal/hostile/retaliate/goat/Life()
 	. = ..()
-	if(.)//chance to go crazy and start wacking stuff
-		if(prob(1))
-			src.visible_message("\red [src] gets an evil-looking gleam in their eye.")
-			faction = "hostile"
-		if(faction == "hostile" && prob(10))
-			faction = "neutral"
+	if(.)
+		//chance to go crazy and start wacking stuff
+		if(!enemies.len && prob(1))
+			Retaliate()
+
+		if(enemies.len && prob(10))
 			enemies = list()
-			stance = HOSTILE_STANCE_IDLE
-			target_mob = null
+			LoseTarget()
+			src.visible_message("\blue [src] calms down.")
+
 		if(stat == CONSCIOUS)
 			if(udder && prob(5))
 				udder.add_reagent("milk", rand(5, 10))
+
 		if(locate(/obj/effect/spacevine) in loc)
 			var/obj/effect/spacevine/SV = locate(/obj/effect/spacevine) in loc
 			del(SV)
 			if(prob(10))
 				say("Nom")
+
 		if(!pulledby)
 			for(var/direction in shuffle(list(1,2,4,8,5,6,9,10)))
 				var/step = get_step(src, direction)
@@ -55,6 +58,10 @@
 					if(locate(/obj/effect/spacevine) in step)
 						Move(step)
 
+/mob/living/simple_animal/hostile/retaliate/goat/Retaliate()
+	..()
+	src.visible_message("\red [src] gets an evil-looking gleam in their eye.")
+
 /mob/living/simple_animal/hostile/retaliate/goat/Move()
 	..()
 	if(!stat)
diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm
index fe680e2698c..7619830a6ed 100644
--- a/code/modules/mob/living/simple_animal/hostile/hostile.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm
@@ -18,8 +18,9 @@
 	stop_automated_movement = 0
 	for(var/atom/A in ListTargets())
 
-		T = Found(A)
-		if(T)
+		var/atom/F = Found(A)
+		if(F)
+			T = F
 			break
 
 		if(isliving(A))
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/retaliate.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/retaliate.dm
index 352574de2a7..49a30558594 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/retaliate.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/retaliate.dm
@@ -4,29 +4,46 @@
 /mob/living/simple_animal/hostile/retaliate/Found(var/atom/A)
 	if(isliving(A))
 		var/mob/living/L = A
-		if(L in enemies)
-			if(!L.stat)
-				stance = HOSTILE_STANCE_ATTACK
-				return L
-			else
-				enemies -= L
+		if(!L.stat)
+			stance = HOSTILE_STANCE_ATTACK
+			return L
+		else
+			enemies -= L
+	else if(istype(A, /obj/mecha))
+		var/obj/mecha/M = A
+		if(M.occupant)
+			stance = HOSTILE_STANCE_ATTACK
+			return A
 
+/mob/living/simple_animal/hostile/retaliate/ListTargets()
+	if(!enemies.len)
+		return list()
+	var/list/see = ..()
+	see &= enemies // Remove all entries that aren't in enemies
+	return see
 
-/mob/living/simple_animal/hostile/retaliate/proc/retaliate()
+/mob/living/simple_animal/hostile/retaliate/proc/Retaliate()
 	..()
-	var/list/mobs_around = viewers(src, 7)
+	var/list/around = view(src, 7)
 
-	for(var/mob/living/M in mobs_around)
-		if(M == src)
+	for(var/atom/movable/A in around)
+		if(A == src)
 			continue
-		if(!attack_same && M.faction != faction)
-			enemies += M
+		if(isliving(A))
+			var/mob/living/M = A
+			if(!attack_same && M.faction != faction)
+				enemies |= M
+		else if(istype(A, /obj/mecha))
+			var/obj/mecha/M = A
+			if(M.occupant)
+				enemies |= M
+				enemies |= M.occupant
 
-	for(var/mob/living/simple_animal/hostile/retaliate/H in mobs_around)
+	for(var/mob/living/simple_animal/hostile/retaliate/H in around)
 		if(!attack_same && !H.attack_same && H.faction == faction)
-			H.enemies += enemies
+			H.enemies |= enemies
 	return 0
 
 /mob/living/simple_animal/hostile/retaliate/adjustBruteLoss(var/damage)
 	..(damage)
-	retaliate()
+	Retaliate()