Merge branch 'master' into science-comms

This commit is contained in:
2018-12-01 19:57:12 -08:00
98 changed files with 1717 additions and 30 deletions

View File

@ -30,5 +30,13 @@ Localization
#LOC_Restock_variant-surface_metal = Metal
#LOC_Restock_variant-service-bay-opaque = Solid Caps
#LOC_Restock_variant-service-bay-transparent = Truss Caps
#LOC_Restock_variant-service-bay-hollow = No Caps
#LOC_Restock_variant-heat-shield-black = Black
#LOC_Restock_variant-heat-shield-brown = Classic
#LOC_Restock_variant-heat-shield-red = Unpainted
}
}