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

Inline UID

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 15:53:09 +01:00
parent 2654775bf0
commit 5cd42c9ad6
803 changed files with 3613 additions and 3577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
View File

@@ -98,13 +98,13 @@ namespace Content.Server.Disposal.Unit.EntitySystems
if (!args.CanAccess ||
!args.CanInteract ||
component.ContainedEntities.Contains(args.User) ||
!_actionBlockerSystem.CanMove(args.User.Uid))
!_actionBlockerSystem.CanMove(args.User))
return;
// Add verb to climb inside of the unit,
Verb verb = new()
{
Act = () => TryInsert(component.Owner.Uid, args.User.Uid, args.User.Uid),
Act = () => TryInsert(component.Owner, args.User, args.User),
Text = Loc.GetString("disposal-self-insert-verb-get-data-text")
};
// TODO VERN ICON
@@ -159,7 +159,7 @@ namespace Content.Server.Disposal.Unit.EntitySystems
public void TogglePower(DisposalUnitComponent component)
{
if (!EntityManager.TryGetComponent(component.Owner.Uid, out ApcPowerReceiverComponent? receiver))
if (!EntityManager.TryGetComponent(component.Owner, out ApcPowerReceiverComponent? receiver))
{
return;
}
@@ -172,7 +172,7 @@ namespace Content.Server.Disposal.Unit.EntitySystems
#region Eventbus Handlers
private void HandleActivate(EntityUid uid, DisposalUnitComponent component, ActivateInWorldEvent args)
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(args.User.Uid, out ActorComponent? actor))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(args.User, out ActorComponent? actor))
{
return;
}
@@ -187,7 +187,7 @@ namespace Content.Server.Disposal.Unit.EntitySystems
private void HandleInteractHand(EntityUid uid, DisposalUnitComponent component, InteractHandEvent args)
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(args.User.Uid, out ActorComponent? actor)) return;
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(args.User, out ActorComponent? actor)) return;
// Duplicated code here, not sure how else to get actor inside to make UserInterface happy.
@@ -198,7 +198,7 @@ namespace Content.Server.Disposal.Unit.EntitySystems
private void HandleInteractUsing(EntityUid uid, DisposalUnitComponent component, InteractUsingEvent args)
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(args.User.Uid, out HandsComponent? hands))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(args.User, out HandsComponent? hands))
{
return;
}
@@ -238,7 +238,7 @@ namespace Content.Server.Disposal.Unit.EntitySystems
UpdateInterface(component, component.Powered);
if (!IoCManager.Resolve<IEntityManager>().HasComponent<AnchorableComponent>(component.Owner.Uid))
if (!IoCManager.Resolve<IEntityManager>().HasComponent<AnchorableComponent>(component.Owner))
{
Logger.WarningS("VitalComponentMissing", $"Disposal unit {uid} is missing an {nameof(AnchorableComponent)}");
}
@@ -302,7 +302,7 @@ namespace Content.Server.Disposal.Unit.EntitySystems
{
var currentTime = GameTiming.CurTime;
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(args.Entity.Uid, out HandsComponent? hands) ||
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(args.Entity, out HandsComponent? hands) ||
hands.Count == 0 ||
currentTime < component.LastExitAttempt + ExitAttemptDelay)
{
@@ -351,7 +351,7 @@ namespace Content.Server.Disposal.Unit.EntitySystems
if (count > 0)
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(component.Owner.Uid, out PhysicsComponent? disposalsBody))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(component.Owner, out PhysicsComponent? disposalsBody))
{
component.RecentlyEjected.Clear();
}
@@ -382,7 +382,7 @@ namespace Content.Server.Disposal.Unit.EntitySystems
private bool IsValidInteraction(ITargetedInteractEventArgs eventArgs)
{
if (!Get<ActionBlockerSystem>().CanInteract(eventArgs.User.Uid))
if (!Get<ActionBlockerSystem>().CanInteract(eventArgs.User))
{
eventArgs.Target.PopupMessage(eventArgs.User, Loc.GetString("ui-disposal-unit-is-valid-interaction-cannot=interact"));
return false;
@@ -395,7 +395,7 @@ namespace Content.Server.Disposal.Unit.EntitySystems
}
// This popup message doesn't appear on clicks, even when code was seperate. Unsure why.
if (!IoCManager.Resolve<IEntityManager>().HasComponent<HandsComponent>(eventArgs.User.Uid))
if (!IoCManager.Resolve<IEntityManager>().HasComponent<HandsComponent>(eventArgs.User))
{
eventArgs.Target.PopupMessage(eventArgs.User, Loc.GetString("ui-disposal-unit-is-valid-interaction-no-hands"));
return false;
@@ -444,8 +444,8 @@ namespace Content.Server.Disposal.Unit.EntitySystems
return false;
}
var grid = _mapManager.GetGrid(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(component.Owner.Uid).GridID);
var coords = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(component.Owner.Uid).Coordinates;
var grid = _mapManager.GetGrid(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(component.Owner).GridID);
var coords = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(component.Owner).Coordinates;
var entry = grid.GetLocal(coords)
.FirstOrDefault(entity => EntityManager.HasComponent<DisposalEntryComponent>(entity));
@@ -457,7 +457,7 @@ namespace Content.Server.Disposal.Unit.EntitySystems
var air = component.Air;
var entryComponent = EntityManager.GetComponent<DisposalEntryComponent>(entry);
if (_atmosSystem.GetTileMixture(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(component.Owner.Uid).Coordinates, true) is {Temperature: > 0} environment)
if (_atmosSystem.GetTileMixture(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(component.Owner).Coordinates, true) is {Temperature: > 0} environment)
{
var transferMoles = 0.1f * (0.05f * Atmospherics.OneAtmosphere * 1.01f - air.Pressure) * air.Volume / (environment.Temperature * Atmospherics.R);
@@ -483,7 +483,7 @@ namespace Content.Server.Disposal.Unit.EntitySystems
public void UpdateInterface(DisposalUnitComponent component, bool powered)
{
var stateString = Loc.GetString($"{component.State}");
var state = new SharedDisposalUnitComponent.DisposalUnitBoundUserInterfaceState(IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(component.Owner.Uid).EntityName, stateString, EstimatedFullPressure(component), powered, component.Engaged);
var state = new SharedDisposalUnitComponent.DisposalUnitBoundUserInterfaceState(IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(component.Owner).EntityName, stateString, EstimatedFullPressure(component), powered, component.Engaged);
component.UserInterface?.SetState(state);
}
@@ -504,12 +504,12 @@ namespace Content.Server.Disposal.Unit.EntitySystems
public void UpdateVisualState(DisposalUnitComponent component, bool flush)
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(component.Owner.Uid, out AppearanceComponent? appearance))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(component.Owner, out AppearanceComponent? appearance))
{
return;
}
if (!IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(component.Owner.Uid).Anchored)
if (!IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(component.Owner).Anchored)
{
appearance.SetData(SharedDisposalUnitComponent.Visuals.VisualState, SharedDisposalUnitComponent.VisualState.UnAnchored);
appearance.SetData(SharedDisposalUnitComponent.Visuals.Handle, SharedDisposalUnitComponent.HandleState.Normal);
@@ -557,8 +557,8 @@ namespace Content.Server.Disposal.Unit.EntitySystems
component.AutomaticEngageToken = null;
}
if (!component.RecentlyEjected.Contains(entity.Uid))
component.RecentlyEjected.Add(entity.Uid);
if (!component.RecentlyEjected.Contains(entity))
component.RecentlyEjected.Add(entity);
component.Dirty();
HandleStateChange(component, true);
@@ -567,7 +567,7 @@ namespace Content.Server.Disposal.Unit.EntitySystems
public bool CanFlush(DisposalUnitComponent component)
{
return component.State == SharedDisposalUnitComponent.PressureState.Ready && component.Powered && IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(component.Owner.Uid).Anchored;
return component.State == SharedDisposalUnitComponent.PressureState.Ready && component.Powered && IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(component.Owner).Anchored;
}
public void Engage(DisposalUnitComponent component)
@@ -633,7 +633,7 @@ namespace Content.Server.Disposal.Unit.EntitySystems
{
TryQueueEngage(component);
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(entity.Uid, out ActorComponent? actor))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(entity, out ActorComponent? actor))
{
component.UserInterface?.Close(actor.PlayerSession);
}