Skip to content

Commit

Permalink
Cherry-picked commit eb80d97 from space-wizards/space-station-14/master
Browse files Browse the repository at this point in the history
  • Loading branch information
SimpleStation14 authored and nikthechampiongr committed Mar 21, 2024
1 parent 3bf08c7 commit 8149f1c
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions Content.Server/Implants/SubdermalImplantSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
using Robust.Shared.Physics.Components;
using Robust.Shared.Random;
using System.Numerics;
using Content.Shared.Movement.Pulling.Components;

Check failure on line 22 in Content.Server/Implants/SubdermalImplantSystem.cs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest)

The type or namespace name 'Pulling' does not exist in the namespace 'Content.Shared.Movement' (are you missing an assembly reference?)

Check failure on line 22 in Content.Server/Implants/SubdermalImplantSystem.cs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest)

The type or namespace name 'Pulling' does not exist in the namespace 'Content.Shared.Movement' (are you missing an assembly reference?)

Check failure on line 22 in Content.Server/Implants/SubdermalImplantSystem.cs

View workflow job for this annotation

GitHub Actions / Test Packaging

The type or namespace name 'Pulling' does not exist in the namespace 'Content.Shared.Movement' (are you missing an assembly reference?)

Check failure on line 22 in Content.Server/Implants/SubdermalImplantSystem.cs

View workflow job for this annotation

GitHub Actions / Test Packaging

The type or namespace name 'Pulling' does not exist in the namespace 'Content.Shared.Movement' (are you missing an assembly reference?)

Check failure on line 22 in Content.Server/Implants/SubdermalImplantSystem.cs

View workflow job for this annotation

GitHub Actions / YAML Linter

The type or namespace name 'Pulling' does not exist in the namespace 'Content.Shared.Movement' (are you missing an assembly reference?)

Check failure on line 22 in Content.Server/Implants/SubdermalImplantSystem.cs

View workflow job for this annotation

GitHub Actions / YAML Linter

The type or namespace name 'Pulling' does not exist in the namespace 'Content.Shared.Movement' (are you missing an assembly reference?)

Check failure on line 22 in Content.Server/Implants/SubdermalImplantSystem.cs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest)

The type or namespace name 'Pulling' does not exist in the namespace 'Content.Shared.Movement' (are you missing an assembly reference?)

Check failure on line 22 in Content.Server/Implants/SubdermalImplantSystem.cs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest)

The type or namespace name 'Pulling' does not exist in the namespace 'Content.Shared.Movement' (are you missing an assembly reference?)
using Content.Shared.Movement.Pulling.Systems;

Check failure on line 23 in Content.Server/Implants/SubdermalImplantSystem.cs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest)

The type or namespace name 'Pulling' does not exist in the namespace 'Content.Shared.Movement' (are you missing an assembly reference?)

Check failure on line 23 in Content.Server/Implants/SubdermalImplantSystem.cs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest)

The type or namespace name 'Pulling' does not exist in the namespace 'Content.Shared.Movement' (are you missing an assembly reference?)

Check failure on line 23 in Content.Server/Implants/SubdermalImplantSystem.cs

View workflow job for this annotation

GitHub Actions / Test Packaging

The type or namespace name 'Pulling' does not exist in the namespace 'Content.Shared.Movement' (are you missing an assembly reference?)

Check failure on line 23 in Content.Server/Implants/SubdermalImplantSystem.cs

View workflow job for this annotation

GitHub Actions / Test Packaging

The type or namespace name 'Pulling' does not exist in the namespace 'Content.Shared.Movement' (are you missing an assembly reference?)

Check failure on line 23 in Content.Server/Implants/SubdermalImplantSystem.cs

View workflow job for this annotation

GitHub Actions / YAML Linter

The type or namespace name 'Pulling' does not exist in the namespace 'Content.Shared.Movement' (are you missing an assembly reference?)

Check failure on line 23 in Content.Server/Implants/SubdermalImplantSystem.cs

View workflow job for this annotation

GitHub Actions / YAML Linter

The type or namespace name 'Pulling' does not exist in the namespace 'Content.Shared.Movement' (are you missing an assembly reference?)

Check failure on line 23 in Content.Server/Implants/SubdermalImplantSystem.cs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest)

The type or namespace name 'Pulling' does not exist in the namespace 'Content.Shared.Movement' (are you missing an assembly reference?)

Check failure on line 23 in Content.Server/Implants/SubdermalImplantSystem.cs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest)

The type or namespace name 'Pulling' does not exist in the namespace 'Content.Shared.Movement' (are you missing an assembly reference?)

namespace Content.Server.Implants;

Expand All @@ -34,6 +36,7 @@ public sealed class SubdermalImplantSystem : SharedSubdermalImplantSystem
[Dependency] private readonly SharedPopupSystem _popup = default!;
[Dependency] private readonly SharedTransformSystem _xform = default!;
[Dependency] private readonly ForensicsSystem _forensicsSystem = default!;
[Dependency] private readonly PullingSystem _pullingSystem = default!;

Check failure on line 39 in Content.Server/Implants/SubdermalImplantSystem.cs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest)

The type or namespace name 'PullingSystem' could not be found (are you missing a using directive or an assembly reference?)

Check failure on line 39 in Content.Server/Implants/SubdermalImplantSystem.cs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest)

The type or namespace name 'PullingSystem' could not be found (are you missing a using directive or an assembly reference?)

Check failure on line 39 in Content.Server/Implants/SubdermalImplantSystem.cs

View workflow job for this annotation

GitHub Actions / Test Packaging

The type or namespace name 'PullingSystem' could not be found (are you missing a using directive or an assembly reference?)

Check failure on line 39 in Content.Server/Implants/SubdermalImplantSystem.cs

View workflow job for this annotation

GitHub Actions / Test Packaging

The type or namespace name 'PullingSystem' could not be found (are you missing a using directive or an assembly reference?)

Check failure on line 39 in Content.Server/Implants/SubdermalImplantSystem.cs

View workflow job for this annotation

GitHub Actions / YAML Linter

The type or namespace name 'PullingSystem' could not be found (are you missing a using directive or an assembly reference?)

Check failure on line 39 in Content.Server/Implants/SubdermalImplantSystem.cs

View workflow job for this annotation

GitHub Actions / YAML Linter

The type or namespace name 'PullingSystem' could not be found (are you missing a using directive or an assembly reference?)

Check failure on line 39 in Content.Server/Implants/SubdermalImplantSystem.cs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest)

The type or namespace name 'PullingSystem' could not be found (are you missing a using directive or an assembly reference?)

Check failure on line 39 in Content.Server/Implants/SubdermalImplantSystem.cs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest)

The type or namespace name 'PullingSystem' could not be found (are you missing a using directive or an assembly reference?)

private EntityQuery<PhysicsComponent> _physicsQuery;

Expand Down Expand Up @@ -98,6 +101,11 @@ private void OnScramImplant(EntityUid uid, SubdermalImplantComponent component,
if (!TryComp<ScramImplantComponent>(uid, out var implant))
return;

// We need stop the user from being pulled so they don't just get "attached" with whoever is pulling them.
// This can for example happen when the user is cuffed and being pulled.
if (TryComp<PullableComponent>(ent, out var pull) && _pullingSystem.IsPulled(ent, pull))
_pullingSystem.TryStopPull(ent, pull);

var xform = Transform(ent);
var entityCoords = xform.Coordinates.ToMap(EntityManager);

Expand Down

0 comments on commit 8149f1c

Please sign in to comment.