Rework repair pickup internals to keep the repair calculations server side (reverted most code changes from yesterday)