From aed4bfb3c4ab11e40b26bf82a8394844b3d14e9b Mon Sep 17 00:00:00 2001
From: Arokha Sieyes <arokha@arokha.com>
Date: Tue, 4 Apr 2017 16:43:27 -0400
Subject: [PATCH 1/2] Simple Animal Tweaks

They can resist out of closets, buckles, and when calling for help, if the helpers can see the issue, they don't just follow the caller, they attack the issue. This means that retaliate class mobs properly assist in fights for the mob who is retaliating.
---
 .../mob/living/simple_animal/simple_animal.dm | 39 +++++++++++++------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 1179dc889f2..1f1de9dc943 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -271,21 +271,31 @@
 	update_icon()
 
 	ai_log("Life() - stance=[stance] ai_inactive=[ai_inactive]", 4)
-	//Movement
-	if(!ai_inactive && !stop_automated_movement && wander && !anchored) //Allowed to move?
-		handle_wander_movement()
 
-	//Speaking
-	if(!ai_inactive && speak_chance && stance == STANCE_IDLE) // Allowed to chatter?
-		handle_idle_speaking()
-
-	//Stanceyness
+	//AI Actions
 	if(!ai_inactive)
+		//Stanceyness
 		handle_stance()
 
-	//Resisting out of things
-	if(!ai_inactive && incapacitated(INCAPACITATION_DEFAULT) && stance != STANCE_IDLE)
-		resist()
+		//Movement
+		if(!stop_automated_movement && wander && !anchored) //Allowed to move?
+			handle_wander_movement()
+
+		//Speaking
+		if(speak_chance && stance == STANCE_IDLE) // Allowed to chatter?
+			handle_idle_speaking()
+
+		//Resisting out buckles
+		if(incapacitated(INCAPACITATION_BUCKLED_PARTIALLY))
+			resist()
+
+		//Resisting out of closets
+		if(istype(loc,/obj/structure/closet))
+			var/obj/structure/closet/C = loc
+			if(C.welded)
+				resist()
+			else
+				C.open()
 
 	return 1
 
@@ -807,12 +817,17 @@
 
 //Someone wants help?
 /mob/living/simple_animal/proc/HelpRequested(var/mob/living/simple_animal/F)
-	if(!(stance == STANCE_IDLE) || stat)
+	if(target_mob || stat)
 		ai_log("HelpRequested() by [F] but we're busy/dead",2)
 		return
 	if(get_dist(src,F) <= follow_dist)
 		ai_log("HelpRequested() by [F] but we're already here",2)
 		return
+	if(get_dist(src,F) <= view_range)
+		ai_log("HelpRequested() by [F] and within targetshare range",2)
+		if(F.target_mob && set_target(F.target_mob))
+			handle_stance(STANCE_ATTACK)
+			return
 
 	if(set_follow(F, 10 SECONDS))
 		handle_stance(STANCE_FOLLOW)

From 3530f71530ce6ea1ced9ca18cb3bc17a9f19b4e4 Mon Sep 17 00:00:00 2001
From: Leshana <Leshana@users.noreply.github.com>
Date: Tue, 4 Apr 2017 19:16:39 -0400
Subject: [PATCH 2/2] Prevent pets from resisting out of being buckled to
 chairs.

* Simple animals won't resist out of being buckled while idle.  This lets them be buckled on shuttles etc. They still will resist out when they lock onto a target etc.
---
 code/modules/mob/living/simple_animal/simple_animal.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 1f1de9dc943..af20f042019 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -286,7 +286,7 @@
 			handle_idle_speaking()
 
 		//Resisting out buckles
-		if(incapacitated(INCAPACITATION_BUCKLED_PARTIALLY))
+		if(stance != STANCE_IDLE && incapacitated(INCAPACITATION_BUCKLED_PARTIALLY))
 			resist()
 
 		//Resisting out of closets