From ef2ef726ce2cd638983402bf2f31a3561a7c9f36 Mon Sep 17 00:00:00 2001
From: AnturK <why@so.serious>
Date: Sat, 26 Sep 2015 21:01:08 +0200
Subject: [PATCH] Fixes Larva/Silicon resizing

---
 .../mob/living/carbon/alien/larva/update_icons.dm  |  1 +
 code/modules/mob/living/silicon/robot/life.dm      |  1 +
 code/modules/mob/living/silicon/robot/robot.dm     |  2 +-
 code/modules/mob/living/silicon/silicon.dm         | 14 +++++++++++++-
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/code/modules/mob/living/carbon/alien/larva/update_icons.dm b/code/modules/mob/living/carbon/alien/larva/update_icons.dm
index b12a2b766b6..5f355eff7c7 100644
--- a/code/modules/mob/living/carbon/alien/larva/update_icons.dm
+++ b/code/modules/mob/living/carbon/alien/larva/update_icons.dm
@@ -22,6 +22,7 @@
 		icon_state = "larva[state]"
 
 /mob/living/carbon/alien/larva/update_transform() //All this is handled in update_icons()
+	..()
 	return update_icons()
 
 /mob/living/carbon/alien/larva/update_inv_handcuffed()
diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm
index fed748e1a3d..5c05df1d953 100644
--- a/code/modules/mob/living/silicon/robot/life.dm
+++ b/code/modules/mob/living/silicon/robot/life.dm
@@ -205,4 +205,5 @@
 		canmove = 0
 	else
 		canmove = 1
+	update_transform()
 	return canmove
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index d4cf25c2e3f..aacc9e31628 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -1150,4 +1150,4 @@
 		if(2) //New Module
 			connected_ai << "<br><br><span class='notice'>NOTICE - Cyborg module change detected: [name] has loaded the [designation] module.</span><br>"
 		if(3) //New Name
-			connected_ai << "<br><br><span class='notice'>NOTICE - Cyborg reclassification detected: [oldname] is now designated as [newname].</span><br>"
+			connected_ai << "<br><br><span class='notice'>NOTICE - Cyborg reclassification detected: [oldname] is now designated as [newname].</span><br>"
\ No newline at end of file
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index 1b730a52172..30d0f635f67 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -448,4 +448,16 @@
 
 /mob/living/silicon/flash_eyes(intensity = 1, override_blindness_check = 0, affect_silicon = 0)
 	if(affect_silicon)
-		return ..()
\ No newline at end of file
+		return ..()
+
+/mob/living/silicon/update_transform()
+	var/matrix/ntransform = matrix(transform) //aka transform.Copy()
+	var/changed = 0
+	if(resize != RESIZE_DEFAULT_SIZE)
+		changed++
+		ntransform.Scale(resize)
+		resize = RESIZE_DEFAULT_SIZE
+
+	if(changed)
+		animate(src, transform = ntransform, time = 2,easing = EASE_IN|EASE_OUT)
+	return ..()
\ No newline at end of file