diff --git a/.travis.yml b/.travis.yml
index 02174a8297..81b8487f48 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,4 +20,5 @@ script:
   - shopt -s globstar
   - (! grep 'step_[xy]' maps/**/*.dmm)
   - (! find nano/templates/ -type f -exec md5sum {} + | sort | uniq -D -w 32 | grep nano)
+  - (  md5sum -c - <<< "0af969f671fba6cf9696c78cd175a14a *baystation12.int")
   - DreamMaker baystation12.dme
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 433a46efb7..1dcd98ffdc 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()
 	..()
diff --git a/html/changelogs/Ccomp5950-Goats.yml b/html/changelogs/Ccomp5950-Goats.yml
new file mode 100644
index 0000000000..be80867380
--- /dev/null
+++ b/html/changelogs/Ccomp5950-Goats.yml
@@ -0,0 +1,7 @@
+author: Ccomp5950
+delete-after: True
+
+changes:
+  - bugfix: "Beepsky no longer kills goats."
+  - tweak: "Goats will move towards vines that are 4 spaces away now instead of 1"
+  - bugfix: "Goats will eat the spawning plants for vines as well as the vines themselves."