Merge pull request #785 from DragonTrance/this-is-my-3rd-branch-i-hate-github-sometimes

Expander + VTEC upgrades Fix (times two)

code/modules/mob/living/silicon/robot/robot.dm

@@ -53,7 +53,7 @@
 
 	var/alarms = list("Motion"=list(), "Fire"=list(), "Atmosphere"=list(), "Power"=list(), "Camera"=list(), "Burglar"=list())
 
-	var/speed = 0 // VTEC speed boost.
+	var/speed = list("enabled"=FALSE, "timer"=null, "ref"=null) // VTEC stats
 	var/magpulse = FALSE // Magboot-like effect.
 	var/ionpulse = FALSE // Jetpack-like effect.
 	var/ionpulse_on = FALSE // Jetpack-like effect.
@@ -1042,10 +1042,6 @@
 	if(hud_used)
 		hud_used.update_robot_modules_display()
 
-	if (hasExpanded)
-		resize = 0.5
-		hasExpanded = FALSE
-		update_transform()
 	module.transform_to(/obj/item/robot_module)
 
 	// Remove upgrades.
@@ -1055,7 +1051,7 @@
 
 	upgrades.Cut()
 
-	speed = 0
+	removeVTecStats()
 	ionpulse = FALSE
 	revert_shell()
 
@@ -1087,6 +1083,13 @@
 	magpulse = module.magpulsing
 	updatename()
 
+/mob/living/silicon/robot/update_transform()
+	. = ..()
+	if (hasExpanded)
+		var/matrix/ntransform = matrix(transform)
+		ntransform.Scale(2)	//This seems a bit big
+		ntransform.Translate(0, 16)
+		transform = ntransform
 
 /mob/living/silicon/robot/proc/place_on_head(obj/item/new_hat)
 	if(hat)
@@ -1242,3 +1245,18 @@
 			connected_ai.aicamera.stored[i] = TRUE
 		for(var/i in connected_ai.aicamera.stored)
 			aicamera.stored[i] = TRUE
+
+/mob/living/silicon/robot/proc/removeVTecStats()
+	if (!speed["enabled"])
+		return FALSE
+
+	speed["enabled"] = FALSE
+	deltimer(speed["timer"])
+	RemoveAbility(speed["ref"])
+	remove_movespeed_modifier(MOVESPEED_ID_SILICON_VTEC)
+
+	speed["ref"] = null
+	speed["timer"] = null
+
+	update_transform()
+	return TRUE

code/modules/mob/living/silicon/silicon.dm

@@ -390,6 +390,7 @@
 	if (aicamera)
 		return aicamera.selectpicture(user)
 
+/*
 /mob/living/silicon/update_transform()
 	var/matrix/ntransform = matrix(transform) //aka transform.Copy()
 	var/changed = 0
@@ -400,7 +401,7 @@
 
 	if(changed)
 		animate(src, transform = ntransform, time = 2,easing = EASE_IN|EASE_OUT)
-	return ..()
+	return ..() */
 
 /mob/living/silicon/is_literate()
 	return 1