From 53e52a6f92976cb15517fa00e52da8897276260a Mon Sep 17 00:00:00 2001
From: ccomp5950 <ccomp5950@gmail.com>
Date: Mon, 18 May 2015 03:34:08 -0400
Subject: [PATCH 1/3] Goat Buffs.

Goats now are no longer on Officer Beepsky's shitlist.
Goats will now prefer to step towards vines.
Goats will now "eat" the plants vines leave behind.
---
 code/game/machinery/bots/secbot.dm                 |  2 +-
 .../living/simple_animal/friendly/farm_animals.dm  | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

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()
 	..()

From 43c10d7d60b1ec25db0ce1ee7e9ef71e099fb4c4 Mon Sep 17 00:00:00 2001
From: ccomp5950 <ccomp5950@gmail.com>
Date: Mon, 18 May 2015 18:51:49 -0400
Subject: [PATCH 2/3] Changelogs

---
 html/changelogs/Ccomp5950-Goats.yml | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 html/changelogs/Ccomp5950-Goats.yml

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."

From 876d518fe0be7cc34c0b8391300cfc22ba8f2b0d Mon Sep 17 00:00:00 2001
From: PsiOmegaDelta <git@psiomega.se>
Date: Wed, 20 May 2015 13:29:25 +0200
Subject: [PATCH 3/3] Update .travis.yml

Attempts to ensure baystation12.int remains unchanged.
---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

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