Skip to content

Commit

Permalink
Fixing merge issue
Browse files Browse the repository at this point in the history
  • Loading branch information
dvir001 committed Oct 10, 2024
1 parent 3df46de commit e14d887
Showing 1 changed file with 0 additions and 11 deletions.
11 changes: 0 additions & 11 deletions Content.Server/_EE/Carrying/CarryingSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,6 @@ public sealed class CarryingSystem : EntitySystem
[Dependency] private readonly PseudoItemSystem _pseudoItem = default!;
[Dependency] private readonly ContestsSystem _contests = default!;
[Dependency] private readonly TransformSystem _transform = default!;
[Dependency] private readonly RespiratorSystem _respirator = default!;
[Dependency] private readonly SharedTransformSystem _transform = default!;
[Dependency] private readonly PseudoItemSystem _pseudoItem = default!; // Needed for fitting check

public override void Initialize()
{
Expand Down Expand Up @@ -276,14 +273,6 @@ private void Carry(EntityUid carrier, EntityUid carried)
_transform.SetCoordinates(carried, Transform(carrier).Coordinates);
_transform.SetParent(carried, carrier);

var carrierXform = Transform(carrier);
var xform = Transform(carried);
_transform.AttachToGridOrMap(carrier, carrierXform);
_transform.AttachToGridOrMap(carried, xform);
xform.Coordinates = carrierXform.Coordinates;

_transform.SetParent(carried, xform, carrier, carrierXform);

_virtualItemSystem.TrySpawnVirtualItemInHand(carried, carrier);
_virtualItemSystem.TrySpawnVirtualItemInHand(carried, carrier);
var carryingComp = EnsureComp<CarryingComponent>(carrier);
Expand Down

0 comments on commit e14d887

Please sign in to comment.