diff --git a/Content.Client/SS220/Pinpointer/UI/PinpointerBoundUserInterface.cs b/Content.Client/SS220/Pinpointer/UI/PinpointerBoundUserInterface.cs
new file mode 100644
index 000000000000..fdf9f2254a57
--- /dev/null
+++ b/Content.Client/SS220/Pinpointer/UI/PinpointerBoundUserInterface.cs
@@ -0,0 +1,89 @@
+// © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt
+
+using Content.Shared.Pinpointer;
+using Content.Shared.SS220.Pinpointer;
+using JetBrains.Annotations;
+using Robust.Client.UserInterface;
+
+namespace Content.Client.SS220.Pinpointer.UI;
+
+[UsedImplicitly]
+public sealed partial class PinpointerBoundUserInterface : BoundUserInterface
+{
+    private PinpointerMenu? _crewMenu;
+    private PinpointerUplinkMenu? _itemMenu;
+
+    public PinpointerBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
+    {
+    }
+
+    protected override void UpdateState(BoundUserInterfaceState state)
+    {
+        base.UpdateState(state);
+
+        switch (state)
+        {
+            case PinpointerCrewUIState crewState:
+                if (_crewMenu == null)
+                    return;
+
+                _crewMenu.CrewListCoords = crewState.Sensors;
+                _crewMenu.PopulateList();
+                break;
+
+            case PinpointerItemUIState itemState:
+                if (_itemMenu == null)
+                    return;
+
+                _itemMenu.ItemListSet = itemState.Items;
+                _itemMenu.PopulateList();
+                break;
+        }
+    }
+
+    protected override void Open()
+    {
+        base.Open();
+
+        if (!EntMan.TryGetComponent<PinpointerComponent>(Owner, out var pinpointer))
+            return;
+
+        switch (pinpointer.Mode)
+        {
+            case PinpointerMode.Crew:
+            {
+                _crewMenu = this.CreateWindow<PinpointerMenu>();
+                _crewMenu.OnTargetPicked = OnTargetPicked;
+                _crewMenu.PopulateList();
+                break;
+            }
+
+            case PinpointerMode.Item:
+            {
+                _itemMenu = this.CreateWindow<PinpointerUplinkMenu>();
+                _itemMenu.OnTargetPicked = OnTargetPicked;
+                _itemMenu.OnDnaPicked = OnDnaPicked;
+                _itemMenu.PopulateList();
+                break;
+            }
+        }
+    }
+
+    protected override void Dispose(bool disposing)
+    {
+        base.Dispose(disposing);
+        _crewMenu?.Close();
+        _itemMenu?.Close();
+        _itemMenu?.DnaWindow?.Close();
+    }
+
+    private void OnTargetPicked(NetEntity target)
+    {
+        SendMessage(new PinpointerTargetPick(target));
+    }
+
+    private void OnDnaPicked(string? dna)
+    {
+        SendMessage(new PinpointerDnaPick(dna));
+    }
+}
diff --git a/Content.Client/SS220/Pinpointer/UI/PinpointerMenu.xaml b/Content.Client/SS220/Pinpointer/UI/PinpointerMenu.xaml
new file mode 100644
index 000000000000..154e3ed27252
--- /dev/null
+++ b/Content.Client/SS220/Pinpointer/UI/PinpointerMenu.xaml
@@ -0,0 +1,17 @@
+<controls:FancyWindow xmlns="https://spacestation14.io"
+                      xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+                      Title="{Loc 'pinpointer-ui-title'}"
+                      MinSize="350 300"
+                      Resizable="True">
+
+    <BoxContainer Orientation="Vertical" VerticalExpand="True">
+        <Label Text="{Loc 'pinpointer-ui-person-to-track'}" Name="LabelTrack" Access="Public" Margin="5 0 0 0" HorizontalExpand="True"/>
+        <PanelContainer StyleClasses="HighDivider"/>
+
+        <ScrollContainer VerticalExpand="True" HScrollEnabled="False">
+            <BoxContainer Name="CrewList" Orientation="Vertical"/>
+        </ScrollContainer>
+        <LineEdit Name="SearchBar" PlaceHolder="{Loc 'object-tab-object-search'}" HorizontalExpand="true"/>
+    </BoxContainer>
+
+</controls:FancyWindow>
diff --git a/Content.Client/SS220/Pinpointer/UI/PinpointerMenu.xaml.cs b/Content.Client/SS220/Pinpointer/UI/PinpointerMenu.xaml.cs
new file mode 100644
index 000000000000..16b4d5178925
--- /dev/null
+++ b/Content.Client/SS220/Pinpointer/UI/PinpointerMenu.xaml.cs
@@ -0,0 +1,75 @@
+// © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt
+
+using Content.Client.UserInterface.Controls;
+using Content.Shared.SS220.Pinpointer;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.SS220.Pinpointer.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class PinpointerMenu : FancyWindow
+{
+    public Action<NetEntity>? OnTargetPicked;
+
+    public HashSet<TrackedItem> CrewListCoords = [];
+
+    private string _searchText = string.Empty;
+
+    public PinpointerMenu()
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+
+        SearchBar.OnTextChanged += OnSearchChanged;
+    }
+
+    private void OnSearchChanged(LineEdit.LineEditEventArgs args)
+    {
+        _searchText = args.Text.Trim().ToLower();
+        PopulateList();
+    }
+
+    public void PopulateList()
+    {
+        CrewList.RemoveAllChildren();
+
+        foreach (var entry in CrewListCoords)
+        {
+            var button = CreateTargetButton(entry.Name, () => OnTargetPicked?.Invoke(entry.Entity));
+
+            if (button == null)
+                continue;
+
+            CrewList.AddChild(button);
+        }
+    }
+
+    private Button? CreateTargetButton(string fullName, Action onClick)
+    {
+        if (!fullName.Contains(_searchText, StringComparison.CurrentCultureIgnoreCase))
+            return null;
+
+        var button = new Button
+        {
+            ToolTip = fullName,
+            StyleClasses = { "OpenBoth" },
+            SetHeight = 30,
+            Margin = new Thickness(5, 0, 5, 5),
+            HorizontalExpand = true,
+        };
+
+        var label = new Label
+        {
+            Text = fullName,
+            HorizontalExpand = true,
+            HorizontalAlignment = HAlignment.Center,
+        };
+
+        button.OnPressed += _ => onClick();
+        button.AddChild(label);
+
+        return button;
+    }
+}
diff --git a/Content.Client/SS220/Pinpointer/UI/PinpointerUplinkMenu.xaml b/Content.Client/SS220/Pinpointer/UI/PinpointerUplinkMenu.xaml
new file mode 100644
index 000000000000..adb4f9863ca1
--- /dev/null
+++ b/Content.Client/SS220/Pinpointer/UI/PinpointerUplinkMenu.xaml
@@ -0,0 +1,29 @@
+<controls:FancyWindow
+    xmlns="https://spacestation14.io"
+    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+    Title="{Loc 'pinpointer-ui-title'}"
+    MinSize="350 300"
+    Resizable="True">
+
+    <BoxContainer Orientation="Vertical" VerticalExpand="True">
+        <BoxContainer Orientation="Horizontal">
+            <Label Text="{Loc 'pinpointer-ui-item-to-track'}"
+                   Name="LabelTrack"
+                   HorizontalExpand="True"
+                   Access="Public"
+                   Margin="5 0 0 0"/>
+            <Button Name="DNASearch"
+                    StyleClasses="OpenBoth"
+                    SetWidth="130"
+                    Text="{Loc 'pinpointer-ui-uplink-search-by-dna'}"
+                    Margin="0 0 5 0"/>
+        </BoxContainer>
+        <PanelContainer StyleClasses="HighDivider"/>
+
+        <ScrollContainer VerticalExpand="True" HScrollEnabled="False">
+            <BoxContainer Name="ItemList" Orientation="Vertical"/>
+        </ScrollContainer>
+        <LineEdit Name="SearchBar" PlaceHolder="{Loc 'object-tab-object-search'}" HorizontalExpand="true"/>
+    </BoxContainer>
+
+</controls:FancyWindow>
diff --git a/Content.Client/SS220/Pinpointer/UI/PinpointerUplinkMenu.xaml.cs b/Content.Client/SS220/Pinpointer/UI/PinpointerUplinkMenu.xaml.cs
new file mode 100644
index 000000000000..dccfa7573f37
--- /dev/null
+++ b/Content.Client/SS220/Pinpointer/UI/PinpointerUplinkMenu.xaml.cs
@@ -0,0 +1,129 @@
+// © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt
+
+using System.Numerics;
+using Content.Client.UserInterface.Controls;
+using Content.Shared.SS220.Pinpointer;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.SS220.Pinpointer.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class PinpointerUplinkMenu : FancyWindow
+{
+    public FancyWindow? DnaWindow;
+
+    public HashSet<TrackedItem> ItemListSet = [];
+
+    public Action<NetEntity>? OnTargetPicked;
+    public Action<string>? OnDnaPicked;
+
+    private string _searchText = string.Empty;
+
+    public PinpointerUplinkMenu()
+    {
+        RobustXamlLoader.Load(this);
+        SearchBar.OnTextChanged += OnSearchChanged;
+        DNASearch.OnPressed += OnDNASearch;
+    }
+
+    private void OnSearchChanged(LineEdit.LineEditEventArgs args)
+    {
+        _searchText = args.Text.Trim().ToLower();
+        PopulateList();
+    }
+
+    private void OnDNASearch(BaseButton.ButtonEventArgs args)
+    {
+        if (DnaWindow != null)
+        {
+            DnaWindow.Open();
+            return;
+        }
+
+        DnaWindow = new FancyWindow
+        {
+            Title = Loc.GetString("pinpointer-ui-uplink-search-by-dna"),
+            SetSize = new Vector2(200, 200),
+        };
+
+
+        var boxContainer = new BoxContainer
+        {
+            Orientation = BoxContainer.LayoutOrientation.Vertical,
+            HorizontalAlignment = HAlignment.Center,
+            VerticalAlignment = VAlignment.Center,
+        };
+
+        var lineEdit = new LineEdit
+        {
+            PlaceHolder = Loc.GetString("pinpointer-ui-uplink-enter-dna"),
+            SetSize = new Vector2(150, 30),
+        };
+
+        var button = new Button()
+        {
+            Text = Loc.GetString("pinpointer-ui-uplink-accept"),
+            Modulate = Color.LimeGreen,
+            StyleClasses = { "OpenBoth" },
+            SetSize = new Vector2(150, 30),
+        };
+
+        button.OnPressed += _ =>
+        {
+            if (string.IsNullOrEmpty(lineEdit.Text))
+                return;
+
+            OnDnaPicked?.Invoke(lineEdit.Text);
+        };
+
+        boxContainer.AddChild(lineEdit);
+        boxContainer.AddChild(button);
+        DnaWindow.AddChild(boxContainer);
+        DnaWindow.OpenCentered();
+    }
+
+    public void PopulateList()
+    {
+        ItemList.RemoveAllChildren();
+
+        foreach (var entry in ItemListSet)
+        {
+            var button = CreateTargetButton(entry.Name, () => OnTargetPicked?.Invoke(entry.Entity));
+
+            if (button == null)
+                continue;
+
+            ItemList.AddChild(button);
+        }
+    }
+
+    private Button? CreateTargetButton(string fullName, Action onClick)
+    {
+        if (!fullName.Contains(_searchText, StringComparison.CurrentCultureIgnoreCase))
+            return null;
+
+        var button = new Button
+        {
+            ToolTip = fullName,
+            StyleClasses = { "OpenBoth" },
+            SetHeight = 30,
+            Margin = new Thickness(5, 0, 5, 5),
+            HorizontalExpand = true,
+        };
+
+        var label = new Label
+        {
+            Text = fullName,
+            HorizontalExpand = true,
+            HorizontalAlignment = HAlignment.Center,
+        };
+
+        button.OnPressed += _ => onClick();
+        button.AddChild(label);
+
+        return button;
+    }
+}
+
diff --git a/Content.Server/SS220/Pinpointer/PinpointerSystem.cs b/Content.Server/SS220/Pinpointer/PinpointerSystem.cs
new file mode 100644
index 000000000000..1ab2fd921e1a
--- /dev/null
+++ b/Content.Server/SS220/Pinpointer/PinpointerSystem.cs
@@ -0,0 +1,161 @@
+// © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt
+
+using System.Linq;
+using Content.Server.DeviceNetwork.Components;
+using Content.Server.Medical.SuitSensors;
+using Content.Shared.Forensics.Components;
+using Content.Shared.Medical.SuitSensor;
+using Content.Shared.Pinpointer;
+using Content.Shared.SS220.Pinpointer;
+using Robust.Shared.Timing;
+
+namespace Content.Server.SS220.Pinpointer;
+
+public sealed class PinpointerSystem : EntitySystem
+{
+    [Dependency] private readonly SharedUserInterfaceSystem _uiSystem = default!;
+    [Dependency] private readonly SharedPinpointerSystem _pinpointer = default!;
+    [Dependency] private readonly IGameTiming _gameTiming = default!;
+    [Dependency] private readonly SuitSensorSystem _suit = default!;
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<PinpointerComponent, PinpointerTargetPick>(OnPickCrew);
+        SubscribeLocalEvent<PinpointerComponent, PinpointerDnaPick>(OnDnaPicked);
+    }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var curTime = _gameTiming.CurTime;
+        var query = EntityQueryEnumerator<PinpointerComponent, UserInterfaceComponent>();
+
+        while (query.MoveNext(out var uid, out var pinpointer, out _))
+        {
+            if (curTime < pinpointer.NextUpdate)
+                continue;
+
+            pinpointer.NextUpdate = curTime + pinpointer.UpdateInterval;
+
+            UpdateTrackers(uid, pinpointer);
+        }
+    }
+
+    private void UpdateTrackers(EntityUid uid, PinpointerComponent comp)
+    {
+        switch (comp.Mode)
+        {
+            case PinpointerMode.Crew:
+                UpdateCrewTrackers(uid, comp);
+                break;
+
+            case PinpointerMode.Item:
+                UpdateItemTrackers(uid, comp);
+                break;
+        }
+
+        if (comp.Target != null && !IsTargetValid(comp))
+        {
+            _pinpointer.SetTarget(uid, null);
+            _pinpointer.TogglePinpointer(uid);
+        }
+
+        UpdateUserInterface((uid, comp));
+        Dirty(uid, comp);
+    }
+
+    private void UpdateCrewTrackers(EntityUid uid, PinpointerComponent comp)
+    {
+        comp.Sensors.Clear();
+
+        var sensorQuery = EntityQueryEnumerator<SuitSensorComponent, DeviceNetworkComponent>();
+
+        while (sensorQuery.MoveNext(out var sensorUid, out var sensorComp, out _))
+        {
+            if (sensorComp.Mode != SuitSensorMode.SensorCords || sensorComp.User == null)
+                continue;
+
+            var stateSensor = _suit.GetSensorState(sensorUid);
+            if (stateSensor == null)
+                continue;
+
+            if (Transform(sensorUid).MapUid != Transform(uid).MapUid)
+                continue;
+
+            comp.Sensors.Add(new TrackedItem(GetNetEntity(sensorUid), stateSensor.Name));
+        }
+    }
+
+    private void UpdateItemTrackers(EntityUid uid, PinpointerComponent comp)
+    {
+        comp.TrackedItems.Clear();
+
+        var itemQuery = EntityQueryEnumerator<TrackedItemComponent>();
+
+        while (itemQuery.MoveNext(out var itemUid, out _))
+        {
+            if (Transform(itemUid).MapUid != Transform(uid).MapUid)
+                continue;
+
+            comp.TrackedItems.Add(new TrackedItem(GetNetEntity(itemUid), MetaData(itemUid).EntityName));
+        }
+
+        if (string.IsNullOrEmpty(comp.DnaToTrack) || comp.TrackedByDnaEntity == null)
+            return;
+
+        comp.TrackedItems.Add(new TrackedItem(GetNetEntity(comp.TrackedByDnaEntity.Value), comp.DnaToTrack));
+    }
+
+    private bool IsTargetValid(PinpointerComponent comp)
+    {
+        return comp.Mode switch
+        {
+            PinpointerMode.Crew => comp.Sensors.Any(sensor => GetEntity(sensor.Entity) == comp.Target),
+            PinpointerMode.Item => comp.TrackedItems.Any(item => item.Entity == GetNetEntity(comp.Target!.Value)),
+            _ => false,
+        };
+    }
+
+    private void OnPickCrew(Entity<PinpointerComponent> ent, ref PinpointerTargetPick args)
+    {
+        _pinpointer.SetTarget(ent.Owner, GetEntity(args.Target));
+        _pinpointer.SetActive(ent.Owner, true);
+    }
+
+    private void OnDnaPicked(Entity<PinpointerComponent> ent, ref PinpointerDnaPick args)
+    {
+        var query = EntityQueryEnumerator<DnaComponent>();
+
+        while (query.MoveNext(out var target, out var dnaComponent))
+        {
+            if (dnaComponent.DNA != args.Dna)
+                continue;
+
+            if (Transform(target).MapUid != Transform(ent.Owner).MapUid)
+                continue;
+
+            _pinpointer.SetTarget(ent.Owner, target);
+            _pinpointer.SetActive(ent.Owner, true);
+            ent.Comp.DnaToTrack = args.Dna;
+            ent.Comp.TrackedByDnaEntity = target;
+        }
+    }
+
+    private void UpdateUserInterface(Entity<PinpointerComponent> ent)
+    {
+        if (!Exists(ent.Owner) || !_uiSystem.IsUiOpen(ent.Owner, PinpointerUIKey.Key))
+            return;
+
+        switch (ent.Comp.Mode)
+        {
+            case PinpointerMode.Crew:
+                _uiSystem.SetUiState(ent.Owner, PinpointerUIKey.Key, new PinpointerCrewUIState(ent.Comp.Sensors));
+                break;
+
+            case PinpointerMode.Item:
+                _uiSystem.SetUiState(ent.Owner, PinpointerUIKey.Key, new PinpointerItemUIState(ent.Comp.TrackedItems));
+                break;
+        }
+    }
+}
diff --git a/Content.Server/SS220/Pinpointer/TrackedItemComponent.cs b/Content.Server/SS220/Pinpointer/TrackedItemComponent.cs
new file mode 100644
index 000000000000..e10cbfd5d88a
--- /dev/null
+++ b/Content.Server/SS220/Pinpointer/TrackedItemComponent.cs
@@ -0,0 +1,8 @@
+// © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt
+
+namespace Content.Server.SS220.Pinpointer;
+
+[RegisterComponent]
+public sealed partial class TrackedItemComponent : Component
+{
+}
diff --git a/Content.Shared/Pinpointer/PinpointerComponent.cs b/Content.Shared/Pinpointer/PinpointerComponent.cs
index e83a2e38d608..d1dd242a50ca 100644
--- a/Content.Shared/Pinpointer/PinpointerComponent.cs
+++ b/Content.Shared/Pinpointer/PinpointerComponent.cs
@@ -1,3 +1,4 @@
+using Content.Shared.SS220.Pinpointer;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 
@@ -62,6 +63,39 @@ public sealed partial class PinpointerComponent : Component
 
     [ViewVariables]
     public bool HasTarget => DistanceToTarget != Distance.Unknown;
+
+    //ss220 add pinpointer ui start
+    [DataField]
+    [AutoNetworkedField]
+    [Access(Other = AccessPermissions.ReadWriteExecute)]
+    public HashSet<TrackedItem> Sensors = [];
+
+    [DataField]
+    [AutoNetworkedField]
+    [Access(Other = AccessPermissions.ReadWriteExecute)]
+    public HashSet<TrackedItem> TrackedItems = [];
+
+    [DataField]
+    [AutoNetworkedField]
+    [Access(Other = AccessPermissions.ReadWriteExecute)]
+    public PinpointerMode Mode = PinpointerMode.Crew;
+
+    [DataField]
+    [Access(Other = AccessPermissions.ReadWriteExecute)]
+    public EntityUid? TrackedByDnaEntity;
+
+    [DataField]
+    [Access(Other = AccessPermissions.ReadWriteExecute)]
+    public string? DnaToTrack;
+
+    [DataField]
+    [Access(Other = AccessPermissions.ReadWriteExecute)]
+    public TimeSpan UpdateInterval = TimeSpan.FromSeconds(2f);
+
+    [DataField]
+    [Access(Other = AccessPermissions.ReadWriteExecute)]
+    public TimeSpan NextUpdate;
+    //ss220 add pinpointer ui end
 }
 
 [Serializable, NetSerializable]
diff --git a/Content.Shared/SS220/Pinpointer/PinpointerEvents.cs b/Content.Shared/SS220/Pinpointer/PinpointerEvents.cs
new file mode 100644
index 000000000000..8dab741394fc
--- /dev/null
+++ b/Content.Shared/SS220/Pinpointer/PinpointerEvents.cs
@@ -0,0 +1,79 @@
+// © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt
+
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.SS220.Pinpointer;
+
+[Serializable, NetSerializable]
+public enum PinpointerUIKey
+{
+    Key,
+}
+
+[Serializable]
+[NetSerializable]
+public sealed partial class PinpointerTargetPick : BoundUserInterfaceMessage
+{
+    public NetEntity Target;
+
+    public PinpointerTargetPick(NetEntity target)
+    {
+        Target = target;
+    }
+}
+
+[Serializable]
+[NetSerializable]
+public sealed partial class PinpointerDnaPick : BoundUserInterfaceMessage
+{
+    public string? Dna;
+
+    public PinpointerDnaPick(string? dna)
+    {
+        Dna = dna;
+    }
+}
+
+[Serializable]
+[NetSerializable]
+public sealed partial class PinpointerCrewUIState : BoundUserInterfaceState
+{
+    public HashSet<TrackedItem> Sensors;
+
+    public PinpointerCrewUIState(HashSet<TrackedItem> sensors)
+    {
+        Sensors = sensors;
+    }
+}
+
+[Serializable]
+[NetSerializable]
+public sealed partial class PinpointerItemUIState : BoundUserInterfaceState
+{
+    public HashSet<TrackedItem> Items;
+
+    public PinpointerItemUIState(HashSet<TrackedItem> items)
+    {
+        Items = items;
+    }
+}
+
+[Serializable]
+[NetSerializable]
+public struct TrackedItem
+{
+    public NetEntity Entity { get; }
+    public string Name { get; }
+
+    public TrackedItem(NetEntity entity, string name)
+    {
+        Entity = entity;
+        Name = name;
+    }
+}
+
+public enum PinpointerMode
+{
+    Crew,
+    Item,
+}
diff --git a/Resources/Locale/ru-RU/ss220/prototypes/entities/devices/pinpointer.ftl b/Resources/Locale/ru-RU/ss220/prototypes/entities/devices/pinpointer.ftl
new file mode 100644
index 000000000000..44d4bbcb4c2c
--- /dev/null
+++ b/Resources/Locale/ru-RU/ss220/prototypes/entities/devices/pinpointer.ftl
@@ -0,0 +1,11 @@
+ent-PinpointerCrew = пинпоинтер персонала
+    .desc = Портативное устройство слежения, предназначенное для отслеживания членов экипажа.
+ent-PinpointerUplink = пинпоинтер синдиката
+    .desc = Портативное устройство слежения, которое отслеживает предметы и членов экипажа.
+
+pinpointer-ui-title = Пинпоинтер
+pinpointer-ui-person-to-track = Личность отслеживания
+pinpointer-ui-item-to-track = Предмет отслеживания
+pinpointer-ui-uplink-search-by-dna = Поиск по ДНК
+pinpointer-ui-uplink-enter-dna = Введите ДНК...
+pinpointer-ui-uplink-accept = Принять
diff --git a/Resources/Locale/ru-RU/ss220/research/technologies.ftl b/Resources/Locale/ru-RU/ss220/research/technologies.ftl
index aa86be3cb10b..6257531c5805 100644
--- a/Resources/Locale/ru-RU/ss220/research/technologies.ftl
+++ b/Resources/Locale/ru-RU/ss220/research/technologies.ftl
@@ -1,2 +1,3 @@
 research-technology-renewable-power = Термоэлектрический генератор
 research-technology-advanced-thermal-sensors = Термальные сенсоры
+research-technology-med-tech = Продвинутые медицинские технологии
diff --git a/Resources/Locale/ru-RU/ss220/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/ss220/store/uplink-catalog.ftl
index ffd60810bd1b..71e997db4388 100644
--- a/Resources/Locale/ru-RU/ss220/store/uplink-catalog.ftl
+++ b/Resources/Locale/ru-RU/ss220/store/uplink-catalog.ftl
@@ -10,6 +10,8 @@ uplink-clothing-eyes-hud-syndicate-agent-desc = Продвинутый визо
 uplink-clothing-briefcase-with-double-bottom-name = Чемодан с двойным дном
 uplink-clothing-briefcase-with-double-bottom-desc = Чемодан с двойным дном, которое может быть открыто отвёрткой. Вмещает в себя одно огнестрельное оружие.
 
+uplink-pinpointer-syndie-name = Пинпоинтер Cиндиката
+uplink-pinpointer-syndie-desc = Пинпоинтер, способный отследить любой ценный предмет на станции, а так же любое существо по ДНК.
 # Disruption
 
 uplink-syndicate-pen-signaller = Ручка-передатчик
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
index 43f14918b727..264ec2a5cc06 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
@@ -150,3 +150,4 @@
       - id: OxygenTankFilled # SS220 - Changing the contents of the paramedic closet
       - id: NitrogenTankFilled # SS220 - Changing the contents of the paramedic closet
 #    - id: HandheldCrewMonitor # SS220 - RemoveParamedicCrewMonitor
+      - id: PinpointerCrew # ss220 - add pinpointer crew
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
index d0b0f254b05e..c2afe8bdcb64 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -494,6 +494,9 @@
     tags:
     - WhitelistChameleon
     - HighRiskItem
+  #ss220 pinpointer ui add start
+  - type: TrackedItem
+  #ss220 pinpointer ui add end
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitRd
   - type: StaticPrice
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
index 0c1257426f31..7372792f7710 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
@@ -62,6 +62,9 @@
     tags:
     - WhitelistChameleon
     - HighRiskItem
+  #ss220 pinpointer ui add start
+  - type: TrackedItem
+  #ss220 pinpointer ui add end
   - type: StaticPrice
     price: 750
   - type: StealTarget
diff --git a/Resources/Prototypes/Entities/Objects/Devices/hand_teleporter.yml b/Resources/Prototypes/Entities/Objects/Devices/hand_teleporter.yml
index 4d3e3cba0a1c..1a1371d170b9 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/hand_teleporter.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/hand_teleporter.yml
@@ -9,6 +9,9 @@
     layers:
     - state: icon
   - type: HandTeleporter
+  #ss220 pinpointer ui add start
+  - type: TrackedItem
+  #ss220 pinpointer ui add end
   - type: Tag
     tags:
     - HighRiskItem
diff --git a/Resources/Prototypes/Entities/Objects/Misc/dat_fukken_disk.yml b/Resources/Prototypes/Entities/Objects/Misc/dat_fukken_disk.yml
index 7c75ea160f36..c3f7fe084346 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/dat_fukken_disk.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/dat_fukken_disk.yml
@@ -22,6 +22,9 @@
     - HighRiskItem
   - type: StealTarget
     stealGroup: NukeDisk
+  #ss220 pinpointer ui add start
+  - type: TrackedItem
+  #ss220 pinpointer ui add end
 
 - type: entity
   name: nuclear authentication disk
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml
index 8df694cd49b9..bbde43311db5 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml
@@ -29,6 +29,9 @@
     - HighRiskItem
   - type: StealTarget
     stealGroup: HandheldCrewMonitor
+  #ss220 pinpointer ui add start
+  - type: TrackedItem
+  #ss220 pinpointer ui add end
 
 - type: entity
   id: HandheldCrewMonitorEmpty
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
index 635af90c57d2..a3650798ff3b 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
@@ -28,6 +28,9 @@
     - HighRiskItem
   - type: StealTarget
     stealGroup: Hypospray
+  #ss220 pinpointer ui add start
+  - type: TrackedItem
+  #ss220 pinpointer ui add end
 
 - type: entity
   name: gorlex hypospray
diff --git a/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml b/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml
index 522c5ef52d46..76a0032d6b12 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml
@@ -154,6 +154,9 @@
   - type: Item
     sprite: Objects/Tanks/Jetpacks/captain.rsi
     size: Normal
+  #ss220 pinpointer ui add start
+  - type: TrackedItem
+  #ss220 pinpointer ui add end
   - type: Tag
     tags:
     - HighRiskItem
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
index ea37945ef9b9..b10031825521 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -596,6 +596,9 @@
     - HighRiskItem
     - Sidearm
     - WeaponAntiqueLaser
+  #ss220 pinpointer ui add start
+  - type: TrackedItem
+  #ss220 pinpointer ui add end
   - type: StaticPrice
     price: 750
   - type: StealTarget
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 990b8c521640..80a9b65c957e 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -475,6 +475,7 @@
     - SurgeryStatic
     dynamicPacks:
     - Chemistry
+    - MedServiceTech #ss220 add pinpointer crew
   - type: Machine
     board: MedicalTechFabCircuitboard
   - type: StealTarget
diff --git a/Resources/Prototypes/SS220/Catalog/Fills/Lockers/command.yml b/Resources/Prototypes/SS220/Catalog/Fills/Lockers/command.yml
index ab98d8426ab8..d22c02ef9b5a 100644
--- a/Resources/Prototypes/SS220/Catalog/Fills/Lockers/command.yml
+++ b/Resources/Prototypes/SS220/Catalog/Fills/Lockers/command.yml
@@ -17,6 +17,7 @@
     - id: BlueShieldGasMask
     - id: RubberStampBlueShield #SS220-additional paperwork
     - id: JetpackMiniBlueFilled #SS220 BlueShield Rework
+    - id: PinpointerCrew
 
 - type: entity
   parent: GunSafe
diff --git a/Resources/Prototypes/SS220/Catalog/uplink_catalog.yml b/Resources/Prototypes/SS220/Catalog/uplink_catalog.yml
index 993a306dd6f6..30f4937b16aa 100644
--- a/Resources/Prototypes/SS220/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/SS220/Catalog/uplink_catalog.yml
@@ -325,3 +325,14 @@
     Telecrystal: 2
   categories:
   - UplinkWearables
+
+- type: listing
+  id: UplinkPinpointerSyndie
+  name: uplink-pinpointer-syndie-name
+  description: uplink-pinpointer-syndie-desc
+  icon: { sprite: Objects/Devices/pinpointer.rsi, state: pinpointer-syndicate }
+  productEntity: PinpointerUplink
+  cost:
+    Telecrystal: 4
+  categories:
+  - UplinkDisruption
diff --git a/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/reactive_armor_rd.yml b/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/reactive_armor_rd.yml
index 588111ff5080..848ade81afa9 100644
--- a/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/reactive_armor_rd.yml
+++ b/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/reactive_armor_rd.yml
@@ -1,23 +1,23 @@
 - type: entity
   parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing, BaseToggleClothing]
   id: ClothingOuterReactiveArmor
-  name: experimental reactive armor 
+  name: experimental reactive armor
   description: The latest armor prototype based on the anomaly core. There are rumors that NT scientists are developing a more stable and multitasking version.
   components:
   - type: Sprite
-    sprite: SS220/Clothing/OuterClothing/Armor/reactive_armor.rsi 
+    sprite: SS220/Clothing/OuterClothing/Armor/reactive_armor.rsi
     layers:
     - state: icon
       map: [ "enum.ToggleVisuals.Layer" ]
   - type: Clothing
     sprite: SS220/Clothing/OuterClothing/Armor/reactive_armor.rsi
-  - type: Appearance      
+  - type: Appearance
   - type: GenericVisualizer
     visuals:
       enum.ToggleVisuals.Toggled:
         enum.ToggleVisuals.Layer:
           True: {state: icon-on}
-          False: {state: icon}   
+          False: {state: icon}
   - type: Armor
     modifiers:
       coefficients:
@@ -25,7 +25,7 @@
         Slash: 0.5
         Piercing: 0.6
         Heat: 0.5
-        Caustic: 0.9    
+        Caustic: 0.9
   - type: HeldSpeedModifier
   - type: ToggleClothing
     action: ActionToggleReactiveArmor
@@ -33,8 +33,8 @@
     verbToggleOn: toggle-reactivearmor-verb-get-data-text
     verbToggleOff: toggle-reactivearmor-verb-get-data-text
   - type: GroupExamine
-  - type: ReactiveTeleportArmor   
-  - type: Explosive 
+  - type: ReactiveTeleportArmor
+  - type: Explosive
     explosionType: Default
     maxIntensity: 2
     totalIntensity: 1.5
@@ -44,17 +44,18 @@
     repeatable: true
   - type: StealTarget
     stealGroup: ClothingOuterReactiveArmor
+  - type: TrackedItem
   - type: Tag
     tags:
-    - HighRiskItem      
+    - HighRiskItem
 
 - type: entity
   id: ActionToggleReactiveArmor
-  name: Toggle Reactive armor 
-  description: Toggles the armor on and off. 
+  name: Toggle Reactive armor
+  description: Toggles the armor on and off.
   components:
   - type: InstantAction
     useDelay: 5
     priority: -9
     itemIconStyle: BigItem
-    event: !type:ToggleActionEvent
\ No newline at end of file
+    event: !type:ToggleActionEvent
diff --git a/Resources/Prototypes/SS220/Entities/Objects/Devices/pinpointer.yml b/Resources/Prototypes/SS220/Entities/Objects/Devices/pinpointer.yml
index 2e1effba7b13..5bc7466ac4d5 100644
--- a/Resources/Prototypes/SS220/Entities/Objects/Devices/pinpointer.yml
+++ b/Resources/Prototypes/SS220/Entities/Objects/Devices/pinpointer.yml
@@ -20,3 +20,59 @@
   - type: Pinpointer
     component: Nuke
     targetName: ядерная боеголовка
+
+- type: entity
+  parent: PinpointerBase
+  id: PinpointerCrew
+  name: crew pinpointer
+  description: A handheld tracking device that leads to the direction of any crew member.
+  suffix: Crew, Pinpointer
+  components:
+  - type: Sprite
+    sprite: Objects/Devices/pinpointer.rsi
+    layers:
+    - state: pinpointer-crew
+      map: ["enum.PinpointerLayers.Base"]
+    - state: pinonnull
+      map: ["enum.PinpointerLayers.Screen"]
+      shader: unshaded
+      visible: false
+  - type: Icon
+    sprite: Objects/Devices/pinpointer.rsi
+    state: pinpointer-crew
+  - type: Pinpointer
+    mode: Crew
+  - type: ActivatableUI
+    key: enum.PinpointerUIKey.Key
+  - type: UserInterface
+    interfaces:
+      enum.PinpointerUIKey.Key:
+        type: PinpointerBoundUserInterface
+
+- type: entity
+  parent: PinpointerBase
+  id: PinpointerUplink
+  name: uplink pinpointer
+  description: A handheld tracking device that leads to the direction of any crew member.
+  suffix: Crew, Dna, Items, Pinpointer
+  components:
+  - type: Sprite
+    sprite: Objects/Devices/pinpointer.rsi
+    layers:
+    - state: pinpointer-syndicate
+      map: ["enum.PinpointerLayers.Base"]
+    - state: pinonnull
+      map: ["enum.PinpointerLayers.Screen"]
+      shader: unshaded
+      visible: false
+  - type: Icon
+    sprite: Objects/Devices/pinpointer.rsi
+    state: pinpointer-syndicate
+  - type: Pinpointer
+    mode: Item
+  - type: ActivatableUI
+    key: enum.PinpointerUIKey.Key
+  - type: UserInterface
+    interfaces:
+      enum.PinpointerUIKey.Key:
+        type: PinpointerBoundUserInterface
diff --git a/Resources/Prototypes/SS220/Entities/Objects/Misc/secret_documents.yml b/Resources/Prototypes/SS220/Entities/Objects/Misc/secret_documents.yml
index 8930ba748456..e13395b45f91 100644
--- a/Resources/Prototypes/SS220/Entities/Objects/Misc/secret_documents.yml
+++ b/Resources/Prototypes/SS220/Entities/Objects/Misc/secret_documents.yml
@@ -31,5 +31,6 @@
       tags:
         - Book
         - HighRiskItem
+    - type: TrackedItem
     - type: StealTarget
       stealGroup: BookSecretDocuments
diff --git a/Resources/Prototypes/SS220/Entities/Objects/Tools/rcd-ce.yml b/Resources/Prototypes/SS220/Entities/Objects/Tools/rcd-ce.yml
index d464dc7c61f6..de1eebf45279 100644
--- a/Resources/Prototypes/SS220/Entities/Objects/Tools/rcd-ce.yml
+++ b/Resources/Prototypes/SS220/Entities/Objects/Tools/rcd-ce.yml
@@ -22,5 +22,6 @@
   - type: Tag
     tags:
     - HighRiskItem
+  - type: TrackedItem
   - type: StealTarget
-    stealGroup: RCDCE
\ No newline at end of file
+    stealGroup: RCDCE
diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/multiphase_energy_gun.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/multiphase_energy_gun.yml
index ed9530e08960..53672c5b0bf1 100644
--- a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/multiphase_energy_gun.yml
+++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/multiphase_energy_gun.yml
@@ -48,6 +48,7 @@
     - HighRiskItem
     - Sidearm
     - WeaponMultiPhaseEnergyGun
+  - type: TrackedItem
   - type: StaticPrice
     price: 750
   - type: StealTarget
diff --git a/Resources/Prototypes/SS220/Recipes/Lathes/Packs/medical.yml b/Resources/Prototypes/SS220/Recipes/Lathes/Packs/medical.yml
new file mode 100644
index 000000000000..7d4378e9f89e
--- /dev/null
+++ b/Resources/Prototypes/SS220/Recipes/Lathes/Packs/medical.yml
@@ -0,0 +1,4 @@
+- type: latheRecipePack
+  id: MedServiceTech
+  recipes:
+  - PinpointerCrew
diff --git a/Resources/Prototypes/SS220/Recipes/Lathes/devices.yml b/Resources/Prototypes/SS220/Recipes/Lathes/devices.yml
index 0dfc2b90f505..d72792b73ee1 100644
--- a/Resources/Prototypes/SS220/Recipes/Lathes/devices.yml
+++ b/Resources/Prototypes/SS220/Recipes/Lathes/devices.yml
@@ -35,3 +35,13 @@
     Glass: 400
     Plasma: 600
     Plastic: 400
+
+- type: latheRecipe
+  id: PinpointerCrew
+  result: PinpointerCrew
+  completetime: 4
+  materials:
+    Steel: 600
+    Glass: 400
+    Gold: 600
+    Plastic: 400
diff --git a/Resources/Prototypes/SS220/Research/civilianservices.yml b/Resources/Prototypes/SS220/Research/civilianservices.yml
index d3f4eec7d14f..88cdd665e37d 100644
--- a/Resources/Prototypes/SS220/Research/civilianservices.yml
+++ b/Resources/Prototypes/SS220/Research/civilianservices.yml
@@ -1,3 +1,15 @@
+- type: technology
+  id: ServiceMedicalTech
+  name: research-technology-med-tech
+  icon:
+    sprite: Objects/Tools/blueprint.rsi
+    state: icon
+  discipline: CivilianServices
+  tier: 2
+  cost: 7500
+  recipeUnlocks:
+  - PinpointerCrew
+
 - type: technology
   id: CloningPodMachine
   name: research-technology-cloning-technology