From 6553207735155ca47a86ceedf5819eb7a8e3820b Mon Sep 17 00:00:00 2001
From: AnturK <why@so.serious>
Date: Sun, 11 Oct 2015 13:10:11 +0200
Subject: [PATCH] Fixes morph infinite loop

---
 code/modules/mob/living/simple_animal/morph/morph.dm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/modules/mob/living/simple_animal/morph/morph.dm b/code/modules/mob/living/simple_animal/morph/morph.dm
index d511e5f2004..dd6e4f36fa2 100644
--- a/code/modules/mob/living/simple_animal/morph/morph.dm
+++ b/code/modules/mob/living/simple_animal/morph/morph.dm
@@ -57,6 +57,8 @@
 		return 0
 	if(istype(A,/obj/singularity))
 		return 0
+	if(istype(A,/mob/living/simple_animal/hostile/morph))
+		return 0
 	return 1
 
 /mob/living/simple_animal/hostile/morph/ShiftClickOn(atom/movable/A)