Convert almost all IActivate instances that open UIs to ActivatableUI (#7028)
* Chem master * Drone support for handhelds * Vending machines, scanners * Cloners, R&D computers * make research a little less sussy * Unfuck wires * PA control computer * Unfuck merge * Clean up git gore for good * Disposals * Microwaves * paper * Magic mirror * More vendors for drones * Solar computer whitelist * EFR review updates
This commit is contained in:
@@ -3,15 +3,12 @@ using Content.Shared.Interaction;
|
||||
using Content.Shared.Research.Components;
|
||||
using Robust.Server.GameObjects;
|
||||
using Robust.Server.Player;
|
||||
using Robust.Shared.GameObjects;
|
||||
using Robust.Shared.IoC;
|
||||
using Robust.Shared.ViewVariables;
|
||||
|
||||
namespace Content.Server.Research.Components
|
||||
{
|
||||
[RegisterComponent]
|
||||
[Virtual]
|
||||
public class ResearchClientComponent : SharedResearchClientComponent, IActivate
|
||||
public class ResearchClientComponent : SharedResearchClientComponent
|
||||
{
|
||||
[Dependency] private readonly IEntitySystemManager _entitySystemManager = default!;
|
||||
|
||||
@@ -55,15 +52,6 @@ namespace Content.Server.Research.Components
|
||||
UpdateUserInterface();
|
||||
UserInterface?.Open(session);
|
||||
}
|
||||
|
||||
void IActivate.Activate(ActivateEventArgs eventArgs)
|
||||
{
|
||||
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(eventArgs.User, out ActorComponent? actor))
|
||||
return;
|
||||
|
||||
OpenUserInterface(actor.PlayerSession);
|
||||
}
|
||||
|
||||
public void UpdateUserInterface()
|
||||
{
|
||||
UserInterface?.SetState(GetNewUiState());
|
||||
|
||||
Reference in New Issue
Block a user