Just to clarify, the Shelter builder boost has a -6 upgrade penalty but gains the following conditions:
1) if it wins it gets normal salvage.
2) if it loses it will only have to discard 6 cards
for #2 above, do the 6 discards come from the deck or from vault?