Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync

# Conflicts:
#	code/game/mecha/mech_fabricator.dm

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

@@ -15,47 +15,37 @@
 
 /obj/item/robot_parts/New(var/newloc, var/model)
 	..(newloc)
-	if(model_info && model)
-		model_info = model
-		var/datum/robolimb/R = all_robolimbs[model]
-		if(R)
-			name = "[R.company] [initial(name)]"
-			desc = "[R.desc]"
-			if(icon_state in icon_states(R.icon))
-				icon = R.icon
-	else
-		name = "robot [initial(name)]"
 
 /obj/item/robot_parts/l_arm
-	name = "left arm"
+	name = "cyborg left arm"
 	desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case."
 	icon_state = "l_arm"
 	part = list(BP_L_ARM, BP_L_HAND)
 	model_info = 1
 
 /obj/item/robot_parts/r_arm
-	name = "right arm"
+	name = "cyborg right arm"
 	desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case."
 	icon_state = "r_arm"
 	part = list(BP_R_ARM, BP_R_HAND)
 	model_info = 1
 
 /obj/item/robot_parts/l_leg
-	name = "left leg"
+	name = "cyborg left leg"
 	desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case."
 	icon_state = "l_leg"
 	part = list(BP_L_LEG, BP_L_FOOT)
 	model_info = 1
 
 /obj/item/robot_parts/r_leg
-	name = "right leg"
+	name = "cyborg leg"
 	desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case."
 	icon_state = "r_leg"
 	part = list(BP_R_LEG, BP_R_FOOT)
 	model_info = 1
 
 /obj/item/robot_parts/chest
-	name = "chest"
+	name = "cyborg chest"
 	desc = "A heavily reinforced case containing cyborg logic boards, with space for a standard power cell."
 	icon_state = "chest"
 	part = list(BP_GROIN,BP_TORSO)
@@ -63,7 +53,7 @@
 	var/obj/item/weapon/cell/cell = null
 
 /obj/item/robot_parts/head
-	name = "head"
+	name = "cyborg head"
 	desc = "A standard reinforced braincase, with spine-plugged neural socket and sensor gimbals."
 	icon_state = "head"
 	part = list(BP_HEAD)