Revert "Borg expander + VTEC fix"

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 = list("enabled"=FALSE, "timer"=null, "ref"=null) // VTEC variables
+	var/speed = 0 // VTEC speed boost.
 	var/magpulse = FALSE // Magboot-like effect.
 	var/ionpulse = FALSE // Jetpack-like effect.
 	var/ionpulse_on = FALSE // Jetpack-like effect.
@@ -1041,6 +1041,11 @@
 	shown_robot_modules = FALSE
 	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.
@@ -1050,7 +1055,7 @@
 
 	upgrades.Cut()
 
-	removeVTecStats()
+	speed = 0
 	ionpulse = FALSE
 	revert_shell()
 
@@ -1082,13 +1087,6 @@
 	magpulse = module.magpulsing
 	updatename()
 
-/mob/living/silicon/robot/update_transform()
-	. = ..()
-	var/matrix/ntransform = matrix(transform)
-	if (hasExpanded)
-		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)
@@ -1244,14 +1242,3 @@
 			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"])
-		speed["enabled"] = false
-		deltimer(speed["timer"])
-		RemoveAbility (speed["ref"])
-		speed["ref"] = null
-		remove_movespeed_modifier(MOVESPEED_ID_SILICON_VTEC)
-		update_transform()
-		return TRUE
-	return FALSE

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

@@ -235,7 +235,6 @@
 	R.notify_ai(NEW_MODULE)
 	if(R.hud_used)
 		R.hud_used.update_robot_modules_display()
-	R.update_transform()
 	SSblackbox.record_feedback("tally", "cyborg_modules", 1, R.module)
 
 /* //Broken

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

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