Merge remote-tracking branch 'upstream/master' into universal-damage

code/game/objects/items.dm

@@ -637,6 +637,10 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
 	deltimer(tip_timer) //delete any in-progress timer if the mouse is moved off the item before it finishes
 	closeToolTip(usr)
 
+// Returns a numeric value for sorting items used as parts in machines, so they can be replaced by the rped
+/obj/item/proc/get_part_rating()
+	return 0
+
 /obj/item/proc/update_slot_icon()
 	if(!ismob(loc))
 		return