From 679de0a7dffc8292bdbdddbe31c0bc3c526639ae Mon Sep 17 00:00:00 2001
From: ReeZer2 <omfgdamndude.dude@gmail.com>
Date: Fri, 20 Dec 2024 20:57:58 +0200
Subject: [PATCH 01/12] ADD: Contactor Traitor

---
 .../Systems/ContractorClientSystem.cs         |  12 +
 .../UI/ContractorBoundUserInterface.cs        | 452 ++++++++++++++++++
 .../Contractor/UI/ContractorPDAMenu.xaml      |  33 ++
 .../Contractor/UI/ContractorPDAMenu.xaml.cs   |  50 ++
 .../SS220/Contractor/UI/ContractorStyle.cs    |  54 +++
 .../Contractor/ContractorServerSystem.cs      | 252 ++++++++++
 .../Conditions/BuyTimeForListingCondition.cs  |  16 +
 .../SS220/Contractor/ContractorComponent.cs   |  53 ++
 .../SS220/Contractor/ContractorMessagesUi.cs  |  78 +++
 .../SS220/Contractor/ContractorPDAVisuals.cs  |   9 +
 .../Contractor/ContractorPdaComponent.cs      |  31 ++
 .../ContractorPortalOnTriggerComponent.cs     |  20 +
 .../Contractor/ContractorTargetComponent.cs   |  36 ++
 .../SharedContractorItemPrototype.cs          |  20 +
 .../SharedContractorPortalSystem.cs           | 100 ++++
 .../Contractor/SharedContractorSystem.cs      |  93 ++++
 .../SharedContractorTargetSystem.cs           |  36 ++
 .../SS220/Antags/contractor_items.yml         |  36 ++
 .../SS220/Catalog/uplink_catalog.yml          |  19 +
 .../SS220/Entities/Effects/portal.yml         |  17 +
 .../SS220/Entities/Objects/Devices/pda.yml    |  16 +-
 Resources/Prototypes/Store/categories.yml     |   5 +
 Resources/Prototypes/Store/presets.yml        |   1 +
 .../background-uplink-contractor.png          | Bin 0 -> 3276 bytes
 .../button-execution.rsi/execution.png        | Bin 0 -> 1499 bytes
 .../Contractor/button-execution.rsi/meta.json |  14 +
 .../Contractor/button-hub.rsi/hub.png         | Bin 0 -> 1263 bytes
 .../Contractor/button-hub.rsi/meta.json       |  14 +
 .../Contractor/button-photo.rsi/meta.json     |  15 +
 .../Contractor/button-photo.rsi/photo.png     | Bin 0 -> 290 bytes
 .../Contractor/button-withdraw.rsi/meta.json  |  15 +
 .../button-withdraw.rsi/withdraw.png          | Bin 0 -> 1809 bytes
 .../Contractor/buttons.rsi/contracts.png      | Bin 0 -> 1583 bytes
 .../Contractor/buttons.rsi/meta.json          |  14 +
 .../Contractor/font-uplink-contractor.png     | Bin 0 -> 2534 bytes
 35 files changed, 1510 insertions(+), 1 deletion(-)
 create mode 100644 Content.Client/SS220/Contractor/Systems/ContractorClientSystem.cs
 create mode 100644 Content.Client/SS220/Contractor/UI/ContractorBoundUserInterface.cs
 create mode 100644 Content.Client/SS220/Contractor/UI/ContractorPDAMenu.xaml
 create mode 100644 Content.Client/SS220/Contractor/UI/ContractorPDAMenu.xaml.cs
 create mode 100644 Content.Client/SS220/Contractor/UI/ContractorStyle.cs
 create mode 100644 Content.Server/SS220/Contractor/ContractorServerSystem.cs
 create mode 100644 Content.Server/SS220/Store/Conditions/BuyTimeForListingCondition.cs
 create mode 100644 Content.Shared/SS220/Contractor/ContractorComponent.cs
 create mode 100644 Content.Shared/SS220/Contractor/ContractorMessagesUi.cs
 create mode 100644 Content.Shared/SS220/Contractor/ContractorPDAVisuals.cs
 create mode 100644 Content.Shared/SS220/Contractor/ContractorPdaComponent.cs
 create mode 100644 Content.Shared/SS220/Contractor/ContractorPortalOnTriggerComponent.cs
 create mode 100644 Content.Shared/SS220/Contractor/ContractorTargetComponent.cs
 create mode 100644 Content.Shared/SS220/Contractor/SharedContractorItemPrototype.cs
 create mode 100644 Content.Shared/SS220/Contractor/SharedContractorPortalSystem.cs
 create mode 100644 Content.Shared/SS220/Contractor/SharedContractorSystem.cs
 create mode 100644 Content.Shared/SS220/Contractor/SharedContractorTargetSystem.cs
 create mode 100644 Resources/Prototypes/SS220/Antags/contractor_items.yml
 create mode 100644 Resources/Prototypes/SS220/Entities/Effects/portal.yml
 create mode 100644 Resources/Textures/SS220/Interface/Contractor/background-uplink-contractor.png
 create mode 100644 Resources/Textures/SS220/Interface/Contractor/button-execution.rsi/execution.png
 create mode 100644 Resources/Textures/SS220/Interface/Contractor/button-execution.rsi/meta.json
 create mode 100644 Resources/Textures/SS220/Interface/Contractor/button-hub.rsi/hub.png
 create mode 100644 Resources/Textures/SS220/Interface/Contractor/button-hub.rsi/meta.json
 create mode 100644 Resources/Textures/SS220/Interface/Contractor/button-photo.rsi/meta.json
 create mode 100644 Resources/Textures/SS220/Interface/Contractor/button-photo.rsi/photo.png
 create mode 100644 Resources/Textures/SS220/Interface/Contractor/button-withdraw.rsi/meta.json
 create mode 100644 Resources/Textures/SS220/Interface/Contractor/button-withdraw.rsi/withdraw.png
 create mode 100644 Resources/Textures/SS220/Interface/Contractor/buttons.rsi/contracts.png
 create mode 100644 Resources/Textures/SS220/Interface/Contractor/buttons.rsi/meta.json
 create mode 100644 Resources/Textures/SS220/Interface/Contractor/font-uplink-contractor.png

diff --git a/Content.Client/SS220/Contractor/Systems/ContractorClientSystem.cs b/Content.Client/SS220/Contractor/Systems/ContractorClientSystem.cs
new file mode 100644
index 000000000000..ad40ed6ba104
--- /dev/null
+++ b/Content.Client/SS220/Contractor/Systems/ContractorClientSystem.cs
@@ -0,0 +1,12 @@
+using Content.Shared.SS220.Contractor;
+
+namespace Content.Client.SS220.Contractor.Systems;
+
+public sealed class ContractorClientSystem : SharedContractorSystem
+{
+    /// <inheritdoc/>
+    public override void Initialize()
+    {
+        base.Initialize();
+    }
+}
diff --git a/Content.Client/SS220/Contractor/UI/ContractorBoundUserInterface.cs b/Content.Client/SS220/Contractor/UI/ContractorBoundUserInterface.cs
new file mode 100644
index 000000000000..a0667472ef12
--- /dev/null
+++ b/Content.Client/SS220/Contractor/UI/ContractorBoundUserInterface.cs
@@ -0,0 +1,452 @@
+using System.Numerics;
+using Content.Client.SS220.Contractor.Systems;
+using Content.Client.SS220.UserInterface;
+using Content.Shared.FixedPoint;
+using Content.Shared.SS220.Contractor;
+using JetBrains.Annotations;
+using Robust.Client.Player;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client.SS220.Contractor.UI;
+
+[UsedImplicitly]
+public sealed class ContractorBoundUserInterface : BoundUserInterface
+{
+    [Dependency] private readonly IPlayerManager _playerManager = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+
+    private ContractorPDAMenu? _menu;
+
+    private DefaultWindow? _withdrawWindow;
+    private DefaultWindow? _photoWindow;
+
+    private readonly ContractorClientSystem _contractorSystem;
+    private readonly ContractorPdaComponent _contractorPdaComponent;
+    private readonly ContractorComponent? _contractorComponent;
+
+    private readonly List<Button> _allPositionButtons = [];
+
+    public ContractorBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
+    {
+        IoCManager.InjectDependencies(this);
+        _contractorSystem = EntMan.System<ContractorClientSystem>();
+        _contractorPdaComponent = EntMan.GetComponent<ContractorPdaComponent>(owner);
+        EntMan.TryGetComponent<ContractorComponent>(
+            EntMan.GetEntity(_contractorPdaComponent.PdaOwner),
+            out var contractorComponent);
+
+        _contractorComponent = contractorComponent;
+    }
+
+    protected override void ReceiveMessage(BoundUserInterfaceMessage message)
+    {
+        base.ReceiveMessage(message);
+
+        if(_menu == null)
+            return;
+
+        switch (message)
+        {
+            case ContractorUpdateButtonStateMessage ev:
+                _menu.ExecutionButton.Disabled = !ev.IsEnabled;
+                break;
+            case ContractorUpdateStatsMessage:
+                UpdateStats();
+                UpdateContracts(EntMan.GetEntity(_contractorPdaComponent.PdaOwner)!.Value, Owner);
+                break;
+            case ContractorCompletedContractMessage:
+            {
+                foreach (var buttons in _allPositionButtons)
+                {
+                    buttons.Disabled = false;
+                }
+                _menu.ExecutionButton.Disabled = true;
+                break;
+            }
+        }
+    }
+
+    protected override void Open()
+    {
+        base.Open();
+
+        _menu = new(this);
+        _menu.OnClose += Close;
+
+        _menu.OpenCentered();
+
+        if (_playerManager.LocalSession?.AttachedEntity == null)
+            return;
+
+        if (_contractorPdaComponent.PdaOwner == null)
+            return;
+
+        UpdateStats();
+
+        UpdateContracts(_playerManager.LocalSession.AttachedEntity.Value, Owner);
+        UpdateHub(_contractorPdaComponent.AvailableItems);
+    }
+
+    protected override void Dispose(bool disposing)
+    {
+        base.Dispose(disposing);
+        if (!disposing)
+            return;
+        _menu?.Close();
+    }
+
+    private void UpdateStats()
+    {
+        if (_menu == null)
+            return;
+
+        if (_contractorComponent == null)
+            return;
+
+        _menu.ReputationCountLabel.Text = $"Текущая репутация: " + _contractorComponent.Reputation;
+        _menu.TcAmountLabel.Text = $"Имеется ТК: " + _contractorComponent.AmountTc;
+        _menu.ContractsFinishedAmountLabel.Text = $"Выполнено контрактов: " + _contractorComponent.ContractsCompleted;
+    }
+
+    private void UpdateContracts(EntityUid contractor, EntityUid pda)
+    {
+        if (_menu == null)
+            return;
+
+        _menu.ContractsListPanel.RemoveAllChildren();
+
+        var contracts = _contractorSystem.GetContractsForPda(contractor, pda);
+
+        if (contracts is null)
+            return;
+
+        foreach (var contract in contracts)
+        {
+            AddContract(contract.Key, contract.Value);
+        }
+
+    }
+
+    private void AddContract(NetEntity key, ContractorContract contract)
+    {
+        if (_menu == null)
+            return;
+
+        var contractContainer = new BoxContainer
+        {
+            Orientation = BoxContainer.LayoutOrientation.Vertical,
+            SeparationOverride = 5,
+            HorizontalExpand = true,
+            VerticalAlignment = Control.VAlignment.Top,
+            Margin = new Thickness(5, 20, 5, 60),
+        };
+
+        var topContainer = new BoxContainer
+        {
+            Orientation = BoxContainer.LayoutOrientation.Horizontal,
+            SeparationOverride = 5,
+            HorizontalExpand = true,
+            VerticalAlignment = Control.VAlignment.Top,
+        };
+
+        var nameLabel = new RichTextLabel
+        {
+            Text = EntMan.GetComponent<MetaDataComponent>(EntMan.GetEntity(key)).EntityName + " - " + contract.Job,
+            HorizontalExpand = false,
+            MaxWidth = 350,
+            VerticalAlignment = Control.VAlignment.Center,
+        };
+
+        var targetButton = new SpriteButton
+        {
+            HorizontalExpand = false,
+            VerticalExpand = false,
+            MinSize = new Vector2(28, 28),
+            Margin = new Thickness(10, 0, 0, 0),
+            VerticalAlignment = Control.VAlignment.Center,
+            StyleClasses = { "ContractorPhotoButton" },
+        };
+
+        targetButton.OnPressed += _ =>
+        {
+            _photoWindow?.Close();
+
+            _photoWindow = new DefaultWindow
+            {
+                Title = "Фото цели",
+                MinSize = new Vector2(200, 200),
+                Resizable = false,
+            };
+
+            _photoWindow.OnClose += () => _photoWindow = null;
+
+            var iconTarget = new EntityPrototypeView
+            {
+                Scale = new Vector2(1.5f, 1.5f),
+                VerticalAlignment = Control.VAlignment.Center,
+                HorizontalAlignment = Control.HAlignment.Center,
+            };
+
+            iconTarget.SetEntity(EntMan.GetEntity(key));
+
+            _photoWindow.AddChild(iconTarget);
+            _photoWindow.OpenCentered();
+        };
+
+        topContainer.AddChild(nameLabel);
+        topContainer.AddChild(targetButton);
+
+        var positionsContainer = new BoxContainer
+        {
+            Orientation = BoxContainer.LayoutOrientation.Vertical,
+            SeparationOverride = 10,
+            HorizontalExpand = true,
+            VerticalAlignment = Control.VAlignment.Center,
+            Margin = new Thickness(5, 5, 5, 5),
+        };
+
+        var isAlreadyAccepted = _contractorPdaComponent.CurrentContractEntity is not null &&
+                                _contractorPdaComponent.CurrentContractData is not null; // todo only on server
+
+        foreach (var amountPosition in contract.AmountPositions)
+        {
+            var positionButton = new Button
+            {
+                Text = $"{amountPosition.Value} ({amountPosition.Key} ТК)",
+                HorizontalExpand = false,
+                VerticalExpand = false,
+                StyleClasses = { "OpenBoth" },
+                MinSize = new Vector2(200, 30),
+                Disabled = isAlreadyAccepted,
+            };
+
+            positionButton.OnPressed += _ =>
+            {
+                SendMessage(new ContractorNewContractAcceptedMessage(key, contract));
+
+                foreach (var buttons in _allPositionButtons)
+                {
+                    buttons.Disabled = true;
+                }
+            };
+
+
+            _allPositionButtons.Add(positionButton);
+            positionsContainer.AddChild(positionButton);
+        }
+
+        var lowerDivider = new PanelContainer
+        {
+            StyleClasses = { "HighDivider" },
+        };
+
+        contractContainer.AddChild(topContainer);
+        contractContainer.AddChild(positionsContainer);
+
+
+        _menu.ContractsListPanel.AddChild(lowerDivider);
+        _menu.ContractsListPanel.AddChild(contractContainer);
+    }
+
+    private void UpdateHub(Dictionary<string, FixedPoint2> shopItems)
+    {
+        if (_menu == null)
+            return;
+
+        _menu.HubPanel.RemoveAllChildren();
+
+        foreach (var item in shopItems)
+        {
+            var protoItem = _prototypeManager.Index<EntityPrototype>(item.Key);
+
+            var shopItemContainer = new BoxContainer
+            {
+                Orientation = BoxContainer.LayoutOrientation.Vertical,
+                SeparationOverride = 5,
+                HorizontalExpand = true,
+                VerticalExpand = true,
+                VerticalAlignment = Control.VAlignment.Top,
+                Margin = new Thickness(5, 5, 5, 5),
+            };
+
+            var topRow = new BoxContainer
+            {
+                Orientation = BoxContainer.LayoutOrientation.Horizontal,
+                SeparationOverride = 10,
+                HorizontalExpand = true,
+                VerticalAlignment = Control.VAlignment.Center,
+            };
+
+            var itemIcon = new EntityPrototypeView
+            {
+                Scale = new Vector2(1.4f, 1.4f),
+                MinSize = new Vector2(32, 32),
+                MaxSize = new Vector2(50, 50),
+                VerticalAlignment = Control.VAlignment.Center,
+                HorizontalAlignment = Control.HAlignment.Left,
+            };
+
+            itemIcon.SetPrototype(protoItem);
+
+            var itemNameLabel = new RichTextLabel
+            {
+                Text = protoItem.Name,
+                HorizontalExpand = true,
+                VerticalAlignment = Control.VAlignment.Center,
+            };
+
+            var buyButton = new Button
+            {
+                Text = $"Купить ({item.Value} Реп.)",
+                HorizontalExpand = false,
+                VerticalExpand = false,
+                StyleClasses = { "OpenBoth" },
+                MinSize = new Vector2(120, 30),
+            };
+
+            buyButton.OnPressed += _ =>
+            {
+                SendMessage(new ContractorHubBuyItemMessage(item.Key, item.Value));
+
+                //if (_contractorComponent is not null)
+                    //UpdateStats(_contractorComponent);
+
+
+            };
+
+            topRow.AddChild(itemIcon);
+            topRow.AddChild(itemNameLabel);
+            topRow.AddChild(buyButton);
+
+            var itemDescriptionLabel = new RichTextLabel
+            {
+                HorizontalExpand = true,
+                VerticalExpand = true,
+            };
+
+            itemDescriptionLabel.SetMessage(protoItem.Description);
+
+            var descriptionContainer = new BoxContainer
+            {
+                Orientation = BoxContainer.LayoutOrientation.Vertical,
+                HorizontalExpand = true,
+                VerticalExpand = true,
+            };
+
+            descriptionContainer.AddChild(itemDescriptionLabel);
+
+            shopItemContainer.AddChild(topRow);
+            shopItemContainer.AddChild(descriptionContainer);
+
+            var lowerDivider = new PanelContainer
+            {
+                StyleClasses = { "HighDivider" },
+            };
+
+            _menu.HubPanel.AddChild(shopItemContainer);
+            _menu.HubPanel.AddChild(lowerDivider);
+        }
+    }
+
+    public void OnContractsButtonPressed()
+    {
+        if (_menu == null)
+            return;
+
+        _menu.HubPanel.Visible = false;
+        _menu.ContractsListPanel.Visible = true;
+
+    }
+
+    public void OnHubButtonPressed()
+    {
+        if (_menu == null)
+            return;
+
+        _menu.HubPanel.Visible = true;
+        _menu.ContractsListPanel.Visible = false;
+    }
+
+    public void OnExecutionButtonPressed()
+    {
+        if (_menu == null)
+            return;
+
+        if (_contractorComponent?.CurrentContractEntity is null)
+            return;
+
+        if (_contractorComponent?.CurrentContractData is null)
+            return;
+
+        SendMessage(new ContractorExecutionButtonPressedMessage()); // TODO only message mb DONE
+
+    }
+
+    public void OnWithdrawButtonPressed()
+    {
+        if (_menu == null)
+            return;
+
+        if (_contractorComponent == null || _contractorComponent.AmountTc <= 0)
+            return;
+
+        if (EntMan.GetEntity(_contractorPdaComponent.PdaOwner) != Owner)
+            return;
+
+        _withdrawWindow?.Close();
+
+        _withdrawWindow = new DefaultWindow
+        {
+            Title = "Вывести",
+            MinSize = new Vector2(300, 150),
+            Resizable = false,
+        };
+
+        _withdrawWindow.OnClose += () => _withdrawWindow = null;
+
+
+        var mainContainer = new BoxContainer
+        {
+            Orientation = BoxContainer.LayoutOrientation.Vertical,
+            SeparationOverride = 10,
+            HorizontalExpand = true,
+            VerticalExpand = true,
+            Margin = new Thickness(10),
+        };
+
+        var tcSlider = new SliderIntInput
+        {
+            MinValue = 1,
+            MaxValue = (int)_contractorComponent.AmountTc,
+            HorizontalExpand = true,
+            Value = 1,
+        };
+
+        var withdrawButton = new Button
+        {
+            Text = "Вывести ТК",
+            HorizontalExpand = true,
+            MinSize = new Vector2(200, 40),
+            StyleClasses = { "OpenBoth" },
+        };
+
+        withdrawButton.OnPressed += _ =>
+        {
+            var amount = tcSlider.Value;
+
+            SendMessage(new ContractorWithdrawTcMessage(amount));
+            _withdrawWindow.Close();
+        };
+
+        mainContainer.AddChild(tcSlider);
+        mainContainer.AddChild(withdrawButton);
+
+        _withdrawWindow.Contents.AddChild(mainContainer);
+        _withdrawWindow.OpenCentered();
+    }
+
+
+}
diff --git a/Content.Client/SS220/Contractor/UI/ContractorPDAMenu.xaml b/Content.Client/SS220/Contractor/UI/ContractorPDAMenu.xaml
new file mode 100644
index 000000000000..82366c74740c
--- /dev/null
+++ b/Content.Client/SS220/Contractor/UI/ContractorPDAMenu.xaml
@@ -0,0 +1,33 @@
+<controls:ContractorPDAMenu xmlns="https://spacestation14.io"
+                    xmlns:controls="clr-namespace:Content.Client.SS220.Contractor.UI"
+                    xmlns:ui220="clr-namespace:Content.Client.SS220.UserInterface"
+                    MinSize="500 606"
+                    Resizable="False"
+                    SetSize="500 606"
+                    MouseFilter="Stop">
+
+    <Control Name="MainContainer">
+        <PanelContainer StyleClasses="ContractorPanel">
+            <Control>
+                <PanelContainer Name="BackgroundPanel" StyleClasses="ContractorFontPanel">
+                    <Label Text="Итог" Margin="55 55 0 0" VerticalAlignment="Top"/>
+                    <Label Name="ReputationCountLabel" Access="Public" Text="Текущая репутация: " Margin="230 55 0 0" VerticalAlignment="Top"/>
+
+                    <Label Name="TcAmountLabel" Text="Имеется ТК:" Access="Public" Margin="55 108 294 0" VerticalAlignment="Top"/>
+                    <Label Name="ContractsFinishedAmountLabel" Text="Выполнено контрактов: " Access="Public" Margin="230 108 0 0" VerticalAlignment="Top"/>
+
+                    <ui220:SpriteButton Name="WithdrawButton" Margin="0 133 255 0" VerticalAlignment="Top" SetSize="138 35" StyleClasses="ContractorWithdrawButton"/>
+                    <ui220:SpriteButton Name="ContractsButton" Margin="0 218 269 0" VerticalAlignment="Top" MaxSize="138 35" StyleClasses="ContractorContractsButton"/>
+                    <ui220:SpriteButton Name="HubButton" Margin="20 218 0 0" VerticalAlignment="Top" MaxSize="138 35" StyleClasses="ContractorHubButton"/>
+                    <ui220:SpriteButton Name="ExecutionButton" Access="Public" Margin="321 184 0 0" VerticalAlignment="Top" MaxSize="138 40" StyleClasses="ContractorExecutionButton"/>
+                    <ScrollContainer Name="ContractsList" Margin="51 260 50 51" VScrollEnabled="True" HorizontalExpand="True" VerticalExpand="True" HScrollEnabled="False">
+                        <BoxContainer Name="ContractsListPanel" Orientation="Vertical" Access="Public" SeparationOverride="5"  HorizontalExpand="True" VerticalExpand="False"/>
+                        <BoxContainer Name="HubPanel" Visible="False" Orientation="Vertical" Access="Public" SeparationOverride="5"  HorizontalExpand="True" VerticalExpand="False"/>
+                    </ScrollContainer>
+                </PanelContainer>
+            </Control>
+        </PanelContainer>
+
+    </Control >
+
+</controls:ContractorPDAMenu>
diff --git a/Content.Client/SS220/Contractor/UI/ContractorPDAMenu.xaml.cs b/Content.Client/SS220/Contractor/UI/ContractorPDAMenu.xaml.cs
new file mode 100644
index 000000000000..37bd8c7143f9
--- /dev/null
+++ b/Content.Client/SS220/Contractor/UI/ContractorPDAMenu.xaml.cs
@@ -0,0 +1,50 @@
+using System.Numerics;
+using Content.Client.SS220.UserInterface.Utility;
+using Content.Client.Stylesheets;
+using Robust.Client.AutoGenerated;
+using Robust.Client.Player;
+using Robust.Client.ResourceManagement;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.SS220.Contractor.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class ContractorPDAMenu : BaseWindow
+{
+    [Dependency] private readonly IEntityManager _entityManager = default!;
+    [Dependency] private readonly IPlayerManager _playerManager = default!;
+    [Dependency] private readonly IResourceCache _resourceCache = default!;
+
+    private readonly ContractorStyle _style;
+    private ContractorBoundUserInterface? _userInterface;
+    private readonly ButtonsListenerCollection _buttons = new();
+
+    public ContractorPDAMenu()
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+
+        _style = new();
+
+        Stylesheet = _style.Create(IoCManager.Resolve<IStylesheetManager>().SheetSpace, _resourceCache);
+    }
+
+    public ContractorPDAMenu(ContractorBoundUserInterface userInterface) : this()
+    {
+        _userInterface = userInterface;
+
+        _buttons.ListenButton(ContractsButton, _ => _userInterface.OnContractsButtonPressed());
+        _buttons.ListenButton(HubButton, _ => _userInterface.OnHubButtonPressed());
+        _buttons.ListenButton(ExecutionButton, _ => _userInterface.OnExecutionButtonPressed());
+        _buttons.ListenButton(WithdrawButton, _ => _userInterface.OnWithdrawButtonPressed());
+    }
+
+    protected override DragMode GetDragModeFor(Vector2 relativeMousePos)
+    {
+        return DragMode.Move;
+    }
+
+}
+
+
diff --git a/Content.Client/SS220/Contractor/UI/ContractorStyle.cs b/Content.Client/SS220/Contractor/UI/ContractorStyle.cs
new file mode 100644
index 000000000000..88699098fd69
--- /dev/null
+++ b/Content.Client/SS220/Contractor/UI/ContractorStyle.cs
@@ -0,0 +1,54 @@
+using Content.Client.SS220.StyleTools;
+using Content.Client.SS220.UserInterface;
+using Robust.Client.UserInterface.Controls;
+
+namespace Content.Client.SS220.Contractor.UI;
+
+public sealed class ContractorStyle : QuickStyle
+{
+    protected override void CreateRules()
+    {
+        Builder
+            .Element<PanelContainer>()
+            .Class("ContractorPanel")
+            .Prop(PanelContainer.StylePropertyPanel,
+                StrechedStyleBoxTexture(Tex("/Textures/SS220/Interface/Contractor/background-uplink-contractor.png")));
+
+        Builder
+            .Element<PanelContainer>()
+            .Class("ContractorFontPanel")
+            .Prop(PanelContainer.StylePropertyPanel,
+                StrechedStyleBoxTexture(Tex("/Textures/SS220/Interface/Contractor/font-uplink-contractor.png")));
+
+        Builder
+            .Element<SpriteButton>()
+            .Class("ContractorContractsButton")
+            .Prop(SpriteButton.StylePropertySprite,
+                Sprite("/Textures/SS220/Interface/Contractor/buttons.rsi", "contracts"));
+
+        Builder
+            .Element<SpriteButton>()
+            .Class("ContractorHubButton")
+            .Prop(SpriteButton.StylePropertySprite,
+                Sprite("/Textures/SS220/Interface/Contractor/button-hub.rsi", "hub"));
+
+        Builder
+            .Element<SpriteButton>()
+            .Class("ContractorWithdrawButton")
+            .Prop(SpriteButton.StylePropertySprite,
+                Sprite("/Textures/SS220/Interface/Contractor/button-withdraw.rsi", "withdraw"));
+
+        Builder
+            .Element<SpriteButton>()
+            .Class("ContractorExecutionButton")
+            .Prop(SpriteButton.StylePropertySprite,
+                Sprite("/Textures/SS220/Interface/Contractor/button-execution.rsi", "execution"));
+
+        Builder
+            .Element<SpriteButton>()
+            .Class("ContractorPhotoButton")
+            .Prop(SpriteButton.StylePropertySprite,
+                Sprite("/Textures/SS220/Interface/Contractor/button-photo.rsi", "photo"));
+    }
+
+}
diff --git a/Content.Server/SS220/Contractor/ContractorServerSystem.cs b/Content.Server/SS220/Contractor/ContractorServerSystem.cs
new file mode 100644
index 000000000000..898f685d69a3
--- /dev/null
+++ b/Content.Server/SS220/Contractor/ContractorServerSystem.cs
@@ -0,0 +1,252 @@
+using System.Linq;
+using Content.Server.Administration.Logs;
+using Content.Server.DoAfter;
+using Content.Server.Hands.Systems;
+using Content.Server.Roles.Jobs;
+using Content.Server.Stack;
+using Content.Shared.Database;
+using Content.Shared.DoAfter;
+using Content.Shared.FixedPoint;
+using Content.Shared.Ghost;
+using Content.Shared.SS220.Contractor;
+using Content.Shared.SSDIndicator;
+using Content.Shared.Store;
+using Robust.Server.GameObjects;
+using Robust.Shared.Containers;
+using Robust.Shared.Map;
+using Robust.Shared.Random;
+
+namespace Content.Server.SS220.Contractor;
+
+/// <summary>
+/// This handles...
+/// </summary>
+public sealed class ContractorServerSystem : SharedContractorSystem
+{
+    [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
+    [Dependency] private readonly StackSystem _stack = default!;
+    [Dependency] private readonly HandsSystem _hands = default!;
+    [Dependency] private readonly DoAfterSystem _doAfter = default!;
+    [Dependency] private readonly EntityLookupSystem _lookup = default!;
+    [Dependency] private readonly JobSystem _jobs = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly IAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly SharedContainerSystem _container = default!;
+
+    //TODO client system
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ContractorComponent, ComponentInit>(OnContractorCompInit);
+        SubscribeLocalEvent<ContractorComponent, OpenPortalContractorEvent>(OnOpenPortalEvent);
+
+        SubscribeLocalEvent<ContractorPdaComponent, ContractorNewContractAcceptedMessage>(OnNewContractAccepted);
+        SubscribeLocalEvent<ContractorPdaComponent, ContractorWithdrawTcMessage>(OnWithdrawTc);
+        SubscribeLocalEvent<ContractorPdaComponent, ContractorExecutionButtonPressedMessage>(OnExecuteContract);
+
+        SubscribeLocalEvent<StoreBuyListingMessage>(OnBuyContractorKit);
+    }
+
+    //TODO on client and on server target is closed to position
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var query = EntityQueryEnumerator<ContractorComponent>();
+
+        while (query.MoveNext(out var uid, out var comp))
+        {
+            if (comp.PdaEntity == null)
+                continue;
+
+            var isEnabled = IsCloseWithPosition(GetNetEntity(uid));
+
+            if (_uiSystem.IsUiOpen(GetEntity(comp.PdaEntity)!.Value, ContractorPdaKey.Key))
+            {
+                _uiSystem.ServerSendUiMessage(
+                    GetEntity(comp.PdaEntity.Value),
+                    ContractorPdaKey.Key,
+                    new ContractorUpdateButtonStateMessage(isEnabled));
+            }
+        }
+    }
+
+    private void OnContractorCompInit(Entity<ContractorComponent> ent, ref ComponentInit ev)
+    {
+        GenerateContracts(ent);
+    }
+
+    private void OnOpenPortalEvent(Entity<ContractorComponent> ent, ref OpenPortalContractorEvent args)
+    {
+        if (!TryComp<ContractorTargetComponent>(GetEntity(ent.Comp.CurrentContractEntity), out var target))
+            return;
+
+        if (args.Cancelled || args.Handled || target.PortalEntity != null)
+            return;
+
+        target.PortalEntity = SpawnAtPosition("ContractorPortal", Transform(ent.Owner).Coordinates);
+        target.PositionVector = Transform(ent.Owner).Coordinates.Position;
+
+        args.Handled = true;
+
+        Dirty(GetEntity(ent.Comp.CurrentContractEntity!.Value), target);
+    }
+
+    //TODO server and checks
+    private void OnNewContractAccepted(Entity<ContractorPdaComponent> ent, ref ContractorNewContractAcceptedMessage ev)
+    {
+        if (!TryComp<ContractorComponent>(ev.Actor, out var contractorComponent))
+            return;
+
+        if (!contractorComponent.Contracts.ContainsKey(ev.ContractEntity))
+        {
+            _adminLogger.Add(LogType.Action, LogImpact.Extreme, $"Contractor {ev.Actor} accepted unknown contract {ev.ContractEntity}");
+            return;
+        }
+
+        EnsureComp<ContractorTargetComponent>(GetEntity(ev.ContractEntity), out var target);
+
+        if (target.AmountTc > 8)
+        {
+            _adminLogger.Add(
+                LogType.Action,
+                LogImpact.Extreme,
+                $"Contractor {ev.Actor} accepted unknown contract {ev.ContractEntity} with very big amount");
+
+            return;
+        }
+
+        foreach (var amountPosition in ev.ContractData.AmountPositions)
+        {
+            target.Position = GetCoordinates(amountPosition.Value);
+            target.AmountTc = amountPosition.Key;
+            target.Performer = ev.Actor;
+        }
+        Dirty(GetEntity(ev.ContractEntity), target);
+
+        contractorComponent.CurrentContractData = ev.ContractData;
+        contractorComponent.CurrentContractEntity = ev.ContractEntity;
+        contractorComponent.PdaEntity = ev.Entity;
+
+        Dirty(ev.Actor, contractorComponent);
+
+        if (TryComp<ContractorPdaComponent>(GetEntity(ev.Entity), out var contractorPdaComponent))
+        {
+            contractorPdaComponent.CurrentContractEntity = ev.ContractEntity;
+            contractorPdaComponent.CurrentContractData = ev.ContractData;
+            Dirty(GetEntity(ev.Entity), contractorPdaComponent);
+        }
+    }
+
+    // TODO on server //DONE
+    private void OnExecuteContract(Entity<ContractorPdaComponent> ent, ref ContractorExecutionButtonPressedMessage ev)
+    {
+        var entity = GetEntity(ent.Comp.CurrentContractEntity);
+
+        if (!TryComp<ContractorTargetComponent>(entity, out var contractorComponent))
+            return;
+
+        if (contractorComponent.PortalEntity != null)
+            return;
+
+        _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, ev.Actor, 5f, new OpenPortalContractorEvent(), ev.Actor)
+        {
+            BreakOnMove = true,
+            BreakOnDamage = true,
+        });
+    }
+
+    private void OnWithdrawTc(Entity<ContractorPdaComponent> ent, ref ContractorWithdrawTcMessage ev)
+    {
+        if (!TryComp<ContractorComponent>(GetEntity(ent.Comp.PdaOwner), out var contractorComponent))
+            return;
+
+        if (ev.Amount > contractorComponent.AmountTc)
+            return;
+
+        if (ev.Actor != GetEntity(ent.Comp.PdaOwner))
+            return;
+
+        var coordinates = Transform(ev.Actor).Coordinates;
+
+        var telCrystal = _stack.SpawnMultiple("Telecrystal", (int)ev.Amount, coordinates);
+
+        if (telCrystal.FirstOrDefault() is {} tUid)
+            _hands.PickupOrDrop(ev.Actor, tUid);
+
+        contractorComponent.AmountTc -= ev.Amount;
+
+        _uiSystem.ServerSendUiMessage(ent.Owner, ContractorPdaKey.Key, new ContractorUpdateStatsMessage());
+        Dirty(ev.Actor, contractorComponent);
+    }
+
+    private void OnBuyContractorKit(StoreBuyListingMessage ev)
+    {
+        if (ev.Listing.Id != "UplinkContractor")
+            return;
+
+        EnsureComp<ContractorComponent>(ev.Actor);
+    }
+
+    public void GenerateContracts(Entity<ContractorComponent> ent)
+    {
+        var playerPool = _lookup.GetEntitiesInRange(ent.Owner, 10f).ToList();
+
+        _random.Shuffle(playerPool);
+
+        foreach (var player in playerPool)
+        {
+            if (HasComp<GhostComponent>(player) ||
+                HasComp<ContractorComponent>(player) ||
+                HasComp<SSDIndicatorComponent>(player) ||
+                HasComp<ContractorTargetComponent>(player) ||
+                !HasComp<MetaDataComponent>(player))
+            {
+                continue;
+            }
+
+            if (_container.IsEntityInContainer(player))
+                continue;
+
+            if (ent.Comp.Contracts.ContainsKey(GetNetEntity(player)))
+                continue;
+
+            _jobs.MindTryGetJobName(player, out var jobName);
+
+            if (ent.Comp.Contracts is { Count: >= 5 })
+                return;
+
+            ent.Comp.Contracts.Add(GetNetEntity(player),
+                new ContractorContract
+                {
+                    Job = jobName,
+                    AmountPositions = GeneratePositionsForTargets(ent.Owner, player),
+                });
+        }
+    }
+    private Dictionary<FixedPoint2, NetCoordinates> GeneratePositionsForTargets(EntityUid contractor, EntityUid target)
+    {
+        return new Dictionary<FixedPoint2, NetCoordinates> { { FixedPoint2.New(10) + target.Id, GetNetCoordinates(Transform(target).Coordinates)} };
+    }
+
+    public bool IsCloseWithPosition(NetEntity playerNet)
+    {
+        var player = GetEntity(playerNet);
+
+        if (!TryComp<ContractorComponent>(player, out var contractorComponent))
+            return false;
+
+        if (contractorComponent.CurrentContractEntity is null &&
+            contractorComponent.CurrentContractData is null)
+            return false;
+
+        var playerPosition = GetNetCoordinates(Transform(player).Coordinates).Position;
+
+        var targetPosition = contractorComponent.CurrentContractData!.Value.AmountPositions.FirstOrDefault().Value.Position;
+
+        var distance = (playerPosition - targetPosition).Length();
+
+        return distance < 4f; //4 tiles distance
+    }
+}
diff --git a/Content.Server/SS220/Store/Conditions/BuyTimeForListingCondition.cs b/Content.Server/SS220/Store/Conditions/BuyTimeForListingCondition.cs
new file mode 100644
index 000000000000..ce5a483ef39f
--- /dev/null
+++ b/Content.Server/SS220/Store/Conditions/BuyTimeForListingCondition.cs
@@ -0,0 +1,16 @@
+using Content.Shared.Store;
+using Microsoft.CodeAnalysis.Elfie.Serialization;
+using Robust.Shared.Timing;
+
+namespace Content.Server.SS220.Store.Conditions;
+
+public sealed partial class BuyTimeForListingCondition : ListingCondition
+{
+    [DataField(required: true)]
+    public int TimeAmount;
+
+    public override bool Condition(ListingConditionArgs args)
+    {
+        return IoCManager.Resolve<IGameTiming>().CurTime <= TimeSpan.FromSeconds(TimeAmount); //todo fix
+    }
+}
diff --git a/Content.Shared/SS220/Contractor/ContractorComponent.cs b/Content.Shared/SS220/Contractor/ContractorComponent.cs
new file mode 100644
index 000000000000..8f4a1645fa9c
--- /dev/null
+++ b/Content.Shared/SS220/Contractor/ContractorComponent.cs
@@ -0,0 +1,53 @@
+using Content.Shared.FixedPoint;
+using Robust.Shared.GameStates;
+using Robust.Shared.Map;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.SS220.Contractor;
+
+[RegisterComponent, NetworkedComponent]
+[AutoGenerateComponentState(true)]
+public sealed partial class ContractorComponent : Component
+{
+    [DataField]
+    [AutoNetworkedField]
+    public Dictionary<NetEntity, ContractorContract> Contracts = new();
+
+    [DataField]
+    [AutoNetworkedField]
+    public NetEntity? CurrentContractEntity;
+
+    [DataField]
+    [AutoNetworkedField]
+    public ContractorContract? CurrentContractData;
+
+    [DataField]
+    [AutoNetworkedField]
+    public NetEntity? PdaEntity;
+
+    [DataField]
+    [AutoNetworkedField]
+    public TimeSpan OpenPortalTime;
+
+    [DataField]
+    [AutoNetworkedField]
+    public int Reputation = 0;
+
+    [DataField]
+    [AutoNetworkedField]
+    public FixedPoint2 AmountTc = FixedPoint2.Zero;
+
+    [DataField]
+    [AutoNetworkedField]
+    public int ContractsCompleted = 0;
+
+    public readonly int ReputationAward = 2;
+}
+
+[Serializable]
+[NetSerializable]
+public struct ContractorContract
+{
+    public string Job;
+    public Dictionary<FixedPoint2, NetCoordinates> AmountPositions;
+}
diff --git a/Content.Shared/SS220/Contractor/ContractorMessagesUi.cs b/Content.Shared/SS220/Contractor/ContractorMessagesUi.cs
new file mode 100644
index 000000000000..ab8e6b1644e0
--- /dev/null
+++ b/Content.Shared/SS220/Contractor/ContractorMessagesUi.cs
@@ -0,0 +1,78 @@
+using Content.Shared.FixedPoint;
+using Robust.Shared.Map;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.SS220.Contractor;
+
+[Serializable, NetSerializable]
+public sealed class ContractorGenerateContractsMessage : BoundUserInterfaceMessage
+{
+    public ContractorGenerateContractsMessage() { }
+}
+
+[Serializable, NetSerializable]
+public sealed class ContractorUpdateStatsMessage : BoundUserInterfaceMessage
+{
+    public ContractorUpdateStatsMessage() { }
+}
+
+[Serializable, NetSerializable]
+public sealed class ContractorCompletedContractMessage : BoundUserInterfaceMessage
+{
+    public ContractorCompletedContractMessage() { }
+}
+
+[Serializable, NetSerializable]
+public sealed class ContractorUpdateButtonStateMessage : BoundUserInterfaceMessage
+{
+    public bool IsEnabled { get; }
+
+    public ContractorUpdateButtonStateMessage(bool isEnabled)
+    {
+        IsEnabled = isEnabled;
+    }
+}
+
+[Serializable, NetSerializable]
+public sealed class ContractorNewContractAcceptedMessage : BoundUserInterfaceMessage
+{
+    public NetEntity ContractEntity;
+    public ContractorContract ContractData;
+
+    public ContractorNewContractAcceptedMessage(NetEntity contractEntity, ContractorContract contractData)
+    {
+        ContractEntity = contractEntity;
+        ContractData = contractData;
+    }
+}
+
+[Serializable, NetSerializable]
+public sealed class ContractorExecutionButtonPressedMessage : BoundUserInterfaceMessage
+{
+
+}
+
+[Serializable, NetSerializable]
+public sealed class ContractorHubBuyItemMessage : BoundUserInterfaceMessage
+{
+    public string Item;
+    public FixedPoint2 Price;
+
+    public ContractorHubBuyItemMessage(string item, FixedPoint2 price)
+    {
+        Item = item;
+        Price = price;
+    }
+}
+
+[Serializable, NetSerializable]
+public sealed class ContractorWithdrawTcMessage : BoundUserInterfaceMessage
+{
+    public FixedPoint2 Amount;
+
+    public ContractorWithdrawTcMessage(FixedPoint2 amount)
+    {
+        Amount = amount;
+    }
+}
+
diff --git a/Content.Shared/SS220/Contractor/ContractorPDAVisuals.cs b/Content.Shared/SS220/Contractor/ContractorPDAVisuals.cs
new file mode 100644
index 000000000000..2d2d20966694
--- /dev/null
+++ b/Content.Shared/SS220/Contractor/ContractorPDAVisuals.cs
@@ -0,0 +1,9 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.SS220.Contractor;
+
+[Serializable, NetSerializable]
+public enum ContractorPdaKey
+{
+    Key
+}
diff --git a/Content.Shared/SS220/Contractor/ContractorPdaComponent.cs b/Content.Shared/SS220/Contractor/ContractorPdaComponent.cs
new file mode 100644
index 000000000000..8970b7d0c653
--- /dev/null
+++ b/Content.Shared/SS220/Contractor/ContractorPdaComponent.cs
@@ -0,0 +1,31 @@
+using Content.Shared.FixedPoint;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.SS220.Contractor;
+
+[RegisterComponent]
+[NetworkedComponent]
+[AutoGenerateComponentState]
+public sealed partial class ContractorPdaComponent : Component
+{
+    [DataField]
+    [AutoNetworkedField]
+    public Dictionary<NetEntity, ContractorContract> Contracts = new();
+
+    [DataField]
+    [AutoNetworkedField]
+    public NetEntity? CurrentContractEntity;
+
+    [DataField]
+    [AutoNetworkedField]
+    public ContractorContract? CurrentContractData;
+
+    [DataField]
+    [AutoNetworkedField]
+    public Dictionary<string, FixedPoint2> AvailableItems = new();
+
+    [DataField]
+    [AutoNetworkedField]
+    public NetEntity? PdaOwner;
+}
diff --git a/Content.Shared/SS220/Contractor/ContractorPortalOnTriggerComponent.cs b/Content.Shared/SS220/Contractor/ContractorPortalOnTriggerComponent.cs
new file mode 100644
index 000000000000..f118b2bf4fd9
--- /dev/null
+++ b/Content.Shared/SS220/Contractor/ContractorPortalOnTriggerComponent.cs
@@ -0,0 +1,20 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.SS220.Contractor;
+
+/// <summary>
+/// This is used for...
+/// </summary>
+[RegisterComponent]
+[NetworkedComponent]
+public sealed partial class ContractorPortalOnTriggerComponent : Component
+{
+    [DataField]
+    public TimeSpan OpenPortalTime;
+
+    [DataField]
+    public NetEntity? TargetEntity;
+
+    public TimeSpan MaxPortalTime = TimeSpan.FromSeconds(15);
+
+}
diff --git a/Content.Shared/SS220/Contractor/ContractorTargetComponent.cs b/Content.Shared/SS220/Contractor/ContractorTargetComponent.cs
new file mode 100644
index 000000000000..1727855efadf
--- /dev/null
+++ b/Content.Shared/SS220/Contractor/ContractorTargetComponent.cs
@@ -0,0 +1,36 @@
+using System.Numerics;
+using Content.Shared.FixedPoint;
+using Robust.Shared.GameStates;
+using Robust.Shared.Map;
+
+namespace Content.Shared.SS220.Contractor;
+
+/// <summary>
+/// This is used for...
+/// </summary>
+[RegisterComponent]
+[NetworkedComponent]
+[AutoGenerateComponentState]
+public sealed partial class ContractorTargetComponent : Component
+{
+    [DataField]
+    public EntityUid Performer;
+
+    [DataField]
+    public FixedPoint2 AmountTc;
+
+    [DataField]
+    public EntityCoordinates Position; //position where target must be placed
+
+    [DataField]
+    [AutoNetworkedField]
+    public Vector2 PositionVector; // position where target was placed on station
+
+    [DataField]
+    public TimeSpan EnteredPortalTime;
+
+    [DataField]
+    public EntityUid? PortalEntity;
+
+    public TimeSpan TimeInJail = TimeSpan.FromSeconds(5);
+}
diff --git a/Content.Shared/SS220/Contractor/SharedContractorItemPrototype.cs b/Content.Shared/SS220/Contractor/SharedContractorItemPrototype.cs
new file mode 100644
index 000000000000..94927d4ed22b
--- /dev/null
+++ b/Content.Shared/SS220/Contractor/SharedContractorItemPrototype.cs
@@ -0,0 +1,20 @@
+using Content.Shared.FixedPoint;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
+
+namespace Content.Shared.SS220.Contractor;
+
+/// <summary>
+/// This is a prototype for...
+/// </summary>
+[Serializable, NetSerializable, Prototype("contractorItems")]
+public sealed partial class SharedContractorItemPrototype : IPrototype
+{
+    [DataField("items", customTypeSerializer: typeof(PrototypeIdDictionarySerializer<FixedPoint2, EntityPrototype>))] //TODO: Delete serializer
+    public Dictionary<string, FixedPoint2> Items = new();
+
+    [IdDataField]
+    public string ID { get; } = default!;
+}
diff --git a/Content.Shared/SS220/Contractor/SharedContractorPortalSystem.cs b/Content.Shared/SS220/Contractor/SharedContractorPortalSystem.cs
new file mode 100644
index 000000000000..812389fe7e0d
--- /dev/null
+++ b/Content.Shared/SS220/Contractor/SharedContractorPortalSystem.cs
@@ -0,0 +1,100 @@
+using Content.Shared.DoAfter;
+using Content.Shared.Popups;
+using Robust.Shared.Network;
+using Robust.Shared.Physics.Events;
+using Robust.Shared.Serialization;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.SS220.Contractor;
+
+/// <summary>
+/// This handles...
+/// </summary>
+public sealed class SharedContractorPortalSystem : EntitySystem
+{
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly SharedUserInterfaceSystem _uiSystem = default!;
+    [Dependency] private readonly INetManager _net = default!;
+    [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
+    [Dependency] private readonly SharedContractorSystem _contractor = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<ContractorPortalOnTriggerComponent, ComponentInit>(OnComponentInit);
+        SubscribeLocalEvent<ContractorPortalOnTriggerComponent, StartCollideEvent>(OnEnterPortal);
+        SubscribeLocalEvent<ContractorPortalOnTriggerComponent, ContractorClosedPortalEvent>(OnClosePortal);
+    }
+
+    private void OnComponentInit(Entity<ContractorPortalOnTriggerComponent> ent, ref ComponentInit args)
+    {
+        ent.Comp.OpenPortalTime = _timing.CurTime;
+        _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, ent.Owner, 5f, new ContractorClosedPortalEvent(), ent.Owner));
+    }
+
+    private void OnEnterPortal(Entity<ContractorPortalOnTriggerComponent> ent, ref StartCollideEvent args)
+    {
+        if (!TryComp<ContractorTargetComponent>(args.OtherEntity, out var targetComponent))
+        {
+            _popup.PopupEntity("Портал недоступен для вас", args.OtherEntity, PopupType.MediumCaution);
+            return;
+        }
+
+        var needsPortalEntity = targetComponent.PortalEntity;
+        var contractorEntity = targetComponent.Performer;
+
+        if (!TryComp<ContractorComponent>(contractorEntity, out var contractorComponent))
+            return;
+
+        var contractorPdaEntity = GetEntity(contractorComponent.PdaEntity)!.Value;
+
+        if (!TryComp<ContractorPdaComponent>(contractorPdaEntity, out var contractorPdaComponent))
+            return;
+
+        if (contractorComponent.CurrentContractEntity != GetNetEntity(args.OtherEntity))
+            return;
+
+        targetComponent.Position = Transform(args.OtherEntity).Coordinates;
+        targetComponent.EnteredPortalTime = _timing.CurTime;
+
+        contractorComponent.CurrentContractEntity = null;
+        contractorComponent.CurrentContractData = null;
+        contractorComponent.Contracts.Remove(GetNetEntity(args.OtherEntity));
+
+        contractorPdaComponent.CurrentContractEntity = null;
+        contractorPdaComponent.CurrentContractData = null;
+        contractorPdaComponent.Contracts.Remove(GetNetEntity(args.OtherEntity));
+
+        if (needsPortalEntity != args.OurEntity)
+        {
+            _popup.PopupEntity("Этот портал предназначен не для этой цели", args.OtherEntity, PopupType.MediumCaution);
+            return;
+        }
+
+        contractorComponent.Reputation += contractorComponent.ReputationAward;
+        contractorComponent.AmountTc += targetComponent.AmountTc;
+        contractorComponent.ContractsCompleted++;
+
+        if (_net.IsServer)
+        {
+            _uiSystem.ServerSendUiMessage(GetEntity(contractorComponent.PdaEntity)!.Value, ContractorPdaKey.Key, new ContractorUpdateStatsMessage());
+            _uiSystem.ServerSendUiMessage(GetEntity(contractorComponent.PdaEntity)!.Value, ContractorPdaKey.Key, new ContractorCompletedContractMessage());
+        }
+
+        _transformSystem.SetCoordinates(args.OtherEntity, Transform(contractorEntity).Coordinates); // ????
+
+        Dirty(contractorPdaEntity, contractorPdaComponent);
+        Dirty(contractorEntity, contractorComponent);
+    }
+
+    private void OnClosePortal(Entity<ContractorPortalOnTriggerComponent> ent, ref ContractorClosedPortalEvent args)
+    {
+        Del(ent.Owner);
+    }
+}
+
+[Serializable, NetSerializable]
+public sealed partial class ContractorClosedPortalEvent : DoAfterEvent
+{
+    public override DoAfterEvent Clone() => this;
+}
diff --git a/Content.Shared/SS220/Contractor/SharedContractorSystem.cs b/Content.Shared/SS220/Contractor/SharedContractorSystem.cs
new file mode 100644
index 000000000000..a9ed718f69c0
--- /dev/null
+++ b/Content.Shared/SS220/Contractor/SharedContractorSystem.cs
@@ -0,0 +1,93 @@
+using Content.Shared.DoAfter;
+using Content.Shared.Hands.EntitySystems;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.SS220.Contractor;
+
+public abstract class SharedContractorSystem : EntitySystem
+{
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly SharedHandsSystem _hands = default!;
+    [Dependency] private readonly SharedUserInterfaceSystem _uiSystem = default!;
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<ContractorPdaComponent, ComponentInit>(OnContractorPdaMapInit);
+        SubscribeLocalEvent<ContractorPdaComponent, BoundUIOpenedEvent>(OnOpenUI);
+        SubscribeLocalEvent<ContractorPdaComponent, ContractorHubBuyItemMessage>(OnBuyItem);
+    }
+
+    private void OnContractorPdaMapInit(Entity<ContractorPdaComponent> ent, ref ComponentInit args)
+    {
+        if (ent.Comp.AvailableItems.Count > 0)
+            return;
+
+        foreach (var itemPrototype in _prototypeManager.EnumeratePrototypes<SharedContractorItemPrototype>())
+        {
+            foreach (var item in itemPrototype.Items)
+            {
+               ent.Comp.AvailableItems.Add(item.Key, item.Value);
+            }
+        }
+    }
+
+    private void OnOpenUI(Entity<ContractorPdaComponent> ent, ref BoundUIOpenedEvent args)
+    {
+        if (ent.Comp.PdaOwner != null)
+            return;
+
+        if (!HasComp<ContractorComponent>(args.Actor))
+            return;
+
+        ent.Comp.PdaOwner = GetNetEntity(args.Actor);
+
+        Dirty(ent);
+    }
+
+    private void OnBuyItem(Entity<ContractorPdaComponent> ent, ref ContractorHubBuyItemMessage ev)
+    {
+        if (!TryComp<ContractorComponent>(ev.Actor, out var contractorComponent))
+            return;
+
+        if (ev.Actor != GetEntity(ent.Comp.PdaOwner))
+            return;
+
+        if (contractorComponent.Reputation < ev.Price.Int())
+            return;
+
+        contractorComponent.Reputation -= ev.Price.Int();
+
+        var coordinates = Transform(ev.Actor).Coordinates;
+        var itemToSpawn = Spawn(ev.Item, coordinates);
+
+        _hands.PickupOrDrop(ev.Actor, itemToSpawn);
+        _uiSystem.ServerSendUiMessage(ent.Owner, ContractorPdaKey.Key, new ContractorUpdateStatsMessage());
+
+        Dirty(ev.Actor, contractorComponent);
+    }
+
+    public Dictionary<NetEntity, ContractorContract>? GetContractsForPda(EntityUid contractor, EntityUid pdaEntity)
+    {
+        AddContractsToPda(contractor, pdaEntity);
+
+        return !TryComp<ContractorPdaComponent>(pdaEntity, out var contractorPdaComponent) ? null : contractorPdaComponent.Contracts;
+    }
+
+    public void AddContractsToPda(EntityUid contractor, EntityUid pdaEntity)
+    {
+        if (!TryComp<ContractorPdaComponent>(pdaEntity, out var contractorPdaComponent))
+            return;
+        if (!TryComp<ContractorComponent>(contractor, out var contractorComponent))
+            return;
+
+        contractorPdaComponent.Contracts = contractorComponent.Contracts;
+    }
+
+}
+
+[Serializable, NetSerializable]
+public sealed partial class OpenPortalContractorEvent : DoAfterEvent
+{
+    public override DoAfterEvent Clone() => this;
+}
diff --git a/Content.Shared/SS220/Contractor/SharedContractorTargetSystem.cs b/Content.Shared/SS220/Contractor/SharedContractorTargetSystem.cs
new file mode 100644
index 000000000000..902bc0fc5f91
--- /dev/null
+++ b/Content.Shared/SS220/Contractor/SharedContractorTargetSystem.cs
@@ -0,0 +1,36 @@
+using Robust.Shared.Timing;
+
+namespace Content.Shared.SS220.Contractor;
+
+/// <summary>
+/// This handles...
+/// </summary>
+public sealed class SharedContractorTargetSystem : EntitySystem
+{
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
+    public override void Initialize()
+    {
+        base.Initialize();
+    }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var quary = EntityQueryEnumerator<ContractorTargetComponent>();
+
+        while (quary.MoveNext(out var uid, out var comp))
+        {
+            if (comp.EnteredPortalTime == TimeSpan.Zero)
+                return;
+
+            if (comp.EnteredPortalTime + comp.TimeInJail < _timing.CurTime)
+            {
+                _transform.SetCoordinates(uid, comp.Position);
+                comp.EnteredPortalTime = TimeSpan.Zero;
+                RemComp<ContractorTargetComponent>(uid);
+            }
+        }
+    }
+}
diff --git a/Resources/Prototypes/SS220/Antags/contractor_items.yml b/Resources/Prototypes/SS220/Antags/contractor_items.yml
new file mode 100644
index 000000000000..731f9d4e6960
--- /dev/null
+++ b/Resources/Prototypes/SS220/Antags/contractor_items.yml
@@ -0,0 +1,36 @@
+- type: contractorItems
+  id: ContractorItems
+  items:
+    Stunbaton: 1
+    Crowbar: 3
+    CrowbarRed: 2
+
+- type: entity
+  name: cardboard box
+  parent: BoxBase
+  id: BoxContractor
+  description: A cardboard box for storing things.
+  components:
+    - type: Item
+      size: Large
+      shape:
+        - 0,0,2,2
+    - type: Storage
+      maxItemSize: Small
+      grid:
+        - 0,0,6,4
+    - type: Sprite
+      state: box
+    - type: StorageFill
+      contents:
+        - id: ContractorPDA
+        - id: AgentIDCard
+        - id: ClothingMaskGasVoiceChameleon
+        - id: CyberPen
+        #- id: ContractorBaton
+        - id: EncryptionKeySyndie
+        - id: CigPackSyndicate
+        - id: FlippoLighter
+    - type: Tag
+      tags:
+        - BoxCardboard
diff --git a/Resources/Prototypes/SS220/Catalog/uplink_catalog.yml b/Resources/Prototypes/SS220/Catalog/uplink_catalog.yml
index 8e5120296f80..aabd996a3468 100644
--- a/Resources/Prototypes/SS220/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/SS220/Catalog/uplink_catalog.yml
@@ -239,6 +239,25 @@
     - Chef
 #SS220 SpicyUPD end
 
+#ss220 contractor add start
+- type: listing
+  id: UplinkContractor
+  name: "набор контрактора" #TODO Name
+  description: "набор контрактора" #TODO Desc
+  icon: { sprite: /Textures/Objects/Consumable/Food/Baked/pizza.rsi, state: spicy } #TODO Sprite
+  productEntity: BoxContractor
+  cost:
+    Telecrystal: 20
+  categories:
+    - ContractorKit
+  conditions:
+    - !type:ListingLimitedStockCondition
+      stock: 1
+    - !type:BuyTimeForListingCondition
+      timeAmount: 30
+    #TODO amount kit for 0.25 * traitor count
+#ss220 contractor add end
+
 #- type: listing
 #  id: UplinkCQC
 #  name: ent-cqc-name
diff --git a/Resources/Prototypes/SS220/Entities/Effects/portal.yml b/Resources/Prototypes/SS220/Entities/Effects/portal.yml
new file mode 100644
index 000000000000..bcd796b4cfaa
--- /dev/null
+++ b/Resources/Prototypes/SS220/Entities/Effects/portal.yml
@@ -0,0 +1,17 @@
+- type: entity
+  id: ContractorPortal
+  parent: BasePortal
+  description: This one looks more like a stranger portal.
+  components:
+    - type: Sprite
+      layers:
+        - state: portal-red
+    - type: PointLight
+      color: OrangeRed
+      radius: 3
+      energy: 1
+      netsync: false
+    - type: Portal
+      canTeleportToOtherMaps: true
+      randomTeleport: false
+    - type: ContractorPortalOnTrigger
diff --git a/Resources/Prototypes/SS220/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/SS220/Entities/Objects/Devices/pda.yml
index 898a9eb11a51..779879e3902c 100644
--- a/Resources/Prototypes/SS220/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/SS220/Entities/Objects/Devices/pda.yml
@@ -27,7 +27,7 @@
   - type: Icon
     sprite: Objects/Devices/pda.rsi
     state: pda-ce_dark
-    
+
 - type: entity
   parent: BasePDA
   id: SeniorServicePDA
@@ -130,3 +130,17 @@
       visible: false
   - type: Icon
     state: pda-rd-alt
+
+- type: entity
+  parent: BasePDA
+  id: ContractorPDA
+  name: contractor PDA
+  components:
+    - type: ActivatableUI
+      key: enum.ContractorPdaKey.Key
+      singleUser: true
+    - type: UserInterface
+      interfaces:
+        enum.ContractorPdaKey.Key:
+          type: ContractorBoundUserInterface
+    - type: ContractorPda
diff --git a/Resources/Prototypes/Store/categories.yml b/Resources/Prototypes/Store/categories.yml
index c7d7b2de9d99..8e237be98427 100644
--- a/Resources/Prototypes/Store/categories.yml
+++ b/Resources/Prototypes/Store/categories.yml
@@ -101,6 +101,11 @@
   name: store-category-pointless
   priority: 11
 
+- type: storeCategory
+  id: ContractorKit
+  name: "Контрактор"
+  priority: 13
+
 #revenant
 - type: storeCategory
   id: RevenantAbilities
diff --git a/Resources/Prototypes/Store/presets.yml b/Resources/Prototypes/Store/presets.yml
index 69a3260e6c68..f8a4d15f7635 100644
--- a/Resources/Prototypes/Store/presets.yml
+++ b/Resources/Prototypes/Store/presets.yml
@@ -17,6 +17,7 @@
     - UplinkWearables
     - UplinkJob
     - UplinkPointless
+    - ContractorKit
     currencyWhitelist:
     - Telecrystal
     balance:
diff --git a/Resources/Textures/SS220/Interface/Contractor/background-uplink-contractor.png b/Resources/Textures/SS220/Interface/Contractor/background-uplink-contractor.png
new file mode 100644
index 0000000000000000000000000000000000000000..18a1e8b4336e53ba9c3efd5a7ac69a2eb7ece6fa
GIT binary patch
literal 3276
zcmeAS@N?(olHy`uVBq!ia0y~yVEn?sz!b;91{87H`F%c+Vk{1FcVbv~PUa;815cZ$
zi(^Q|oVRxz*GYRaHaz@f5G1C&aKmTaW7c{Coze<=2aoPx4AMJru9*9M$ApNKM!DHG
zDG8Hy+)ds7cmMln8{6BlS5@=t%6H%1ZFv3klb;L=a=sS`_v#zofB#*0IZMN`%P+tD
zdOt<%JlC!n%m<u|7uzYnNaAA%pC$TrtD|@^Lqw+AmFq0AXBZPEZ4KOS29le+w)2-M
zNN&f(?8W;`KtkqazE`G$R6X#U=Jxl}f^JKOJ2xk-h!-j`WN+w=k^1_cwKnR^c`+7-
z{8P93;)K5Dv({#v;cq|us*>S>q-_83+3tU{K}ODaaV_xwR<Qm9x{Lqq2V1i++V!su
z$eQwk?iKslK-To7x!0N>kzp`1G=62@qxg(rL+jy(8-A5X#Yz7=+{4;w$q<w7cIEgC
z0gwYq(_CspFC3L&corf3b#=4eGX{g}vsT25g5+-RFneXMCtJ`xL%#p`%Fm1kY;6xY
zzI(LbyxC(p8-^Q~K33eZc@>-&y?fdW=70_N-<#Xt-V+Hlt6|dG#rr%#j77SO>%N0r
zoC<X2I*^0!HR&#@+YS=SKe>1DzL%lz7!JrZ@i8zW<JteG{SK11tG`vn$*_k}{{G(k
zRh->6z86|$8mg<_p4;5=SJQ7N(1_^DX>7JN7v?|hWm)iAGV03*M|OsN?-w@z<C)*V
zP$4b1*OOnigyDe^ve~0-)UX~65AwrfxBdT@%cn1GuKWMlzq|a)^!@*8KhC)S@6+s~
z$qWy|{(bzsU#$P<WBI!66=&|({e1q&u<rt+g2N~t4Ff8sfduno6*u317w5N_>-V_8
zLg(Jaj}<cB-;9q*087xQJ@O1YruM(Tr+@2T+*zBse!vvCU^E4e=EBi5K>alE0NC>Q
zc=z|(=?o0XJ;(DeIkU?$>^O6n{qIG4LB<Q;d339OEa?9zldr<yd;Zb_`R#EBmd4$`
zz(3zUcaIRTVU*7KbM<o0U#rurn;9R-&3iP(n&Cq(w(7Z@``5z)iRG7H#_eWq@SW?o
zywF1C-M0O^<ra2ZG2|cIn{0QCZTTHn*@jKJNp{EF?t_F~qmS0~@alI7moj*5>-i}m
z4Qyfo4LSa}@U$w!0g>oqH9dx9$vxBm*6q)@aBaR5!-7{8HhtN<YOZR2|6BL|gcO6?
zZnbCY*Zt#*y~3C<&(u&p`KfE+B0h%KYkPl62(K#=FJ;(quV+TT;md8Nf$R-W(}4Er
zJI*h(-?4)E0Fd`*>%-mp{qe^nE~}M!OEc8meFIcmwtMq)S6PO<H)4kW&(Ajo8fRX#
zddC0j_USINKnqjP{C|H?5@?!dp6uuN+DAP=qrAR%{0yIOV{H10;ls5%%FpiCJUp{y
z1vA6x7@^Pa_f@!EVSI2-ulJ{`^c+E;izcfY?yp!3Hh7!Kvu-mR<yQ;^%GZz7d^`rR
z!t7Z%uLV%h;N+|s@wP9(He@I7%X$E^R{Lzn&sPUQ3dLrLe%2HQ8+qZ(4FB0r&OrJL
cQSJYEgG{dY>)E>V1G^^-p00i_>zopr0K?fonE(I)

literal 0
HcmV?d00001

diff --git a/Resources/Textures/SS220/Interface/Contractor/button-execution.rsi/execution.png b/Resources/Textures/SS220/Interface/Contractor/button-execution.rsi/execution.png
new file mode 100644
index 0000000000000000000000000000000000000000..b9378d069ab320e1bde421d639717d3f0b846cb3
GIT binary patch
literal 1499
zcmV<11tj{3P)<h;3K|Lk000e1NJLTq0040S002e^1^@s6`vH5!00001b5ch_0Itp)
z=>Px)l}SWFRCt{2olj^ZRUF5^DTz(6jm%V25|e<vNxSB<U>03U1EJDD7m5|OyZ$+N
zD|!*63m$q9w(M1U^HA&l0Tp2jDTZQ7S!G%95_cDG7TRpX2AW`3NyI=r#5Z}9Ow*ZU
zCV9VcJ}|WN@4eUg%<nfdZ(bP}0NlJDsKbFISFaUat{Wf25l9?2`y~_%C<}kMaWas`
zIGoK}pZb;Gj|xQqz)<T(jzF=|@-yT_AU$|bp<tjHiH<;8@V?v~wj;?(cKg(IYl*o&
zwxoa9LLx8jpIS}Vc6Jg<R^m!_8@u-&;@~ik-Fpx5=7m?!+=mJN>HcpBe)tihkuYX1
zo+B@`?e3HUyuemuIRIG>XzbMvI{`YSU<#0vxRTw5+cT`pM<ZcX6qZUwluE@@_m|}W
z=2O#%M#9Q6w`Z8NNKz7cfd_~AHi1S+Ce9-o2`kY|StJ>Wyuh98FUoSC?|DO0rSg}u
zAA^-gRU`?COdx;Yt%9OR5)uJ*<giqlOq}nj9CmFyIL!Cu1hER?CALNdOMUaHX~U^h
zOVoU78UV1B-s@Pe$OtbH07Bsjczq+5*TY1Q`en=OG83UCu4K0n3Qs8WTj@O|m3n<6
zno~FMcd3j~zf2|?$@bWsMlTV&mEOZUZ>N;`XD1~ynq)b`M&e3#8_~#%n(O!jZ3d^6
z_tJQjL^KL1v6Dam@Oa$HWHx-+9*-NL@PzOpg_NkpH{Yc-`$}66dbbnMcyzgS=Wf6M
zw4M>}nz*#N@!!o%<E5wDrG8l*jfC5lnSs{LO>4VuzxRRZ^_qcDk+`(Efp|RLahvy-
zW-O_@Q@Nq=1mf|yuxVAONQ{P?uaIhWzbfL`qXkdp@9ygH4QnqyD;h;bs7P$3R&NZ?
z`|9>C0N~2yOQ_ZT%H(;jed+}kjnuA-LQ4c1BDJE>Dkw&yQ0Wu^j`F_)fYMWAG%EB&
zV@=1H_gi=F;>zVqsy2y=P!bRFMFd}d1%)U3gKi3draaNw)rxTGRF?dZ#)4Q&%wa7t
zhnb7#lyz1|1YbTIK(&^bgESU|EcJH1wGyEskx@P_U^$(^dTLe~iB<sc0NSsJ_)c=Y
zXq^!JsJFE*zW@L%r!y!Y7gYbNA{s(Tl*WQ6l}|7^6+@|fqKM?t8eZ7V^P8Swip%K?
zyk4);9%(FSxSoC>l*IMaES5GmAWJdGk{^#B>AMEC3VD5X6|q=Mna|~Nc(A%^xIN|L
z0w$*#<rJRmJ3TgfVbLfOB1a)0SR?|CXk1Qb@c7X_CZ}Tf<i|Z!tJSu&Y9%a<HnKqu
z(pa#s^&3UFNCcodV6x;#`M6+c|73C&xm*rFBb6qT#srj)3#z+Okp%*RN(6dKt2;Xx
z<(e3a#jvxJ>8c#j(<no@bjr|5s{kxZtt^ECAd^NJ!bT#{Ok<_;iIU!ordGYMa%IV{
zWB>{R0l_5#P|_JMQV)MV`$P3p54=DMX_Vo*c|A}+DirbS*WN+5<y4k7H@ezyWb_3?
z5_v>@CggeT-6}%CfVkI09{zxS_Va!CeCD5Ul}Z(#zj49za{Gbs>9m#d(>yAbs;OmG
zDpi!9(t3x;Lr&uQ!lJ1nnZWghMN`Tf1mq+-v_n#&S<z^RC<KT~bWlT9Vz1F?mnZ}X
zOI-f`TcOGsBxEHzG$Acf8V`5<;P3N!A&vKEEUVR!lxTJeq@GeqN_0@;NVEZtL>u5p
zv;qHHiDthE86+envR;;6`%l^HC+fX6Bqajo9eC;j0m2d;nvj;*Z6~;$I==zp5&`2P
z?IsYgfkZ$p@~p{j0s(<XfE#6fVNq8fsNDntHj)U~Q;;5%bjp9y%|U#4UqkF0e61@S
z#HIBcifuPGj!3c5^5cAt)&{r$=flvHxq7YW`WMZTRsNv$Y=!^;002ovPDHLkV1fd7
B!9oB4

literal 0
HcmV?d00001

diff --git a/Resources/Textures/SS220/Interface/Contractor/button-execution.rsi/meta.json b/Resources/Textures/SS220/Interface/Contractor/button-execution.rsi/meta.json
new file mode 100644
index 000000000000..e50fa5505d94
--- /dev/null
+++ b/Resources/Textures/SS220/Interface/Contractor/button-execution.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt",
+    "copyright": "Made by ReeZii",
+    "size": {
+        "x": 113,
+        "y": 70
+    },
+    "states": [
+        {
+            "name": "execution"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/SS220/Interface/Contractor/button-hub.rsi/hub.png b/Resources/Textures/SS220/Interface/Contractor/button-hub.rsi/hub.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff6a813e1509cb4127912ae98f46dbcfd36b2c2b
GIT binary patch
literal 1263
zcmV<L1Q7d)P)<h;3K|Lk000e1NJLTq003hE001Kh1^@s6fMc}z00001b5ch_0Itp)
z=>Px(sYygZRA_<in|n-CR~*Mb_d*fyElm>`!v?3Ij%BDDal)98xd$W=jAkgSdql+r
zNj8{K>yyc2L`(*{;244%z7Vqv7qSHyb3>=7kW8GZ2nIn($}5x%3YD=x7Ai#}1uC?9
zKYyK^SAX|>^F8PGoO1<$yktc`5)(?)Hmx9}#v%z}CD;!n+*}pL%%4+r6B5j`#M@h@
z8PoTgv;c@hD@j6(504sWQF6q@F?hV)Ton(TAqg=t3?BD~rYVVuLlVP^uphn(Bvw`#
z)9OXOPb`>c9myG1gjvoQ?1se3Dm0p!G5zRwk*mkl{%OT5F$Sa2)Qo8`RVVUC-S%l`
z#A1Ny8ZuJG>Z$=|xx2IZR6do3g`E8|#iVTR(xs@<GsyX56Lps_58Ia@iUg?E;Tsyt
zEO&S89UL(9^iWYyKvCL$i^OXVqY`5*i@2qn(bm{V(SbC=wyUWwDdzUos{lC9n8C`u
z36$sMnI!~3NL)N}rIO>H$J5r>NT0!Akr+pc%{l|%@|iQt4-6z?_a4$$ufm|$6R~SI
zy5?p|4jnYB51FGQi^Ib?5FSQnbF;-_8x1z=i~)W~NFX-<H1Ed6qphoBj-MZg)<n{G
z|Gu%#Y+ql3)~`q5IfuzJXQFFvrlO#L-*a<Nc+TOU_IBJCEac6Y7+gF&XlrPo^l&EC
z#l;qlbvSI=833IvE&Q02L}Y3z|MvA!n4CmQeZ8^VY1%Z_WgMg|>l=>6#UY3y%c7!q
zD>fEQ`5#PinT7N8>4fjx$>|+x8m?Vq!SWzh?@Oesql3DN3X8`3IBeb-05uo?q+6%M
z!P%KxmoAx<b?bB__%AcbJAdpL!5gEQDwks?lQC)XWJ(Wba_izn0IGgE%L{&f1aH`A
z{bE>?GXTQXJLu`^!l2i)>Wh73ef$yq{SVH}>|`<)1_k3b-y0VX58S-x1OLB8_4W1w
zP+w*GObyl7@Cpd9c&v}Z=AE%PEF7N|D>%A222m7IrDyQ^2On}S=Li6fQ>L&n_b8&h
z9e<boMs-OEzh-6<bMh1bovp0^CTk3Uy~88~L9l47!(r3TkSmphZrQ?x<HxDFZ~=gd
zf&zl0qq%v$oTi&M@eT|`u2hn^{0;P-od7(yU?Bhk0@~VIdb+xJ-p7X~jmFrwa?v90
z-ne10Sk1v^ona@F@m@*_tqphhCH*U7e$jz6JYRi<Rf$P_y><=V9UX|Gi06_eXv)iR
zoi~q_d-nn$b8_T<Z!hPvvk8vgM9ZB!+`WFCmqSAE^7rS+rf7@AYA&M^!y2|U-ud)1
z<Q}s*w04cjpEQGB&uO)q4LP~2*c?ky+J4HivIyI*M&{&%wzihCZ?g$dsc?VMhwG)K
z#wjgg*KVfD<+L?6a&qfdZeO`FuFoXoB`f;xHEH?ldq=YxBvw{Q+vpbNrT6u?xhlqg
z%`oWO+4EY^sM|lyj7W@u>1i}Ox2hBQczMmGuD)eN?Vcs1!zC+XM9vt?IfitgG(3_s
ztO!XAE5azo;Jcp^<Hz7}7Y8og4lR&)@(jKF{LnNd2{JxBYMiC-Gpq;!q%W7Ofv9a-
Z;XiHivDPe_MZy38002ovPDHLkV1kTPU>yJe

literal 0
HcmV?d00001

diff --git a/Resources/Textures/SS220/Interface/Contractor/button-hub.rsi/meta.json b/Resources/Textures/SS220/Interface/Contractor/button-hub.rsi/meta.json
new file mode 100644
index 000000000000..19072c54c4a1
--- /dev/null
+++ b/Resources/Textures/SS220/Interface/Contractor/button-hub.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt",
+    "copyright": "Made by ReeZii",
+    "size": {
+        "x": 99,
+        "y": 35
+    },
+    "states": [
+        {
+            "name": "hub"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/SS220/Interface/Contractor/button-photo.rsi/meta.json b/Resources/Textures/SS220/Interface/Contractor/button-photo.rsi/meta.json
new file mode 100644
index 000000000000..a11bca3e9925
--- /dev/null
+++ b/Resources/Textures/SS220/Interface/Contractor/button-photo.rsi/meta.json
@@ -0,0 +1,15 @@
+{
+    "version": 1,
+    "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt",
+    "copyright": "Made by ReeZii",
+    "size": {
+        "x": 28,
+        "y": 28
+    },
+    "states": [
+		{
+			"name": "photo"
+		}
+		
+    ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/SS220/Interface/Contractor/button-photo.rsi/photo.png b/Resources/Textures/SS220/Interface/Contractor/button-photo.rsi/photo.png
new file mode 100644
index 0000000000000000000000000000000000000000..ef1c58c8ece208e70d2336666fe815d2fd35b2f4
GIT binary patch
literal 290
zcmeAS@N?(olHy`uVBq!ia0vp^G9b*s1|*Ak?@s|zjKx9jP7LeL$-D$|?s&R5hIn))
zrz9jK2=G1nd)|TlL)qPQH@CMuTmSO_!FRcPt=<J9|CV;K+W(sQFh{jAl??>cN?fmO
z;+Y=l(;^aZJ7}5s`gxbn7?pU(@2TpOT(X6&Wc!5H2~5jp9#oOsp<k<;DrRJ0U~p!h
z?QD(HLBYYCs}xT;flN_URNV9F{k^@)r{+AIpW&t}v$a4X^2h)G^?PPSIFxvP{`a?f
z5%1C)PD!UcRz-TO_@XY#bI--ulw0+Pill@@!0eJMYzCWwoWNQSZtsg{k8lKKMRlFk
gabsiqW%iYEMVa3QrAL8zKz}lLy85}Sb4q9e0NZA682|tP

literal 0
HcmV?d00001

diff --git a/Resources/Textures/SS220/Interface/Contractor/button-withdraw.rsi/meta.json b/Resources/Textures/SS220/Interface/Contractor/button-withdraw.rsi/meta.json
new file mode 100644
index 000000000000..3bec809aa67e
--- /dev/null
+++ b/Resources/Textures/SS220/Interface/Contractor/button-withdraw.rsi/meta.json
@@ -0,0 +1,15 @@
+{
+    "version": 1,
+    "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt",
+    "copyright": "Made by ReeZii",
+    "size": {
+        "x": 138,
+        "y": 35
+    },
+    "states": [
+		{
+			"name": "withdraw"
+		}
+		
+    ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/SS220/Interface/Contractor/button-withdraw.rsi/withdraw.png b/Resources/Textures/SS220/Interface/Contractor/button-withdraw.rsi/withdraw.png
new file mode 100644
index 0000000000000000000000000000000000000000..d307f8176581a27be8c86afbb6bd34399adff095
GIT binary patch
literal 1809
zcmV+s2k!WZP)<h;3K|Lk000e1NJLTq004>r001Kh1^@s6OO%pA00001b5ch_0Itp)
z=>Px*%Sl8*RCt{2oO@7I*B!?{`+^ON{-K%8K&eb8mM&r%s}Nfz@d0E;G)N?fMonX6
zoslHXi0udnbw+$ZNCIfZM?!q0v~<vvSYOa21SD}JY#<XxRwRlo3>%3&8i6Y8qkpWs
z0Tu*y*Och_{I&NyzW3a--+RvQ?74R(00kLp3j)CitVwB;NU~l-m_#rta@z-AAGJNP
zB<s8XOJf8RgGHMs+dsD&+5nIaEhJ1L7|sJyF_H*|W1ts&ebnEND8eLyp$znd!_*@X
z42Lj^U`)tIFLHNgY)l?Dy*@Y7RcXNl!eyfb&z(JNdcCW{f(eDwM)_@F5dgtu#{ih5
zuLj^|V2HKAo&5Knk8`Dcf(e4tM$uK(01%ATB>9z>0MKGJi!EPpe=u&N%-EPr@Z8yh
zMiQGz0P-s@p#?SsT90*wMd+$(oQhdeKKuypsZ;I8#=br}TADduSV;Bz?~hyW$Hej-
zJDIh3@re2D&CO&-FXgpk$N5)nEhl#E1VAd25tW?6ubz1ZU2!p|vR-#fdt8c9hML5N
z%`En5$OS&h&*!6kc>s8Lc@Y#A&U4$g(bL&UeOZ~y`V*C7X{j7bO9f!ET1`?(DFvGn
z(U+IswcdhwEdimS<i;$c%V2O@dz@Y#k7N=X`IVRKaf`d?>+PlX)Ja<PdV<2j-Ku>*
zAd}0P8yCm9BS+k75^!NexfvJ&cQJ~+%ss$tHq-UZ_Z_jlT1Qb@Ds`o$4rP~Z-O6P3
zBOHD86?WFt+S5(_{d5{yDap;X-=&@^6^k||5)>AOOfILT{vstgIT$Wqw%1d7d$TAp
zkr@jXqEISn)$2K%n?v}91Oh@s9nSyx@#CC)J(KO#x<Mnt%!sFXJ}Zmj^mKF|6uYHg
zg2E&4c<3R%JagJDdINEJdHh47P%4=j9)a0pr1I!dr!;I|mZwTZL_z|w+tS%Se;xpF
zJ9i=X^x(kS7wPTn<cZkjtbg|qyJMf@Ki97VuqG!5xu=r1<JZyK)kVm%7+%`9pRC1^
z-0tq?r;k0xhNJJ1@pJ^;?d^ayZWwwUk()NT&=Z4^NTp1jHjRjc1TGX6al5C-ZQ3>_
zyipcvwJg+X2c>=6)Wj4&KU(#Ar*+LH6CPe(^mKLt;H%M~nKzHD$VGNjoI7%upzv^>
zh>hjLygYmY0{GdSVD_$D!HsLz0H`>8h>F99#&=EY*VA_ODoT~g>GlsKBqoNCm>60c
z8u<9Yez#~2Wx^X}U@$9FDDVjgAU1tFtKZ7zt))?zjYa@gW@NH5Ba>U*-CV!&HDw16
z^7Vxa4ti^{a|Rus&9NRoGX3WOY(87!P{(E*_4MhOj7Gj`Y;^j1rcRs2uj5vbw`vtH
z7Zf<HGmz@yzw_nkGpv5|P1f$+%b|n>d%w5~r;Rd}Ky{M78p4)4dkP0k{r$9DyhzzQ
z@33OmE~fbT+3)PXr6f~VT8h%!n~<0oUf8{dJ+ZM48n&rNrcf{^`dOlqlF(O_BbCW8
z_V=?b^f#DIreV+Tj?RxtO6GiFA??loc3I1Y#boAM%@-7<rLuN!9t+mRQ}*^jx9Nim
ztDc*IA!wh{jF_)|N^{SGS-C=v#bV*V-#I=SajUzVPYVi=%4GZ`C}>0tQ-41-|2Tm}
zD#bT2khZH=kSi4U&zd!2owlYXWO6y`M;~>n-7~`@c-Y^c@^|x{sy`Zy=g(7n>J;<i
z<9XQM->up%?H-S0mV0Fqi9~|0M#KDd@m#8?pr@n5p^S3UBtloM28#tl!^o>Lg;L4m
zk&##|77PsyG}qN}rK*bPEvfiwG<d31{Nl+c`D4X7=0raW!1cyPE`RnJOH;Nm#m^79
zrzej`Mv`9jIaB=nMs5GBB}+K{#v2%K-*&zeM&V3$HhsOlM5m^?Rd?J|PknBtb;HlL
z*Ms$Ed;3rLcTA$YGv&Ct*E2AfH5rZEym5oNf0pt|{@}aP7NZ#Z`e<)%rYLm_-!?Tl
z=-FZvv&lr4!N7?fJM7a}VbW$I6F2eFzWsQ3dC}3*OzEHY@WqJ_?DdP%Qd#o*Kk)Kj
z{)$X4$8foUBfoo<j+T~DuchJBO7s=wPWHsu=<VvHboXwSZQaW3s3>Yqo^*?@q##3W
zX*IO*)t{B)s%U$>U_;Lpz;RRXfXX^Ni^mOq-2C!|Tlo5@oeySh2GHFZS%wC!^<vlf
zzQX0@vDhVkFmTx@VrqFX5YNmC#)L46U`z<32*!lnC<EU&6$oIkC#1HQkcVan9&Cob
zsO~WJ2(t)=^MLq&6v3E~fcVEH!QEMt(kA&I*m#9}@C16T00000NkvXXu0mjf<a&jG

literal 0
HcmV?d00001

diff --git a/Resources/Textures/SS220/Interface/Contractor/buttons.rsi/contracts.png b/Resources/Textures/SS220/Interface/Contractor/buttons.rsi/contracts.png
new file mode 100644
index 0000000000000000000000000000000000000000..f212bdfab75142efca9e0b24848c4da2cbfa2760
GIT binary patch
literal 1583
zcmV+~2GIG5P)<h;3K|Lk000e1NJLTq004>r001Kh1^@s6OO%pA00001b5ch_0Itp)
z=>Px)=}AOERCt{2+-p!&Wf;Km|1QX2ib*gipkyi+L7M?F6E#Rgt&u_TGN4$>g2~7r
z>Wqp@mNJMUnHEKcnwNDnWCThHMiM7iLqRUyU_&!-1iatCyutRtVdJJOxFf8-zfWi0
z^PcxPXL;s%cF%HF0-%VoP$LM>5D;-yB8d${B#F=}!}<*?OAF0lM(o`VIT@jIn6RXW
zX1k*DDge@^lSGmTE#-hzR1%>j4RgWD(&GP$B9cUCs$otvYdwO{5|Jo^Rt%rFGdjPZ
z-3!ZIoZEe@(D^(!QJ{T)@E1uip>q<gN6<>E6$Rjv-AP(6xWj*XyHBPiVSAG)D<~js
zbu<7{0|UI5Mc_PfB6%q(?2lcm(|AJ5v`UoD#6uQ@otqmQd?$0eva+L3=e40#qUgFx
zw3mUQA;YIn=g_82B1vAdPTzVOa`GIDQP-{%rXSFZz0uQ@aiO8uj~YeSH{aya>C<Fv
z*udp;XEk%8^9xWcT1fHX!vGi>8L=|wINL(!<2GX^c5ZIXVx34%=GV1rh|105mzWra
zPn*VDefv^XT1t9c9Ob8q0C?NknK8k^So9x2H&avYUc1JL<YfNX_7hSA1EO;C*s&lC
z)sZ6%pEjKd;o<C$jb*Tx*E8d$t&S!tH;<%9Ij1u-o6VWLVg)@cda*rp{)@h(TGNZx
zBauomv$0`pNC-JeNj$8n(TvYYNZ`@^`)r;Y%)fW<;t?n#C^3<Ee?M-Nm$$lh{fpgq
z$Pngj-$9JmSgLQ_0G_@d0`QtYpS_WC%8H8kVD@b0BqXqL>J%Q<)bQ!I@nk3d$gahU
zkw~SC3<zL+SQskh5w2alsEK1@Zq9`8a1w)LR1_C;GA;F)aXTZuXg$MxeHrHKONC0s
z?>{7H#%)KqVP$VmocBa-UA_!J`ueZ1bsND5KYyLQ(N!vTqEadWI2a#~lcy)HlO~gu
z@I9+Wjchdc=&oIOel`yib8}6i7#bNdK5PMh9X(1#aj{O$>1ET4){~pEkHQ1#%#4d;
zc6>ZrLqe!~@`PRk2T*hCmL^H+T{?4?-nIi9jRma#y4~^13JW#cYPFim5*58|Z2>Uo
z(gmk6o>&cXz|6)5D~CbA(`r|5#=1D}UBAwEGyK~W*Dq!belcr!P+iTH3+FksX%pvj
za@u_zFG4Twqo`}^_$U7)Ns)5i8S08hpbUT~4<EHSUm}%I`}lFAF~y>V$X%R~yEya3
z`@`E5zpl2n$@)_2YHKm>-ks3hd+-dIhguD1va(QwFKBlB&&!unRa(lV$j{ppcTdDJ
z<Sx#v`}iY@v$L7C@f*zg+O%m6UD1oyQ?K;cF$(tY$6Y4lRAvTO{=PsrQ&UW>ts7O9
zK8{YD&-qhlajonfC@Xk+w^<^QVCCRIUTP{1?(UfP>qqp59z3{r4*+XNr>FCfXpVna
zQ%y?LDi)=tF?g&OXR;2qDgJ}%YLp5E<H8nT?c}7Rt7@AUYCRp1K<Vq(V?TN{KJrMm
z%nhczsEDbnqS&|cOYYyfgGZo@o|cvz-@8|5G2H_LsVFJt%7qJf$YdCsn2?v6LLWy*
zq*5vUU0qQrl~~%@F=gdS0J?NFZnVaosw$2rB{42ElyljKnpLUiF*Y$_sLv!&tEp6#
zFyOsmI=eP)=|$^l=>F|nWNzF@e^*yryuDE@Uc~LnN<wxjSd#u5z3psClm&9VtW0My
zPi17_y=)mvGcvIr<jCgWAZl*jM5R=cotTKvayjzs!%SSVl<du0s3<9+&)^}=);YX&
z3*F7k80I@gtGIqKYlzM-AmU&aLw$Tmk}q%cN$O>iC}J$s6_r;xwbQuS&glGtc7G}O
zDtvofe;=gbJ($<cyR#l(Woe;*tw-n>de?e{j-gkddS14=+S*s5h3bN+D1ug6ttjHZ
z)dXlIQAF7l>WS7PXhoAK4WBm^1ZbQS()x#xo9+-^Z%rRmZ`OK5vIs5ZfcSkBK`Rmv
hzqlkkUqHlF$$w{K9y}|!(-Qyy002ovPDHLkV1nuu`mO)~

literal 0
HcmV?d00001

diff --git a/Resources/Textures/SS220/Interface/Contractor/buttons.rsi/meta.json b/Resources/Textures/SS220/Interface/Contractor/buttons.rsi/meta.json
new file mode 100644
index 000000000000..141884abe8a3
--- /dev/null
+++ b/Resources/Textures/SS220/Interface/Contractor/buttons.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt",
+    "copyright": "Made by ReeZii",
+    "size": {
+        "x": 138,
+        "y": 35
+    },
+    "states": [
+        {
+            "name": "contracts"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/SS220/Interface/Contractor/font-uplink-contractor.png b/Resources/Textures/SS220/Interface/Contractor/font-uplink-contractor.png
new file mode 100644
index 0000000000000000000000000000000000000000..073081c323b1492a25d9003811b7057f777b6dae
GIT binary patch
literal 2534
zcmeAS@N?(olHy`uVBq!ia0y~yVEn?sz!b;91{87H`F%c+Vk{1FcVbv~PUa;81Lp!y
z7srr_Id5+`b|r;Nv^`ur&DB9BC1!P@d}Q4F!&krTU{^BHohB*S<*?w*wqi^D^P8Lc
z>p$HqJ`Oa9`rtwM+G%nhHuLR%oBNWN;fu`q>6*7K?!Kr#;s5&VrC<h*Tl?dWOMGsv
zUA0j@xz65#!RGSuV`oIZPG8Dy^Q!K}%s!q2HhjAacW-~T-v0lN+MnNQyY8)-F83j_
z{q8rlXAFPxj(<+wTED;Va+UGEe>0xve=u=mXZSaJ0kcEHC>}9kaKOaTexCm7zrRc8
zT$^2ZBRAjsJ>!Cx8*bn8dwuo>FoE5Eo%Ygl{<f&91Iq6d_sdH$%zK-h-1q#n$=sSq
zpcs(#3aI#<eknu6w(2wY<II!i=yR|CxhHd<&A+qx<qUQ0+pnMf@#*dFEwwDv&mxqY
z_<(WsQuaS<4(C-zS1~i#0`tTvGe7fRa-S|&ZT=#{(Dd#7b;DydiSx7G9G`KYpO4}E
zmyL$Tu76WsGWPG1uUe+eY|wu=?@n5cg`e<IpdrG=4FC9z&C>S*3z`SlIjtC2I7abk
z7>uTY(KIkf)4&>F8>0hQa#^o6PySyg3oHOvy=6F)c<tIA9oq+izrVk>SZn@xgY@>L
z+Ziqt_y5dU#`OzWC)E5c{Hy+o;X}^%8Rx%P$tQ1$e<v?n7Oh{xFfVW01ZK+1WlR%3
a*wiy;yRU9Pn0hf6B<tzw=d#Wzp$P!hw+P7q

literal 0
HcmV?d00001


From d658838a16e625686d893d443a20504146c41537 Mon Sep 17 00:00:00 2001
From: ReeZer2 <omfgdamndude.dude@gmail.com>
Date: Sun, 22 Dec 2024 12:12:08 +0200
Subject: [PATCH 02/12] fixed some bugs and etc

---
 .../Systems/ContractorClientSystem.cs         |  5 ----
 .../UI/ContractorBoundUserInterface.cs        |  4 +--
 .../Contractor/ContractorServerSystem.cs      | 10 ++++---
 .../Contractor/ContractorTargetComponent.cs   |  4 +--
 .../SharedContractorPortalSystem.cs           | 29 +++----------------
 .../SharedContractorTargetSystem.cs           |  2 +-
 .../SS220/Entities/Effects/portal.yml         |  2 ++
 7 files changed, 17 insertions(+), 39 deletions(-)

diff --git a/Content.Client/SS220/Contractor/Systems/ContractorClientSystem.cs b/Content.Client/SS220/Contractor/Systems/ContractorClientSystem.cs
index ad40ed6ba104..cbf86aad51df 100644
--- a/Content.Client/SS220/Contractor/Systems/ContractorClientSystem.cs
+++ b/Content.Client/SS220/Contractor/Systems/ContractorClientSystem.cs
@@ -4,9 +4,4 @@ namespace Content.Client.SS220.Contractor.Systems;
 
 public sealed class ContractorClientSystem : SharedContractorSystem
 {
-    /// <inheritdoc/>
-    public override void Initialize()
-    {
-        base.Initialize();
-    }
 }
diff --git a/Content.Client/SS220/Contractor/UI/ContractorBoundUserInterface.cs b/Content.Client/SS220/Contractor/UI/ContractorBoundUserInterface.cs
index a0667472ef12..a7b0b7d8a336 100644
--- a/Content.Client/SS220/Contractor/UI/ContractorBoundUserInterface.cs
+++ b/Content.Client/SS220/Contractor/UI/ContractorBoundUserInterface.cs
@@ -381,7 +381,7 @@ public void OnExecutionButtonPressed()
         if (_contractorComponent?.CurrentContractData is null)
             return;
 
-        SendMessage(new ContractorExecutionButtonPressedMessage()); // TODO only message mb DONE
+        SendMessage(new ContractorExecutionButtonPressedMessage());
 
     }
 
@@ -393,7 +393,7 @@ public void OnWithdrawButtonPressed()
         if (_contractorComponent == null || _contractorComponent.AmountTc <= 0)
             return;
 
-        if (EntMan.GetEntity(_contractorPdaComponent.PdaOwner) != Owner)
+        if (EntMan.GetEntity(_contractorPdaComponent.PdaOwner) != PlayerManager.LocalEntity)
             return;
 
         _withdrawWindow?.Close();
diff --git a/Content.Server/SS220/Contractor/ContractorServerSystem.cs b/Content.Server/SS220/Contractor/ContractorServerSystem.cs
index 898f685d69a3..83085ef628de 100644
--- a/Content.Server/SS220/Contractor/ContractorServerSystem.cs
+++ b/Content.Server/SS220/Contractor/ContractorServerSystem.cs
@@ -86,7 +86,7 @@ private void OnOpenPortalEvent(Entity<ContractorComponent> ent, ref OpenPortalCo
             return;
 
         target.PortalEntity = SpawnAtPosition("ContractorPortal", Transform(ent.Owner).Coordinates);
-        target.PositionVector = Transform(ent.Owner).Coordinates.Position;
+        target.PositionOnStation = Transform(ent.Owner).Coordinates.Position;
 
         args.Handled = true;
 
@@ -107,6 +107,8 @@ private void OnNewContractAccepted(Entity<ContractorPdaComponent> ent, ref Contr
 
         EnsureComp<ContractorTargetComponent>(GetEntity(ev.ContractEntity), out var target);
 
+        //Only for test
+        /*
         if (target.AmountTc > 8)
         {
             _adminLogger.Add(
@@ -116,10 +118,10 @@ private void OnNewContractAccepted(Entity<ContractorPdaComponent> ent, ref Contr
 
             return;
         }
-
+        */
         foreach (var amountPosition in ev.ContractData.AmountPositions)
         {
-            target.Position = GetCoordinates(amountPosition.Value);
+            target.PortalPosition = GetCoordinates(amountPosition.Value);
             target.AmountTc = amountPosition.Key;
             target.Performer = ev.Actor;
         }
@@ -150,7 +152,7 @@ private void OnExecuteContract(Entity<ContractorPdaComponent> ent, ref Contracto
         if (contractorComponent.PortalEntity != null)
             return;
 
-        _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, ev.Actor, 5f, new OpenPortalContractorEvent(), ev.Actor)
+        _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, ev.Actor, 5f, new OpenPortalContractorEvent(), ev.Actor, ev.Actor)
         {
             BreakOnMove = true,
             BreakOnDamage = true,
diff --git a/Content.Shared/SS220/Contractor/ContractorTargetComponent.cs b/Content.Shared/SS220/Contractor/ContractorTargetComponent.cs
index 1727855efadf..204e3b27029c 100644
--- a/Content.Shared/SS220/Contractor/ContractorTargetComponent.cs
+++ b/Content.Shared/SS220/Contractor/ContractorTargetComponent.cs
@@ -20,11 +20,11 @@ public sealed partial class ContractorTargetComponent : Component
     public FixedPoint2 AmountTc;
 
     [DataField]
-    public EntityCoordinates Position; //position where target must be placed
+    public EntityCoordinates PortalPosition; //position where target must be placed
 
     [DataField]
     [AutoNetworkedField]
-    public Vector2 PositionVector; // position where target was placed on station
+    public Vector2 PositionOnStation; // position where target was placed on station
 
     [DataField]
     public TimeSpan EnteredPortalTime;
diff --git a/Content.Shared/SS220/Contractor/SharedContractorPortalSystem.cs b/Content.Shared/SS220/Contractor/SharedContractorPortalSystem.cs
index 812389fe7e0d..a3eb43968a43 100644
--- a/Content.Shared/SS220/Contractor/SharedContractorPortalSystem.cs
+++ b/Content.Shared/SS220/Contractor/SharedContractorPortalSystem.cs
@@ -16,27 +16,17 @@ public sealed class SharedContractorPortalSystem : EntitySystem
     [Dependency] private readonly SharedUserInterfaceSystem _uiSystem = default!;
     [Dependency] private readonly INetManager _net = default!;
     [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
-    [Dependency] private readonly SharedContractorSystem _contractor = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
-    [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
     public override void Initialize()
     {
-        SubscribeLocalEvent<ContractorPortalOnTriggerComponent, ComponentInit>(OnComponentInit);
         SubscribeLocalEvent<ContractorPortalOnTriggerComponent, StartCollideEvent>(OnEnterPortal);
-        SubscribeLocalEvent<ContractorPortalOnTriggerComponent, ContractorClosedPortalEvent>(OnClosePortal);
-    }
-
-    private void OnComponentInit(Entity<ContractorPortalOnTriggerComponent> ent, ref ComponentInit args)
-    {
-        ent.Comp.OpenPortalTime = _timing.CurTime;
-        _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, ent.Owner, 5f, new ContractorClosedPortalEvent(), ent.Owner));
     }
 
     private void OnEnterPortal(Entity<ContractorPortalOnTriggerComponent> ent, ref StartCollideEvent args)
     {
         if (!TryComp<ContractorTargetComponent>(args.OtherEntity, out var targetComponent))
         {
-            _popup.PopupEntity("Портал недоступен для вас", args.OtherEntity, PopupType.MediumCaution);
+            _popup.PopupClient("Портал недоступен для вас", args.OtherEntity, PopupType.Medium);
             return;
         }
 
@@ -54,7 +44,7 @@ private void OnEnterPortal(Entity<ContractorPortalOnTriggerComponent> ent, ref S
         if (contractorComponent.CurrentContractEntity != GetNetEntity(args.OtherEntity))
             return;
 
-        targetComponent.Position = Transform(args.OtherEntity).Coordinates;
+        targetComponent.PortalPosition = Transform(args.OtherEntity).Coordinates;
         targetComponent.EnteredPortalTime = _timing.CurTime;
 
         contractorComponent.CurrentContractEntity = null;
@@ -67,7 +57,7 @@ private void OnEnterPortal(Entity<ContractorPortalOnTriggerComponent> ent, ref S
 
         if (needsPortalEntity != args.OurEntity)
         {
-            _popup.PopupEntity("Этот портал предназначен не для этой цели", args.OtherEntity, PopupType.MediumCaution);
+            _popup.PopupClient("Этот портал предназначен не для этой цели", args.OtherEntity, PopupType.Medium);
             return;
         }
 
@@ -81,20 +71,9 @@ private void OnEnterPortal(Entity<ContractorPortalOnTriggerComponent> ent, ref S
             _uiSystem.ServerSendUiMessage(GetEntity(contractorComponent.PdaEntity)!.Value, ContractorPdaKey.Key, new ContractorCompletedContractMessage());
         }
 
-        _transformSystem.SetCoordinates(args.OtherEntity, Transform(contractorEntity).Coordinates); // ????
+        _transformSystem.SetCoordinates(args.OtherEntity, Transform(contractorEntity).Coordinates); // tp target to other map in future
 
         Dirty(contractorPdaEntity, contractorPdaComponent);
         Dirty(contractorEntity, contractorComponent);
     }
-
-    private void OnClosePortal(Entity<ContractorPortalOnTriggerComponent> ent, ref ContractorClosedPortalEvent args)
-    {
-        Del(ent.Owner);
-    }
-}
-
-[Serializable, NetSerializable]
-public sealed partial class ContractorClosedPortalEvent : DoAfterEvent
-{
-    public override DoAfterEvent Clone() => this;
 }
diff --git a/Content.Shared/SS220/Contractor/SharedContractorTargetSystem.cs b/Content.Shared/SS220/Contractor/SharedContractorTargetSystem.cs
index 902bc0fc5f91..97a95bae1ee0 100644
--- a/Content.Shared/SS220/Contractor/SharedContractorTargetSystem.cs
+++ b/Content.Shared/SS220/Contractor/SharedContractorTargetSystem.cs
@@ -27,7 +27,7 @@ public override void Update(float frameTime)
 
             if (comp.EnteredPortalTime + comp.TimeInJail < _timing.CurTime)
             {
-                _transform.SetCoordinates(uid, comp.Position);
+                _transform.SetCoordinates(uid, comp.PortalPosition);
                 comp.EnteredPortalTime = TimeSpan.Zero;
                 RemComp<ContractorTargetComponent>(uid);
             }
diff --git a/Resources/Prototypes/SS220/Entities/Effects/portal.yml b/Resources/Prototypes/SS220/Entities/Effects/portal.yml
index bcd796b4cfaa..182f4fc2d051 100644
--- a/Resources/Prototypes/SS220/Entities/Effects/portal.yml
+++ b/Resources/Prototypes/SS220/Entities/Effects/portal.yml
@@ -6,6 +6,8 @@
     - type: Sprite
       layers:
         - state: portal-red
+    - type: TimedDespawn
+      lifetime: 10 #Only for test
     - type: PointLight
       color: OrangeRed
       radius: 3

From 76d262eb79cf98ffe42080d37066790a13c90c1d Mon Sep 17 00:00:00 2001
From: ReeZer2 <omfgdamndude.dude@gmail.com>
Date: Mon, 23 Dec 2024 19:54:25 +0200
Subject: [PATCH 03/12] some fixes and warp point func

---
 .../UI/ContractorBoundUserInterface.cs        |  7 ++-
 .../Contractor/ContractorServerSystem.cs      | 53 ++++++++++++++-----
 .../ContractorWarpPointComponent.cs           | 16 ++++++
 .../SS220/Contractor/ContractorComponent.cs   |  3 +-
 .../SS220/Contractor/ContractorMessagesUi.cs  | 21 ++++----
 .../Contractor/ContractorTargetComponent.cs   |  2 +-
 .../SharedContractorTargetSystem.cs           |  4 --
 .../SS220/Antags/contractor_items.yml         | 18 +++++++
 .../SS220/Catalog/uplink_catalog.yml          |  6 ++-
 9 files changed, 95 insertions(+), 35 deletions(-)
 create mode 100644 Content.Server/SS220/Contractor/ContractorWarpPointComponent.cs

diff --git a/Content.Client/SS220/Contractor/UI/ContractorBoundUserInterface.cs b/Content.Client/SS220/Contractor/UI/ContractorBoundUserInterface.cs
index a7b0b7d8a336..64c9f7981195 100644
--- a/Content.Client/SS220/Contractor/UI/ContractorBoundUserInterface.cs
+++ b/Content.Client/SS220/Contractor/UI/ContractorBoundUserInterface.cs
@@ -215,7 +215,7 @@ private void AddContract(NetEntity key, ContractorContract contract)
         {
             var positionButton = new Button
             {
-                Text = $"{amountPosition.Value} ({amountPosition.Key} ТК)",
+                Text = $"{amountPosition.Location} ({amountPosition.TcReward} ТК) ({amountPosition.Difficulty})",
                 HorizontalExpand = false,
                 VerticalExpand = false,
                 StyleClasses = { "OpenBoth" },
@@ -225,7 +225,10 @@ private void AddContract(NetEntity key, ContractorContract contract)
 
             positionButton.OnPressed += _ =>
             {
-                SendMessage(new ContractorNewContractAcceptedMessage(key, contract));
+                SendMessage(new ContractorNewContractAcceptedMessage(key,
+                    contract,
+                    amountPosition.TcReward,
+                    amountPosition.Uid));
 
                 foreach (var buttons in _allPositionButtons)
                 {
diff --git a/Content.Server/SS220/Contractor/ContractorServerSystem.cs b/Content.Server/SS220/Contractor/ContractorServerSystem.cs
index 83085ef628de..267b45cda473 100644
--- a/Content.Server/SS220/Contractor/ContractorServerSystem.cs
+++ b/Content.Server/SS220/Contractor/ContractorServerSystem.cs
@@ -13,7 +13,6 @@
 using Content.Shared.Store;
 using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
-using Robust.Shared.Map;
 using Robust.Shared.Random;
 
 namespace Content.Server.SS220.Contractor;
@@ -119,12 +118,11 @@ private void OnNewContractAccepted(Entity<ContractorPdaComponent> ent, ref Contr
             return;
         }
         */
-        foreach (var amountPosition in ev.ContractData.AmountPositions)
-        {
-            target.PortalPosition = GetCoordinates(amountPosition.Value);
-            target.AmountTc = amountPosition.Key;
-            target.Performer = ev.Actor;
-        }
+
+        target.PortalPosition = Transform(GetEntity(ev.WarpPointEntity)).Coordinates;
+        target.AmountTc = ev.TcReward;
+        target.Performer = ev.Actor;
+
         Dirty(GetEntity(ev.ContractEntity), target);
 
         contractorComponent.CurrentContractData = ev.ContractData;
@@ -161,7 +159,7 @@ private void OnExecuteContract(Entity<ContractorPdaComponent> ent, ref Contracto
 
     private void OnWithdrawTc(Entity<ContractorPdaComponent> ent, ref ContractorWithdrawTcMessage ev)
     {
-        if (!TryComp<ContractorComponent>(GetEntity(ent.Comp.PdaOwner), out var contractorComponent))
+        if (!TryComp<ContractorComponent>(ev.Actor, out var contractorComponent))
             return;
 
         if (ev.Amount > contractorComponent.AmountTc)
@@ -223,13 +221,42 @@ public void GenerateContracts(Entity<ContractorComponent> ent)
                 new ContractorContract
                 {
                     Job = jobName,
-                    AmountPositions = GeneratePositionsForTargets(ent.Owner, player),
+                    AmountPositions = GeneratePositionsForTarget(),
                 });
         }
     }
-    private Dictionary<FixedPoint2, NetCoordinates> GeneratePositionsForTargets(EntityUid contractor, EntityUid target)
+
+    private List<(NetEntity Uid, string Location, FixedPoint2 TcReward, string Difficulty)> GeneratePositionsForTarget()
     {
-        return new Dictionary<FixedPoint2, NetCoordinates> { { FixedPoint2.New(10) + target.Id, GetNetCoordinates(Transform(target).Coordinates)} };
+        List<(NetEntity Uid, string Location, FixedPoint2 TcReward, string Difficulty)> allLocations = [];
+
+        var query = EntityQueryEnumerator<ContractorWarpPointComponent>();
+
+        while (query.MoveNext(out var uid, out var comp))
+        {
+            allLocations.Add((GetNetEntity(uid), comp.LocationName, comp.AmountTc, comp.Difficulty));
+        }
+
+        var easyLocations = allLocations.Where(loc => loc.Difficulty == "Easy").ToList();
+        var mediumLocations = allLocations.Where(loc => loc.Difficulty == "Medium").ToList();
+        var hardLocations = allLocations.Where(loc => loc.Difficulty == "Hard").ToList();
+
+        _random.Shuffle(easyLocations);
+        _random.Shuffle(mediumLocations);
+        _random.Shuffle(hardLocations);
+
+        var result = new List<(NetEntity uid, string Location, FixedPoint2 Value, string Difficulty)>();
+
+        if (easyLocations.Count > 0)
+            result.Add(easyLocations[0]);
+
+        if (mediumLocations.Count > 0)
+            result.Add(mediumLocations[0]);
+
+        if (hardLocations.Count > 0)
+            result.Add(hardLocations[0]);
+
+        return result;
     }
 
     public bool IsCloseWithPosition(NetEntity playerNet)
@@ -245,10 +272,10 @@ public bool IsCloseWithPosition(NetEntity playerNet)
 
         var playerPosition = GetNetCoordinates(Transform(player).Coordinates).Position;
 
-        var targetPosition = contractorComponent.CurrentContractData!.Value.AmountPositions.FirstOrDefault().Value.Position;
+        var targetPosition = GetNetCoordinates(Transform(GetEntity(contractorComponent.CurrentContractData!.Value.AmountPositions.First().Uid)).Coordinates).Position;
 
         var distance = (playerPosition - targetPosition).Length();
 
-        return distance < 4f; //4 tiles distance
+        return distance < 1f; //4 tiles distance
     }
 }
diff --git a/Content.Server/SS220/Contractor/ContractorWarpPointComponent.cs b/Content.Server/SS220/Contractor/ContractorWarpPointComponent.cs
new file mode 100644
index 000000000000..bc7b4256861d
--- /dev/null
+++ b/Content.Server/SS220/Contractor/ContractorWarpPointComponent.cs
@@ -0,0 +1,16 @@
+using Content.Shared.FixedPoint;
+
+namespace Content.Server.SS220.Contractor;
+
+[RegisterComponent]
+public sealed partial class ContractorWarpPointComponent : Component
+{
+    [DataField]
+    public string LocationName;
+
+    [DataField]
+    public FixedPoint2 AmountTc;
+
+    [DataField]
+    public string Difficulty;
+}
diff --git a/Content.Shared/SS220/Contractor/ContractorComponent.cs b/Content.Shared/SS220/Contractor/ContractorComponent.cs
index 8f4a1645fa9c..51ded9234022 100644
--- a/Content.Shared/SS220/Contractor/ContractorComponent.cs
+++ b/Content.Shared/SS220/Contractor/ContractorComponent.cs
@@ -1,6 +1,5 @@
 using Content.Shared.FixedPoint;
 using Robust.Shared.GameStates;
-using Robust.Shared.Map;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.SS220.Contractor;
@@ -49,5 +48,5 @@ public sealed partial class ContractorComponent : Component
 public struct ContractorContract
 {
     public string Job;
-    public Dictionary<FixedPoint2, NetCoordinates> AmountPositions;
+    public List<(NetEntity Uid, string Location, FixedPoint2 TcReward, string Difficulty)> AmountPositions;
 }
diff --git a/Content.Shared/SS220/Contractor/ContractorMessagesUi.cs b/Content.Shared/SS220/Contractor/ContractorMessagesUi.cs
index ab8e6b1644e0..dc0585f9fe70 100644
--- a/Content.Shared/SS220/Contractor/ContractorMessagesUi.cs
+++ b/Content.Shared/SS220/Contractor/ContractorMessagesUi.cs
@@ -1,5 +1,4 @@
 using Content.Shared.FixedPoint;
-using Robust.Shared.Map;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.SS220.Contractor;
@@ -7,19 +6,21 @@ namespace Content.Shared.SS220.Contractor;
 [Serializable, NetSerializable]
 public sealed class ContractorGenerateContractsMessage : BoundUserInterfaceMessage
 {
-    public ContractorGenerateContractsMessage() { }
 }
 
 [Serializable, NetSerializable]
 public sealed class ContractorUpdateStatsMessage : BoundUserInterfaceMessage
 {
-    public ContractorUpdateStatsMessage() { }
 }
 
 [Serializable, NetSerializable]
 public sealed class ContractorCompletedContractMessage : BoundUserInterfaceMessage
 {
-    public ContractorCompletedContractMessage() { }
+}
+
+[Serializable, NetSerializable]
+public sealed class ContractorExecutionButtonPressedMessage : BoundUserInterfaceMessage
+{
 }
 
 [Serializable, NetSerializable]
@@ -38,20 +39,18 @@ public sealed class ContractorNewContractAcceptedMessage : BoundUserInterfaceMes
 {
     public NetEntity ContractEntity;
     public ContractorContract ContractData;
+    public FixedPoint2 TcReward;
+    public NetEntity WarpPointEntity;
 
-    public ContractorNewContractAcceptedMessage(NetEntity contractEntity, ContractorContract contractData)
+    public ContractorNewContractAcceptedMessage(NetEntity contractEntity, ContractorContract contractData, FixedPoint2 tcReward, NetEntity warpPointEntity)
     {
         ContractEntity = contractEntity;
         ContractData = contractData;
+        TcReward = tcReward;
+        WarpPointEntity = warpPointEntity;
     }
 }
 
-[Serializable, NetSerializable]
-public sealed class ContractorExecutionButtonPressedMessage : BoundUserInterfaceMessage
-{
-
-}
-
 [Serializable, NetSerializable]
 public sealed class ContractorHubBuyItemMessage : BoundUserInterfaceMessage
 {
diff --git a/Content.Shared/SS220/Contractor/ContractorTargetComponent.cs b/Content.Shared/SS220/Contractor/ContractorTargetComponent.cs
index 204e3b27029c..49198e0854ce 100644
--- a/Content.Shared/SS220/Contractor/ContractorTargetComponent.cs
+++ b/Content.Shared/SS220/Contractor/ContractorTargetComponent.cs
@@ -32,5 +32,5 @@ public sealed partial class ContractorTargetComponent : Component
     [DataField]
     public EntityUid? PortalEntity;
 
-    public TimeSpan TimeInJail = TimeSpan.FromSeconds(5);
+    public TimeSpan TimeInJail = TimeSpan.FromSeconds(5); // Time in another map
 }
diff --git a/Content.Shared/SS220/Contractor/SharedContractorTargetSystem.cs b/Content.Shared/SS220/Contractor/SharedContractorTargetSystem.cs
index 97a95bae1ee0..41e91151a4b8 100644
--- a/Content.Shared/SS220/Contractor/SharedContractorTargetSystem.cs
+++ b/Content.Shared/SS220/Contractor/SharedContractorTargetSystem.cs
@@ -9,10 +9,6 @@ public sealed class SharedContractorTargetSystem : EntitySystem
 {
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
-    public override void Initialize()
-    {
-        base.Initialize();
-    }
 
     public override void Update(float frameTime)
     {
diff --git a/Resources/Prototypes/SS220/Antags/contractor_items.yml b/Resources/Prototypes/SS220/Antags/contractor_items.yml
index 731f9d4e6960..d8a7c6ccc556 100644
--- a/Resources/Prototypes/SS220/Antags/contractor_items.yml
+++ b/Resources/Prototypes/SS220/Antags/contractor_items.yml
@@ -1,3 +1,4 @@
+# Items in store in contractor uplink
 - type: contractorItems
   id: ContractorItems
   items:
@@ -5,6 +6,23 @@
     Crowbar: 3
     CrowbarRed: 2
 
+# Contractor warp point
+- type: entity
+  parent: MarkerBase
+  id: ContractorWarpPoint
+  name: warp point
+  suffix: contractor target point
+  components:
+    - type: ContractorWarpPoint
+      locationName: contractor warp point
+      amountTc: 1
+      difficulty: Easy
+    - type: Sprite
+      layers:
+        - state: pink
+        - sprite: Objects/Weapons/Bombs/spidercharge.rsi #TODO Sprite
+          state: icon
+
 - type: entity
   name: cardboard box
   parent: BoxBase
diff --git a/Resources/Prototypes/SS220/Catalog/uplink_catalog.yml b/Resources/Prototypes/SS220/Catalog/uplink_catalog.yml
index aabd996a3468..304ee2e5d130 100644
--- a/Resources/Prototypes/SS220/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/SS220/Catalog/uplink_catalog.yml
@@ -253,8 +253,10 @@
   conditions:
     - !type:ListingLimitedStockCondition
       stock: 1
-    - !type:BuyTimeForListingCondition
-      timeAmount: 30
+    - !type:StoreWhitelistCondition
+      blacklist:
+        tags:
+          - NukeOpsUplink
     #TODO amount kit for 0.25 * traitor count
 #ss220 contractor add end
 

From c9a535f2bd1a79340292ebfe1fe79af94c57e626 Mon Sep 17 00:00:00 2001
From: ReeZer2 <omfgdamndude.dude@gmail.com>
Date: Tue, 24 Dec 2024 12:56:29 +0200
Subject: [PATCH 04/12] del some useless field and add condition

---
 .../ListingLimitedForRuleCondition.cs         | 56 +++++++++++++++++++
 .../ContractorPortalOnTriggerComponent.cs     |  3 -
 .../SharedContractorItemPrototype.cs          |  4 +-
 .../SharedContractorTargetSystem.cs           |  4 +-
 .../SS220/Catalog/uplink_catalog.yml          |  3 +-
 5 files changed, 61 insertions(+), 9 deletions(-)
 create mode 100644 Content.Server/SS220/Store/Conditions/ListingLimitedForRuleCondition.cs

diff --git a/Content.Server/SS220/Store/Conditions/ListingLimitedForRuleCondition.cs b/Content.Server/SS220/Store/Conditions/ListingLimitedForRuleCondition.cs
new file mode 100644
index 000000000000..2f381ce2ffe5
--- /dev/null
+++ b/Content.Server/SS220/Store/Conditions/ListingLimitedForRuleCondition.cs
@@ -0,0 +1,56 @@
+using System.Linq;
+using Content.Server.GameTicking;
+using Content.Server.GameTicking.Rules.Components;
+using Content.Shared.Store;
+using Content.Shared.Store.Components;
+
+namespace Content.Server.SS220.Store.Conditions;
+
+/// <summary>
+/// Condition that limits the stock availability of a listing based on the percentage of traitors.
+/// </summary>
+public sealed partial class ListingStockLimitByTraitorsCondition  : ListingCondition
+{
+    private GameTicker _gameTicker;
+
+    [DataField(required: true)]
+    public float ContractorPercentage;
+
+    public override bool Condition(ListingConditionArgs args)
+    {
+        _gameTicker = args.EntityManager.System<GameTicker>();
+
+        if (!_gameTicker.IsGameRuleAdded<TraitorRuleComponent>())
+            return false;
+
+        var totalPurchases = 0;
+        var storeCounts = args.EntityManager.EntityQuery<StoreComponent>();
+
+        //count purchases for all stores
+        foreach (var store in storeCounts)
+        {
+            ListingDataWithCostModifiers first = new();
+            foreach (var x in store.FullListingsCatalog.Where(x => x.ID == args.Listing.ID))
+            {
+                first = x;
+                break;
+            }
+
+            totalPurchases += first.PurchaseAmount;
+        }
+
+        var ruleEntities = _gameTicker.GetAddedGameRules();
+
+        foreach (var ruleEnt in ruleEntities)
+        {
+            if (!args.EntityManager.TryGetComponent<TraitorRuleComponent>(ruleEnt, out var traitorComp))
+                continue;
+
+            var maxContractors = Math.Ceiling(traitorComp.TotalTraitors * ContractorPercentage); // round up
+
+            return totalPurchases < maxContractors;
+        }
+
+        return false;
+    }
+}
diff --git a/Content.Shared/SS220/Contractor/ContractorPortalOnTriggerComponent.cs b/Content.Shared/SS220/Contractor/ContractorPortalOnTriggerComponent.cs
index f118b2bf4fd9..04b0cc734a20 100644
--- a/Content.Shared/SS220/Contractor/ContractorPortalOnTriggerComponent.cs
+++ b/Content.Shared/SS220/Contractor/ContractorPortalOnTriggerComponent.cs
@@ -14,7 +14,4 @@ public sealed partial class ContractorPortalOnTriggerComponent : Component
 
     [DataField]
     public NetEntity? TargetEntity;
-
-    public TimeSpan MaxPortalTime = TimeSpan.FromSeconds(15);
-
 }
diff --git a/Content.Shared/SS220/Contractor/SharedContractorItemPrototype.cs b/Content.Shared/SS220/Contractor/SharedContractorItemPrototype.cs
index 94927d4ed22b..e607ae02c36c 100644
--- a/Content.Shared/SS220/Contractor/SharedContractorItemPrototype.cs
+++ b/Content.Shared/SS220/Contractor/SharedContractorItemPrototype.cs
@@ -1,8 +1,6 @@
 using Content.Shared.FixedPoint;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Shared.SS220.Contractor;
 
@@ -12,7 +10,7 @@ namespace Content.Shared.SS220.Contractor;
 [Serializable, NetSerializable, Prototype("contractorItems")]
 public sealed partial class SharedContractorItemPrototype : IPrototype
 {
-    [DataField("items", customTypeSerializer: typeof(PrototypeIdDictionarySerializer<FixedPoint2, EntityPrototype>))] //TODO: Delete serializer
+    [DataField("items")]
     public Dictionary<string, FixedPoint2> Items = new();
 
     [IdDataField]
diff --git a/Content.Shared/SS220/Contractor/SharedContractorTargetSystem.cs b/Content.Shared/SS220/Contractor/SharedContractorTargetSystem.cs
index 41e91151a4b8..4aeb7d29cfef 100644
--- a/Content.Shared/SS220/Contractor/SharedContractorTargetSystem.cs
+++ b/Content.Shared/SS220/Contractor/SharedContractorTargetSystem.cs
@@ -14,9 +14,9 @@ public override void Update(float frameTime)
     {
         base.Update(frameTime);
 
-        var quary = EntityQueryEnumerator<ContractorTargetComponent>();
+        var query = EntityQueryEnumerator<ContractorTargetComponent>();
 
-        while (quary.MoveNext(out var uid, out var comp))
+        while (query.MoveNext(out var uid, out var comp))
         {
             if (comp.EnteredPortalTime == TimeSpan.Zero)
                 return;
diff --git a/Resources/Prototypes/SS220/Catalog/uplink_catalog.yml b/Resources/Prototypes/SS220/Catalog/uplink_catalog.yml
index 304ee2e5d130..4ebe20e44076 100644
--- a/Resources/Prototypes/SS220/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/SS220/Catalog/uplink_catalog.yml
@@ -257,7 +257,8 @@
       blacklist:
         tags:
           - NukeOpsUplink
-    #TODO amount kit for 0.25 * traitor count
+    - !type:ListingStockLimitByTraitorsCondition #amount kit for traitor count / 4
+      contractorPercentage: 0.25
 #ss220 contractor add end
 
 #- type: listing

From 07ebdc85b22c642d1d1c692cfc8df89277d531f7 Mon Sep 17 00:00:00 2001
From: ReeZer2 <omfgdamndude.dude@gmail.com>
Date: Fri, 27 Dec 2024 12:40:47 +0200
Subject: [PATCH 05/12] some fixes and buy time for listing

---
 .../GameTicking/Rules/TraitorRuleSystem.cs    |  6 +++++
 Content.Server/Roles/TraitorRoleComponent.cs  |  4 +++
 .../Conditions/BuyTimeForListingCondition.cs  | 26 ++++++++++++++++---
 ...> ListingStockLimitByTraitorsCondition.cs} | 12 +++------
 .../SS220/Catalog/uplink_catalog.yml          |  2 ++
 5 files changed, 39 insertions(+), 11 deletions(-)
 rename Content.Server/SS220/Store/Conditions/{ListingLimitedForRuleCondition.cs => ListingStockLimitByTraitorsCondition.cs} (81%)

diff --git a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
index d5b479b8f710..e60a4852da3f 100644
--- a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
@@ -19,6 +19,7 @@
 using Robust.Shared.Random;
 using System.Linq;
 using System.Text;
+using Robust.Shared.Timing;
 
 namespace Content.Server.GameTicking.Rules;
 
@@ -37,6 +38,7 @@ public sealed class TraitorRuleSystem : GameRuleSystem<TraitorRuleComponent>
     [Dependency] private readonly GameTicker _gameTicker = default!;
     [Dependency] private readonly SharedRoleSystem _roleSystem = default!;
     [Dependency] private readonly UplinkSystem _uplink = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
 
     public override void Initialize()
     {
@@ -165,6 +167,10 @@ public bool MakeTraitor(EntityUid traitor, TraitorRuleComponent component)
             Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - Add traitor briefing components");
             AddComp<RoleBriefingComponent>(traitorRole.Value.Owner);
             Comp<RoleBriefingComponent>(traitorRole.Value.Owner).Briefing = briefing;
+
+            //ss220 time of assignment on traitor for conditions start
+            traitorRole.Value.Comp2.TimeOfAssignment = _timing.CurTime;
+            //ss220 time of assignment on traitor for conditions end
         }
         else
         {
diff --git a/Content.Server/Roles/TraitorRoleComponent.cs b/Content.Server/Roles/TraitorRoleComponent.cs
index a8a11a8f1bd4..3ecc4123e9fa 100644
--- a/Content.Server/Roles/TraitorRoleComponent.cs
+++ b/Content.Server/Roles/TraitorRoleComponent.cs
@@ -8,4 +8,8 @@ namespace Content.Server.Roles;
 [RegisterComponent]
 public sealed partial class TraitorRoleComponent : BaseMindRoleComponent
 {
+    //ss220 time of assignment on traitor for conditions start
+    [DataField]
+    public TimeSpan? TimeOfAssignment;
+    //ss220 time of assignment on traitor for conditions end
 }
diff --git a/Content.Server/SS220/Store/Conditions/BuyTimeForListingCondition.cs b/Content.Server/SS220/Store/Conditions/BuyTimeForListingCondition.cs
index ce5a483ef39f..9b292688a61c 100644
--- a/Content.Server/SS220/Store/Conditions/BuyTimeForListingCondition.cs
+++ b/Content.Server/SS220/Store/Conditions/BuyTimeForListingCondition.cs
@@ -1,16 +1,36 @@
+using Content.Server.Mind;
+using Content.Server.Roles;
+using Content.Shared.Roles;
 using Content.Shared.Store;
-using Microsoft.CodeAnalysis.Elfie.Serialization;
 using Robust.Shared.Timing;
 
 namespace Content.Server.SS220.Store.Conditions;
 
 public sealed partial class BuyTimeForListingCondition : ListingCondition
 {
+    private IGameTiming _gameTiming;
+    private MindSystem _mindSystem;
+    private SharedRoleSystem _role;
+
     [DataField(required: true)]
-    public int TimeAmount;
+    public TimeSpan TimeAmount;
 
     public override bool Condition(ListingConditionArgs args)
     {
-        return IoCManager.Resolve<IGameTiming>().CurTime <= TimeSpan.FromSeconds(TimeAmount); //todo fix
+        _gameTiming = IoCManager.Resolve<IGameTiming>();
+        _mindSystem = args.EntityManager.System<MindSystem>();
+        _role = args.EntityManager.System<SharedRoleSystem>();
+
+        _mindSystem.TryGetMind(args.Buyer, out var mind, out _);
+
+        if (!_role.MindHasRole<TraitorRoleComponent>(mind, out var traitorRoleComponent))
+            return false;
+
+        var currentTime = _gameTiming.CurTime;
+
+        var creationTime = traitorRoleComponent.Value.Comp2.TimeOfAssignment;
+
+        return currentTime < creationTime + TimeAmount;
+
     }
 }
diff --git a/Content.Server/SS220/Store/Conditions/ListingLimitedForRuleCondition.cs b/Content.Server/SS220/Store/Conditions/ListingStockLimitByTraitorsCondition.cs
similarity index 81%
rename from Content.Server/SS220/Store/Conditions/ListingLimitedForRuleCondition.cs
rename to Content.Server/SS220/Store/Conditions/ListingStockLimitByTraitorsCondition.cs
index 2f381ce2ffe5..702aa099df7d 100644
--- a/Content.Server/SS220/Store/Conditions/ListingLimitedForRuleCondition.cs
+++ b/Content.Server/SS220/Store/Conditions/ListingStockLimitByTraitorsCondition.cs
@@ -9,7 +9,7 @@ namespace Content.Server.SS220.Store.Conditions;
 /// <summary>
 /// Condition that limits the stock availability of a listing based on the percentage of traitors.
 /// </summary>
-public sealed partial class ListingStockLimitByTraitorsCondition  : ListingCondition
+public sealed partial class ListingStockLimitByTraitorsCondition : ListingCondition
 {
     private GameTicker _gameTicker;
 
@@ -26,17 +26,13 @@ public override bool Condition(ListingConditionArgs args)
         var totalPurchases = 0;
         var storeCounts = args.EntityManager.EntityQuery<StoreComponent>();
 
-        //count purchases for all stores
         foreach (var store in storeCounts)
         {
-            ListingDataWithCostModifiers first = new();
-            foreach (var x in store.FullListingsCatalog.Where(x => x.ID == args.Listing.ID))
+            var listing = store.FullListingsCatalog.FirstOrDefault(x => x.ID == args.Listing.ID);
+            if (listing != null)
             {
-                first = x;
-                break;
+                totalPurchases += listing.PurchaseAmount;
             }
-
-            totalPurchases += first.PurchaseAmount;
         }
 
         var ruleEntities = _gameTicker.GetAddedGameRules();
diff --git a/Resources/Prototypes/SS220/Catalog/uplink_catalog.yml b/Resources/Prototypes/SS220/Catalog/uplink_catalog.yml
index 4ebe20e44076..c981095a2f55 100644
--- a/Resources/Prototypes/SS220/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/SS220/Catalog/uplink_catalog.yml
@@ -259,6 +259,8 @@
           - NukeOpsUplink
     - !type:ListingStockLimitByTraitorsCondition #amount kit for traitor count / 4
       contractorPercentage: 0.25
+    - !type:BuyTimeForListingCondition #time for buy contractor kit
+      timeAmount: 10
 #ss220 contractor add end
 
 #- type: listing

From 9e6bf58c5e9f588c316da2762cb34bba00d24b33 Mon Sep 17 00:00:00 2001
From: ReeZer2 <omfgdamndude.dude@gmail.com>
Date: Fri, 27 Dec 2024 16:35:57 +0200
Subject: [PATCH 06/12] change diff, some locale

---
 .../UI/ContractorBoundUserInterface.cs        |  9 +++--
 .../ContractorPortalServerSystem.cs           | 20 +++++------
 .../Contractor/ContractorServerSystem.cs      | 36 +++++++++++--------
 .../SS220/Contractor/ContractorComponent.cs   |  2 +-
 .../ContractorWarpPointComponent.cs           | 12 +++++--
 .../ru-RU/ss220/contractor/contractor.ftl     |  3 ++
 6 files changed, 51 insertions(+), 31 deletions(-)
 rename Content.Shared/SS220/Contractor/SharedContractorPortalSystem.cs => Content.Server/SS220/Contractor/ContractorPortalServerSystem.cs (81%)
 rename {Content.Server => Content.Shared}/SS220/Contractor/ContractorWarpPointComponent.cs (61%)
 create mode 100644 Resources/Locale/ru-RU/ss220/contractor/contractor.ftl

diff --git a/Content.Client/SS220/Contractor/UI/ContractorBoundUserInterface.cs b/Content.Client/SS220/Contractor/UI/ContractorBoundUserInterface.cs
index 64c9f7981195..32a87c82b182 100644
--- a/Content.Client/SS220/Contractor/UI/ContractorBoundUserInterface.cs
+++ b/Content.Client/SS220/Contractor/UI/ContractorBoundUserInterface.cs
@@ -106,9 +106,12 @@ private void UpdateStats()
         if (_contractorComponent == null)
             return;
 
-        _menu.ReputationCountLabel.Text = $"Текущая репутация: " + _contractorComponent.Reputation;
-        _menu.TcAmountLabel.Text = $"Имеется ТК: " + _contractorComponent.AmountTc;
-        _menu.ContractsFinishedAmountLabel.Text = $"Выполнено контрактов: " + _contractorComponent.ContractsCompleted;
+        _menu.ReputationCountLabel.Text =
+            Loc.GetString("contractor-uplink-current-reputation", ("currentReputation", _contractorComponent.Reputation));
+        _menu.TcAmountLabel.Text =
+            Loc.GetString("contractor-uplink-current-tc", ("amountTc", _contractorComponent.AmountTc));
+        _menu.ContractsFinishedAmountLabel.Text =
+            Loc.GetString("contractor-uplink-current-contracts-completed", ("amountContractsCompleted", _contractorComponent.ContractsCompleted));
     }
 
     private void UpdateContracts(EntityUid contractor, EntityUid pda)
diff --git a/Content.Shared/SS220/Contractor/SharedContractorPortalSystem.cs b/Content.Server/SS220/Contractor/ContractorPortalServerSystem.cs
similarity index 81%
rename from Content.Shared/SS220/Contractor/SharedContractorPortalSystem.cs
rename to Content.Server/SS220/Contractor/ContractorPortalServerSystem.cs
index a3eb43968a43..ed28854282c9 100644
--- a/Content.Shared/SS220/Contractor/SharedContractorPortalSystem.cs
+++ b/Content.Server/SS220/Contractor/ContractorPortalServerSystem.cs
@@ -1,22 +1,21 @@
-using Content.Shared.DoAfter;
 using Content.Shared.Popups;
-using Robust.Shared.Network;
+using Content.Shared.SS220.Contractor;
 using Robust.Shared.Physics.Events;
-using Robust.Shared.Serialization;
 using Robust.Shared.Timing;
 
-namespace Content.Shared.SS220.Contractor;
+namespace Content.Server.SS220.Contractor;
 
 /// <summary>
 /// This handles...
 /// </summary>
-public sealed class SharedContractorPortalSystem : EntitySystem
+public sealed class ContractorPortalServerSystem : EntitySystem
 {
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly SharedUserInterfaceSystem _uiSystem = default!;
-    [Dependency] private readonly INetManager _net = default!;
     [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly ContractorServerSystem _contractorServer = default!;
+
     public override void Initialize()
     {
         SubscribeLocalEvent<ContractorPortalOnTriggerComponent, StartCollideEvent>(OnEnterPortal);
@@ -65,11 +64,10 @@ private void OnEnterPortal(Entity<ContractorPortalOnTriggerComponent> ent, ref S
         contractorComponent.AmountTc += targetComponent.AmountTc;
         contractorComponent.ContractsCompleted++;
 
-        if (_net.IsServer)
-        {
-            _uiSystem.ServerSendUiMessage(GetEntity(contractorComponent.PdaEntity)!.Value, ContractorPdaKey.Key, new ContractorUpdateStatsMessage());
-            _uiSystem.ServerSendUiMessage(GetEntity(contractorComponent.PdaEntity)!.Value, ContractorPdaKey.Key, new ContractorCompletedContractMessage());
-        }
+        _uiSystem.ServerSendUiMessage(GetEntity(contractorComponent.PdaEntity)!.Value, ContractorPdaKey.Key, new ContractorUpdateStatsMessage());
+        _uiSystem.ServerSendUiMessage(GetEntity(contractorComponent.PdaEntity)!.Value, ContractorPdaKey.Key, new ContractorCompletedContractMessage());
+
+        _contractorServer.GenerateContracts((contractorEntity, contractorComponent));
 
         _transformSystem.SetCoordinates(args.OtherEntity, Transform(contractorEntity).Coordinates); // tp target to other map in future
 
diff --git a/Content.Server/SS220/Contractor/ContractorServerSystem.cs b/Content.Server/SS220/Contractor/ContractorServerSystem.cs
index 267b45cda473..3e0085deba2b 100644
--- a/Content.Server/SS220/Contractor/ContractorServerSystem.cs
+++ b/Content.Server/SS220/Contractor/ContractorServerSystem.cs
@@ -226,9 +226,9 @@ public void GenerateContracts(Entity<ContractorComponent> ent)
         }
     }
 
-    private List<(NetEntity Uid, string Location, FixedPoint2 TcReward, string Difficulty)> GeneratePositionsForTarget()
+    private List<(NetEntity Uid, string Location, FixedPoint2 TcReward, Difficulty Difficulty)> GeneratePositionsForTarget()
     {
-        List<(NetEntity Uid, string Location, FixedPoint2 TcReward, string Difficulty)> allLocations = [];
+        var allLocations = new List<(NetEntity Uid, string Location, FixedPoint2 TcReward, Difficulty Difficulty)>();
 
         var query = EntityQueryEnumerator<ContractorWarpPointComponent>();
 
@@ -237,26 +237,26 @@ public void GenerateContracts(Entity<ContractorComponent> ent)
             allLocations.Add((GetNetEntity(uid), comp.LocationName, comp.AmountTc, comp.Difficulty));
         }
 
-        var easyLocations = allLocations.Where(loc => loc.Difficulty == "Easy").ToList();
-        var mediumLocations = allLocations.Where(loc => loc.Difficulty == "Medium").ToList();
-        var hardLocations = allLocations.Where(loc => loc.Difficulty == "Hard").ToList();
+        var easyLocations = allLocations.Where(loc => loc.Difficulty == Difficulty.Easy).ToList();
+        var mediumLocations = allLocations.Where(loc => loc.Difficulty == Difficulty.Medium).ToList();
+        var hardLocations = allLocations.Where(loc => loc.Difficulty == Difficulty.Hard).ToList();
 
         _random.Shuffle(easyLocations);
         _random.Shuffle(mediumLocations);
         _random.Shuffle(hardLocations);
 
-        var result = new List<(NetEntity uid, string Location, FixedPoint2 Value, string Difficulty)>();
+        allLocations.Clear();
 
         if (easyLocations.Count > 0)
-            result.Add(easyLocations[0]);
+            allLocations.Add(easyLocations[0]);
 
         if (mediumLocations.Count > 0)
-            result.Add(mediumLocations[0]);
+            allLocations.Add(mediumLocations[0]);
 
         if (hardLocations.Count > 0)
-            result.Add(hardLocations[0]);
+            allLocations.Add(hardLocations[0]);
 
-        return result;
+        return allLocations;
     }
 
     public bool IsCloseWithPosition(NetEntity playerNet)
@@ -270,12 +270,20 @@ public bool IsCloseWithPosition(NetEntity playerNet)
             contractorComponent.CurrentContractData is null)
             return false;
 
-        var playerPosition = GetNetCoordinates(Transform(player).Coordinates).Position;
+        var targetEntity = GetEntity(contractorComponent.CurrentContractEntity);
+
+        if (!TryComp<ContractorTargetComponent>(targetEntity, out var targetComponent))
+            return false;
+
+        var playerPosition = Transform(player).Coordinates.Position;
+        var targetPosition = Transform(targetEntity.Value).Coordinates.Position;
+
+        var targetPortalPosition = targetComponent.PortalPosition.Position;
 
-        var targetPosition = GetNetCoordinates(Transform(GetEntity(contractorComponent.CurrentContractData!.Value.AmountPositions.First().Uid)).Coordinates).Position;
 
-        var distance = (playerPosition - targetPosition).Length();
+        var isPlayerCloseToPortal = (playerPosition - targetPortalPosition).Length() < 1f;
+        var isTargetCloseToPortal = (targetPosition - targetPortalPosition).Length() < 1f;
 
-        return distance < 1f; //4 tiles distance
+        return isPlayerCloseToPortal && isTargetCloseToPortal; //tile distance
     }
 }
diff --git a/Content.Shared/SS220/Contractor/ContractorComponent.cs b/Content.Shared/SS220/Contractor/ContractorComponent.cs
index 51ded9234022..2ea9278139b3 100644
--- a/Content.Shared/SS220/Contractor/ContractorComponent.cs
+++ b/Content.Shared/SS220/Contractor/ContractorComponent.cs
@@ -48,5 +48,5 @@ public sealed partial class ContractorComponent : Component
 public struct ContractorContract
 {
     public string Job;
-    public List<(NetEntity Uid, string Location, FixedPoint2 TcReward, string Difficulty)> AmountPositions;
+    public List<(NetEntity Uid, string Location, FixedPoint2 TcReward, Difficulty Difficulty)> AmountPositions;
 }
diff --git a/Content.Server/SS220/Contractor/ContractorWarpPointComponent.cs b/Content.Shared/SS220/Contractor/ContractorWarpPointComponent.cs
similarity index 61%
rename from Content.Server/SS220/Contractor/ContractorWarpPointComponent.cs
rename to Content.Shared/SS220/Contractor/ContractorWarpPointComponent.cs
index bc7b4256861d..74fa70ceb7d5 100644
--- a/Content.Server/SS220/Contractor/ContractorWarpPointComponent.cs
+++ b/Content.Shared/SS220/Contractor/ContractorWarpPointComponent.cs
@@ -1,6 +1,6 @@
 using Content.Shared.FixedPoint;
 
-namespace Content.Server.SS220.Contractor;
+namespace Content.Shared.SS220.Contractor;
 
 [RegisterComponent]
 public sealed partial class ContractorWarpPointComponent : Component
@@ -12,5 +12,13 @@ public sealed partial class ContractorWarpPointComponent : Component
     public FixedPoint2 AmountTc;
 
     [DataField]
-    public string Difficulty;
+    public Difficulty Difficulty;
+}
+
+[Serializable]
+public enum Difficulty
+{
+    Easy,
+    Medium,
+    Hard
 }
diff --git a/Resources/Locale/ru-RU/ss220/contractor/contractor.ftl b/Resources/Locale/ru-RU/ss220/contractor/contractor.ftl
new file mode 100644
index 000000000000..85a1de3f9b65
--- /dev/null
+++ b/Resources/Locale/ru-RU/ss220/contractor/contractor.ftl
@@ -0,0 +1,3 @@
+contractor-uplink-current-reputation = Текущая репутация: {$currentReputation}
+contractor-uplink-current-tc = Имеется ТК: {$amountTc}
+contractor-uplink-current-contracts-completed = Выполнено контрактов: {$amountContractsCompleted}

From e1bead37825effdc723b9545ca24b58564559c27 Mon Sep 17 00:00:00 2001
From: ReeZer2 <omfgdamndude.dude@gmail.com>
Date: Sat, 28 Dec 2024 17:38:47 +0200
Subject: [PATCH 07/12] some fixes and state

---
 .../UI/ContractorBoundUserInterface.cs        | 15 ++-
 .../Contractor/UI/ContractorPDAMenu.xaml      | 30 +++---
 .../Contractor/UI/ContractorPDAMenu.xaml.cs   |  9 +-
 .../Contractor/ContractorServerSystem.cs      | 99 ++++++++++++++++---
 .../SS220/Contractor/ContractorMessagesUi.cs  | 25 +++--
 .../Contractor/SharedContractorSystem.cs      |  9 +-
 6 files changed, 142 insertions(+), 45 deletions(-)

diff --git a/Content.Client/SS220/Contractor/UI/ContractorBoundUserInterface.cs b/Content.Client/SS220/Contractor/UI/ContractorBoundUserInterface.cs
index 32a87c82b182..c87f06fb0366 100644
--- a/Content.Client/SS220/Contractor/UI/ContractorBoundUserInterface.cs
+++ b/Content.Client/SS220/Contractor/UI/ContractorBoundUserInterface.cs
@@ -50,13 +50,11 @@ protected override void ReceiveMessage(BoundUserInterfaceMessage message)
 
         switch (message)
         {
-            case ContractorUpdateButtonStateMessage ev:
-                _menu.ExecutionButton.Disabled = !ev.IsEnabled;
-                break;
             case ContractorUpdateStatsMessage:
                 UpdateStats();
                 UpdateContracts(EntMan.GetEntity(_contractorPdaComponent.PdaOwner)!.Value, Owner);
                 break;
+
             case ContractorCompletedContractMessage:
             {
                 foreach (var buttons in _allPositionButtons)
@@ -90,6 +88,17 @@ protected override void Open()
         UpdateHub(_contractorPdaComponent.AvailableItems);
     }
 
+    protected override void UpdateState(BoundUserInterfaceState state)
+    {
+        if (_menu == null)
+            return;
+
+        if (state is not ContractorExecutionBoundUserInterfaceState cast)
+            return;
+
+        _menu.UpdateExecutionState(cast);
+    }
+
     protected override void Dispose(bool disposing)
     {
         base.Dispose(disposing);
diff --git a/Content.Client/SS220/Contractor/UI/ContractorPDAMenu.xaml b/Content.Client/SS220/Contractor/UI/ContractorPDAMenu.xaml
index 82366c74740c..2411faf073bd 100644
--- a/Content.Client/SS220/Contractor/UI/ContractorPDAMenu.xaml
+++ b/Content.Client/SS220/Contractor/UI/ContractorPDAMenu.xaml
@@ -8,24 +8,22 @@
 
     <Control Name="MainContainer">
         <PanelContainer StyleClasses="ContractorPanel">
-            <Control>
-                <PanelContainer Name="BackgroundPanel" StyleClasses="ContractorFontPanel">
-                    <Label Text="Итог" Margin="55 55 0 0" VerticalAlignment="Top"/>
-                    <Label Name="ReputationCountLabel" Access="Public" Text="Текущая репутация: " Margin="230 55 0 0" VerticalAlignment="Top"/>
+            <PanelContainer Name="BackgroundPanel" StyleClasses="ContractorFontPanel">
+                <Label Text="Итог" Margin="55 55 0 0" VerticalAlignment="Top"/>
+                <Label Name="ReputationCountLabel" Access="Public" Text="Текущая репутация: " Margin="230 55 0 0" VerticalAlignment="Top"/>
 
-                    <Label Name="TcAmountLabel" Text="Имеется ТК:" Access="Public" Margin="55 108 294 0" VerticalAlignment="Top"/>
-                    <Label Name="ContractsFinishedAmountLabel" Text="Выполнено контрактов: " Access="Public" Margin="230 108 0 0" VerticalAlignment="Top"/>
+                <Label Name="TcAmountLabel" Text="Имеется ТК:" Access="Public" Margin="55 108 294 0" VerticalAlignment="Top"/>
+                <Label Name="ContractsFinishedAmountLabel" Text="Выполнено контрактов: " Access="Public" Margin="230 108 0 0" VerticalAlignment="Top"/>
 
-                    <ui220:SpriteButton Name="WithdrawButton" Margin="0 133 255 0" VerticalAlignment="Top" SetSize="138 35" StyleClasses="ContractorWithdrawButton"/>
-                    <ui220:SpriteButton Name="ContractsButton" Margin="0 218 269 0" VerticalAlignment="Top" MaxSize="138 35" StyleClasses="ContractorContractsButton"/>
-                    <ui220:SpriteButton Name="HubButton" Margin="20 218 0 0" VerticalAlignment="Top" MaxSize="138 35" StyleClasses="ContractorHubButton"/>
-                    <ui220:SpriteButton Name="ExecutionButton" Access="Public" Margin="321 184 0 0" VerticalAlignment="Top" MaxSize="138 40" StyleClasses="ContractorExecutionButton"/>
-                    <ScrollContainer Name="ContractsList" Margin="51 260 50 51" VScrollEnabled="True" HorizontalExpand="True" VerticalExpand="True" HScrollEnabled="False">
-                        <BoxContainer Name="ContractsListPanel" Orientation="Vertical" Access="Public" SeparationOverride="5"  HorizontalExpand="True" VerticalExpand="False"/>
-                        <BoxContainer Name="HubPanel" Visible="False" Orientation="Vertical" Access="Public" SeparationOverride="5"  HorizontalExpand="True" VerticalExpand="False"/>
-                    </ScrollContainer>
-                </PanelContainer>
-            </Control>
+                <ui220:SpriteButton Name="WithdrawButton" Margin="0 133 255 0" VerticalAlignment="Top" SetSize="138 35" StyleClasses="ContractorWithdrawButton"/>
+                <ui220:SpriteButton Name="ContractsButton" Margin="0 218 269 0" VerticalAlignment="Top" MaxSize="138 35" StyleClasses="ContractorContractsButton"/>
+                <ui220:SpriteButton Name="HubButton" Margin="20 218 0 0" VerticalAlignment="Top" MaxSize="138 35" StyleClasses="ContractorHubButton"/>
+                <ui220:SpriteButton Name="ExecutionButton" Access="Public" Margin="321 184 0 0" VerticalAlignment="Top" MaxSize="138 40" StyleClasses="ContractorExecutionButton"/>
+                <ScrollContainer Name="ContractsList" Margin="51 260 50 51" VScrollEnabled="True" HorizontalExpand="True" VerticalExpand="True" HScrollEnabled="False">
+                    <BoxContainer Name="ContractsListPanel" Orientation="Vertical" Access="Public" SeparationOverride="5"  HorizontalExpand="True" VerticalExpand="False"/>
+                    <BoxContainer Name="HubPanel" Visible="False" Orientation="Vertical" Access="Public" SeparationOverride="5"  HorizontalExpand="True" VerticalExpand="False"/>
+                </ScrollContainer>
+            </PanelContainer>
         </PanelContainer>
 
     </Control >
diff --git a/Content.Client/SS220/Contractor/UI/ContractorPDAMenu.xaml.cs b/Content.Client/SS220/Contractor/UI/ContractorPDAMenu.xaml.cs
index 37bd8c7143f9..9047e3ebbac2 100644
--- a/Content.Client/SS220/Contractor/UI/ContractorPDAMenu.xaml.cs
+++ b/Content.Client/SS220/Contractor/UI/ContractorPDAMenu.xaml.cs
@@ -1,8 +1,8 @@
 using System.Numerics;
 using Content.Client.SS220.UserInterface.Utility;
 using Content.Client.Stylesheets;
+using Content.Shared.SS220.Contractor;
 using Robust.Client.AutoGenerated;
-using Robust.Client.Player;
 using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
@@ -12,8 +12,6 @@ namespace Content.Client.SS220.Contractor.UI;
 [GenerateTypedNameReferences]
 public sealed partial class ContractorPDAMenu : BaseWindow
 {
-    [Dependency] private readonly IEntityManager _entityManager = default!;
-    [Dependency] private readonly IPlayerManager _playerManager = default!;
     [Dependency] private readonly IResourceCache _resourceCache = default!;
 
     private readonly ContractorStyle _style;
@@ -40,6 +38,11 @@ public ContractorPDAMenu(ContractorBoundUserInterface userInterface) : this()
         _buttons.ListenButton(WithdrawButton, _ => _userInterface.OnWithdrawButtonPressed());
     }
 
+    public void UpdateExecutionState(ContractorExecutionBoundUserInterfaceState state)
+    {
+        ExecutionButton.Disabled = !state.IsEnabled;
+    }
+
     protected override DragMode GetDragModeFor(Vector2 relativeMousePos)
     {
         return DragMode.Move;
diff --git a/Content.Server/SS220/Contractor/ContractorServerSystem.cs b/Content.Server/SS220/Contractor/ContractorServerSystem.cs
index 3e0085deba2b..ac13187fc2eb 100644
--- a/Content.Server/SS220/Contractor/ContractorServerSystem.cs
+++ b/Content.Server/SS220/Contractor/ContractorServerSystem.cs
@@ -2,17 +2,21 @@
 using Content.Server.Administration.Logs;
 using Content.Server.DoAfter;
 using Content.Server.Hands.Systems;
+using Content.Server.Roles;
 using Content.Server.Roles.Jobs;
 using Content.Server.Stack;
 using Content.Shared.Database;
 using Content.Shared.DoAfter;
 using Content.Shared.FixedPoint;
 using Content.Shared.Ghost;
+using Content.Shared.Mind;
+using Content.Shared.Roles;
 using Content.Shared.SS220.Contractor;
 using Content.Shared.SSDIndicator;
 using Content.Shared.Store;
 using Robust.Server.GameObjects;
-using Robust.Shared.Containers;
+using Robust.Shared.Enums;
+using Robust.Shared.Player;
 using Robust.Shared.Random;
 
 namespace Content.Server.SS220.Contractor;
@@ -26,13 +30,13 @@ public sealed class ContractorServerSystem : SharedContractorSystem
     [Dependency] private readonly StackSystem _stack = default!;
     [Dependency] private readonly HandsSystem _hands = default!;
     [Dependency] private readonly DoAfterSystem _doAfter = default!;
-    [Dependency] private readonly EntityLookupSystem _lookup = default!;
     [Dependency] private readonly JobSystem _jobs = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly IAdminLogManager _adminLogger = default!;
-    [Dependency] private readonly SharedContainerSystem _container = default!;
+    [Dependency] private readonly SharedMindSystem _mindSystem = default!;
+    [Dependency] private readonly ISharedPlayerManager _playerManager = default!;
+    [Dependency] private readonly SharedRoleSystem _roleSystem = default!;
 
-    //TODO client system
     public override void Initialize()
     {
         base.Initialize();
@@ -63,10 +67,10 @@ public override void Update(float frameTime)
 
             if (_uiSystem.IsUiOpen(GetEntity(comp.PdaEntity)!.Value, ContractorPdaKey.Key))
             {
-                _uiSystem.ServerSendUiMessage(
+                _uiSystem.SetUiState(
                     GetEntity(comp.PdaEntity.Value),
                     ContractorPdaKey.Key,
-                    new ContractorUpdateButtonStateMessage(isEnabled));
+                    new ContractorExecutionBoundUserInterfaceState(isEnabled));
             }
         }
     }
@@ -137,6 +141,8 @@ private void OnNewContractAccepted(Entity<ContractorPdaComponent> ent, ref Contr
             contractorPdaComponent.CurrentContractData = ev.ContractData;
             Dirty(GetEntity(ev.Entity), contractorPdaComponent);
         }
+
+        HandleContractAccepted(ev.ContractEntity, ev.Actor);
     }
 
     // TODO on server //DONE
@@ -189,9 +195,78 @@ private void OnBuyContractorKit(StoreBuyListingMessage ev)
         EnsureComp<ContractorComponent>(ev.Actor);
     }
 
+    public void HandleContractAccepted(NetEntity acceptedPlayer, EntityUid contractor)
+    {
+        var query = EntityQueryEnumerator<ContractorComponent>();
+
+        while (query.MoveNext(out var uid, out var contractorComp))
+        {
+            if (uid == contractor)
+                continue;
+
+            if (!contractorComp.Contracts.Remove(acceptedPlayer))
+                continue;
+
+            if (contractorComp.Contracts.Count >= 5)
+                continue;
+
+            var newContract = GenerateContractForContractor(uid);
+
+            if (newContract != null)
+            {
+                contractorComp.Contracts[newContract.Value.Target] = newContract.Value.Contract;
+            }
+
+            Dirty(uid, contractorComp);
+
+            _uiSystem.ServerSendUiMessage(GetEntity(contractorComp.PdaEntity!.Value), ContractorPdaKey.Key, new ContractorUpdateStatsMessage());
+        }
+    }
+
+    private (NetEntity Target, ContractorContract Contract)? GenerateContractForContractor(EntityUid contractor)
+    {
+        var playerPool = _playerManager.Sessions
+            .Where(p => p is { Status: SessionStatus.InGame, AttachedEntity: not null })
+            .Select(p => p.AttachedEntity!.Value)
+            .ToList();
+
+        _random.Shuffle(playerPool);
+
+        foreach (var player in playerPool)
+        {
+            if (HasComp<GhostComponent>(player) ||
+                HasComp<ContractorComponent>(player) ||
+                HasComp<ContractorTargetComponent>(player) ||
+                (TryComp<SSDIndicatorComponent>(player, out var ssdIndicatorComponent) && ssdIndicatorComponent.IsSSD))
+            {
+                continue;
+            }
+
+            if (!_mindSystem.TryGetMind(player, out var mindId, out _))
+                continue;
+
+            if (_roleSystem.MindHasRole<TraitorRoleComponent>(mindId))
+                continue;
+
+            _jobs.MindTryGetJobName(mindId, out var jobName);
+
+            return (GetNetEntity(player),
+                new ContractorContract
+                {
+                    Job = jobName,
+                    AmountPositions = GeneratePositionsForTarget(),
+                });
+        }
+
+        return null;
+    }
+
     public void GenerateContracts(Entity<ContractorComponent> ent)
     {
-        var playerPool = _lookup.GetEntitiesInRange(ent.Owner, 10f).ToList();
+        var playerPool = _playerManager.Sessions
+            .Where(p => p is { Status: SessionStatus.InGame, AttachedEntity: not null })
+            .Select(p => p.AttachedEntity!.Value)
+            .ToList();
 
         _random.Shuffle(playerPool);
 
@@ -199,20 +274,22 @@ public void GenerateContracts(Entity<ContractorComponent> ent)
         {
             if (HasComp<GhostComponent>(player) ||
                 HasComp<ContractorComponent>(player) ||
-                HasComp<SSDIndicatorComponent>(player) ||
                 HasComp<ContractorTargetComponent>(player) ||
-                !HasComp<MetaDataComponent>(player))
+                (TryComp<SSDIndicatorComponent>(player, out var ssdIndicatorComponent) && ssdIndicatorComponent.IsSSD))
             {
                 continue;
             }
 
-            if (_container.IsEntityInContainer(player))
+            if (!_mindSystem.TryGetMind(player, out var mindId, out _))
+                continue;
+
+            if (_roleSystem.MindHasRole<TraitorRoleComponent>(mindId))
                 continue;
 
             if (ent.Comp.Contracts.ContainsKey(GetNetEntity(player)))
                 continue;
 
-            _jobs.MindTryGetJobName(player, out var jobName);
+            _jobs.MindTryGetJobName(mindId, out var jobName);
 
             if (ent.Comp.Contracts is { Count: >= 5 })
                 return;
diff --git a/Content.Shared/SS220/Contractor/ContractorMessagesUi.cs b/Content.Shared/SS220/Contractor/ContractorMessagesUi.cs
index dc0585f9fe70..be8602cb49a6 100644
--- a/Content.Shared/SS220/Contractor/ContractorMessagesUi.cs
+++ b/Content.Shared/SS220/Contractor/ContractorMessagesUi.cs
@@ -4,34 +4,39 @@
 namespace Content.Shared.SS220.Contractor;
 
 [Serializable, NetSerializable]
-public sealed class ContractorGenerateContractsMessage : BoundUserInterfaceMessage
+public sealed class ContractorExecutionBoundUserInterfaceState : BoundUserInterfaceState
 {
+    public bool IsEnabled;
+
+    public ContractorExecutionBoundUserInterfaceState(bool isEnabled)
+    {
+        IsEnabled = isEnabled;
+    }
 }
 
 [Serializable, NetSerializable]
-public sealed class ContractorUpdateStatsMessage : BoundUserInterfaceMessage
+public sealed class ContractorUpdateContractsMessage : BoundUserInterfaceMessage
 {
 }
 
 [Serializable, NetSerializable]
-public sealed class ContractorCompletedContractMessage : BoundUserInterfaceMessage
+public sealed class ContractorGenerateContractsMessage : BoundUserInterfaceMessage
 {
 }
 
 [Serializable, NetSerializable]
-public sealed class ContractorExecutionButtonPressedMessage : BoundUserInterfaceMessage
+public sealed class ContractorUpdateStatsMessage : BoundUserInterfaceMessage
 {
 }
 
 [Serializable, NetSerializable]
-public sealed class ContractorUpdateButtonStateMessage : BoundUserInterfaceMessage
+public sealed class ContractorCompletedContractMessage : BoundUserInterfaceMessage
 {
-    public bool IsEnabled { get; }
+}
 
-    public ContractorUpdateButtonStateMessage(bool isEnabled)
-    {
-        IsEnabled = isEnabled;
-    }
+[Serializable, NetSerializable]
+public sealed class ContractorExecutionButtonPressedMessage : BoundUserInterfaceMessage
+{
 }
 
 [Serializable, NetSerializable]
diff --git a/Content.Shared/SS220/Contractor/SharedContractorSystem.cs b/Content.Shared/SS220/Contractor/SharedContractorSystem.cs
index a9ed718f69c0..5c7ff18f4e58 100644
--- a/Content.Shared/SS220/Contractor/SharedContractorSystem.cs
+++ b/Content.Shared/SS220/Contractor/SharedContractorSystem.cs
@@ -37,9 +37,14 @@ private void OnOpenUI(Entity<ContractorPdaComponent> ent, ref BoundUIOpenedEvent
         if (ent.Comp.PdaOwner != null)
             return;
 
-        if (!HasComp<ContractorComponent>(args.Actor))
+        if (!TryComp<ContractorComponent>(args.Actor, out var contractorComponent))
             return;
 
+        if (contractorComponent.PdaEntity != null)
+            return;
+
+        contractorComponent.PdaEntity = GetNetEntity(ent.Owner);
+
         ent.Comp.PdaOwner = GetNetEntity(args.Actor);
 
         Dirty(ent);
@@ -74,7 +79,7 @@ private void OnBuyItem(Entity<ContractorPdaComponent> ent, ref ContractorHubBuyI
         return !TryComp<ContractorPdaComponent>(pdaEntity, out var contractorPdaComponent) ? null : contractorPdaComponent.Contracts;
     }
 
-    public void AddContractsToPda(EntityUid contractor, EntityUid pdaEntity)
+    private void AddContractsToPda(EntityUid contractor, EntityUid pdaEntity)
     {
         if (!TryComp<ContractorPdaComponent>(pdaEntity, out var contractorPdaComponent))
             return;

From d4cdfcce7c5e7fcc1132d133279d30fb15f92fd5 Mon Sep 17 00:00:00 2001
From: ReeZer2 <omfgdamndude.dude@gmail.com>
Date: Thu, 2 Jan 2025 12:52:25 +0200
Subject: [PATCH 08/12] little fixes, some loc, summaries

---
 .../ContractorPortalServerSystem.cs           | 15 +++----
 .../Contractor/ContractorServerSystem.cs      | 42 ++++++++++++++-----
 .../ContractorPortalOnTriggerComponent.cs     |  2 +-
 .../Contractor/ContractorTargetComponent.cs   |  2 +-
 .../SharedContractorItemPrototype.cs          |  2 +-
 .../Contractor/SharedContractorSystem.cs      | 23 +++++++++-
 .../ru-RU/ss220/contractor/contractor.ftl     |  3 ++
 .../SS220/Antags/contractor_items.yml         |  1 -
 8 files changed, 66 insertions(+), 24 deletions(-)

diff --git a/Content.Server/SS220/Contractor/ContractorPortalServerSystem.cs b/Content.Server/SS220/Contractor/ContractorPortalServerSystem.cs
index ed28854282c9..6e0fad0b7462 100644
--- a/Content.Server/SS220/Contractor/ContractorPortalServerSystem.cs
+++ b/Content.Server/SS220/Contractor/ContractorPortalServerSystem.cs
@@ -5,9 +5,6 @@
 
 namespace Content.Server.SS220.Contractor;
 
-/// <summary>
-/// This handles...
-/// </summary>
 public sealed class ContractorPortalServerSystem : EntitySystem
 {
     [Dependency] private readonly IGameTiming _timing = default!;
@@ -21,11 +18,14 @@ public override void Initialize()
         SubscribeLocalEvent<ContractorPortalOnTriggerComponent, StartCollideEvent>(OnEnterPortal);
     }
 
+    /// <summary>
+    /// This is used for what doing when player enter portal
+    /// </summary>
     private void OnEnterPortal(Entity<ContractorPortalOnTriggerComponent> ent, ref StartCollideEvent args)
     {
         if (!TryComp<ContractorTargetComponent>(args.OtherEntity, out var targetComponent))
         {
-            _popup.PopupClient("Портал недоступен для вас", args.OtherEntity, PopupType.Medium);
+            _popup.PopupClient(Loc.GetString("contractor-portal-for-non-target"), args.OtherEntity, PopupType.Medium);
             return;
         }
 
@@ -56,7 +56,7 @@ private void OnEnterPortal(Entity<ContractorPortalOnTriggerComponent> ent, ref S
 
         if (needsPortalEntity != args.OurEntity)
         {
-            _popup.PopupClient("Этот портал предназначен не для этой цели", args.OtherEntity, PopupType.Medium);
+            _popup.PopupClient(Loc.GetString("contractor-portal-for-another-target"), args.OtherEntity, PopupType.Medium);
             return;
         }
 
@@ -67,9 +67,10 @@ private void OnEnterPortal(Entity<ContractorPortalOnTriggerComponent> ent, ref S
         _uiSystem.ServerSendUiMessage(GetEntity(contractorComponent.PdaEntity)!.Value, ContractorPdaKey.Key, new ContractorUpdateStatsMessage());
         _uiSystem.ServerSendUiMessage(GetEntity(contractorComponent.PdaEntity)!.Value, ContractorPdaKey.Key, new ContractorCompletedContractMessage());
 
-        _contractorServer.GenerateContracts((contractorEntity, contractorComponent));
+        _contractorServer.GenerateContracts((contractorEntity, contractorComponent)); // generate new contracts
 
-        _transformSystem.SetCoordinates(args.OtherEntity, Transform(contractorEntity).Coordinates); // tp target to other map in future
+        // TODO: create new warp point for another map (tajpan???)
+        _transformSystem.SetCoordinates(args.OtherEntity, Transform(contractorEntity).Coordinates);
 
         Dirty(contractorPdaEntity, contractorPdaComponent);
         Dirty(contractorEntity, contractorComponent);
diff --git a/Content.Server/SS220/Contractor/ContractorServerSystem.cs b/Content.Server/SS220/Contractor/ContractorServerSystem.cs
index ac13187fc2eb..b81b1cd91b3a 100644
--- a/Content.Server/SS220/Contractor/ContractorServerSystem.cs
+++ b/Content.Server/SS220/Contractor/ContractorServerSystem.cs
@@ -75,11 +75,17 @@ public override void Update(float frameTime)
         }
     }
 
+    /// <summary>
+    /// Generate contracts on server, once time while called CompInit event
+    /// </summary>
     private void OnContractorCompInit(Entity<ContractorComponent> ent, ref ComponentInit ev)
     {
         GenerateContracts(ent);
     }
 
+    /// <summary>
+    /// Handle open portal event
+    /// </summary>
     private void OnOpenPortalEvent(Entity<ContractorComponent> ent, ref OpenPortalContractorEvent args)
     {
         if (!TryComp<ContractorTargetComponent>(GetEntity(ent.Comp.CurrentContractEntity), out var target))
@@ -97,6 +103,9 @@ private void OnOpenPortalEvent(Entity<ContractorComponent> ent, ref OpenPortalCo
     }
 
     //TODO server and checks
+    /// <summary>
+    /// Raised when clicked on position button on pda
+    /// </summary>
     private void OnNewContractAccepted(Entity<ContractorPdaComponent> ent, ref ContractorNewContractAcceptedMessage ev)
     {
         if (!TryComp<ContractorComponent>(ev.Actor, out var contractorComponent))
@@ -110,9 +119,7 @@ private void OnNewContractAccepted(Entity<ContractorPdaComponent> ent, ref Contr
 
         EnsureComp<ContractorTargetComponent>(GetEntity(ev.ContractEntity), out var target);
 
-        //Only for test
-        /*
-        if (target.AmountTc > 8)
+        if (target.AmountTc > 8 || ev.TcReward > 8)
         {
             _adminLogger.Add(
                 LogType.Action,
@@ -121,7 +128,6 @@ private void OnNewContractAccepted(Entity<ContractorPdaComponent> ent, ref Contr
 
             return;
         }
-        */
 
         target.PortalPosition = Transform(GetEntity(ev.WarpPointEntity)).Coordinates;
         target.AmountTc = ev.TcReward;
@@ -131,7 +137,7 @@ private void OnNewContractAccepted(Entity<ContractorPdaComponent> ent, ref Contr
 
         contractorComponent.CurrentContractData = ev.ContractData;
         contractorComponent.CurrentContractEntity = ev.ContractEntity;
-        contractorComponent.PdaEntity = ev.Entity;
+        //contractorComponent.PdaEntity = ev.Entity; //why this shit here?
 
         Dirty(ev.Actor, contractorComponent);
 
@@ -145,7 +151,9 @@ private void OnNewContractAccepted(Entity<ContractorPdaComponent> ent, ref Contr
         HandleContractAccepted(ev.ContractEntity, ev.Actor);
     }
 
-    // TODO on server //DONE
+    /// <summary>
+    /// Raised when clicked on execute button, then doAfter, then open portal.
+    /// </summary>
     private void OnExecuteContract(Entity<ContractorPdaComponent> ent, ref ContractorExecutionButtonPressedMessage ev)
     {
         var entity = GetEntity(ent.Comp.CurrentContractEntity);
@@ -195,6 +203,11 @@ private void OnBuyContractorKit(StoreBuyListingMessage ev)
         EnsureComp<ContractorComponent>(ev.Actor);
     }
 
+    /// <summary>
+    /// When contractor accepts new contract, remove this contract from other contractors and generate another contract for them
+    /// </summary>
+    /// <param name="acceptedPlayer">Target, on what contractor accepted</param>
+    /// <param name="contractor">Contractor, who accepted</param>
     public void HandleContractAccepted(NetEntity acceptedPlayer, EntityUid contractor)
     {
         var query = EntityQueryEnumerator<ContractorComponent>();
@@ -210,7 +223,7 @@ public void HandleContractAccepted(NetEntity acceptedPlayer, EntityUid contracto
             if (contractorComp.Contracts.Count >= 5)
                 continue;
 
-            var newContract = GenerateContractForContractor(uid);
+            var newContract = GenerateContractForContractor((uid, contractorComp));
 
             if (newContract != null)
             {
@@ -223,7 +236,12 @@ public void HandleContractAccepted(NetEntity acceptedPlayer, EntityUid contracto
         }
     }
 
-    private (NetEntity Target, ContractorContract Contract)? GenerateContractForContractor(EntityUid contractor)
+    /// <summary>
+    /// Generate a new contract or contracts for contractors, if another contractor has accepted their contract
+    /// </summary>
+    /// <param name="contractor"></param>
+    /// <returns></returns>
+    private (NetEntity Target, ContractorContract Contract)? GenerateContractForContractor(Entity<ContractorComponent> contractor)
     {
         var playerPool = _playerManager.Sessions
             .Where(p => p is { Status: SessionStatus.InGame, AttachedEntity: not null })
@@ -242,6 +260,9 @@ public void HandleContractAccepted(NetEntity acceptedPlayer, EntityUid contracto
                 continue;
             }
 
+            if (contractor.Comp.Contracts.ContainsKey(GetNetEntity(player)))
+                continue;
+
             if (!_mindSystem.TryGetMind(player, out var mindId, out _))
                 continue;
 
@@ -336,7 +357,7 @@ public void GenerateContracts(Entity<ContractorComponent> ent)
         return allLocations;
     }
 
-    public bool IsCloseWithPosition(NetEntity playerNet)
+    private bool IsCloseWithPosition(NetEntity playerNet)
     {
         var player = GetEntity(playerNet);
 
@@ -357,10 +378,9 @@ public bool IsCloseWithPosition(NetEntity playerNet)
 
         var targetPortalPosition = targetComponent.PortalPosition.Position;
 
-
         var isPlayerCloseToPortal = (playerPosition - targetPortalPosition).Length() < 1f;
         var isTargetCloseToPortal = (targetPosition - targetPortalPosition).Length() < 1f;
 
-        return isPlayerCloseToPortal && isTargetCloseToPortal; //tile distance
+        return isPlayerCloseToPortal && isTargetCloseToPortal;
     }
 }
diff --git a/Content.Shared/SS220/Contractor/ContractorPortalOnTriggerComponent.cs b/Content.Shared/SS220/Contractor/ContractorPortalOnTriggerComponent.cs
index 04b0cc734a20..96535ab9d3c5 100644
--- a/Content.Shared/SS220/Contractor/ContractorPortalOnTriggerComponent.cs
+++ b/Content.Shared/SS220/Contractor/ContractorPortalOnTriggerComponent.cs
@@ -3,7 +3,7 @@
 namespace Content.Shared.SS220.Contractor;
 
 /// <summary>
-/// This is used for...
+/// This is used for marking a portal.
 /// </summary>
 [RegisterComponent]
 [NetworkedComponent]
diff --git a/Content.Shared/SS220/Contractor/ContractorTargetComponent.cs b/Content.Shared/SS220/Contractor/ContractorTargetComponent.cs
index 49198e0854ce..756aeb4b6db0 100644
--- a/Content.Shared/SS220/Contractor/ContractorTargetComponent.cs
+++ b/Content.Shared/SS220/Contractor/ContractorTargetComponent.cs
@@ -6,7 +6,7 @@
 namespace Content.Shared.SS220.Contractor;
 
 /// <summary>
-/// This is used for...
+/// This is used for marking target for contractor.
 /// </summary>
 [RegisterComponent]
 [NetworkedComponent]
diff --git a/Content.Shared/SS220/Contractor/SharedContractorItemPrototype.cs b/Content.Shared/SS220/Contractor/SharedContractorItemPrototype.cs
index e607ae02c36c..257ce1b1e8d7 100644
--- a/Content.Shared/SS220/Contractor/SharedContractorItemPrototype.cs
+++ b/Content.Shared/SS220/Contractor/SharedContractorItemPrototype.cs
@@ -5,7 +5,7 @@
 namespace Content.Shared.SS220.Contractor;
 
 /// <summary>
-/// This is a prototype for...
+/// This is a prototype for contractor items in uplink.
 /// </summary>
 [Serializable, NetSerializable, Prototype("contractorItems")]
 public sealed partial class SharedContractorItemPrototype : IPrototype
diff --git a/Content.Shared/SS220/Contractor/SharedContractorSystem.cs b/Content.Shared/SS220/Contractor/SharedContractorSystem.cs
index 5c7ff18f4e58..6c08de656a0e 100644
--- a/Content.Shared/SS220/Contractor/SharedContractorSystem.cs
+++ b/Content.Shared/SS220/Contractor/SharedContractorSystem.cs
@@ -13,12 +13,17 @@ public abstract class SharedContractorSystem : EntitySystem
 
     public override void Initialize()
     {
-        SubscribeLocalEvent<ContractorPdaComponent, ComponentInit>(OnContractorPdaMapInit);
+        SubscribeLocalEvent<ContractorPdaComponent, ComponentInit>(OnContractorPdaCompInit);
         SubscribeLocalEvent<ContractorPdaComponent, BoundUIOpenedEvent>(OnOpenUI);
         SubscribeLocalEvent<ContractorPdaComponent, ContractorHubBuyItemMessage>(OnBuyItem);
     }
 
-    private void OnContractorPdaMapInit(Entity<ContractorPdaComponent> ent, ref ComponentInit args)
+    /// <summary>
+    /// On CompInit pda generate available items
+    /// </summary>
+    /// <param name="ent">Entity pda</param>
+    /// <param name="args">Event</param>
+    private void OnContractorPdaCompInit(Entity<ContractorPdaComponent> ent, ref ComponentInit args)
     {
         if (ent.Comp.AvailableItems.Count > 0)
             return;
@@ -32,6 +37,10 @@ private void OnContractorPdaMapInit(Entity<ContractorPdaComponent> ent, ref Comp
         }
     }
 
+    /// <summary>
+    /// Will generate a pda owner once for the person who first opened it
+    /// </summary>
+    /// <param name="ent">PDA entity</param>
     private void OnOpenUI(Entity<ContractorPdaComponent> ent, ref BoundUIOpenedEvent args)
     {
         if (ent.Comp.PdaOwner != null)
@@ -50,6 +59,9 @@ private void OnOpenUI(Entity<ContractorPdaComponent> ent, ref BoundUIOpenedEvent
         Dirty(ent);
     }
 
+    /// <summary>
+    /// Raise event for buying an item, but only if buyer is pda owner
+    /// </summary>
     private void OnBuyItem(Entity<ContractorPdaComponent> ent, ref ContractorHubBuyItemMessage ev)
     {
         if (!TryComp<ContractorComponent>(ev.Actor, out var contractorComponent))
@@ -72,6 +84,10 @@ private void OnBuyItem(Entity<ContractorPdaComponent> ent, ref ContractorHubBuyI
         Dirty(ev.Actor, contractorComponent);
     }
 
+    /// <summary>
+    /// Used in bound ui on client, to get contracts for pda
+    /// </summary>
+    /// <returns>Return dictionary of contracts</returns>
     public Dictionary<NetEntity, ContractorContract>? GetContractsForPda(EntityUid contractor, EntityUid pdaEntity)
     {
         AddContractsToPda(contractor, pdaEntity);
@@ -91,6 +107,9 @@ private void AddContractsToPda(EntityUid contractor, EntityUid pdaEntity)
 
 }
 
+/// <summary>
+/// Event for opening a portal
+/// </summary>
 [Serializable, NetSerializable]
 public sealed partial class OpenPortalContractorEvent : DoAfterEvent
 {
diff --git a/Resources/Locale/ru-RU/ss220/contractor/contractor.ftl b/Resources/Locale/ru-RU/ss220/contractor/contractor.ftl
index 85a1de3f9b65..7556f4e80e3e 100644
--- a/Resources/Locale/ru-RU/ss220/contractor/contractor.ftl
+++ b/Resources/Locale/ru-RU/ss220/contractor/contractor.ftl
@@ -1,3 +1,6 @@
 contractor-uplink-current-reputation = Текущая репутация: {$currentReputation}
 contractor-uplink-current-tc = Имеется ТК: {$amountTc}
 contractor-uplink-current-contracts-completed = Выполнено контрактов: {$amountContractsCompleted}
+
+contractor-portal-for-non-target = Портал недоступен для вас
+contractor-portal-for-another-target = Этот портал предназначен не для этой цели
diff --git a/Resources/Prototypes/SS220/Antags/contractor_items.yml b/Resources/Prototypes/SS220/Antags/contractor_items.yml
index d8a7c6ccc556..2c2aa0db2f8d 100644
--- a/Resources/Prototypes/SS220/Antags/contractor_items.yml
+++ b/Resources/Prototypes/SS220/Antags/contractor_items.yml
@@ -34,7 +34,6 @@
       shape:
         - 0,0,2,2
     - type: Storage
-      maxItemSize: Small
       grid:
         - 0,0,6,4
     - type: Sprite

From 08e75486e7a0d37605c8e49f1936fd913547e03d Mon Sep 17 00:00:00 2001
From: ReeZer2 <omfgdamndude.dude@gmail.com>
Date: Sat, 4 Jan 2025 14:37:08 +0200
Subject: [PATCH 09/12] new listing condition

---
 .../Contractor/UI/ContractorPDAMenu.xaml      |  2 +-
 .../Store/Conditions/BuyBeforeCondition.cs    | 38 +++++++++++++++----
 .../SS220/Catalog/uplink_catalog.yml          |  2 +
 3 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/Content.Client/SS220/Contractor/UI/ContractorPDAMenu.xaml b/Content.Client/SS220/Contractor/UI/ContractorPDAMenu.xaml
index 2411faf073bd..f6ac92b103ac 100644
--- a/Content.Client/SS220/Contractor/UI/ContractorPDAMenu.xaml
+++ b/Content.Client/SS220/Contractor/UI/ContractorPDAMenu.xaml
@@ -18,7 +18,7 @@
                 <ui220:SpriteButton Name="WithdrawButton" Margin="0 133 255 0" VerticalAlignment="Top" SetSize="138 35" StyleClasses="ContractorWithdrawButton"/>
                 <ui220:SpriteButton Name="ContractsButton" Margin="0 218 269 0" VerticalAlignment="Top" MaxSize="138 35" StyleClasses="ContractorContractsButton"/>
                 <ui220:SpriteButton Name="HubButton" Margin="20 218 0 0" VerticalAlignment="Top" MaxSize="138 35" StyleClasses="ContractorHubButton"/>
-                <ui220:SpriteButton Name="ExecutionButton" Access="Public" Margin="321 184 0 0" VerticalAlignment="Top" MaxSize="138 40" StyleClasses="ContractorExecutionButton"/>
+                <ui220:SpriteButton Name="ExecutionButton" Access="Public" Disabled="True" Margin="321 184 0 0" VerticalAlignment="Top" MaxSize="138 40" StyleClasses="ContractorExecutionButton"/>
                 <ScrollContainer Name="ContractsList" Margin="51 260 50 51" VScrollEnabled="True" HorizontalExpand="True" VerticalExpand="True" HScrollEnabled="False">
                     <BoxContainer Name="ContractsListPanel" Orientation="Vertical" Access="Public" SeparationOverride="5"  HorizontalExpand="True" VerticalExpand="False"/>
                     <BoxContainer Name="HubPanel" Visible="False" Orientation="Vertical" Access="Public" SeparationOverride="5"  HorizontalExpand="True" VerticalExpand="False"/>
diff --git a/Content.Server/Store/Conditions/BuyBeforeCondition.cs b/Content.Server/Store/Conditions/BuyBeforeCondition.cs
index fcfb5f92c9d0..2800ecb808a7 100644
--- a/Content.Server/Store/Conditions/BuyBeforeCondition.cs
+++ b/Content.Server/Store/Conditions/BuyBeforeCondition.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using Content.Shared.Store;
 using Content.Shared.Store.Components;
 using Robust.Shared.Prototypes;
@@ -6,11 +7,19 @@ namespace Content.Server.Store.Conditions;
 
 public sealed partial class BuyBeforeCondition : ListingCondition
 {
+    //ss220 blocking all listings, if any other listing was bought start
     /// <summary>
     ///     Required listing(s) needed to purchase before this listing is available
     /// </summary>
-    [DataField(required: true)]
-    public HashSet<ProtoId<ListingPrototype>> Whitelist;
+    [DataField]
+    public HashSet<ProtoId<ListingPrototype>>? Whitelist;
+
+    /// <summary>
+    /// If true, block to buy listing if any other listing was bought
+    /// </summary>
+    [DataField]
+    public bool BlacklistAll;
+    //ss220 blocking all listings, if any other listing was bought end
 
     /// <summary>
     ///     Listing(s) that if bought, block this purchase, if any.
@@ -24,7 +33,15 @@ public override bool Condition(ListingConditionArgs args)
 
         var allListings = storeComp.FullListingsCatalog;
 
-        var purchasesFound = false;
+        //ss220 blocking all listings, if any other listing was bought start
+        if (BlacklistAll)
+        {
+            if (allListings.Any(listing => listing.PurchaseAmount > 0))
+                return false;
+        }
+
+        var purchasesFound = true;
+        //ss220 blocking all listings, if any other listing was bought end
 
         if (Blacklist != null)
         {
@@ -38,17 +55,22 @@ public override bool Condition(ListingConditionArgs args)
             }
         }
 
-        foreach (var requiredListing in Whitelist)
+        //ss220 blocking all listings, if any other listing was bought start
+        if (Whitelist != null)
         {
-            foreach (var listing in allListings)
+            foreach (var requiredListing in Whitelist)
             {
-                if (listing.ID == requiredListing.Id)
+                foreach (var listing in allListings)
                 {
-                    purchasesFound = listing.PurchaseAmount > 0;
-                    break;
+                    if (listing.ID == requiredListing.Id)
+                    {
+                        purchasesFound = listing.PurchaseAmount > 0;
+                        break;
+                    }
                 }
             }
         }
+        //ss220 blocking all listings, if any other listing was bought end
 
         return purchasesFound;
     }
diff --git a/Resources/Prototypes/SS220/Catalog/uplink_catalog.yml b/Resources/Prototypes/SS220/Catalog/uplink_catalog.yml
index c981095a2f55..41905dfd3889 100644
--- a/Resources/Prototypes/SS220/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/SS220/Catalog/uplink_catalog.yml
@@ -253,6 +253,8 @@
   conditions:
     - !type:ListingLimitedStockCondition
       stock: 1
+    - !type:BuyBeforeCondition #block buy listing, if any other listing was bought
+      blacklistAll: true
     - !type:StoreWhitelistCondition
       blacklist:
         tags:

From ab58cd1c5ae9005783b3d98928303ef7d9f75b72 Mon Sep 17 00:00:00 2001
From: ReeZer2 <omfgdamndude.dude@gmail.com>
Date: Mon, 6 Jan 2025 20:49:36 +0200
Subject: [PATCH 10/12] add abort button, some refactor, etc

---
 .../UI/ContractorBoundUserInterface.cs        | 33 ++++++++++++---
 .../Contractor/ContractorServerSystem.cs      | 41 +++++++++++++++++--
 .../SS220/Contractor/ContractorComponent.cs   |  2 +
 .../SS220/Contractor/ContractorMessagesUi.cs  | 11 +++++
 .../Contractor/SharedContractorSystem.cs      | 22 ----------
 5 files changed, 78 insertions(+), 31 deletions(-)

diff --git a/Content.Client/SS220/Contractor/UI/ContractorBoundUserInterface.cs b/Content.Client/SS220/Contractor/UI/ContractorBoundUserInterface.cs
index c87f06fb0366..90a2abdbbcb8 100644
--- a/Content.Client/SS220/Contractor/UI/ContractorBoundUserInterface.cs
+++ b/Content.Client/SS220/Contractor/UI/ContractorBoundUserInterface.cs
@@ -52,7 +52,7 @@ protected override void ReceiveMessage(BoundUserInterfaceMessage message)
         {
             case ContractorUpdateStatsMessage:
                 UpdateStats();
-                UpdateContracts(EntMan.GetEntity(_contractorPdaComponent.PdaOwner)!.Value, Owner);
+                UpdateContracts(EntMan.GetEntity(_contractorPdaComponent.PdaOwner)!.Value);
                 break;
 
             case ContractorCompletedContractMessage:
@@ -84,7 +84,7 @@ protected override void Open()
 
         UpdateStats();
 
-        UpdateContracts(_playerManager.LocalSession.AttachedEntity.Value, Owner);
+        UpdateContracts(_playerManager.LocalSession.AttachedEntity.Value);
         UpdateHub(_contractorPdaComponent.AvailableItems);
     }
 
@@ -123,16 +123,16 @@ private void UpdateStats()
             Loc.GetString("contractor-uplink-current-contracts-completed", ("amountContractsCompleted", _contractorComponent.ContractsCompleted));
     }
 
-    private void UpdateContracts(EntityUid contractor, EntityUid pda)
+    private void UpdateContracts(EntityUid player)
     {
         if (_menu == null)
             return;
 
         _menu.ContractsListPanel.RemoveAllChildren();
 
-        var contracts = _contractorSystem.GetContractsForPda(contractor, pda);
+        var contracts = _contractorComponent!.Contracts;
 
-        if (contracts is null)
+        if (_contractorPdaComponent.PdaOwner != EntMan.GetNetEntity(player))
             return;
 
         foreach (var contract in contracts)
@@ -223,8 +223,29 @@ private void AddContract(NetEntity key, ContractorContract contract)
         var isAlreadyAccepted = _contractorPdaComponent.CurrentContractEntity is not null &&
                                 _contractorPdaComponent.CurrentContractData is not null; // todo only on server
 
+        var abortButton = new Button()
+        {
+            VerticalExpand = false,
+            HorizontalExpand = false,
+            Visible = false,
+            MaxSize = new Vector2(100, 30),
+        };
+
+        abortButton.OnPressed += _ =>
+        {
+            SendMessage(new ContractorAbortContractMessage(key));
+            topContainer.RemoveChild(abortButton);
+        };
+
+        topContainer.AddChild(abortButton);
+
         foreach (var amountPosition in contract.AmountPositions)
         {
+            if (_contractorPdaComponent.CurrentContractEntity == key)
+            {
+                abortButton.Visible = true;
+            }
+
             var positionButton = new Button
             {
                 Text = $"{amountPosition.Location} ({amountPosition.TcReward} ТК) ({amountPosition.Difficulty})",
@@ -242,6 +263,8 @@ private void AddContract(NetEntity key, ContractorContract contract)
                     amountPosition.TcReward,
                     amountPosition.Uid));
 
+                abortButton.Visible = true;
+
                 foreach (var buttons in _allPositionButtons)
                 {
                     buttons.Disabled = true;
diff --git a/Content.Server/SS220/Contractor/ContractorServerSystem.cs b/Content.Server/SS220/Contractor/ContractorServerSystem.cs
index b81b1cd91b3a..08a0381172a8 100644
--- a/Content.Server/SS220/Contractor/ContractorServerSystem.cs
+++ b/Content.Server/SS220/Contractor/ContractorServerSystem.cs
@@ -47,6 +47,7 @@ public override void Initialize()
         SubscribeLocalEvent<ContractorPdaComponent, ContractorNewContractAcceptedMessage>(OnNewContractAccepted);
         SubscribeLocalEvent<ContractorPdaComponent, ContractorWithdrawTcMessage>(OnWithdrawTc);
         SubscribeLocalEvent<ContractorPdaComponent, ContractorExecutionButtonPressedMessage>(OnExecuteContract);
+        SubscribeLocalEvent<ContractorPdaComponent, ContractorAbortContractMessage>(AbortContract);
 
         SubscribeLocalEvent<StoreBuyListingMessage>(OnBuyContractorKit);
     }
@@ -220,7 +221,7 @@ public void HandleContractAccepted(NetEntity acceptedPlayer, EntityUid contracto
             if (!contractorComp.Contracts.Remove(acceptedPlayer))
                 continue;
 
-            if (contractorComp.Contracts.Count >= 5)
+            if (contractorComp.Contracts.Count >= contractorComp.MaxAvailableContracts)
                 continue;
 
             var newContract = GenerateContractForContractor((uid, contractorComp));
@@ -269,7 +270,7 @@ public void HandleContractAccepted(NetEntity acceptedPlayer, EntityUid contracto
             if (_roleSystem.MindHasRole<TraitorRoleComponent>(mindId))
                 continue;
 
-            _jobs.MindTryGetJobName(mindId, out var jobName);
+            _jobs.MindTryGetJobName(mindId, out var jobName); // && jobName == "JobCaptain" - disable for testing
 
             return (GetNetEntity(player),
                 new ContractorContract
@@ -310,9 +311,9 @@ public void GenerateContracts(Entity<ContractorComponent> ent)
             if (ent.Comp.Contracts.ContainsKey(GetNetEntity(player)))
                 continue;
 
-            _jobs.MindTryGetJobName(mindId, out var jobName);
+            _jobs.MindTryGetJobName(mindId, out var jobName); // && jobName == "JobCaptain" - disable for testing
 
-            if (ent.Comp.Contracts is { Count: >= 5 })
+            if (ent.Comp.Contracts.Count == ent.Comp.MaxAvailableContracts)
                 return;
 
             ent.Comp.Contracts.Add(GetNetEntity(player),
@@ -383,4 +384,36 @@ private bool IsCloseWithPosition(NetEntity playerNet)
 
         return isPlayerCloseToPortal && isTargetCloseToPortal;
     }
+
+    private void AbortContract(Entity<ContractorPdaComponent> ent, ref ContractorAbortContractMessage ev)
+    {
+        var pdaOwner = GetEntity(ent.Comp.PdaOwner);
+
+        if (ev.Actor != pdaOwner)
+            return;
+
+        if (!TryComp<ContractorComponent>(pdaOwner, out var contractorComponent))
+            return;
+
+        if (!contractorComponent.Contracts.Remove(ev.ContractEntity))
+            return;
+
+        _adminLogger.Add(
+            LogType.Action,
+            LogImpact.High,
+            $"Contractor {ev.Actor} aborted unknown contract {ev.ContractEntity}");
+
+        contractorComponent.MaxAvailableContracts--;
+        contractorComponent.Reputation--;
+        contractorComponent.CurrentContractEntity = null;
+        contractorComponent.CurrentContractData = null;
+
+        ent.Comp.CurrentContractEntity = null;
+        ent.Comp.CurrentContractData = null;
+
+        _uiSystem.ServerSendUiMessage(ent.Owner, ContractorPdaKey.Key, new ContractorUpdateStatsMessage());
+
+        Dirty(ent);
+        Dirty(pdaOwner.Value, contractorComponent);
+    }
 }
diff --git a/Content.Shared/SS220/Contractor/ContractorComponent.cs b/Content.Shared/SS220/Contractor/ContractorComponent.cs
index 2ea9278139b3..7c0ba88bca8a 100644
--- a/Content.Shared/SS220/Contractor/ContractorComponent.cs
+++ b/Content.Shared/SS220/Contractor/ContractorComponent.cs
@@ -41,6 +41,8 @@ public sealed partial class ContractorComponent : Component
     public int ContractsCompleted = 0;
 
     public readonly int ReputationAward = 2;
+
+    public int MaxAvailableContracts = 5;
 }
 
 [Serializable]
diff --git a/Content.Shared/SS220/Contractor/ContractorMessagesUi.cs b/Content.Shared/SS220/Contractor/ContractorMessagesUi.cs
index be8602cb49a6..5f7d77da373e 100644
--- a/Content.Shared/SS220/Contractor/ContractorMessagesUi.cs
+++ b/Content.Shared/SS220/Contractor/ContractorMessagesUi.cs
@@ -56,6 +56,17 @@ public ContractorNewContractAcceptedMessage(NetEntity contractEntity, Contractor
     }
 }
 
+[Serializable, NetSerializable]
+public sealed class ContractorAbortContractMessage : BoundUserInterfaceMessage
+{
+    public NetEntity ContractEntity;
+
+    public ContractorAbortContractMessage(NetEntity contractEntity)
+    {
+        ContractEntity = contractEntity;
+    }
+}
+
 [Serializable, NetSerializable]
 public sealed class ContractorHubBuyItemMessage : BoundUserInterfaceMessage
 {
diff --git a/Content.Shared/SS220/Contractor/SharedContractorSystem.cs b/Content.Shared/SS220/Contractor/SharedContractorSystem.cs
index 6c08de656a0e..17b54c6e32fb 100644
--- a/Content.Shared/SS220/Contractor/SharedContractorSystem.cs
+++ b/Content.Shared/SS220/Contractor/SharedContractorSystem.cs
@@ -83,28 +83,6 @@ private void OnBuyItem(Entity<ContractorPdaComponent> ent, ref ContractorHubBuyI
 
         Dirty(ev.Actor, contractorComponent);
     }
-
-    /// <summary>
-    /// Used in bound ui on client, to get contracts for pda
-    /// </summary>
-    /// <returns>Return dictionary of contracts</returns>
-    public Dictionary<NetEntity, ContractorContract>? GetContractsForPda(EntityUid contractor, EntityUid pdaEntity)
-    {
-        AddContractsToPda(contractor, pdaEntity);
-
-        return !TryComp<ContractorPdaComponent>(pdaEntity, out var contractorPdaComponent) ? null : contractorPdaComponent.Contracts;
-    }
-
-    private void AddContractsToPda(EntityUid contractor, EntityUid pdaEntity)
-    {
-        if (!TryComp<ContractorPdaComponent>(pdaEntity, out var contractorPdaComponent))
-            return;
-        if (!TryComp<ContractorComponent>(contractor, out var contractorComponent))
-            return;
-
-        contractorPdaComponent.Contracts = contractorComponent.Contracts;
-    }
-
 }
 
 /// <summary>

From ce8339b0e5f864a788f40535bb74d3a5f5b57923 Mon Sep 17 00:00:00 2001
From: ReeZer2 <omfgdamndude.dude@gmail.com>
Date: Thu, 9 Jan 2025 18:23:22 +0200
Subject: [PATCH 11/12] little fixes

---
 Content.Server/SS220/Contractor/ContractorServerSystem.cs | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/Content.Server/SS220/Contractor/ContractorServerSystem.cs b/Content.Server/SS220/Contractor/ContractorServerSystem.cs
index 08a0381172a8..1ebd10a3f9fc 100644
--- a/Content.Server/SS220/Contractor/ContractorServerSystem.cs
+++ b/Content.Server/SS220/Contractor/ContractorServerSystem.cs
@@ -64,7 +64,7 @@ public override void Update(float frameTime)
             if (comp.PdaEntity == null)
                 continue;
 
-            var isEnabled = IsCloseWithPosition(GetNetEntity(uid));
+            var isEnabled = IsCloseWithPosition(uid);
 
             if (_uiSystem.IsUiOpen(GetEntity(comp.PdaEntity)!.Value, ContractorPdaKey.Key))
             {
@@ -138,7 +138,6 @@ private void OnNewContractAccepted(Entity<ContractorPdaComponent> ent, ref Contr
 
         contractorComponent.CurrentContractData = ev.ContractData;
         contractorComponent.CurrentContractEntity = ev.ContractEntity;
-        //contractorComponent.PdaEntity = ev.Entity; //why this shit here?
 
         Dirty(ev.Actor, contractorComponent);
 
@@ -358,10 +357,8 @@ public void GenerateContracts(Entity<ContractorComponent> ent)
         return allLocations;
     }
 
-    private bool IsCloseWithPosition(NetEntity playerNet)
+    private bool IsCloseWithPosition(EntityUid player)
     {
-        var player = GetEntity(playerNet);
-
         if (!TryComp<ContractorComponent>(player, out var contractorComponent))
             return false;
 

From 25a4baa545bbd3bdec8c441b4a853bcdb28bef78 Mon Sep 17 00:00:00 2001
From: ReeZer2 <omfgdamndude.dude@gmail.com>
Date: Mon, 20 Jan 2025 10:41:27 +0200
Subject: [PATCH 12/12] changes struct with jobproto, and some little changes

---
 .../Contractor/UI/ContractorBoundUserInterface.cs |  8 +++++---
 .../SS220/Contractor/ContractorServerSystem.cs    | 15 +++++++++++----
 .../SS220/Contractor/ContractorComponent.cs       |  8 +++++---
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/Content.Client/SS220/Contractor/UI/ContractorBoundUserInterface.cs b/Content.Client/SS220/Contractor/UI/ContractorBoundUserInterface.cs
index 90a2abdbbcb8..8f14cea63648 100644
--- a/Content.Client/SS220/Contractor/UI/ContractorBoundUserInterface.cs
+++ b/Content.Client/SS220/Contractor/UI/ContractorBoundUserInterface.cs
@@ -166,7 +166,7 @@ private void AddContract(NetEntity key, ContractorContract contract)
 
         var nameLabel = new RichTextLabel
         {
-            Text = EntMan.GetComponent<MetaDataComponent>(EntMan.GetEntity(key)).EntityName + " - " + contract.Job,
+            Text = EntMan.GetComponent<MetaDataComponent>(EntMan.GetEntity(key)).EntityName + " - " + _prototypeManager.Index(contract.Job).LocalizedName,
             HorizontalExpand = false,
             MaxWidth = 350,
             VerticalAlignment = Control.VAlignment.Center,
@@ -195,6 +195,7 @@ private void AddContract(NetEntity key, ContractorContract contract)
 
             _photoWindow.OnClose += () => _photoWindow = null;
 
+            // TODO: mb new system for entity photo view, which will work on client
             var iconTarget = new EntityPrototypeView
             {
                 Scale = new Vector2(1.5f, 1.5f),
@@ -202,7 +203,7 @@ private void AddContract(NetEntity key, ContractorContract contract)
                 HorizontalAlignment = Control.HAlignment.Center,
             };
 
-            iconTarget.SetEntity(EntMan.GetEntity(key));
+            iconTarget.SetEntity(key);
 
             _photoWindow.AddChild(iconTarget);
             _photoWindow.OpenCentered();
@@ -223,8 +224,9 @@ private void AddContract(NetEntity key, ContractorContract contract)
         var isAlreadyAccepted = _contractorPdaComponent.CurrentContractEntity is not null &&
                                 _contractorPdaComponent.CurrentContractData is not null; // todo only on server
 
-        var abortButton = new Button()
+        var abortButton = new Button
         {
+            Text = "Отмена",
             VerticalExpand = false,
             HorizontalExpand = false,
             Visible = false,
diff --git a/Content.Server/SS220/Contractor/ContractorServerSystem.cs b/Content.Server/SS220/Contractor/ContractorServerSystem.cs
index 1ebd10a3f9fc..91a1754a3665 100644
--- a/Content.Server/SS220/Contractor/ContractorServerSystem.cs
+++ b/Content.Server/SS220/Contractor/ContractorServerSystem.cs
@@ -11,6 +11,7 @@
 using Content.Shared.Ghost;
 using Content.Shared.Mind;
 using Content.Shared.Roles;
+using Content.Shared.Roles.Jobs;
 using Content.Shared.SS220.Contractor;
 using Content.Shared.SSDIndicator;
 using Content.Shared.Store;
@@ -269,12 +270,15 @@ public void HandleContractAccepted(NetEntity acceptedPlayer, EntityUid contracto
             if (_roleSystem.MindHasRole<TraitorRoleComponent>(mindId))
                 continue;
 
-            _jobs.MindTryGetJobName(mindId, out var jobName); // && jobName == "JobCaptain" - disable for testing
+            _jobs.MindTryGetJob(mindId, out var jobProto); // && jobName == "JobCaptain" - disable for testing
+
+            if (jobProto == null)
+                continue;
 
             return (GetNetEntity(player),
                 new ContractorContract
                 {
-                    Job = jobName,
+                    Job = jobProto,
                     AmountPositions = GeneratePositionsForTarget(),
                 });
         }
@@ -310,7 +314,10 @@ public void GenerateContracts(Entity<ContractorComponent> ent)
             if (ent.Comp.Contracts.ContainsKey(GetNetEntity(player)))
                 continue;
 
-            _jobs.MindTryGetJobName(mindId, out var jobName); // && jobName == "JobCaptain" - disable for testing
+            _jobs.MindTryGetJob(mindId, out var jobProto); // && jobName == "JobCaptain" - disable for testing
+
+            if (jobProto == null)
+                continue;
 
             if (ent.Comp.Contracts.Count == ent.Comp.MaxAvailableContracts)
                 return;
@@ -318,7 +325,7 @@ public void GenerateContracts(Entity<ContractorComponent> ent)
             ent.Comp.Contracts.Add(GetNetEntity(player),
                 new ContractorContract
                 {
-                    Job = jobName,
+                    Job = jobProto,
                     AmountPositions = GeneratePositionsForTarget(),
                 });
         }
diff --git a/Content.Shared/SS220/Contractor/ContractorComponent.cs b/Content.Shared/SS220/Contractor/ContractorComponent.cs
index 7c0ba88bca8a..f11466a79d37 100644
--- a/Content.Shared/SS220/Contractor/ContractorComponent.cs
+++ b/Content.Shared/SS220/Contractor/ContractorComponent.cs
@@ -1,5 +1,7 @@
 using Content.Shared.FixedPoint;
+using Content.Shared.Roles;
 using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.SS220.Contractor;
@@ -30,7 +32,7 @@ public sealed partial class ContractorComponent : Component
 
     [DataField]
     [AutoNetworkedField]
-    public int Reputation = 0;
+    public int Reputation;
 
     [DataField]
     [AutoNetworkedField]
@@ -38,7 +40,7 @@ public sealed partial class ContractorComponent : Component
 
     [DataField]
     [AutoNetworkedField]
-    public int ContractsCompleted = 0;
+    public int ContractsCompleted;
 
     public readonly int ReputationAward = 2;
 
@@ -49,6 +51,6 @@ public sealed partial class ContractorComponent : Component
 [NetSerializable]
 public struct ContractorContract
 {
-    public string Job;
+    public ProtoId<JobPrototype> Job;
     public List<(NetEntity Uid, string Location, FixedPoint2 TcReward, Difficulty Difficulty)> AmountPositions;
 }