Skip to content
This repository has been archived by the owner on Nov 1, 2024. It is now read-only.

Commit

Permalink
реквесты
Browse files Browse the repository at this point in the history
  • Loading branch information
Ivan Rubinov committed May 22, 2024
1 parent c8ad794 commit 33761ab
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
6 changes: 2 additions & 4 deletions Content.Client/PDA/PdaMenu.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ public sealed partial class PdaMenu : PdaWindow
private string _stationName = Loc.GetString("comp-pda-ui-unknown");
private string _alertLevel = Loc.GetString("comp-pda-ui-unknown");
private string _instructions = Loc.GetString("comp-pda-ui-unknown");
private string _balance = Loc.GetString("comp-pda-ui-balance", ("balance", 0));
private string _balance = 0;

Check failure on line 35 in Content.Client/PDA/PdaMenu.xaml.cs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest)

Cannot implicitly convert type 'int' to 'string'

Check failure on line 35 in Content.Client/PDA/PdaMenu.xaml.cs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest)

Cannot implicitly convert type 'int' to 'string'

Check failure on line 35 in Content.Client/PDA/PdaMenu.xaml.cs

View workflow job for this annotation

GitHub Actions / YAML Linter

Cannot implicitly convert type 'int' to 'string'

Check failure on line 35 in Content.Client/PDA/PdaMenu.xaml.cs

View workflow job for this annotation

GitHub Actions / YAML Linter

Cannot implicitly convert type 'int' to 'string'

Check failure on line 35 in Content.Client/PDA/PdaMenu.xaml.cs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest)

Cannot implicitly convert type 'int' to 'string'

Check failure on line 35 in Content.Client/PDA/PdaMenu.xaml.cs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest)

Cannot implicitly convert type 'int' to 'string'

Check failure on line 35 in Content.Client/PDA/PdaMenu.xaml.cs

View workflow job for this annotation

GitHub Actions / Test Packaging

Cannot implicitly convert type 'int' to 'string'

Check failure on line 35 in Content.Client/PDA/PdaMenu.xaml.cs

View workflow job for this annotation

GitHub Actions / Test Packaging

Cannot implicitly convert type 'int' to 'string'


private int _currentView;

Expand Down Expand Up @@ -131,9 +132,6 @@ public PdaMenu()
_clipboard.SetText(_instructions);
};




HideAllViews();
ToHomeScreen();
}
Expand Down
7 changes: 3 additions & 4 deletions Content.Server/PDA/PdaSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -167,11 +167,10 @@ public void UpdatePdaUi(EntityUid uid, PdaComponent? pda = null, EntityUid? acto
var programs = _cartridgeLoader.GetAvailablePrograms(uid, loader);
var id = CompOrNull<IdCardComponent>(pda.ContainedId);
ulong balance = 0;
if (actor_uid != null){
if (TryComp<BankAccountComponent>(actor_uid, out var bank)) {
if (actor_uid != null)
if (TryComp<BankAccountComponent>(actor_uid, out var bank))
balance = (ulong)bank.Balance;
}
}

var state = new PdaUpdateState(
programs,
GetNetEntity(loader.ActiveProgram),
Expand Down

0 comments on commit 33761ab

Please sign in to comment.