Unstable 0.17.4.0

This commit is contained in:
Markus Isberg
2022-03-30 00:08:09 +09:00
parent 2968e23ae8
commit c1b8e5a341
177 changed files with 3388 additions and 1977 deletions
@@ -680,7 +680,7 @@ namespace Barotrauma
//locationInfoPanel?.UpdateAuto(1.0f);
}
public void SelectTab(CampaignMode.InteractionType tab)
public void SelectTab(CampaignMode.InteractionType tab, Identifier storeIdentifier = default)
{
if (Campaign.ShowCampaignUI || (Campaign.ForceMapUI && tab == CampaignMode.InteractionType.Map))
{
@@ -724,8 +724,7 @@ namespace Barotrauma
}
break;
case CampaignMode.InteractionType.Store:
Store.RefreshItemsToSell();
Store.Refresh();
Store.SelectStore(storeIdentifier);
break;
case CampaignMode.InteractionType.Crew:
CrewManagement.UpdateCrew();