From daea0d35306f4de5ad82befe0168266d488c6043 Mon Sep 17 00:00:00 2001
From: Kyep <github-aweb@sneakemail.com>
Date: Sat, 30 Dec 2017 21:10:14 -0800
Subject: [PATCH] Tiger requests

---
 code/modules/mob/living/living.dm                   |  3 ---
 .../mob/living/simple_animal/friendly/pet.dm        | 13 ++++++++++++-
 code/modules/mob/pulling.dm                         |  3 ---
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 198bba5ac0a..8c81980eb8e 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -57,9 +57,6 @@
 	if(moving_diagonally) //no mob swap during diagonal moves.
 		return 1
 
-	if(ispet(src))
-		return 1
-
 	if(!M.buckled && !M.has_buckled_mobs())
 		var/mob_swap
 		//the puller can always swap with it's victim if on grab intent
diff --git a/code/modules/mob/living/simple_animal/friendly/pet.dm b/code/modules/mob/living/simple_animal/friendly/pet.dm
index 7202c8a4054..cb104be6f92 100644
--- a/code/modules/mob/living/simple_animal/friendly/pet.dm
+++ b/code/modules/mob/living/simple_animal/friendly/pet.dm
@@ -28,4 +28,15 @@
 		overlays.Cut()
 	if(collar)
 		overlays += "[icon_state]collar"
-		overlays += "[icon_state]tag"
\ No newline at end of file
+		overlays += "[icon_state]tag"
+
+/mob/living/simple_animal/pet/start_pulling(atom/movable/AM)
+	if(isliving(AM) && !ispet(AM))
+		return
+	..()
+
+/mob/living/simple_animal/pet/MobBump(mob/M)
+	if(ispet(M))
+		return ..()
+	spreadFire(M)
+	return 1
\ No newline at end of file
diff --git a/code/modules/mob/pulling.dm b/code/modules/mob/pulling.dm
index c89c5b9d144..5a532ee1a42 100644
--- a/code/modules/mob/pulling.dm
+++ b/code/modules/mob/pulling.dm
@@ -15,9 +15,6 @@
 				return
 			stop_pulling()
 
-		if(ispet(src) && isliving(AM) && !ispet(AM))
-			return
-
 		if(AM.pulledby)
 			visible_message("<span class='danger'>[src] has pulled [AM] from [AM.pulledby]'s grip.</span>")
 			AM.pulledby.stop_pulling() //an object can't be pulled by two mobs at once.