Merge branch 'master' of https://github.com/tgstation/-tg-station into mineral_economy

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

@@ -105,7 +105,7 @@
 		if (user.get_inactive_hand()==src)
 			user.unEquip(src)
 			user.put_in_inactive_hand(B)
-		del(src)
+		qdel(src)
 	if(istype(W, /obj/item/robot_parts/l_leg))
 		if(src.l_leg)	return
 		user.drop_item()

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

@@ -30,7 +30,7 @@
 	R.uneq_all()
 	R.hands.icon_state = "nomod"
 	R.icon_state = "robot"
-	del(R.module)
+	qdel(R.module)
 	R.module = null
 	R.modtype = "robot"
 	R.updatename("Default")
@@ -53,6 +53,7 @@
 	if(..()) return 0
 	R.name = heldname
 	R.real_name = heldname
+	R.custom_name = heldname //Required or else if the cyborg's module changes, their name is lost.
 
 	return 1