As per the G-Carrier taking up 8 dT, that includes all the space required to repair the G-Carrier as well. So long as we do the same treatment on the other items, we’ll be fine with repairing things in the Shuttle. Room for cleverness here in leaving only enough room to repair one thing at a time , by overlapping the repair zones. My point about off-shuttle storage of the “toys” is that, when we want to use the shuttle for other things, we need a place to store the “toys”. Since we can repair on the Shuttle, it doesn’t need to be the full utility volume... it can just be the “stowed” volume. It doesn’t need to be bay space, either; adjacent cargo space will do, and have more overall utility.