tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

RND Rework [Death to Techweb] (#16370)

Browse Source 
* Techweb rework

* more ui work

* finishing ui

* Finish all the C# logic

* the techs + lathes

* remove old-tech

* mirror-review
This commit is contained in:
Nemanja
2023-05-15 16:17:30 -04:00
committed by GitHub
parent a71d9c8eff
commit 9efc727fe1
51 changed files with 1732 additions and 1401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Server/Research/Systems/ResearchSystem.Console.cs
View File

@@ -33,18 +33,17 @@ public sealed partial class ResearchSystem
ResearchConsoleBoundInterfaceState state;
if (TryGetClientServer(uid, out var server, out var serverComponent, clientComponent))
if (TryGetClientServer(uid, out _, out var serverComponent, clientComponent))
{
var points = clientComponent.ConnectedToServer ? serverComponent.Points : 0;
var pointsPerSecond = clientComponent.ConnectedToServer ? PointsPerSecond(server.Value, serverComponent) : 0;
state = new ResearchConsoleBoundInterfaceState(points, pointsPerSecond);
state = new ResearchConsoleBoundInterfaceState(points);
}
else
{
state = new ResearchConsoleBoundInterfaceState(default, default);
state = new ResearchConsoleBoundInterfaceState(default);
}
_uiSystem.TrySetUiState(component.Owner, ResearchConsoleUiKey.Key, state);
_uiSystem.TrySetUiState(uid, ResearchConsoleUiKey.Key, state);
}
private void OnPointsChanged(EntityUid uid, ResearchConsoleComponent component, ref ResearchServerPointsChangedEvent args)