Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13

code/game/objects/items/robot/robot_parts.dm

@@ -59,8 +59,8 @@
 		if(src.l_leg && src.r_leg)
 			if(src.chest && src.head)
 				SSblackbox.record_feedback("amount", "cyborg_frames_built", 1)
-				return 1
-	return 0
+				return TRUE
+	return FALSE
 
 /obj/item/robot_suit/wrench_act(mob/living/user, obj/item/I) //Deconstucts empty borg shell. Flashes remain unbroken because they haven't been used yet
 	var/turf/T = get_turf(src)

code/game/objects/items/robot/robot_upgrades.dm

@@ -721,6 +721,6 @@
 				user.vtec = initial(user.vtec) - maxReduction * 1
 
 	action.button_icon_state = "Chevron_State_[currentState]"
-	action.UpdateButtonIcon()
+	action.UpdateButtons()
 
 	return TRUE