Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

ECS and bandaid research (#9251)

Browse Source
This commit is contained in:
metalgearsloth
2022-06-28 22:54:08 +10:00
committed by GitHub
parent 9b08457e52
commit 5dbb3220dd
21 changed files with 496 additions and 531 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Client/Entry/EntryPoint.cs
View File

@@ -70,7 +70,7 @@ namespace Content.Client.Entry
factory.DoAutoRegistrations();
factory.IgnoreMissingComponents();
factory.RegisterClass<SharedResearchConsoleComponent>();
// Do not add to these, they are legacy.
factory.RegisterClass<SharedLatheComponent>();
factory.RegisterClass<SharedSpawnPointComponent>();
factory.RegisterClass<SharedVendingMachineComponent>();
@@ -78,6 +78,7 @@ namespace Content.Client.Entry
factory.RegisterClass<SharedChemMasterComponent>();
factory.RegisterClass<SharedGravityGeneratorComponent>();
factory.RegisterClass<SharedAMEControllerComponent>();
// Do not add to the above, they are legacy
prototypes.RegisterIgnore("accent");
prototypes.RegisterIgnore("material");

4
Content.Client/Research/TechnologyDatabaseComponent.cs
View File

@@ -21,14 +21,14 @@ namespace Content.Client.Research
if (curState is not TechnologyDatabaseState state) return;
_technologies.Clear();
Technologies.Clear();
var protoManager = IoCManager.Resolve<IPrototypeManager>();
foreach (var techID in state.Technologies)
{
if (!protoManager.TryIndex(techID, out TechnologyPrototype? technology)) continue;
_technologies.Add(technology);
Technologies.Add(technology);
}
OnDatabaseUpdated?.Invoke();

3
Content.Client/Research/UI/ResearchClientBoundUserInterface.cs
View File

@@ -1,6 +1,5 @@
using Content.Shared.Research.Components;
using Robust.Client.GameObjects;
using Robust.Shared.GameObjects;
using static Content.Shared.Research.Components.SharedResearchClientComponent;
namespace Content.Client.Research.UI
{

4
Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs
View File

@@ -1,9 +1,7 @@
using Content.Shared.Research.Components;
using Content.Shared.Research.Prototypes;
using JetBrains.Annotations;
using Robust.Client.GameObjects;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using static Content.Shared.Research.Components.SharedResearchConsoleComponent;
namespace Content.Client.Research.UI
{