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

Convert almost all IActivate instances that open UIs to ActivatableUI (#7028)

Browse Source 
* 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:
Rane
2022-03-12 13:26:06 -05:00
committed by GitHub
parent 865c9630bd
commit 926e36d81d
48 changed files with 305 additions and 584 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Content.Server/Kitchen/Components/MicrowaveComponent.cs
View File

@@ -30,8 +30,7 @@ using Robust.Shared.Player;
namespace Content.Server.Kitchen.Components
{
[RegisterComponent]
[ComponentReference(typeof(IActivate))]
public sealed class MicrowaveComponent : SharedMicrowaveComponent, IActivate, IInteractUsing, ISuicideAct, IBreakAct
public sealed class MicrowaveComponent : SharedMicrowaveComponent, IInteractUsing, ISuicideAct, IBreakAct
{
[Dependency] private readonly IEntityManager _entities = default!;
@@ -76,13 +75,13 @@ namespace Content.Server.Kitchen.Components
private bool HasContents => _storage.ContainedEntities.Count > 0;
private bool _uiDirty = true;
public bool UIDirty = true;
private bool _lostPower;
private int _currentCookTimeButtonIndex;
public void DirtyUi()
{
_uiDirty = true;
UIDirty = true;
}
private Container _storage = default!;
@@ -121,7 +120,7 @@ namespace Content.Server.Kitchen.Components
{
EjectSolids();
ClickSound();
_uiDirty = true;
UIDirty = true;
}
break;
@@ -130,7 +129,7 @@ namespace Content.Server.Kitchen.Components
{
EjectSolid(msg.EntityID);
ClickSound();
_uiDirty = true;
UIDirty = true;
}
break;
@@ -138,7 +137,7 @@ namespace Content.Server.Kitchen.Components
_currentCookTimeButtonIndex = msg.ButtonIndex;
_currentCookTimerTime = msg.NewCookTime;
ClickSound();
_uiDirty = true;
UIDirty = true;
break;
}
}
@@ -157,7 +156,7 @@ namespace Content.Server.Kitchen.Components
_lostPower = true;
EjectSolids();
_busy = false;
_uiDirty = true;
UIDirty = true;
}
if (_busy && _broken)
@@ -167,10 +166,10 @@ namespace Content.Server.Kitchen.Components
_lostPower = true;
EjectSolids();
_busy = false;
_uiDirty = true;
UIDirty = true;
}
if (_uiDirty)
if (UIDirty)
{
UserInterface?.SetState(new MicrowaveUpdateUserInterfaceState
(
@@ -179,7 +178,7 @@ namespace Content.Server.Kitchen.Components
_currentCookTimeButtonIndex,
_currentCookTimerTime
));
_uiDirty = false;
UIDirty = false;
}
}
@@ -203,17 +202,6 @@ namespace Content.Server.Kitchen.Components
SetAppearance(MicrowaveVisualState.Broken);
}
void IActivate.Activate(ActivateEventArgs eventArgs)
{
if (!_entities.TryGetComponent(eventArgs.User, out ActorComponent? actor) || !Powered)
{
return;
}
_uiDirty = true;
UserInterface?.Toggle(actor.PlayerSession);
}
async Task<bool> IInteractUsing.InteractUsing(InteractUsingEventArgs eventArgs)
{
if (!Powered)
@@ -242,7 +230,7 @@ namespace Content.Server.Kitchen.Components
var ent = food.Owner; //Get the entity of the ItemComponent.
_storage.Insert(ent);
_uiDirty = true;
UIDirty = true;
return true;
}
@@ -353,10 +341,10 @@ namespace Content.Server.Kitchen.Components
SetAppearance(MicrowaveVisualState.Idle);
_busy = false;
_uiDirty = true;
UIDirty = true;
});
_lostPower = false;
_uiDirty = true;
UIDirty = true;
}
/// <summary>
@@ -544,7 +532,7 @@ namespace Content.Server.Kitchen.Components
_currentCookTimerTime = 10;
ClickSound();
_uiDirty = true;
UIDirty = true;
Wzhzhzh();
return SuicideKind.Heat;
}