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.Client.cs
View File

@@ -105,8 +105,10 @@ public sealed partial class ResearchSystem
/// <param name="serverComponent">The server's ResearchServerComponent. Null if false</param>
/// <param name="component">The client's Researchclient component</param>
/// <returns>If the server was successfully retrieved.</returns>
public bool TryGetClientServer(EntityUid uid, [NotNullWhen(returnValue: true)] out EntityUid? server,
[NotNullWhen(returnValue: true)] out ResearchServerComponent? serverComponent, ResearchClientComponent? component = null)
public bool TryGetClientServer(EntityUid uid,
[NotNullWhen(returnValue: true)] out EntityUid? server,
[NotNullWhen(returnValue: true)] out ResearchServerComponent? serverComponent,
ResearchClientComponent? component = null)
{
server = null;
serverComponent = null;
@@ -117,11 +119,10 @@ public sealed partial class ResearchSystem
if (component.Server == null)
return false;
if (!TryComp<ResearchServerComponent>(component.Server, out var sc))
if (!TryComp(component.Server, out serverComponent))
return false;
server = component.Server;
serverComponent = sc;
return true;
}
}