From 5e0ed0585fe3e4c0e2f12ec1af64c15119016a46 Mon Sep 17 00:00:00 2001
From: Verkister <superverkelian@hotmail.com>
Date: Mon, 9 Apr 2018 23:40:20 +0300
Subject: [PATCH] done

---
 code/modules/mob/living/living.dm                    | 12 ++++++------
 .../mob/living/simple_animal/simple_animal.dm        |  4 +++-
 code/modules/vore/resizing/resize_vr.dm              |  8 --------
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index e5cec557a5..52000630a3 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -1062,7 +1062,7 @@ default behaviour is:
 	if(lying != lying_prev)
 		lying_prev = lying
 		update_transform()
-		
+
 	return canmove
 
 // Adds overlays for specific modifiers.
@@ -1090,10 +1090,10 @@ default behaviour is:
 /mob/living/proc/is_sentient()
 	return TRUE
 
-/* //VOREStation Edit. We have a better system in place.
+
 /mob/living/update_transform()
 	// First, get the correct size.
-	var/desired_scale = icon_scale
+	var/desired_scale = size_multiplier //VOREStation edit
 	for(var/datum/modifier/M in modifiers)
 		if(!isnull(M.icon_scale_percent))
 			desired_scale *= M.icon_scale_percent
@@ -1103,8 +1103,8 @@ default behaviour is:
 	M.Scale(desired_scale)
 	M.Translate(0, 16*(desired_scale-1))
 	src.transform = M
-	animate(src, transform = M, time = 10)
-*/ //VOREStation Edit
+	//animate(src, transform = M, time = 10) //VOREStation edit
+
 
 // This handles setting the client's color variable, which makes everything look a specific color.
 // This proc is here so it can be called without needing to check if the client exists, or if the client relogs.
@@ -1226,7 +1226,7 @@ default behaviour is:
 		return UNDERWATER
 	else
 		return ..()
-		
+
 //Add an entry to overlays, assuming it exists
 /mob/living/proc/apply_hud(cache_index, var/image/I)
 	hud_list[cache_index] = I
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 1f5cb25862..4c6d9312c4 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -314,9 +314,11 @@
 	else
 		ma.icon_state = initial(icon_state)
 
-	var/vore_icon_state = update_vore_icon() //VOREStation edit
+	//VOREStation edit start
+	var/vore_icon_state = update_vore_icon()
 	if(vore_icon_state)
 		ma.icon_state = vore_icon_state
+	//VOREStation edit end
 
 	if(has_hands)
 		if(r_hand_sprite)
diff --git a/code/modules/vore/resizing/resize_vr.dm b/code/modules/vore/resizing/resize_vr.dm
index a9487ce8d7..9e957955b8 100644
--- a/code/modules/vore/resizing/resize_vr.dm
+++ b/code/modules/vore/resizing/resize_vr.dm
@@ -45,14 +45,6 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2
 	M.Translate(0, 16*(size_multiplier-1))
 	src.transform = M
 
-/mob/living/update_transform()
-	. = ..()
-	ASSERT(!ishuman(src))
-	var/matrix/M = matrix()
-	M.Scale(size_multiplier)
-	M.Translate(0, 16*(size_multiplier-1))
-	src.transform = M
-
 /**
  * Get the effective size of a mob.
  * Currently this is based only on size_multiplier for micro/macro stuff,