tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests 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

14
Content.Client/Verbs/VerbSystem.cs
View File

@@ -20,8 +20,6 @@ using Robust.Shared.Containers;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Map;
using Robust.Shared.Maths;
using static Content.Shared.Interaction.SharedInteractionSystem;
namespace Content.Client.Verbs
{
@@ -87,7 +85,7 @@ namespace Content.Client.Verbs
/// <summary>
/// Get all of the entities in an area for displaying on the context menu.
/// </summary>
public bool TryGetEntityMenuEntities(MapCoordinates targetPos, [NotNullWhen(true)] out List<IEntity>? result)
public bool TryGetEntityMenuEntities(MapCoordinates targetPos, [NotNullWhen(true)] out List<EntityUid>? result)
{
result = null;
@@ -107,8 +105,8 @@ namespace Content.Client.Verbs
if ((visibility & MenuVisibility.NoFov) == 0)
{
var entitiesUnderMouse = gameScreenBase.GetEntitiesUnderPosition(targetPos);
Ignored? predicate = e => e == player || entitiesUnderMouse.Contains(e);
if (!_examineSystem.CanExamine(player, targetPos, predicate))
bool Predicate(EntityUid e) => e == player || entitiesUnderMouse.Contains(e);
if (!_examineSystem.CanExamine(player.Value, targetPos, Predicate))
return false;
}
@@ -130,7 +128,7 @@ namespace Content.Client.Verbs
{
foreach (var entity in entities.ToList())
{
if (!player.IsInSameOrTransparentContainer(entity))
if (!player.Value.IsInSameOrTransparentContainer(entity))
entities.Remove(entity);
}
}
@@ -155,7 +153,7 @@ namespace Content.Client.Verbs
// Remove any entities that do not have LOS
if ((visibility & MenuVisibility.NoFov) == 0)
{
var playerPos = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(player).MapPosition;
var playerPos = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(player.Value).MapPosition;
foreach (var entity in entities.ToList())
{
if (!ExamineSystemShared.InRangeUnOccluded(
@@ -180,7 +178,7 @@ namespace Content.Client.Verbs
/// Ask the server to send back a list of server-side verbs, and for now return an incomplete list of verbs
/// (only those defined locally).
/// </summary>
public Dictionary<VerbType, SortedSet<Verb>> GetVerbs(IEntity target, IEntity user, VerbType verbTypes)
public Dictionary<VerbType, SortedSet<Verb>> GetVerbs(EntityUid target, EntityUid user, VerbType verbTypes)
{
if (!target.IsClientSide())
{