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

Fix 3000 errors

Browse Source
This commit is contained in:
DrSmugleaf
2021-12-05 18:09:01 +01:00
parent 2bfec7ec62
commit 2a3b7d809d
569 changed files with 2979 additions and 3280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Server/Body/Commands/AddHandCommand.cs
View File

@@ -1,7 +1,6 @@
using Content.Server.Administration;
using Content.Shared.Administration;
using Content.Shared.Body.Components;
using Content.Shared.Body.Part;
using Robust.Server.Player;
using Robust.Shared.Console;
using Robust.Shared.GameObjects;
@@ -45,13 +44,13 @@ namespace Content.Server.Body.Commands
return;
}
if (player.AttachedEntityUid == null)
if (player.AttachedEntity == null)
{
shell.WriteLine("You don't have an entity to add a hand to.");
return;
}
entity = player.AttachedEntityUid.Value;
entity = player.AttachedEntity.Value;
hand = entityManager.SpawnEntity(DefaultHandPrototype, entityManager.GetComponent<TransformComponent>(entity).Coordinates);
break;
}
@@ -76,13 +75,13 @@ namespace Content.Server.Body.Commands
return;
}
if (player.AttachedEntityUid == null)
if (player.AttachedEntity == null)
{
shell.WriteLine("You don't have an entity to add a hand to.");
return;
}
entity = player.AttachedEntityUid.Value;
entity = player.AttachedEntity.Value;
hand = entityManager.SpawnEntity(args[0], entityManager.GetComponent<TransformComponent>(entity).Coordinates);
}

22
Content.Server/Body/Commands/AttachBodyPartCommand.cs
View File

@@ -20,7 +20,7 @@ namespace Content.Server.Body.Commands
var player = shell.Player as IPlayerSession;
var entityManager = IoCManager.Resolve<IEntityManager>();
IEntity entity;
EntityUid entity;
EntityUid partUid;
switch (args.Length)
@@ -44,7 +44,7 @@ namespace Content.Server.Body.Commands
return;
}
entity = player.AttachedEntity;
entity = player.AttachedEntity.Value;
break;
case 2:
@@ -60,44 +60,44 @@ namespace Content.Server.Body.Commands
return;
}
if (!entityManager.TryGetEntity(entityUid, out var tempEntity))
if (!entityManager.EntityExists(entityUid))
{
shell.WriteLine($"{entityUid} is not a valid entity.");
return;
}
entity = tempEntity;
entity = entityUid;
break;
default:
shell.WriteLine(Help);
return;
}
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(entity, out SharedBodyComponent? body))
if (!entityManager.TryGetComponent(entity, out SharedBodyComponent? body))
{
shell.WriteLine($"Entity {IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity).EntityName} with uid {entity} does not have a {nameof(SharedBodyComponent)} component.");
shell.WriteLine($"Entity {entityManager.GetComponent<MetaDataComponent>(entity).EntityName} with uid {entity} does not have a {nameof(SharedBodyComponent)} component.");
return;
}
if (!entityManager.TryGetEntity(partUid, out var partEntity))
if (!entityManager.EntityExists(partUid))
{
shell.WriteLine($"{partUid} is not a valid entity.");
return;
}
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(partEntity, out SharedBodyPartComponent? part))
if (!entityManager.TryGetComponent(partUid, out SharedBodyPartComponent? part))
{
shell.WriteLine($"Entity {IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(partEntity).EntityName} with uid {args[0]} does not have a {nameof(SharedBodyPartComponent)} component.");
shell.WriteLine($"Entity {entityManager.GetComponent<MetaDataComponent>(partUid).EntityName} with uid {args[0]} does not have a {nameof(SharedBodyPartComponent)} component.");
return;
}
if (body.HasPart(part))
{
shell.WriteLine($"Body part {IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(partEntity).EntityName} with uid {partEntity} is already attached to entity {IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity).EntityName} with uid {entity}");
shell.WriteLine($"Body part {entityManager.GetComponent<MetaDataComponent>(partUid).EntityName} with uid {partUid} is already attached to entity {entityManager.GetComponent<MetaDataComponent>(entity).EntityName} with uid {entity}");
return;
}
body.SetPart($"AttachBodyPartVerb-{partEntity}", part);
body.SetPart($"AttachBodyPartVerb-{partUid}", part);
}
}
}

2
Content.Server/Body/Commands/DestroyMechanismCommand.cs
View File

@@ -37,7 +37,7 @@ namespace Content.Server.Body.Commands
return;
}
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(player.AttachedEntity, out SharedBodyComponent? body))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(player.AttachedEntity.Value, out SharedBodyComponent? body))
{
var random = IoCManager.Resolve<IRobustRandom>();
var text = $"You have no body{(random.Prob(0.2f) ? " and you must scream." : ".")}";

2
Content.Server/Body/Commands/RemoveHandCommand.cs
View File

@@ -33,7 +33,7 @@ namespace Content.Server.Body.Commands
return;
}
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(player.AttachedEntity, out SharedBodyComponent? body))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(player.AttachedEntity.Value, out SharedBodyComponent? body))
{
var random = IoCManager.Resolve<IRobustRandom>();
var text = $"You have no body{(random.Prob(0.2f) ? " and you must scream." : ".")}";

3
Content.Server/Body/Components/BodyComponent.cs
View File

@@ -1,6 +1,5 @@
using Content.Server.Ghost;
using Content.Shared.Audio;
using Content.Shared.Body;
using Content.Shared.Body.Components;
using Content.Shared.Body.Part;
using Content.Shared.Random.Helpers;
@@ -103,7 +102,7 @@ namespace Content.Server.Body.Components
}
}
IoCManager.Resolve<IEntityManager>().QueueDeleteEntity((EntityUid) Owner);
IoCManager.Resolve<IEntityManager>().QueueDeleteEntity(Owner);
}
}
}

13
Content.Server/Body/Components/BodyPartComponent.cs
View File

@@ -2,13 +2,10 @@ using System.Collections.Generic;
using System.Threading.Tasks;
using Content.Server.UserInterface;
using Content.Shared.Body.Components;
using Content.Shared.Body.Part;
using Content.Shared.Body.Surgery;
using Content.Shared.Interaction;
using Content.Shared.Popups;
using Content.Shared.Random.Helpers;
using Content.Shared.Verbs;
using Robust.Server.Console;
using Robust.Server.GameObjects;
using Robust.Server.Player;
using Robust.Shared.Containers;
@@ -27,7 +24,7 @@ namespace Content.Server.Body.Components
private readonly Dictionary<int, object> _optionsCache = new();
private SharedBodyComponent? _owningBodyCache;
private int _idHash;
private IEntity? _surgeonCache;
private EntityUid? _surgeonCache;
private Container _mechanismContainer = default!;
[ViewVariables] private BoundUserInterface? UserInterface => Owner.GetUIOrNull(SurgeryUIKey.Key);
@@ -104,7 +101,7 @@ namespace Content.Server.Body.Components
_surgeonCache = null;
_owningBodyCache = null;
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(eventArgs.Target, out SharedBodyComponent? body))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(eventArgs.Target.Value, out SharedBodyComponent? body))
{
SendSlots(eventArgs, body);
}
@@ -161,7 +158,7 @@ namespace Content.Server.Body.Components
private void ReceiveBodyPartSlot(int key)
{
if (_surgeonCache == null ||
!IoCManager.Resolve<IEntityManager>().TryGetComponent(_surgeonCache, out ActorComponent? actor))
!IoCManager.Resolve<IEntityManager>().TryGetComponent(_surgeonCache.Value, out ActorComponent? actor))
{
return;
}
@@ -176,7 +173,7 @@ namespace Content.Server.Body.Components
// TODO: sanity checks to see whether user is in range, user is still able-bodied, target is still the same, etc etc
if (!_optionsCache.TryGetValue(key, out var targetObject))
{
_owningBodyCache.Owner.PopupMessage(_surgeonCache,
_owningBodyCache.Owner.PopupMessage(_surgeonCache.Value,
Loc.GetString("bodypart-component-no-way-to-attach-message", ("partName", Owner)));
}
@@ -185,7 +182,7 @@ namespace Content.Server.Body.Components
? Loc.GetString("bodypart-component-attach-success-message",("partName", Owner))
: Loc.GetString("bodypart-component-attach-fail-message",("partName", Owner));
_owningBodyCache.Owner.PopupMessage(_surgeonCache, message);
_owningBodyCache.Owner.PopupMessage(_surgeonCache.Value, message);
}
private void OpenSurgeryUI(IPlayerSession session)

2
Content.Server/Body/Components/BodyScannerComponent.cs
View File

@@ -29,7 +29,7 @@ namespace Content.Server.Body.Components
return;
}
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(session.AttachedEntity, out SharedBodyComponent? body))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(session.AttachedEntity.Value, out SharedBodyComponent? body))
{
var state = InterfaceState(body);
UserInterface?.SetState(state);

28
Content.Server/Body/Components/InternalsComponent.cs
View File

@@ -9,24 +9,24 @@ namespace Content.Server.Body.Components
public class InternalsComponent : Component
{
public override string Name => "Internals";
[ViewVariables] public IEntity? GasTankEntity { get; set; }
[ViewVariables] public IEntity? BreathToolEntity { get; set; }
[ViewVariables] public EntityUid GasTankEntity { get; set; }
[ViewVariables] public EntityUid BreathToolEntity { get; set; }
public void DisconnectBreathTool()
{
var old = BreathToolEntity;
BreathToolEntity = null;
BreathToolEntity = default;
if (old != null && IoCManager.Resolve<IEntityManager>().TryGetComponent(old, out BreathToolComponent? breathTool) )
if (old != default && IoCManager.Resolve<IEntityManager>().TryGetComponent(old, out BreathToolComponent? breathTool) )
{
breathTool.DisconnectInternals();
DisconnectTank();
}
}
public void ConnectBreathTool(IEntity toolEntity)
public void ConnectBreathTool(EntityUid toolEntity)
{
if (BreathToolEntity != null && IoCManager.Resolve<IEntityManager>().TryGetComponent(BreathToolEntity, out BreathToolComponent? tool))
if (BreathToolEntity != default && IoCManager.Resolve<IEntityManager>().TryGetComponent(BreathToolEntity, out BreathToolComponent? tool))
{
tool.DisconnectInternals();
}
@@ -36,20 +36,20 @@ namespace Content.Server.Body.Components
public void DisconnectTank()
{
if (GasTankEntity != null && IoCManager.Resolve<IEntityManager>().TryGetComponent(GasTankEntity, out GasTankComponent? tank))
if (GasTankEntity != default && IoCManager.Resolve<IEntityManager>().TryGetComponent(GasTankEntity, out GasTankComponent? tank))
{
tank.DisconnectFromInternals(Owner);
}
GasTankEntity = null;
GasTankEntity = default;
}
public bool TryConnectTank(IEntity tankEntity)
public bool TryConnectTank(EntityUid tankEntity)
{
if (BreathToolEntity == null)
if (BreathToolEntity == default)
return false;
if (GasTankEntity != null && IoCManager.Resolve<IEntityManager>().TryGetComponent(GasTankEntity, out GasTankComponent? tank))
if (GasTankEntity != default && IoCManager.Resolve<IEntityManager>().TryGetComponent(GasTankEntity, out GasTankComponent? tank))
{
tank.DisconnectFromInternals(Owner);
}
@@ -60,12 +60,12 @@ namespace Content.Server.Body.Components
public bool AreInternalsWorking()
{
return BreathToolEntity != null &&
GasTankEntity != null &&
return BreathToolEntity != default &&
GasTankEntity != default &&
IoCManager.Resolve<IEntityManager>().TryGetComponent(BreathToolEntity, out BreathToolComponent? breathTool) &&
breathTool.IsFunctional &&
IoCManager.Resolve<IEntityManager>().TryGetComponent(GasTankEntity, out GasTankComponent? gasTank) &&
gasTank.Air != null;
gasTank.Air != default;
}
}

21
Content.Server/Body/Components/MechanismComponent.cs
View File

@@ -2,7 +2,6 @@ using System.Collections.Generic;
using System.Threading.Tasks;
using Content.Server.UserInterface;
using Content.Shared.Body.Components;
using Content.Shared.Body.Part;
using Content.Shared.Body.Surgery;
using Content.Shared.Interaction;
using Content.Shared.Popups;
@@ -20,6 +19,8 @@ namespace Content.Server.Body.Components
[ComponentReference(typeof(SharedMechanismComponent))]
public class MechanismComponent : SharedMechanismComponent, IAfterInteract
{
[Dependency] private readonly IEntityManager _entities = default!;
[ViewVariables] private BoundUserInterface? UserInterface => Owner.GetUIOrNull(SurgeryUIKey.Key);
protected override void Initialize()
@@ -44,17 +45,17 @@ namespace Content.Server.Body.Components
PerformerCache = null;
BodyCache = null;
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(eventArgs.Target, out SharedBodyComponent? body))
if (_entities.TryGetComponent(eventArgs.Target.Value, out SharedBodyComponent? body))
{
SendBodyPartListToUser(eventArgs, body);
}
else if (IoCManager.Resolve<IEntityManager>().TryGetComponent<SharedBodyPartComponent?>(eventArgs.Target, out var part))
else if (_entities.TryGetComponent<SharedBodyPartComponent?>(eventArgs.Target.Value, out var part))
{
DebugTools.AssertNotNull(part);
if (!part.TryAddMechanism(this))
{
eventArgs.Target.PopupMessage(eventArgs.User, Loc.GetString("mechanism-component-cannot-fit-message"));
eventArgs.Target.Value.PopupMessage(eventArgs.User, Loc.GetString("mechanism-component-cannot-fit-message"));
}
}
@@ -77,7 +78,7 @@ namespace Content.Server.Body.Components
}
if (OptionsCache.Count > 0 &&
IoCManager.Resolve<IEntityManager>().TryGetComponent(eventArgs.User, out ActorComponent? actor))
_entities.TryGetComponent(eventArgs.User, out ActorComponent? actor))
{
OpenSurgeryUI(actor.PlayerSession);
UpdateSurgeryUIBodyPartRequest(actor.PlayerSession, toSend);
@@ -87,7 +88,7 @@ namespace Content.Server.Body.Components
else // If surgery cannot be performed, show message saying so.
{
eventArgs.Target?.PopupMessage(eventArgs.User,
Loc.GetString("mechanism-component-no-way-to-install-message", ("partName", Name: IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(Owner).EntityName)));
Loc.GetString("mechanism-component-no-way-to-install-message", ("partName", Name: _entities.GetComponent<MetaDataComponent>(Owner).EntityName)));
}
}
@@ -97,7 +98,7 @@ namespace Content.Server.Body.Components
private void HandleReceiveBodyPart(int key)
{
if (PerformerCache == null ||
!IoCManager.Resolve<IEntityManager>().TryGetComponent(PerformerCache, out ActorComponent? actor))
!_entities.TryGetComponent(PerformerCache.Value, out ActorComponent? actor))
{
return;
}
@@ -112,8 +113,8 @@ namespace Content.Server.Body.Components
// TODO: sanity checks to see whether user is in range, user is still able-bodied, target is still the same, etc etc
if (!OptionsCache.TryGetValue(key, out var targetObject))
{
BodyCache.Owner.PopupMessage(PerformerCache,
Loc.GetString("mechanism-component-no-useful-way-to-use-message",("partName", Name: IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(Owner).EntityName)));
BodyCache.Owner.PopupMessage(PerformerCache.Value,
Loc.GetString("mechanism-component-no-useful-way-to-use-message",("partName", Name: _entities.GetComponent<MetaDataComponent>(Owner).EntityName)));
return;
}
@@ -122,7 +123,7 @@ namespace Content.Server.Body.Components
? Loc.GetString("mechanism-component-jam-inside-message",("ownerName", Owner),("them", PerformerCache))
: Loc.GetString("mechanism-component-cannot-fit-message");
BodyCache.Owner.PopupMessage(PerformerCache, message);
BodyCache.Owner.PopupMessage(PerformerCache.Value, message);
// TODO: {1:theName}
}

22
Content.Server/Body/Surgery/BiologicalSurgeryDataComponent.cs
View File

@@ -51,7 +51,7 @@ namespace Content.Server.Body.Surgery
}
}
private async Task<bool> SurgeryDoAfter(IEntity performer)
private async Task<bool> SurgeryDoAfter(EntityUid performer)
{
if (!IoCManager.Resolve<IEntityManager>().HasComponent<DoAfterComponent>(performer))
{
@@ -203,7 +203,7 @@ namespace Content.Server.Body.Surgery
return GetSurgeryStep(toolType) != null;
}
public bool PerformSurgery(SurgeryType surgeryType, IBodyPartContainer container, ISurgeon surgeon, IEntity performer)
public bool PerformSurgery(SurgeryType surgeryType, IBodyPartContainer container, ISurgeon surgeon, EntityUid performer)
{
var step = GetSurgeryStep(surgeryType);
@@ -216,7 +216,7 @@ namespace Content.Server.Body.Surgery
return true;
}
private async void OpenSkinSurgery(IBodyPartContainer container, ISurgeon surgeon, IEntity performer)
private async void OpenSkinSurgery(IBodyPartContainer container, ISurgeon surgeon, EntityUid performer)
{
if (Parent == null)
{
@@ -231,7 +231,7 @@ namespace Content.Server.Body.Surgery
}
}
private async void ClampVesselsSurgery(IBodyPartContainer container, ISurgeon surgeon, IEntity performer)
private async void ClampVesselsSurgery(IBodyPartContainer container, ISurgeon surgeon, EntityUid performer)
{
if (Parent == null) return;
@@ -243,7 +243,7 @@ namespace Content.Server.Body.Surgery
}
}
private async void RetractSkinSurgery(IBodyPartContainer container, ISurgeon surgeon, IEntity performer)
private async void RetractSkinSurgery(IBodyPartContainer container, ISurgeon surgeon, EntityUid performer)
{
if (Parent == null) return;
@@ -255,7 +255,7 @@ namespace Content.Server.Body.Surgery
}
}
private async void CauterizeIncisionSurgery(IBodyPartContainer container, ISurgeon surgeon, IEntity performer)
private async void CauterizeIncisionSurgery(IBodyPartContainer container, ISurgeon surgeon, EntityUid performer)
{
if (Parent == null) return;
@@ -269,7 +269,7 @@ namespace Content.Server.Body.Surgery
}
}
private void LoosenOrganSurgery(IBodyPartContainer container, ISurgeon surgeon, IEntity performer)
private void LoosenOrganSurgery(IBodyPartContainer container, ISurgeon surgeon, EntityUid performer)
{
if (Parent == null) return;
if (Parent.Mechanisms.Count <= 0) return;
@@ -290,7 +290,7 @@ namespace Content.Server.Body.Surgery
}
private async void LoosenOrganSurgeryCallback(SharedMechanismComponent? target, IBodyPartContainer container, ISurgeon surgeon,
IEntity performer)
EntityUid performer)
{
if (Parent == null || target == null || !Parent.Mechanisms.Contains(target))
{
@@ -311,7 +311,7 @@ namespace Content.Server.Body.Surgery
}
}
private void RemoveOrganSurgery(IBodyPartContainer container, ISurgeon surgeon, IEntity performer)
private void RemoveOrganSurgery(IBodyPartContainer container, ISurgeon surgeon, EntityUid performer)
{
if (Parent == null) return;
@@ -331,7 +331,7 @@ namespace Content.Server.Body.Surgery
}
private async void RemoveOrganSurgeryCallback(SharedMechanismComponent? target, IBodyPartContainer container, ISurgeon surgeon,
IEntity performer)
EntityUid performer)
{
if (Parent == null || target == null || !Parent.Mechanisms.Contains(target))
{
@@ -354,7 +354,7 @@ namespace Content.Server.Body.Surgery
}
}
private async void RemoveBodyPartSurgery(IBodyPartContainer container, ISurgeon surgeon, IEntity performer)
private async void RemoveBodyPartSurgery(IBodyPartContainer container, ISurgeon surgeon, EntityUid performer)
{
if (Parent == null) return;
if (container is not SharedBodyComponent body) return;

33
Content.Server/Body/Surgery/Components/SurgeryToolComponent.cs
View File

@@ -5,7 +5,6 @@ using Content.Server.Body.Components;
using Content.Server.Body.Surgery.Messages;
using Content.Server.UserInterface;
using Content.Shared.Body.Components;
using Content.Shared.Body.Part;
using Content.Shared.Body.Surgery;
using Content.Shared.Interaction;
using Content.Shared.Popups;
@@ -27,6 +26,8 @@ namespace Content.Server.Body.Surgery.Components
[RegisterComponent]
public class SurgeryToolComponent : Component, ISurgeon, IAfterInteract
{
[Dependency] private readonly IEntityManager _entities = default!;
public override string Name => "SurgeryTool";
private readonly Dictionary<int, object> _optionsCache = new();
@@ -45,7 +46,7 @@ namespace Content.Server.Body.Surgery.Components
public SharedBodyComponent? BodyCache { get; private set; }
public IEntity? PerformerCache { get; private set; }
public EntityUid? PerformerCache { get; private set; }
async Task<bool> IAfterInteract.AfterInteract(AfterInteractEventArgs eventArgs)
{
@@ -54,7 +55,7 @@ namespace Content.Server.Body.Surgery.Components
return false;
}
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(eventArgs.User, out ActorComponent? actor))
if (!_entities.TryGetComponent(eventArgs.User, out ActorComponent? actor))
{
return false;
}
@@ -62,7 +63,7 @@ namespace Content.Server.Body.Surgery.Components
CloseAllSurgeryUIs();
// Attempt surgery on a body by sending a list of operable parts for the client to choose from
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(eventArgs.Target, out SharedBodyComponent? body))
if (_entities.TryGetComponent(eventArgs.Target.Value, out SharedBodyComponent? body))
{
// Create dictionary to send to client (text to be shown : data sent back if selected)
var toSend = new Dictionary<string, int>();
@@ -89,7 +90,7 @@ namespace Content.Server.Body.Surgery.Components
NotUsefulPopup();
}
}
else if (IoCManager.Resolve<IEntityManager>().TryGetComponent<SharedBodyPartComponent?>(eventArgs.Target, out var part))
else if (_entities.TryGetComponent<SharedBodyPartComponent?>(eventArgs.Target.Value, out var part))
{
// Attempt surgery on a DroppedBodyPart - there's only one possible target so no need for selection UI
PerformerCache = eventArgs.User;
@@ -109,7 +110,7 @@ namespace Content.Server.Body.Surgery.Components
}
// Log error if the surgery fails somehow.
Logger.Debug($"Error when trying to perform surgery on ${nameof(SharedBodyPartComponent)} {IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(eventArgs.User).EntityName}");
Logger.Debug($"Error when trying to perform surgery on ${nameof(SharedBodyPartComponent)} {_entities.GetComponent<MetaDataComponent>(eventArgs.User).EntityName}");
throw new InvalidOperationException();
}
@@ -129,8 +130,8 @@ namespace Content.Server.Body.Surgery.Components
if (_optionsCache.Count > 0 && PerformerCache != null)
{
OpenSurgeryUI(IoCManager.Resolve<IEntityManager>().GetComponent<ActorComponent>(PerformerCache).PlayerSession);
UpdateSurgeryUIMechanismRequest(IoCManager.Resolve<IEntityManager>().GetComponent<ActorComponent>(PerformerCache).PlayerSession,
OpenSurgeryUI(_entities.GetComponent<ActorComponent>(PerformerCache.Value).PlayerSession);
UpdateSurgeryUIMechanismRequest(_entities.GetComponent<ActorComponent>(PerformerCache.Value).PlayerSession,
toSend);
_callbackCache = callback;
}
@@ -160,7 +161,7 @@ namespace Content.Server.Body.Surgery.Components
#pragma warning disable 618
SendMessage(message);
#pragma warning restore 618
IoCManager.Resolve<IEntityManager>().EventBus.RaiseEvent(EventSource.Local, message);
_entities.EventBus.RaiseEvent(EventSource.Local, message);
}
private void UpdateSurgeryUIBodyPartRequest(IPlayerSession session, Dictionary<string, int> options)
@@ -214,7 +215,7 @@ namespace Content.Server.Body.Surgery.Components
private void HandleReceiveBodyPart(int key)
{
if (PerformerCache == null ||
!IoCManager.Resolve<IEntityManager>().TryGetComponent(PerformerCache, out ActorComponent? actor))
!_entities.TryGetComponent(PerformerCache.Value, out ActorComponent? actor))
{
return;
}
@@ -228,10 +229,10 @@ namespace Content.Server.Body.Surgery.Components
return;
}
var target = (SharedBodyPartComponent) targetObject!;
var target = (SharedBodyPartComponent) targetObject;
// TODO BODY Reconsider
if (!target.AttemptSurgery(_surgeryType, BodyCache, this, PerformerCache))
if (!target.AttemptSurgery(_surgeryType, BodyCache, this, PerformerCache.Value))
{
NotUsefulAnymorePopup();
}
@@ -248,21 +249,21 @@ namespace Content.Server.Body.Surgery.Components
!_optionsCache.TryGetValue(key, out var targetObject) ||
targetObject is not MechanismComponent target ||
PerformerCache == null ||
!IoCManager.Resolve<IEntityManager>().TryGetComponent(PerformerCache, out ActorComponent? actor))
!_entities.TryGetComponent(PerformerCache.Value, out ActorComponent? actor))
{
NotUsefulAnymorePopup();
return;
}
CloseSurgeryUI(actor.PlayerSession);
_callbackCache?.Invoke(target, BodyCache, this, PerformerCache);
_callbackCache?.Invoke(target, BodyCache, this, PerformerCache.Value);
}
private void NotUsefulPopup()
{
if (PerformerCache == null) return;
BodyCache?.Owner.PopupMessage(PerformerCache,
BodyCache?.Owner.PopupMessage(PerformerCache.Value,
Loc.GetString("surgery-tool-component-not-useful-message", ("bodyPart", Owner)));
}
@@ -270,7 +271,7 @@ namespace Content.Server.Body.Surgery.Components
{
if (PerformerCache == null) return;
BodyCache?.Owner.PopupMessage(PerformerCache,
BodyCache?.Owner.PopupMessage(PerformerCache.Value,
Loc.GetString("surgery-tool-component-not-useful-anymore-message", ("bodyPart", Owner)));
}
}

5
Content.Server/Body/Surgery/Components/SurgeryToolSystem.cs
View File

@@ -2,7 +2,6 @@
using Content.Server.Body.Surgery.Messages;
using Content.Shared.ActionBlocker;
using Content.Shared.GameTicking;
using Content.Shared.Interaction.Events;
using Content.Shared.Interaction.Helpers;
using JetBrains.Annotations;
using Robust.Shared.GameObjects;
@@ -57,8 +56,8 @@ namespace Content.Server.Body.Surgery.Components
continue;
}
if (!_actionBlockerSystem.CanInteract(tool.PerformerCache) ||
!tool.PerformerCache.InRangeUnobstructed(tool.BodyCache))
if (!_actionBlockerSystem.CanInteract(tool.PerformerCache.Value) ||
!tool.PerformerCache.Value.InRangeUnobstructed(tool.BodyCache))
{
tool.CloseAllSurgeryUIs();
}

4
Content.Server/Body/Systems/MetabolizerSystem.cs
View File

@@ -89,7 +89,7 @@ namespace Content.Server.Body.Systems
if (!Resolve(((IComponent) body).Owner, ref manager, false))
return;
_solutionContainerSystem.TryGetSolution(((IComponent) body).Owner, meta.SolutionName, out solution, manager);
solutionEntityUid = body.OwnerUid;
solutionEntityUid = body.Owner;
}
}
}
@@ -163,7 +163,7 @@ namespace Content.Server.Body.Systems
if (effect.ShouldLog)
{
var entity = EntityManager.GetEntity(args.SolutionEntity);
var entity = args.SolutionEntity;
_logSystem.Add(LogType.ReagentEffect, effect.LogImpact,
$"Metabolism effect {effect.GetType().Name} of reagent {args.Reagent.Name:reagent} applied on entity {entity} at {IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity).Coordinates}");
}

4
Content.Server/Body/Systems/RespiratorSystem.cs
View File

@@ -199,7 +199,7 @@ namespace Content.Server.Body.Systems
private void TakeSuffocationDamage(EntityUid uid, RespiratorComponent respirator)
{
if (!respirator.Suffocating)
_logSys.Add(LogType.Asphyxiation, $"{EntityManager.GetEntity(uid)} started suffocating");
_logSys.Add(LogType.Asphyxiation, $"{uid:Entity} started suffocating");
respirator.Suffocating = true;
@@ -214,7 +214,7 @@ namespace Content.Server.Body.Systems
private void StopSuffocation(EntityUid uid, RespiratorComponent respirator)
{
if (respirator.Suffocating)
_logSys.Add(LogType.Asphyxiation, $"{EntityManager.GetEntity(uid)} stopped suffocating");
_logSys.Add(LogType.Asphyxiation, $"{uid:Entity} stopped suffocating");
respirator.Suffocating = false;