From b8a2c211aa1c379cb6bbe96f71652ac43ac0ccf0 Mon Sep 17 00:00:00 2001
From: AwareFoxy <vgstecker@gmail.com>
Date: Sat, 9 Nov 2024 00:55:39 +0100
Subject: [PATCH 01/17] =?UTF-8?q?[Feature]=20=D0=A1=D0=B8=D1=81=D1=82?=
 =?UTF-8?q?=D0=B5=D0=BC=D0=B0=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=D0=B0=D1=87?=
 =?UTF-8?q?=D0=B8=20=D0=B8=D0=B7=20=D1=80=D1=83=D0=BA=20=D0=B2=20=D1=80?=
 =?UTF-8?q?=D1=83=D0=BA=D0=B8=20(#780)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* up 1

* refactor

* Update alerts.yml

* fix popups

* Update SharedOfferItemSystem.cs

---------

Co-authored-by: Zack Backmen <backmen@bk.ru>
---
 .../OfferItem/OfferItemIndicatorsOverlay.cs   |  72 ++++++
 .../Backmen/OfferItem/OfferItemSystem.cs      |  54 +++++
 Content.Client/Input/ContentContexts.cs       |   1 +
 .../Options/UI/Tabs/KeyRebindTab.xaml.cs      |   2 +-
 Content.Client/Options/UI/Tabs/MiscTab.xaml   |   1 +
 .../Options/UI/Tabs/MiscTab.xaml.cs           |   3 +-
 .../Backmen/OfferItem/OfferItemSystem.cs      |  58 +++++
 .../Backmen/Alert/Click/AcceptingOffer.cs     |   8 +
 .../Backmen/OfferItem/OfferItemComponent.cs   |  26 ++
 .../SharedOfferItemSystem.Interactions.cs     |  76 ++++++
 .../OfferItem/SharedOfferItemSystem.cs        | 229 ++++++++++++++++++
 Content.Shared/Input/ContentKeyFunctions.cs   |   1 +
 Content.Shared/_CorvaxNext/NextVars.cs        |  17 ++
 Resources/Locale/ru-RU/alerts/alerts.ftl      |   2 +
 .../ru-RU/escape-menu/ui/options-menu.ftl     |   2 +
 .../ru-RU/interaction/offer-item-system.ftl   |  13 +
 Resources/Prototypes/Alerts/alerts.yml        |  10 +
 .../Prototypes/Entities/Mobs/Species/base.yml |   1 +
 .../Interface/Alerts/offer_item.rsi/meta.json |  14 ++
 .../Alerts/offer_item.rsi/offer_item.png      | Bin 0 -> 782 bytes
 .../Misc/give_item.rsi/give_item.png          | Bin 0 -> 7276 bytes
 .../Interface/Misc/give_item.rsi/meta.json    |  14 ++
 Resources/keybinds.yml                        |   3 +
 23 files changed, 605 insertions(+), 2 deletions(-)
 create mode 100644 Content.Client/Backmen/OfferItem/OfferItemIndicatorsOverlay.cs
 create mode 100644 Content.Client/Backmen/OfferItem/OfferItemSystem.cs
 create mode 100644 Content.Server/Backmen/OfferItem/OfferItemSystem.cs
 create mode 100644 Content.Shared/Backmen/Alert/Click/AcceptingOffer.cs
 create mode 100644 Content.Shared/Backmen/OfferItem/OfferItemComponent.cs
 create mode 100644 Content.Shared/Backmen/OfferItem/SharedOfferItemSystem.Interactions.cs
 create mode 100644 Content.Shared/Backmen/OfferItem/SharedOfferItemSystem.cs
 create mode 100644 Content.Shared/_CorvaxNext/NextVars.cs
 create mode 100644 Resources/Locale/ru-RU/interaction/offer-item-system.ftl
 create mode 100644 Resources/Textures/Interface/Alerts/offer_item.rsi/meta.json
 create mode 100644 Resources/Textures/Interface/Alerts/offer_item.rsi/offer_item.png
 create mode 100644 Resources/Textures/Interface/Misc/give_item.rsi/give_item.png
 create mode 100644 Resources/Textures/Interface/Misc/give_item.rsi/meta.json

diff --git a/Content.Client/Backmen/OfferItem/OfferItemIndicatorsOverlay.cs b/Content.Client/Backmen/OfferItem/OfferItemIndicatorsOverlay.cs
new file mode 100644
index 00000000000..1f09cfa41d7
--- /dev/null
+++ b/Content.Client/Backmen/OfferItem/OfferItemIndicatorsOverlay.cs
@@ -0,0 +1,72 @@
+using System.Numerics;
+using Robust.Client.GameObjects;
+using Robust.Client.Graphics;
+using Robust.Client.Input;
+using Robust.Client.UserInterface;
+using Robust.Shared.Enums;
+using Robust.Shared.Utility;
+
+namespace Content.Client.Backmen.OfferItem;
+
+public sealed class OfferItemIndicatorsOverlay : Overlay
+{
+    private readonly IInputManager _inputManager;
+    private readonly IEntityManager _entMan;
+    private readonly IEyeManager _eye;
+    private readonly OfferItemSystem _offer;
+
+    private readonly Texture _sight;
+
+    public override OverlaySpace Space => OverlaySpace.ScreenSpace;
+
+    private readonly Color _mainColor = Color.White.WithAlpha(0.3f);
+    private readonly Color _strokeColor = Color.Black.WithAlpha(0.5f);
+    private readonly float _scale = 0.6f;  // 1 is a little big
+
+    public OfferItemIndicatorsOverlay(IInputManager input, IEntityManager entMan,
+            IEyeManager eye, OfferItemSystem offerSys)
+    {
+        _inputManager = input;
+        _entMan = entMan;
+        _eye = eye;
+        _offer = offerSys;
+
+        var spriteSys = _entMan.EntitySysManager.GetEntitySystem<SpriteSystem>();
+        _sight = spriteSys.Frame0(new SpriteSpecifier.Rsi(new ResPath("/Textures/Interface/Misc/give_item.rsi"),
+            "give_item"));
+    }
+
+    protected override bool BeforeDraw(in OverlayDrawArgs args)
+    {
+        if (!_offer.IsInOfferMode())
+            return false;
+
+        return base.BeforeDraw(in args);
+    }
+
+    protected override void Draw(in OverlayDrawArgs args)
+    {
+        var mouseScreenPosition = _inputManager.MouseScreenPosition;
+        var mousePosMap = _eye.PixelToMap(mouseScreenPosition);
+        if (mousePosMap.MapId != args.MapId)
+            return;
+
+
+        var mousePos = mouseScreenPosition.Position;
+        var uiScale = (args.ViewportControl as Control)?.UIScale ?? 1f;
+        var limitedScale = uiScale > 1.25f ? 1.25f : uiScale;
+
+        DrawSight(_sight, args.ScreenHandle, mousePos, limitedScale * _scale);
+    }
+
+    private void DrawSight(Texture sight, DrawingHandleScreen screen, Vector2 centerPos, float scale)
+    {
+        var sightSize = sight.Size * scale;
+        var expandedSize = sightSize + new Vector2(7f, 7f);
+
+        screen.DrawTextureRect(sight,
+            UIBox2.FromDimensions(centerPos - sightSize * 0.5f, sightSize), _strokeColor);
+        screen.DrawTextureRect(sight,
+            UIBox2.FromDimensions(centerPos - expandedSize * 0.5f, expandedSize), _mainColor);
+    }
+}
diff --git a/Content.Client/Backmen/OfferItem/OfferItemSystem.cs b/Content.Client/Backmen/OfferItem/OfferItemSystem.cs
new file mode 100644
index 00000000000..92b489afaa0
--- /dev/null
+++ b/Content.Client/Backmen/OfferItem/OfferItemSystem.cs
@@ -0,0 +1,54 @@
+using Content.Shared.Backmen.OfferItem;
+using Content.Shared._CorvaxNext.NextVars;
+using Robust.Client.Graphics;
+using Robust.Client.Input;
+using Robust.Client.Player;
+using Robust.Shared.Configuration;
+
+namespace Content.Client.Backmen.OfferItem;
+
+public sealed class OfferItemSystem : SharedOfferItemSystem
+{
+    [Dependency] private readonly IOverlayManager _overlayManager = default!;
+    [Dependency] private readonly IPlayerManager _playerManager = default!;
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
+    [Dependency] private readonly IInputManager _inputManager = default!;
+    [Dependency] private readonly IEyeManager _eye = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        Subs.CVar(_cfg, NextVars.OfferModeIndicatorsPointShow, OnShowOfferIndicatorsChanged, true);
+    }
+
+
+
+    public override void Shutdown()
+    {
+        _overlayManager.RemoveOverlay<OfferItemIndicatorsOverlay>();
+        base.Shutdown();
+    }
+
+    public bool IsInOfferMode()
+    {
+        var entity = _playerManager.LocalEntity;
+
+        if (entity == null)
+            return false;
+
+        return IsInOfferMode(entity.Value);
+    }
+    private void OnShowOfferIndicatorsChanged(bool isShow)
+    {
+        if (isShow)
+        {
+            _overlayManager.AddOverlay(new OfferItemIndicatorsOverlay(
+                _inputManager,
+                EntityManager,
+                _eye,
+                this));
+        }
+        else
+            _overlayManager.RemoveOverlay<OfferItemIndicatorsOverlay>();
+    }
+}
diff --git a/Content.Client/Input/ContentContexts.cs b/Content.Client/Input/ContentContexts.cs
index 639f326f7f4..d90b0b5bda3 100644
--- a/Content.Client/Input/ContentContexts.cs
+++ b/Content.Client/Input/ContentContexts.cs
@@ -84,6 +84,7 @@ public static void SetupContexts(IInputContextContainer contexts)
             human.AddFunction(ContentKeyFunctions.Arcade1);
             human.AddFunction(ContentKeyFunctions.Arcade2);
             human.AddFunction(ContentKeyFunctions.Arcade3);
+            human.AddFunction(ContentKeyFunctions.OfferItem); // Corvax-Next-Offer
 
             // actions should be common (for ghosts, mobs, etc)
             common.AddFunction(ContentKeyFunctions.OpenActionsMenu);
diff --git a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
index 24be904e061..fe5a7adafbb 100644
--- a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
@@ -184,7 +184,7 @@ void AddCheckBox(string checkBoxName, bool currentState, Action<BaseButton.Butto
             AddButton(ContentKeyFunctions.MoveStoredItem);
             AddButton(ContentKeyFunctions.RotateStoredItem);
             AddButton(ContentKeyFunctions.SaveItemLocation);
-
+            AddButton(ContentKeyFunctions.OfferItem); // Corvax-Next-Offer
             AddHeader("ui-options-header-interaction-adv");
             AddButton(ContentKeyFunctions.SmartEquipBackpack);
             AddButton(ContentKeyFunctions.SmartEquipBelt);
diff --git a/Content.Client/Options/UI/Tabs/MiscTab.xaml b/Content.Client/Options/UI/Tabs/MiscTab.xaml
index c1733e209db..c738e4fac15 100644
--- a/Content.Client/Options/UI/Tabs/MiscTab.xaml
+++ b/Content.Client/Options/UI/Tabs/MiscTab.xaml
@@ -22,6 +22,7 @@
                        StyleClasses="LabelKeyText"/>
                 <CheckBox Name="ShowHeldItemCheckBox" Text="{Loc 'ui-options-show-held-item'}" />
                 <CheckBox Name="ShowCombatModeIndicatorsCheckBox" Text="{Loc 'ui-options-show-combat-mode-indicators'}" />
+                <CheckBox Name="ShowOfferModeIndicatorsCheckBox" Text="{Loc 'ui-options-show-offer-mode-indicators'}" />
                 <Label Text="{Loc 'ui-options-general-storage'}"
                        StyleClasses="LabelKeyText"/>
                 <CheckBox Name="OpaqueStorageWindowCheckBox" Text="{Loc 'ui-options-opaque-storage-window'}" />
diff --git a/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs b/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs
index 79000af58c6..50820e0b435 100644
--- a/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs
@@ -1,5 +1,6 @@
 using System.Linq;
 using Content.Client.UserInterface.Screens;
+using Content.Shared._CorvaxNext.NextVars;
 using Content.Shared.CCVar;
 using Content.Shared.HUD;
 using Robust.Client.AutoGenerated;
@@ -52,7 +53,7 @@ public MiscTab()
         Control.AddOptionCheckBox(CCVars.ChatEnableFancyBubbles, FancySpeechBubblesCheckBox);
         Control.AddOptionCheckBox(CCVars.ChatFancyNameBackground, FancyNameBackgroundsCheckBox);
         Control.AddOptionCheckBox(CCVars.StaticStorageUI, StaticStorageUI);
-
+        Control.AddOptionCheckBox(NextVars.OfferModeIndicatorsPointShow, ShowOfferModeIndicatorsCheckBox); // Corvax-Next-Offer
         Control.Initialize();
     }
 }
diff --git a/Content.Server/Backmen/OfferItem/OfferItemSystem.cs b/Content.Server/Backmen/OfferItem/OfferItemSystem.cs
new file mode 100644
index 00000000000..3e3af399cd3
--- /dev/null
+++ b/Content.Server/Backmen/OfferItem/OfferItemSystem.cs
@@ -0,0 +1,58 @@
+using Content.Shared.Alert;
+using Content.Shared.Backmen.OfferItem;
+using Content.Shared.Hands.Components;
+
+namespace Content.Server.Backmen.OfferItem;
+
+public sealed class OfferItemSystem : SharedOfferItemSystem
+{
+    [Dependency] private readonly AlertsSystem _alertsSystem = default!;
+
+    private float _offerAcc = 0;
+    private const float OfferAccMax = 3f;
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        _offerAcc += frameTime;
+        if (_offerAcc >= OfferAccMax)
+        {
+            _offerAcc -= OfferAccMax;
+        }
+        else
+        {
+            return;
+        }
+
+        var query = EntityQueryEnumerator<OfferItemComponent,HandsComponent>();
+        while (query.MoveNext(out var uid, out var offerItem, out var hands))
+        {
+            if (hands.ActiveHand == null)
+                continue;
+
+            if (offerItem.Hand != null &&
+                hands.Hands[offerItem.Hand].HeldEntity == null)
+            {
+                if (offerItem.Target != null)
+                {
+                    UnReceive(offerItem.Target.Value, offerItem: offerItem);
+                    offerItem.IsInOfferMode = false;
+                    Dirty(uid, offerItem);
+                }
+                else
+                    UnOffer(uid, offerItem);
+            }
+
+            if (!offerItem.IsInReceiveMode)
+            {
+                _alertsSystem.ClearAlert(uid, OfferAlert);
+                continue;
+            }
+
+            _alertsSystem.ShowAlert(uid, OfferAlert);
+        }
+    }
+
+
+}
diff --git a/Content.Shared/Backmen/Alert/Click/AcceptingOffer.cs b/Content.Shared/Backmen/Alert/Click/AcceptingOffer.cs
new file mode 100644
index 00000000000..a8bc9b278de
--- /dev/null
+++ b/Content.Shared/Backmen/Alert/Click/AcceptingOffer.cs
@@ -0,0 +1,8 @@
+using Content.Shared.Alert;
+
+namespace Content.Shared.Backmen.Alert.Click;
+
+/// <summary>
+/// Accepting the offer and receive item
+/// </summary>
+public sealed partial class AcceptOfferAlertEvent : BaseAlertEvent;
diff --git a/Content.Shared/Backmen/OfferItem/OfferItemComponent.cs b/Content.Shared/Backmen/OfferItem/OfferItemComponent.cs
new file mode 100644
index 00000000000..06b1d38d8f7
--- /dev/null
+++ b/Content.Shared/Backmen/OfferItem/OfferItemComponent.cs
@@ -0,0 +1,26 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Backmen.OfferItem;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)]
+[Access(typeof(SharedOfferItemSystem))]
+public sealed partial class OfferItemComponent : Component
+{
+    [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField]
+    public bool IsInOfferMode;
+
+    [DataField, AutoNetworkedField]
+    public bool IsInReceiveMode;
+
+    [DataField, AutoNetworkedField]
+    public string? Hand;
+
+    [DataField, AutoNetworkedField]
+    public EntityUid? Item;
+
+    [DataField, AutoNetworkedField]
+    public EntityUid? Target;
+
+    [DataField]
+    public float MaxOfferDistance = 2f;
+}
diff --git a/Content.Shared/Backmen/OfferItem/SharedOfferItemSystem.Interactions.cs b/Content.Shared/Backmen/OfferItem/SharedOfferItemSystem.Interactions.cs
new file mode 100644
index 00000000000..ce937e11c69
--- /dev/null
+++ b/Content.Shared/Backmen/OfferItem/SharedOfferItemSystem.Interactions.cs
@@ -0,0 +1,76 @@
+using Content.Shared.ActionBlocker;
+using Content.Shared.Hands.Components;
+using Content.Shared.Input;
+using Content.Shared.Popups;
+using Robust.Shared.Input.Binding;
+using Robust.Shared.Player;
+
+namespace Content.Shared.Backmen.OfferItem;
+
+public abstract partial class SharedOfferItemSystem
+{
+    [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
+
+    private void InitializeInteractions()
+    {
+        CommandBinds.Builder
+            .Bind(ContentKeyFunctions.OfferItem, InputCmdHandler.FromDelegate(SetInOfferMode, handle: false, outsidePrediction: false))
+            .Register<SharedOfferItemSystem>();
+    }
+
+    public override void Shutdown()
+    {
+        base.Shutdown();
+
+        CommandBinds.Unregister<SharedOfferItemSystem>();
+    }
+
+    private void SetInOfferMode(ICommonSession? session)
+    {
+        if (!_timing.IsFirstTimePredicted)
+            return;
+
+        if (session is not { } playerSession)
+            return;
+
+        if ((playerSession.AttachedEntity is not { Valid: true } uid || !Exists(uid)) ||
+            !_actionBlocker.CanInteract(uid, null))
+            return;
+
+        if (!TryComp<OfferItemComponent>(uid, out var offerItem))
+            return;
+
+        if (!TryComp<HandsComponent>(uid, out var hands) || hands.ActiveHand == null)
+            return;
+
+        offerItem.Item = hands.ActiveHand.HeldEntity;
+
+        if (offerItem.IsInOfferMode == false)
+        {
+            if (offerItem.Item == null)
+            {
+                _popup.PopupEntity(Loc.GetString("offer-item-empty-hand"), uid, uid);
+                return;
+            }
+
+            if (offerItem.Hand == null || offerItem.Target == null)
+            {
+                offerItem.IsInOfferMode = true;
+                offerItem.Hand = hands.ActiveHand.Name;
+
+                Dirty(uid, offerItem);
+                return;
+            }
+        }
+
+        if (offerItem.Target != null)
+        {
+            UnReceive(offerItem.Target.Value, offerItem: offerItem);
+            offerItem.IsInOfferMode = false;
+            Dirty(uid, offerItem);
+            return;
+        }
+
+        UnOffer(uid, offerItem);
+    }
+}
diff --git a/Content.Shared/Backmen/OfferItem/SharedOfferItemSystem.cs b/Content.Shared/Backmen/OfferItem/SharedOfferItemSystem.cs
new file mode 100644
index 00000000000..d1af9116f38
--- /dev/null
+++ b/Content.Shared/Backmen/OfferItem/SharedOfferItemSystem.cs
@@ -0,0 +1,229 @@
+using Content.Shared.Alert;
+using Content.Shared.Backmen.Alert.Click;
+using Content.Shared.Hands.Components;
+using Content.Shared.Hands.EntitySystems;
+using Content.Shared.IdentityManagement;
+using Content.Shared.Interaction;
+using Content.Shared.Popups;
+using Robust.Shared.Player;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.Backmen.OfferItem;
+
+public abstract partial class SharedOfferItemSystem : EntitySystem
+{
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
+    [Dependency] private readonly SharedHandsSystem _hands = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<OfferItemComponent, InteractUsingEvent>(SetInReceiveMode);
+        SubscribeLocalEvent<OfferItemComponent, MoveEvent>(OnMove);
+
+        InitializeInteractions();
+
+        SubscribeLocalEvent<OfferItemComponent,AcceptOfferAlertEvent>(OnClickAlertEvent);
+    }
+
+    [ValidatePrototypeId<AlertPrototype>]
+    protected const string OfferAlert = "Offer";
+    private void OnClickAlertEvent(Entity<OfferItemComponent> ent, ref AcceptOfferAlertEvent ev)
+    {
+        if(ev.Handled)
+            return;
+
+        if (ev.AlertId != OfferAlert)
+            return;
+
+        ev.Handled = true;
+
+        Receive(ent!);
+    }
+    /// <summary>
+    /// Accepting the offer and receive item
+    /// </summary>
+    public void Receive(Entity<OfferItemComponent?> ent)
+    {
+        if (!_timing.IsFirstTimePredicted)
+            return;
+
+        if (!Resolve(ent, ref ent.Comp) ||
+            !TryComp<OfferItemComponent>(ent.Comp.Target, out var offerItem) ||
+            offerItem.Hand == null ||
+            ent.Comp.Target == null ||
+            !TryComp<HandsComponent>(ent, out var hands))
+            return;
+
+        if (offerItem.Item != null)
+        {
+            if (!_hands.TryPickup(ent, offerItem.Item.Value, handsComp: hands))
+            {
+                _popup.PopupClient(Loc.GetString("offer-item-full-hand"), ent, ent);
+                return;
+            }
+
+            _popup.PopupClient(Loc.GetString("offer-item-give",
+                ("item", Identity.Entity(offerItem.Item.Value, EntityManager)),
+                ("target", Identity.Entity(ent, EntityManager))), ent.Comp.Target.Value, ent.Comp.Target.Value);
+
+            _popup.PopupPredicted(Loc.GetString("offer-item-give-other",
+                    ("user", Identity.Entity(ent.Comp.Target.Value, EntityManager)),
+                    ("item", Identity.Entity(offerItem.Item.Value, EntityManager)),
+                    ("target", Identity.Entity(ent, EntityManager)))
+                , ent.Comp.Target.Value, ent);
+        }
+
+        offerItem.Item = null;
+        Dirty(ent);
+        UnReceive(ent, ent, offerItem);
+    }
+
+    private void SetInReceiveMode(EntityUid uid, OfferItemComponent component, InteractUsingEvent args)
+    {
+        if (!TryComp<OfferItemComponent>(args.User, out var offerItem))
+            return;
+
+        if (args.User == uid || component.IsInReceiveMode || !offerItem.IsInOfferMode ||
+            (offerItem.IsInReceiveMode && offerItem.Target != uid))
+            return;
+
+        component.IsInReceiveMode = true;
+        component.Target = args.User;
+
+        Dirty(uid, component);
+
+        offerItem.Target = uid;
+        offerItem.IsInOfferMode = false;
+
+        Dirty(args.User, offerItem);
+
+        if (offerItem.Item == null)
+            return;
+
+        _popup.PopupPredicted(Loc.GetString("offer-item-try-give",
+            ("item", Identity.Entity(offerItem.Item.Value, EntityManager)),
+            ("target", Identity.Entity(uid, EntityManager))), component.Target.Value, component.Target.Value);
+        _popup.PopupClient(Loc.GetString("offer-item-try-give-target",
+            ("user", Identity.Entity(component.Target.Value, EntityManager)),
+            ("item", Identity.Entity(offerItem.Item.Value, EntityManager))), component.Target.Value, uid);
+
+        args.Handled = true;
+    }
+
+    private void OnMove(EntityUid uid, OfferItemComponent component, MoveEvent args)
+    {
+        if (component.Target == null ||
+            _transform.InRange(args.NewPosition,
+                Transform(component.Target.Value).Coordinates,
+                component.MaxOfferDistance)
+            )
+            return;
+
+        UnOffer(uid, component);
+    }
+
+    /// <summary>
+    /// Resets the <see cref="OfferItemComponent"/> of the user and the target
+    /// </summary>
+    protected void UnOffer(EntityUid uid, OfferItemComponent component)
+    {
+        if (!TryComp<HandsComponent>(uid, out var hands) || hands.ActiveHand == null)
+            return;
+
+        if (TryComp<OfferItemComponent>(component.Target, out var offerItem) && component.Target != null)
+        {
+
+            if (component.Item != null)
+            {
+                if (!_timing.IsFirstTimePredicted)
+                {
+                    _popup.PopupClient(Loc.GetString("offer-item-no-give",
+                        ("item", Identity.Entity(component.Item.Value, EntityManager)),
+                        ("target", Identity.Entity(component.Target.Value, EntityManager))), uid, uid);
+                    _popup.PopupEntity(Loc.GetString("offer-item-no-give-target",
+                        ("user", Identity.Entity(uid, EntityManager)),
+                        ("item", Identity.Entity(component.Item.Value, EntityManager))), uid, component.Target.Value);
+                }
+
+            }
+
+            else if (offerItem.Item != null)
+            {
+                if (!_timing.IsFirstTimePredicted)
+                {
+                    _popup.PopupClient(Loc.GetString("offer-item-no-give",
+                        ("item", Identity.Entity(offerItem.Item.Value, EntityManager)),
+                        ("target", Identity.Entity(uid, EntityManager))), component.Target.Value, component.Target.Value);
+                    _popup.PopupEntity(Loc.GetString("offer-item-no-give-target",
+                        ("user", Identity.Entity(component.Target.Value, EntityManager)),
+                        ("item", Identity.Entity(offerItem.Item.Value, EntityManager))), component.Target.Value, uid);
+                }
+            }
+
+            offerItem.IsInOfferMode = false;
+            offerItem.IsInReceiveMode = false;
+            offerItem.Hand = null;
+            offerItem.Target = null;
+            offerItem.Item = null;
+
+            Dirty(component.Target.Value, offerItem);
+        }
+
+        component.IsInOfferMode = false;
+        component.IsInReceiveMode = false;
+        component.Hand = null;
+        component.Target = null;
+        component.Item = null;
+
+        Dirty(uid, component);
+    }
+
+
+    /// <summary>
+    /// Cancels the transfer of the item
+    /// </summary>
+    protected void UnReceive(EntityUid uid, OfferItemComponent? component = null, OfferItemComponent? offerItem = null)
+    {
+        if (component == null && !TryComp(uid, out component))
+            return;
+
+        if (offerItem == null && !TryComp(component.Target, out offerItem))
+            return;
+
+        if (!TryComp<HandsComponent>(uid, out var hands) || hands.ActiveHand == null ||
+            component.Target == null)
+            return;
+
+        if (offerItem.Item != null)
+        {
+            _popup.PopupClient(Loc.GetString("offer-item-no-give",
+                ("item", Identity.Entity(offerItem.Item.Value, EntityManager)),
+                ("target", Identity.Entity(uid, EntityManager))), component.Target.Value, component.Target.Value);
+            _popup.PopupEntity(Loc.GetString("offer-item-no-give-target",
+                ("user", Identity.Entity(component.Target.Value, EntityManager)),
+                ("item", Identity.Entity(offerItem.Item.Value, EntityManager))), component.Target.Value, uid);
+        }
+
+        if (!offerItem.IsInReceiveMode)
+        {
+            offerItem.Target = null;
+            component.Target = null;
+        }
+
+        offerItem.Item = null;
+        offerItem.Hand = null;
+        component.IsInReceiveMode = false;
+
+        Dirty(uid, component);
+    }
+
+    /// <summary>
+    /// Returns true if <see cref="OfferItemComponent.IsInOfferMode"/> = true
+    /// </summary>
+    protected bool IsInOfferMode(EntityUid? entity, OfferItemComponent? component = null)
+    {
+        return entity != null && Resolve(entity.Value, ref component, false) && component.IsInOfferMode;
+    }
+}
diff --git a/Content.Shared/Input/ContentKeyFunctions.cs b/Content.Shared/Input/ContentKeyFunctions.cs
index 863d9da970f..b34fdab30f2 100644
--- a/Content.Shared/Input/ContentKeyFunctions.cs
+++ b/Content.Shared/Input/ContentKeyFunctions.cs
@@ -56,6 +56,7 @@ public static class ContentKeyFunctions
         public static readonly BoundKeyFunction TakeScreenshotNoUI = "TakeScreenshotNoUI";
         public static readonly BoundKeyFunction ToggleFullscreen = "ToggleFullscreen";
         public static readonly BoundKeyFunction Point = "Point";
+        public static readonly BoundKeyFunction OfferItem = "OfferItem"; // Corvax-Next-Offer
         public static readonly BoundKeyFunction ZoomOut = "ZoomOut";
         public static readonly BoundKeyFunction ZoomIn = "ZoomIn";
         public static readonly BoundKeyFunction ResetZoom = "ResetZoom";
diff --git a/Content.Shared/_CorvaxNext/NextVars.cs b/Content.Shared/_CorvaxNext/NextVars.cs
new file mode 100644
index 00000000000..5d232025ae7
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/NextVars.cs
@@ -0,0 +1,17 @@
+using Robust.Shared.Configuration;
+
+namespace Content.Shared._CorvaxNext.NextVars;
+
+/// <summary>
+///     Corvax modules console variables
+/// </summary>
+[CVarDefs]
+// ReSharper disable once InconsistentNaming
+public sealed class NextVars
+{
+    /// <summary>
+    /// Offer item.
+    /// </summary>
+    public static readonly CVarDef<bool> OfferModeIndicatorsPointShow =
+        CVarDef.Create("hud.offer_mode_indicators_point_show", true, CVar.ARCHIVE | CVar.CLIENTONLY);
+}
diff --git a/Resources/Locale/ru-RU/alerts/alerts.ftl b/Resources/Locale/ru-RU/alerts/alerts.ftl
index f73606a7b93..645a813bd68 100644
--- a/Resources/Locale/ru-RU/alerts/alerts.ftl
+++ b/Resources/Locale/ru-RU/alerts/alerts.ftl
@@ -74,3 +74,5 @@ alerts-revenant-essence-name = Эссенция
 alerts-revenant-essence-desc = Сила душ. Поддерживает вас и используется при использовании способностей. Медленно восстанавливается с течением времени.
 alerts-revenant-corporeal-name = Материальность
 alerts-revenant-corporeal-desc = Вы физически воплотились. Окружающие могут видеть и наносить вам вред.
+alerts-offer-name = передать
+alerts-offer-desc = кто-то передаёт вам предмет
diff --git a/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl b/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl
index 30417ce5613..efef631c92c 100644
--- a/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl
+++ b/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl
@@ -260,3 +260,5 @@ ui-options-colorblind-friendly = Режим для дальтоников
 ui-options-reduced-motion = Снижение интенсивности визуальных эффектов
 ui-options-chat-window-opacity = Прозрачность окна чата
 ui-options-screen-shake-intensity = Интенсивность дрожания экрана
+ui-options-show-offer-mode-indicators = показывать индикатор передачи предмета
+ui-options-function-offer-item = Передать что-либо
diff --git a/Resources/Locale/ru-RU/interaction/offer-item-system.ftl b/Resources/Locale/ru-RU/interaction/offer-item-system.ftl
new file mode 100644
index 00000000000..92713010741
--- /dev/null
+++ b/Resources/Locale/ru-RU/interaction/offer-item-system.ftl
@@ -0,0 +1,13 @@
+offer-item-empty-hand = У тебя в руках нет ничего, что ты мог бы отдать!
+
+offer-item-full-hand = Ваша рука не свободна для получения предмета.
+
+offer-item-try-give = Вы предлагаете {THE($item)}  {$target}
+offer-item-try-give-target = {$user} предлагает вам {THE($item)}
+
+offer-item-give = Вы отдали {THE($item)}  {$target}
+offer-item-give-other = {$user} отдал {THE($item)}  {$target}
+offer-item-give-target = {$user} отдал вам {THE($item)}
+
+offer-item-no-give = Вы перестаёте предлагать {THE($item)}  {$target}
+offer-item-no-give-target = {$user} больше не предлагает вам {THE($item)}
diff --git a/Resources/Prototypes/Alerts/alerts.yml b/Resources/Prototypes/Alerts/alerts.yml
index 80fcc44a559..c0e6c9d2b9d 100644
--- a/Resources/Prototypes/Alerts/alerts.yml
+++ b/Resources/Prototypes/Alerts/alerts.yml
@@ -24,6 +24,7 @@
     - category: Thirst
     - alertType: Magboots
     - alertType: Pacified
+    - alertType: Offer #Ataraxia
 
 - type: entity
   id: AlertSpriteView
@@ -91,6 +92,15 @@
   name: alerts-on-fire-name
   description: alerts-on-fire-desc
 
+- type: alert #Ataraxia
+  id: Offer
+  clickEvent: !type:AcceptOfferAlertEvent
+  icons:
+  - sprite: /Textures/Interface/Alerts/offer_item.rsi
+    state: offer_item
+  name: alerts-offer-name
+  description: alerts-offer-desc
+
 
 - type: alert
   id: Cold
diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml
index 100a0ced842..9e8a070559d 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -223,6 +223,7 @@
   id: BaseMobSpeciesOrganic
   abstract: true
   components:
+  - type: OfferItem # Corvax-Next-Offer
   - type: Barotrauma
     damage:
       types:
diff --git a/Resources/Textures/Interface/Alerts/offer_item.rsi/meta.json b/Resources/Textures/Interface/Alerts/offer_item.rsi/meta.json
new file mode 100644
index 00000000000..9b5f9361314
--- /dev/null
+++ b/Resources/Textures/Interface/Alerts/offer_item.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Original icon taken from https://github.com/ss220-space/Paradise/blob/master220/icons/mob/screen_alert.dmi, modified by Mocho",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "offer_item"
+    }
+  ]
+}
diff --git a/Resources/Textures/Interface/Alerts/offer_item.rsi/offer_item.png b/Resources/Textures/Interface/Alerts/offer_item.rsi/offer_item.png
new file mode 100644
index 0000000000000000000000000000000000000000..44ac380ddb19fefba315b2d433582aa773b8e6c7
GIT binary patch
literal 782
zcmV+p1M&QcP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000XT
z000XT0n*)m`~Uy~z)3_wR9HvtR?BYFKoq@k8tjm!Bu(n(0p-#15)%J_#1F6n1dDzG
zAlQ@*&um}^65B3d35XAXe_+!^5;n9+lO~mwHla?i6Xp(?$a3v@6jf|G(#RhB-gC~}
zd*|8!N8>+7Aj0EcF0GE(`_+}@$iJ?Y_sR(UR|e!2gwMj({^wpHnyM-U^8(7Oc^p%!
z0x%U`AJH0Z{WeMw;Ds+pygwrT+ELx`q1$s$0kYq`_aqfJ&sa=}W7SW+f3>m^rtHqc
zmj&_;ar+-$KW>Y5AS^;8znGtgB{K^ba`P~iF06CNuf}GJH8MBIY~8y5bWtQgstCK?
z4#eZrA}k=J-<QleVmAU!i$WQoI*vxDFIT|r2hT2}=k_lfGUQs@wV_k1+~6tEG!2GB
z7ka&pP%s*BQ=n%T)-DxtkU4IEVZ_0R0-PwG{~U&l6<=;NVQ;THF}eGwbd4)G>?Izj
zv)MHC2YtxQnxN}(IG4{uE^%yM$72}igLRTjrszcRq-MSyNB}y;Vmh66--f|p0IuW0
zT*eF(!N@f&0*>QQPRAY6;^p-cVG))$8&FIdkVwoBKo>gOTacWdA@DmCcz5$hB$;2N
zA1%!N&sG~wX0lX7b*oJU95@1Dj+JJ6ECS%;o9EOFiI7lr2>Sp68b)G*+vp8or(V5+
zB5;r>&?_Uy-Kz{K0W_b^Zy1gK{vLdK`(n*nFJC9Ow3A}>^FBB{L7_F^|A^Er3-YPd
z1nbMY(pQz8Vx$P>J{N8Tyt}ep(%;4r5D~L<VDaMpI6{GLQYnZ=Ne3cBRsdtd&M8Wb
zlmNeUR(PUF$h=n;a5{}W0Pwd=2483+B>+RekfOw)1Dlel=>$0oJ0Ww@bsZ|r7F*)6
z3lxJbTSbWQj|f>jy*!lIYsUnz6Tpj{lmKBOeFn0ERdJ8(4<!PB0L}v`#4MX$RR910
M07*qoM6N<$g85We+W-In

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Interface/Misc/give_item.rsi/give_item.png b/Resources/Textures/Interface/Misc/give_item.rsi/give_item.png
new file mode 100644
index 0000000000000000000000000000000000000000..26bc88fb2294b62811e09e41055bbe34b2268882
GIT binary patch
literal 7276
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
b9}n61DDi*O{rCx-31VStWpd4EU-W+fq+7tg

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Interface/Misc/give_item.rsi/meta.json b/Resources/Textures/Interface/Misc/give_item.rsi/meta.json
new file mode 100644
index 00000000000..94cd6fa2e1e
--- /dev/null
+++ b/Resources/Textures/Interface/Misc/give_item.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "https://github.com/ss220-space/Paradise/blob/master220/icons/misc/mouse_icons/give_item.dmi",
+  "size": {
+    "x": 64,
+    "y": 64
+  },
+  "states": [
+    {
+      "name": "give_item"
+    }
+  ]
+}
diff --git a/Resources/keybinds.yml b/Resources/keybinds.yml
index 3b8158b7c7a..3d6bcc2b8d1 100644
--- a/Resources/keybinds.yml
+++ b/Resources/keybinds.yml
@@ -584,3 +584,6 @@ binds:
   type: State
   key: MouseRight
   canFocus: true
+- function: OfferItem # Ataraxia
+  type: State
+  key: F

From 6c981a48bf78a2ab160f9d6061128934f41a4e53 Mon Sep 17 00:00:00 2001
From: AwareFoxy <vgstecker@gmail.com>
Date: Sun, 10 Nov 2024 01:27:59 +0100
Subject: [PATCH 02/17] sledi

---
 .../OfferItem/OfferItemIndicatorsOverlay.cs                   | 2 +-
 .../{Backmen => _CorvaxNext}/OfferItem/OfferItemSystem.cs     | 2 +-
 .../{Backmen/OfferItem => _CorvaxNext}/OfferItemSystem.cs     | 4 ++--
 .../{Backmen => _CorvaxNext}/Alert/Click/AcceptingOffer.cs    | 2 +-
 .../{Backmen => _CorvaxNext}/OfferItem/OfferItemComponent.cs  | 2 +-
 .../OfferItem/SharedOfferItemSystem.Interactions.cs           | 2 +-
 .../OfferItem/SharedOfferItemSystem.cs                        | 4 ++--
 7 files changed, 9 insertions(+), 9 deletions(-)
 rename Content.Client/{Backmen => _CorvaxNext}/OfferItem/OfferItemIndicatorsOverlay.cs (98%)
 rename Content.Client/{Backmen => _CorvaxNext}/OfferItem/OfferItemSystem.cs (96%)
 rename Content.Server/{Backmen/OfferItem => _CorvaxNext}/OfferItemSystem.cs (94%)
 rename Content.Shared/{Backmen => _CorvaxNext}/Alert/Click/AcceptingOffer.cs (77%)
 rename Content.Shared/{Backmen => _CorvaxNext}/OfferItem/OfferItemComponent.cs (92%)
 rename Content.Shared/{Backmen => _CorvaxNext}/OfferItem/SharedOfferItemSystem.Interactions.cs (97%)
 rename Content.Shared/{Backmen => _CorvaxNext}/OfferItem/SharedOfferItemSystem.cs (98%)

diff --git a/Content.Client/Backmen/OfferItem/OfferItemIndicatorsOverlay.cs b/Content.Client/_CorvaxNext/OfferItem/OfferItemIndicatorsOverlay.cs
similarity index 98%
rename from Content.Client/Backmen/OfferItem/OfferItemIndicatorsOverlay.cs
rename to Content.Client/_CorvaxNext/OfferItem/OfferItemIndicatorsOverlay.cs
index 1f09cfa41d7..d98edba6a5b 100644
--- a/Content.Client/Backmen/OfferItem/OfferItemIndicatorsOverlay.cs
+++ b/Content.Client/_CorvaxNext/OfferItem/OfferItemIndicatorsOverlay.cs
@@ -6,7 +6,7 @@
 using Robust.Shared.Enums;
 using Robust.Shared.Utility;
 
-namespace Content.Client.Backmen.OfferItem;
+namespace Content.Client._CorvaxNext.OfferItem;
 
 public sealed class OfferItemIndicatorsOverlay : Overlay
 {
diff --git a/Content.Client/Backmen/OfferItem/OfferItemSystem.cs b/Content.Client/_CorvaxNext/OfferItem/OfferItemSystem.cs
similarity index 96%
rename from Content.Client/Backmen/OfferItem/OfferItemSystem.cs
rename to Content.Client/_CorvaxNext/OfferItem/OfferItemSystem.cs
index 92b489afaa0..259007557ac 100644
--- a/Content.Client/Backmen/OfferItem/OfferItemSystem.cs
+++ b/Content.Client/_CorvaxNext/OfferItem/OfferItemSystem.cs
@@ -5,7 +5,7 @@
 using Robust.Client.Player;
 using Robust.Shared.Configuration;
 
-namespace Content.Client.Backmen.OfferItem;
+namespace Content.Client._CorvaxNext.OfferItem;
 
 public sealed class OfferItemSystem : SharedOfferItemSystem
 {
diff --git a/Content.Server/Backmen/OfferItem/OfferItemSystem.cs b/Content.Server/_CorvaxNext/OfferItemSystem.cs
similarity index 94%
rename from Content.Server/Backmen/OfferItem/OfferItemSystem.cs
rename to Content.Server/_CorvaxNext/OfferItemSystem.cs
index 3e3af399cd3..d8af26f97ad 100644
--- a/Content.Server/Backmen/OfferItem/OfferItemSystem.cs
+++ b/Content.Server/_CorvaxNext/OfferItemSystem.cs
@@ -1,8 +1,8 @@
 using Content.Shared.Alert;
-using Content.Shared.Backmen.OfferItem;
+using Content.Shared._CorvaxNext.OfferItem;
 using Content.Shared.Hands.Components;
 
-namespace Content.Server.Backmen.OfferItem;
+namespace Content.Server._CorvaxNext.OfferItem;
 
 public sealed class OfferItemSystem : SharedOfferItemSystem
 {
diff --git a/Content.Shared/Backmen/Alert/Click/AcceptingOffer.cs b/Content.Shared/_CorvaxNext/Alert/Click/AcceptingOffer.cs
similarity index 77%
rename from Content.Shared/Backmen/Alert/Click/AcceptingOffer.cs
rename to Content.Shared/_CorvaxNext/Alert/Click/AcceptingOffer.cs
index a8bc9b278de..0b7be4ccb08 100644
--- a/Content.Shared/Backmen/Alert/Click/AcceptingOffer.cs
+++ b/Content.Shared/_CorvaxNext/Alert/Click/AcceptingOffer.cs
@@ -1,6 +1,6 @@
 using Content.Shared.Alert;
 
-namespace Content.Shared.Backmen.Alert.Click;
+namespace Content.Shared._CorvaxNext.Alert.Click;
 
 /// <summary>
 /// Accepting the offer and receive item
diff --git a/Content.Shared/Backmen/OfferItem/OfferItemComponent.cs b/Content.Shared/_CorvaxNext/OfferItem/OfferItemComponent.cs
similarity index 92%
rename from Content.Shared/Backmen/OfferItem/OfferItemComponent.cs
rename to Content.Shared/_CorvaxNext/OfferItem/OfferItemComponent.cs
index 06b1d38d8f7..3389b947f90 100644
--- a/Content.Shared/Backmen/OfferItem/OfferItemComponent.cs
+++ b/Content.Shared/_CorvaxNext/OfferItem/OfferItemComponent.cs
@@ -1,6 +1,6 @@
 using Robust.Shared.GameStates;
 
-namespace Content.Shared.Backmen.OfferItem;
+namespace Content.Shared._CorvaxNext.OfferItem;
 
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)]
 [Access(typeof(SharedOfferItemSystem))]
diff --git a/Content.Shared/Backmen/OfferItem/SharedOfferItemSystem.Interactions.cs b/Content.Shared/_CorvaxNext/OfferItem/SharedOfferItemSystem.Interactions.cs
similarity index 97%
rename from Content.Shared/Backmen/OfferItem/SharedOfferItemSystem.Interactions.cs
rename to Content.Shared/_CorvaxNext/OfferItem/SharedOfferItemSystem.Interactions.cs
index ce937e11c69..efc573d8278 100644
--- a/Content.Shared/Backmen/OfferItem/SharedOfferItemSystem.Interactions.cs
+++ b/Content.Shared/_CorvaxNext/OfferItem/SharedOfferItemSystem.Interactions.cs
@@ -5,7 +5,7 @@
 using Robust.Shared.Input.Binding;
 using Robust.Shared.Player;
 
-namespace Content.Shared.Backmen.OfferItem;
+namespace Content.Shared._CorvaxNext.OfferItem;
 
 public abstract partial class SharedOfferItemSystem
 {
diff --git a/Content.Shared/Backmen/OfferItem/SharedOfferItemSystem.cs b/Content.Shared/_CorvaxNext/OfferItem/SharedOfferItemSystem.cs
similarity index 98%
rename from Content.Shared/Backmen/OfferItem/SharedOfferItemSystem.cs
rename to Content.Shared/_CorvaxNext/OfferItem/SharedOfferItemSystem.cs
index d1af9116f38..5df594d3c80 100644
--- a/Content.Shared/Backmen/OfferItem/SharedOfferItemSystem.cs
+++ b/Content.Shared/_CorvaxNext/OfferItem/SharedOfferItemSystem.cs
@@ -1,5 +1,5 @@
 using Content.Shared.Alert;
-using Content.Shared.Backmen.Alert.Click;
+using Content.Shared._CorvaxNext.Alert.Click;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.IdentityManagement;
@@ -8,7 +8,7 @@
 using Robust.Shared.Player;
 using Robust.Shared.Timing;
 
-namespace Content.Shared.Backmen.OfferItem;
+namespace Content.Shared._CorvaxNext.OfferItem;
 
 public abstract partial class SharedOfferItemSystem : EntitySystem
 {

From a9f29fdeeb2cbf7428474a62f099d0733de7b44d Mon Sep 17 00:00:00 2001
From: AwareFoxy <vgstecker@gmail.com>
Date: Sun, 10 Nov 2024 01:45:19 +0100
Subject: [PATCH 03/17] fixim govno

---
 .../OfferItem/OfferItemIndicatorsOverlay.cs         |   2 +-
 .../_CorvaxNext/OfferItem/OfferItemSystem.cs        |   2 +-
 Resources/Prototypes/Alerts/alerts.yml              |   2 +-
 .../Alerts/offer_item.rsi/meta.json                 |   0
 .../Alerts/offer_item.rsi/offer_item.png            | Bin
 .../Misc/give_item.rsi/give_item.png                | Bin
 .../Misc/give_item.rsi/meta.json                    |   0
 7 files changed, 3 insertions(+), 3 deletions(-)
 rename Resources/Textures/{Interface => _CorvaxNext}/Alerts/offer_item.rsi/meta.json (100%)
 rename Resources/Textures/{Interface => _CorvaxNext}/Alerts/offer_item.rsi/offer_item.png (100%)
 rename Resources/Textures/{Interface => _CorvaxNext}/Misc/give_item.rsi/give_item.png (100%)
 rename Resources/Textures/{Interface => _CorvaxNext}/Misc/give_item.rsi/meta.json (100%)

diff --git a/Content.Client/_CorvaxNext/OfferItem/OfferItemIndicatorsOverlay.cs b/Content.Client/_CorvaxNext/OfferItem/OfferItemIndicatorsOverlay.cs
index d98edba6a5b..8b3e7f587a6 100644
--- a/Content.Client/_CorvaxNext/OfferItem/OfferItemIndicatorsOverlay.cs
+++ b/Content.Client/_CorvaxNext/OfferItem/OfferItemIndicatorsOverlay.cs
@@ -32,7 +32,7 @@ public OfferItemIndicatorsOverlay(IInputManager input, IEntityManager entMan,
         _offer = offerSys;
 
         var spriteSys = _entMan.EntitySysManager.GetEntitySystem<SpriteSystem>();
-        _sight = spriteSys.Frame0(new SpriteSpecifier.Rsi(new ResPath("/Textures/Interface/Misc/give_item.rsi"),
+        _sight = spriteSys.Frame0(new SpriteSpecifier.Rsi(new ResPath("/Textures/_CorvaxNext/Misc/give_item.rsi"),
             "give_item"));
     }
 
diff --git a/Content.Client/_CorvaxNext/OfferItem/OfferItemSystem.cs b/Content.Client/_CorvaxNext/OfferItem/OfferItemSystem.cs
index 259007557ac..ab44ba398c2 100644
--- a/Content.Client/_CorvaxNext/OfferItem/OfferItemSystem.cs
+++ b/Content.Client/_CorvaxNext/OfferItem/OfferItemSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Backmen.OfferItem;
+using Content.Shared._CorvaxNext.OfferItem;
 using Content.Shared._CorvaxNext.NextVars;
 using Robust.Client.Graphics;
 using Robust.Client.Input;
diff --git a/Resources/Prototypes/Alerts/alerts.yml b/Resources/Prototypes/Alerts/alerts.yml
index c0e6c9d2b9d..4edd0152d58 100644
--- a/Resources/Prototypes/Alerts/alerts.yml
+++ b/Resources/Prototypes/Alerts/alerts.yml
@@ -96,7 +96,7 @@
   id: Offer
   clickEvent: !type:AcceptOfferAlertEvent
   icons:
-  - sprite: /Textures/Interface/Alerts/offer_item.rsi
+  - sprite: /Textures/_CorvaxNext/Alerts/offer_item.rsi
     state: offer_item
   name: alerts-offer-name
   description: alerts-offer-desc
diff --git a/Resources/Textures/Interface/Alerts/offer_item.rsi/meta.json b/Resources/Textures/_CorvaxNext/Alerts/offer_item.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Interface/Alerts/offer_item.rsi/meta.json
rename to Resources/Textures/_CorvaxNext/Alerts/offer_item.rsi/meta.json
diff --git a/Resources/Textures/Interface/Alerts/offer_item.rsi/offer_item.png b/Resources/Textures/_CorvaxNext/Alerts/offer_item.rsi/offer_item.png
similarity index 100%
rename from Resources/Textures/Interface/Alerts/offer_item.rsi/offer_item.png
rename to Resources/Textures/_CorvaxNext/Alerts/offer_item.rsi/offer_item.png
diff --git a/Resources/Textures/Interface/Misc/give_item.rsi/give_item.png b/Resources/Textures/_CorvaxNext/Misc/give_item.rsi/give_item.png
similarity index 100%
rename from Resources/Textures/Interface/Misc/give_item.rsi/give_item.png
rename to Resources/Textures/_CorvaxNext/Misc/give_item.rsi/give_item.png
diff --git a/Resources/Textures/Interface/Misc/give_item.rsi/meta.json b/Resources/Textures/_CorvaxNext/Misc/give_item.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Interface/Misc/give_item.rsi/meta.json
rename to Resources/Textures/_CorvaxNext/Misc/give_item.rsi/meta.json

From 4759bf052823728b056567ea4c7ea772dbd9612e Mon Sep 17 00:00:00 2001
From: FN <firenamefn@gmail.com>
Date: Sun, 10 Nov 2024 08:05:29 +0700
Subject: [PATCH 04/17] Fixes

---
 .../OfferItem/OfferItemIndicatorsOverlay.cs   | 23 +++-----
 Content.Server/_CorvaxNext/OfferItemSystem.cs | 20 ++-----
 .../SharedOfferItemSystem.Interactions.cs     | 16 +++--
 .../OfferItem/SharedOfferItemSystem.cs        | 59 ++++++++++---------
 .../interaction/offer-item-system.ftl         |  0
 5 files changed, 51 insertions(+), 67 deletions(-)
 rename Resources/Locale/ru-RU/{ => _CorvaxNext}/interaction/offer-item-system.ftl (100%)

diff --git a/Content.Client/_CorvaxNext/OfferItem/OfferItemIndicatorsOverlay.cs b/Content.Client/_CorvaxNext/OfferItem/OfferItemIndicatorsOverlay.cs
index 8b3e7f587a6..a233ec833ec 100644
--- a/Content.Client/_CorvaxNext/OfferItem/OfferItemIndicatorsOverlay.cs
+++ b/Content.Client/_CorvaxNext/OfferItem/OfferItemIndicatorsOverlay.cs
@@ -23,8 +23,7 @@ public sealed class OfferItemIndicatorsOverlay : Overlay
     private readonly Color _strokeColor = Color.Black.WithAlpha(0.5f);
     private readonly float _scale = 0.6f;  // 1 is a little big
 
-    public OfferItemIndicatorsOverlay(IInputManager input, IEntityManager entMan,
-            IEyeManager eye, OfferItemSystem offerSys)
+    public OfferItemIndicatorsOverlay(IInputManager input, IEntityManager entMan, IEyeManager eye, OfferItemSystem offerSys)
     {
         _inputManager = input;
         _entMan = entMan;
@@ -32,29 +31,25 @@ public OfferItemIndicatorsOverlay(IInputManager input, IEntityManager entMan,
         _offer = offerSys;
 
         var spriteSys = _entMan.EntitySysManager.GetEntitySystem<SpriteSystem>();
-        _sight = spriteSys.Frame0(new SpriteSpecifier.Rsi(new ResPath("/Textures/_CorvaxNext/Misc/give_item.rsi"),
-            "give_item"));
+        _sight = spriteSys.Frame0(new SpriteSpecifier.Rsi(new ResPath("/Textures/_CorvaxNext/Misc/give_item.rsi"), "give_item"));
     }
 
     protected override bool BeforeDraw(in OverlayDrawArgs args)
     {
-        if (!_offer.IsInOfferMode())
-            return false;
-
-        return base.BeforeDraw(in args);
+        return _offer.IsInOfferMode() && base.BeforeDraw(in args);
     }
 
     protected override void Draw(in OverlayDrawArgs args)
     {
         var mouseScreenPosition = _inputManager.MouseScreenPosition;
         var mousePosMap = _eye.PixelToMap(mouseScreenPosition);
+
         if (mousePosMap.MapId != args.MapId)
             return;
 
-
         var mousePos = mouseScreenPosition.Position;
         var uiScale = (args.ViewportControl as Control)?.UIScale ?? 1f;
-        var limitedScale = uiScale > 1.25f ? 1.25f : uiScale;
+        var limitedScale = Math.Min(1.25f, uiScale);
 
         DrawSight(_sight, args.ScreenHandle, mousePos, limitedScale * _scale);
     }
@@ -62,11 +57,9 @@ protected override void Draw(in OverlayDrawArgs args)
     private void DrawSight(Texture sight, DrawingHandleScreen screen, Vector2 centerPos, float scale)
     {
         var sightSize = sight.Size * scale;
-        var expandedSize = sightSize + new Vector2(7f, 7f);
+        var expandedSize = sightSize + new Vector2(7);
 
-        screen.DrawTextureRect(sight,
-            UIBox2.FromDimensions(centerPos - sightSize * 0.5f, sightSize), _strokeColor);
-        screen.DrawTextureRect(sight,
-            UIBox2.FromDimensions(centerPos - expandedSize * 0.5f, expandedSize), _mainColor);
+        screen.DrawTextureRect(sight, UIBox2.FromDimensions(centerPos - sightSize * 0.5f, sightSize), _strokeColor);
+        screen.DrawTextureRect(sight, UIBox2.FromDimensions(centerPos - expandedSize * 0.5f, expandedSize), _mainColor);
     }
 }
diff --git a/Content.Server/_CorvaxNext/OfferItemSystem.cs b/Content.Server/_CorvaxNext/OfferItemSystem.cs
index d8af26f97ad..b21512ec065 100644
--- a/Content.Server/_CorvaxNext/OfferItemSystem.cs
+++ b/Content.Server/_CorvaxNext/OfferItemSystem.cs
@@ -13,28 +13,21 @@ public sealed class OfferItemSystem : SharedOfferItemSystem
 
     public override void Update(float frameTime)
     {
-        base.Update(frameTime);
-
         _offerAcc += frameTime;
+
         if (_offerAcc >= OfferAccMax)
-        {
             _offerAcc -= OfferAccMax;
-        }
         else
-        {
             return;
-        }
 
-        var query = EntityQueryEnumerator<OfferItemComponent,HandsComponent>();
+        var query = EntityQueryEnumerator<OfferItemComponent, HandsComponent>();
         while (query.MoveNext(out var uid, out var offerItem, out var hands))
         {
-            if (hands.ActiveHand == null)
+            if (hands.ActiveHand is null)
                 continue;
 
-            if (offerItem.Hand != null &&
-                hands.Hands[offerItem.Hand].HeldEntity == null)
-            {
-                if (offerItem.Target != null)
+            if (offerItem.Hand is not null && hands.Hands[offerItem.Hand].HeldEntity is null)
+                if (offerItem.Target is not null)
                 {
                     UnReceive(offerItem.Target.Value, offerItem: offerItem);
                     offerItem.IsInOfferMode = false;
@@ -42,7 +35,6 @@ public override void Update(float frameTime)
                 }
                 else
                     UnOffer(uid, offerItem);
-            }
 
             if (!offerItem.IsInReceiveMode)
             {
@@ -53,6 +45,4 @@ public override void Update(float frameTime)
             _alertsSystem.ShowAlert(uid, OfferAlert);
         }
     }
-
-
 }
diff --git a/Content.Shared/_CorvaxNext/OfferItem/SharedOfferItemSystem.Interactions.cs b/Content.Shared/_CorvaxNext/OfferItem/SharedOfferItemSystem.Interactions.cs
index efc573d8278..2c54c0aa606 100644
--- a/Content.Shared/_CorvaxNext/OfferItem/SharedOfferItemSystem.Interactions.cs
+++ b/Content.Shared/_CorvaxNext/OfferItem/SharedOfferItemSystem.Interactions.cs
@@ -1,7 +1,6 @@
 using Content.Shared.ActionBlocker;
 using Content.Shared.Hands.Components;
 using Content.Shared.Input;
-using Content.Shared.Popups;
 using Robust.Shared.Input.Binding;
 using Robust.Shared.Player;
 
@@ -30,30 +29,29 @@ private void SetInOfferMode(ICommonSession? session)
         if (!_timing.IsFirstTimePredicted)
             return;
 
-        if (session is not { } playerSession)
+        if (session is null)
             return;
 
-        if ((playerSession.AttachedEntity is not { Valid: true } uid || !Exists(uid)) ||
-            !_actionBlocker.CanInteract(uid, null))
+        if (session.AttachedEntity is not { Valid: true } uid || !Exists(uid) || !_actionBlocker.CanInteract(uid, null))
             return;
 
         if (!TryComp<OfferItemComponent>(uid, out var offerItem))
             return;
 
-        if (!TryComp<HandsComponent>(uid, out var hands) || hands.ActiveHand == null)
+        if (!TryComp<HandsComponent>(uid, out var hands) || hands.ActiveHand is null)
             return;
 
         offerItem.Item = hands.ActiveHand.HeldEntity;
 
-        if (offerItem.IsInOfferMode == false)
+        if (!offerItem.IsInOfferMode)
         {
-            if (offerItem.Item == null)
+            if (offerItem.Item is null)
             {
                 _popup.PopupEntity(Loc.GetString("offer-item-empty-hand"), uid, uid);
                 return;
             }
 
-            if (offerItem.Hand == null || offerItem.Target == null)
+            if (offerItem.Hand is null || offerItem.Target is null)
             {
                 offerItem.IsInOfferMode = true;
                 offerItem.Hand = hands.ActiveHand.Name;
@@ -63,7 +61,7 @@ private void SetInOfferMode(ICommonSession? session)
             }
         }
 
-        if (offerItem.Target != null)
+        if (offerItem.Target is not null)
         {
             UnReceive(offerItem.Target.Value, offerItem: offerItem);
             offerItem.IsInOfferMode = false;
diff --git a/Content.Shared/_CorvaxNext/OfferItem/SharedOfferItemSystem.cs b/Content.Shared/_CorvaxNext/OfferItem/SharedOfferItemSystem.cs
index 5df594d3c80..ddcf774aef1 100644
--- a/Content.Shared/_CorvaxNext/OfferItem/SharedOfferItemSystem.cs
+++ b/Content.Shared/_CorvaxNext/OfferItem/SharedOfferItemSystem.cs
@@ -5,7 +5,6 @@
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
 using Content.Shared.Popups;
-using Robust.Shared.Player;
 using Robust.Shared.Timing;
 
 namespace Content.Shared._CorvaxNext.OfferItem;
@@ -17,6 +16,9 @@ public abstract partial class SharedOfferItemSystem : EntitySystem
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
 
+    [ValidatePrototypeId<AlertPrototype>]
+    protected const string OfferAlert = "Offer";
+
     public override void Initialize()
     {
         SubscribeLocalEvent<OfferItemComponent, InteractUsingEvent>(SetInReceiveMode);
@@ -24,14 +26,12 @@ public override void Initialize()
 
         InitializeInteractions();
 
-        SubscribeLocalEvent<OfferItemComponent,AcceptOfferAlertEvent>(OnClickAlertEvent);
+        SubscribeLocalEvent<OfferItemComponent, AcceptOfferAlertEvent>(OnClickAlertEvent);
     }
 
-    [ValidatePrototypeId<AlertPrototype>]
-    protected const string OfferAlert = "Offer";
     private void OnClickAlertEvent(Entity<OfferItemComponent> ent, ref AcceptOfferAlertEvent ev)
     {
-        if(ev.Handled)
+        if (ev.Handled)
             return;
 
         if (ev.AlertId != OfferAlert)
@@ -49,14 +49,22 @@ public void Receive(Entity<OfferItemComponent?> ent)
         if (!_timing.IsFirstTimePredicted)
             return;
 
-        if (!Resolve(ent, ref ent.Comp) ||
-            !TryComp<OfferItemComponent>(ent.Comp.Target, out var offerItem) ||
-            offerItem.Hand == null ||
-            ent.Comp.Target == null ||
-            !TryComp<HandsComponent>(ent, out var hands))
+        if (!Resolve(ent, ref ent.Comp))
+            return;
+
+        if (!TryComp<OfferItemComponent>(ent.Comp.Target, out var offerItem))
+            return;
+
+        if (offerItem.Hand is null)
             return;
 
-        if (offerItem.Item != null)
+        if (ent.Comp.Target is null)
+            return;
+
+        if (!TryComp<HandsComponent>(ent, out var hands))
+            return;
+
+        if (offerItem.Item is not null)
         {
             if (!_hands.TryPickup(ent, offerItem.Item.Value, handsComp: hands))
             {
@@ -85,8 +93,7 @@ private void SetInReceiveMode(EntityUid uid, OfferItemComponent component, Inter
         if (!TryComp<OfferItemComponent>(args.User, out var offerItem))
             return;
 
-        if (args.User == uid || component.IsInReceiveMode || !offerItem.IsInOfferMode ||
-            (offerItem.IsInReceiveMode && offerItem.Target != uid))
+        if (args.User == uid || component.IsInReceiveMode || !offerItem.IsInOfferMode || offerItem.IsInReceiveMode && offerItem.Target != uid)
             return;
 
         component.IsInReceiveMode = true;
@@ -114,7 +121,7 @@ private void SetInReceiveMode(EntityUid uid, OfferItemComponent component, Inter
 
     private void OnMove(EntityUid uid, OfferItemComponent component, MoveEvent args)
     {
-        if (component.Target == null ||
+        if (component.Target is null ||
             _transform.InRange(args.NewPosition,
                 Transform(component.Target.Value).Coordinates,
                 component.MaxOfferDistance)
@@ -129,13 +136,12 @@ private void OnMove(EntityUid uid, OfferItemComponent component, MoveEvent args)
     /// </summary>
     protected void UnOffer(EntityUid uid, OfferItemComponent component)
     {
-        if (!TryComp<HandsComponent>(uid, out var hands) || hands.ActiveHand == null)
+        if (!TryComp<HandsComponent>(uid, out var hands) || hands.ActiveHand is null)
             return;
 
-        if (TryComp<OfferItemComponent>(component.Target, out var offerItem) && component.Target != null)
+        if (TryComp<OfferItemComponent>(component.Target, out var offerItem) && component.Target is not null)
         {
-
-            if (component.Item != null)
+            if (component.Item is not null)
             {
                 if (!_timing.IsFirstTimePredicted)
                 {
@@ -148,9 +154,7 @@ protected void UnOffer(EntityUid uid, OfferItemComponent component)
                 }
 
             }
-
-            else if (offerItem.Item != null)
-            {
+            else if (offerItem.Item is not null)
                 if (!_timing.IsFirstTimePredicted)
                 {
                     _popup.PopupClient(Loc.GetString("offer-item-no-give",
@@ -160,7 +164,6 @@ protected void UnOffer(EntityUid uid, OfferItemComponent component)
                         ("user", Identity.Entity(component.Target.Value, EntityManager)),
                         ("item", Identity.Entity(offerItem.Item.Value, EntityManager))), component.Target.Value, uid);
                 }
-            }
 
             offerItem.IsInOfferMode = false;
             offerItem.IsInReceiveMode = false;
@@ -186,17 +189,17 @@ protected void UnOffer(EntityUid uid, OfferItemComponent component)
     /// </summary>
     protected void UnReceive(EntityUid uid, OfferItemComponent? component = null, OfferItemComponent? offerItem = null)
     {
-        if (component == null && !TryComp(uid, out component))
+        if (component is null && !TryComp(uid, out component))
             return;
 
-        if (offerItem == null && !TryComp(component.Target, out offerItem))
+        if (offerItem is null && !TryComp(component.Target, out offerItem))
             return;
 
-        if (!TryComp<HandsComponent>(uid, out var hands) || hands.ActiveHand == null ||
-            component.Target == null)
+        if (!TryComp<HandsComponent>(uid, out var hands) || hands.ActiveHand is null ||
+            component.Target is null)
             return;
 
-        if (offerItem.Item != null)
+        if (offerItem.Item is not null)
         {
             _popup.PopupClient(Loc.GetString("offer-item-no-give",
                 ("item", Identity.Entity(offerItem.Item.Value, EntityManager)),
@@ -224,6 +227,6 @@ protected void UnReceive(EntityUid uid, OfferItemComponent? component = null, Of
     /// </summary>
     protected bool IsInOfferMode(EntityUid? entity, OfferItemComponent? component = null)
     {
-        return entity != null && Resolve(entity.Value, ref component, false) && component.IsInOfferMode;
+        return entity is not null && Resolve(entity.Value, ref component, false) && component.IsInOfferMode;
     }
 }
diff --git a/Resources/Locale/ru-RU/interaction/offer-item-system.ftl b/Resources/Locale/ru-RU/_CorvaxNext/interaction/offer-item-system.ftl
similarity index 100%
rename from Resources/Locale/ru-RU/interaction/offer-item-system.ftl
rename to Resources/Locale/ru-RU/_CorvaxNext/interaction/offer-item-system.ftl

From e59ae240a2c97b7e9e668af1581100da31d03552 Mon Sep 17 00:00:00 2001
From: FN <firenamefn@gmail.com>
Date: Sun, 10 Nov 2024 08:13:30 +0700
Subject: [PATCH 05/17] Last fix

---
 .../_CorvaxNext/OfferItem/OfferItemSystem.cs     | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/Content.Client/_CorvaxNext/OfferItem/OfferItemSystem.cs b/Content.Client/_CorvaxNext/OfferItem/OfferItemSystem.cs
index ab44ba398c2..949ce1addbc 100644
--- a/Content.Client/_CorvaxNext/OfferItem/OfferItemSystem.cs
+++ b/Content.Client/_CorvaxNext/OfferItem/OfferItemSystem.cs
@@ -21,8 +21,6 @@ public override void Initialize()
         Subs.CVar(_cfg, NextVars.OfferModeIndicatorsPointShow, OnShowOfferIndicatorsChanged, true);
     }
 
-
-
     public override void Shutdown()
     {
         _overlayManager.RemoveOverlay<OfferItemIndicatorsOverlay>();
@@ -33,21 +31,13 @@ public bool IsInOfferMode()
     {
         var entity = _playerManager.LocalEntity;
 
-        if (entity == null)
-            return false;
-
-        return IsInOfferMode(entity.Value);
+        return entity is not null && IsInOfferMode(entity.Value);
     }
+
     private void OnShowOfferIndicatorsChanged(bool isShow)
     {
         if (isShow)
-        {
-            _overlayManager.AddOverlay(new OfferItemIndicatorsOverlay(
-                _inputManager,
-                EntityManager,
-                _eye,
-                this));
-        }
+            _overlayManager.AddOverlay(new OfferItemIndicatorsOverlay(_inputManager, EntityManager, _eye, this));
         else
             _overlayManager.RemoveOverlay<OfferItemIndicatorsOverlay>();
     }

From 1ee2dcd395c26855558b38c33b38e84ba8248a7a Mon Sep 17 00:00:00 2001
From: AwareFoxy <135021509+AwareFoxy@users.noreply.github.com>
Date: Sun, 10 Nov 2024 11:27:07 +0100
Subject: [PATCH 06/17] apply suggestionges frome code reviewere

---
 Resources/Prototypes/Alerts/alerts.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/Alerts/alerts.yml b/Resources/Prototypes/Alerts/alerts.yml
index 4edd0152d58..91d876bf93b 100644
--- a/Resources/Prototypes/Alerts/alerts.yml
+++ b/Resources/Prototypes/Alerts/alerts.yml
@@ -24,7 +24,7 @@
     - category: Thirst
     - alertType: Magboots
     - alertType: Pacified
-    - alertType: Offer #Ataraxia
+    - alertType: Offer # Corvax-Next-Offer
 
 - type: entity
   id: AlertSpriteView
@@ -92,7 +92,7 @@
   name: alerts-on-fire-name
   description: alerts-on-fire-desc
 
-- type: alert #Ataraxia
+- type: alert # Corvax-Next-Offer
   id: Offer
   clickEvent: !type:AcceptOfferAlertEvent
   icons:

From 418e0990d60cb86e7464c46a31a7e5bf1d35b38f Mon Sep 17 00:00:00 2001
From: AwareFoxy <vgstecker@gmail.com>
Date: Sun, 10 Nov 2024 11:50:26 +0100
Subject: [PATCH 07/17] icon locale

---
 .../Alerts/offer_item.rsi/offer_item.png        | Bin 782 -> 738 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/Resources/Textures/_CorvaxNext/Alerts/offer_item.rsi/offer_item.png b/Resources/Textures/_CorvaxNext/Alerts/offer_item.rsi/offer_item.png
index 44ac380ddb19fefba315b2d433582aa773b8e6c7..25a58166da1fcbaa1f59516e0d370b30be58d74b 100644
GIT binary patch
delta 714
zcmV;*0yX`P2I2*fB!2;OQb$4nuFf3k0007<Nkl<ZScUDDy>8P`6vuyYYV43Y<g0Ez
zN+~pyA|&1ci5Fl31cM&|5G-Ng(+g}Mv3h_J5Dx(Fz|tWJ3vJpaO%<gdG%-%h&^n5u
z#5W0*VCaAH^*#5TpU=7HUc-t0u>yXRhH1Ipvz0djla8&tF@H3UBqHozJZRkeZqR%$
z*w_I5>UU<Cmg^Tlq^WTih%z!R%-9*|SAPcl>iu6zNPF|%lW0g^sC#3lzJB)otNhw9
z`#TR`W{&)}KD>Th6ZsdGAfzwUFQsS6=}DGSvrNS@t3JW6%JFPjj%U~8cy{a7{ill}
z|08X}y}bsZ(0{bhPL5~4=kyuCMUsLPpoAdHz5ur$Ji83A{i{g=DDO6Dl#4g~)<}{>
zr_*MCzaaz$K?#)P{K|4BMdGxIs)kU5a3*{4^DuiWZv+aP6%G#ey6^5jGOtYpV3?MB
zJ{hBBw@Acw6eYxkbedH7)X-ixOv_zL&7x^hG%d<<CV$0LEc0z5003E5kY$BttBGyf
zw4F9H34I`h7hIA8IF18=)9#SdlfH+Oa1$0bHpyx#;cx_}-KMc!MVpQQI~b<r?r!`D
zXz4{4pwnsdbF0Q&B8lTTl&UpydeYbbL?>afQagfxk8hp>kkgZts=~IP3_w-G-RI4H
zo1OL2m49O8FqmOl0Nvno3I8vi2mruwe&f1_rTp~v#Y%m(aGj$b@4u4A(a=56e~+)%
z>!hR6?);Z`=GRFA_RBW|y<gRA)6IZLUOBRwN~v1=yFVg;U@!=b4&bT0+Z0~U6Lo>N
z@s2}d1DuOR0Nmq(7zx02UFM?^UmL@;T+yL3NJAt46Do>Av9je216JM`XlL8D@bv4|
wNWI(Bjza_Y+Iaw?4j36=T#X8RqW?mF0B`XRfuvr3)Bpeg07*qoM6N<$f^AY>X#fBK

delta 758
zcmV<S0tx-%1&#)gB!3BTNLh0L01FZT01FZU(%pXi0008ONkl<ZSV!$v%Wl&^6uog8
z?2x7;P3q<W<<asI690h253m9Ri+%zi*pv;=Y+wfx+b&=Uh!22&VADksHnd5TCY6;o
zp-!+9<_?+2a_xB(Rct!a$R7LNbI#m*=h^^A<3C3r!sA~qt$&W#`_+}@$iJ?Y_sR(U
zR|e!2gwMj({^wpHnyM-U^8(7Oc^p%!0x%U`AJH0Z{WeMw;Ds+pygwrT+ELx`q1$s$
z0kYq`_aqfJ&sa=}W7SW+f3>m^rtHqcmj&_;ar+-$KW>Y5AS^;8znGtgB{K^ba`P~i
zF06CNuf}GJHGeWU$ZXxZ|8!9#K&lA4-44X#(;_S&q~Dj!Ibt^gO^ZSqpgN95s4rK*
z?FY{;qv!T78#3ft+qI!ntK8rz(KHQ)Ll=6zj!-Zfa8saX7uGHna*#Q0fMLYJhyt7_
zp8p(%j1^yQG+}SAJ2AQYsC11hIP4`Jr?c5K^ap*&%zv7o>v1@j&qFS8Y+uJ?80dp_
zl1!%PMDe6%z8y#aI>ll-op#@b!C(Nc<HB6V3>3l0H7x>;<4{h=9n#|E^%7wbmNy$v
zOd60#%n(2qI@?>2oSq@@I}~_#^G76^U!)%`%>B<+8%}1jR77>FO$8h{0%4AoW_v6G
z;NzR;)PD?#kWh69`v3wOMq+~7=nY_}UcG`MaF8g_D<j9<s|+atG@s6I7>)k^9(;QH
zV$E7FUnjS;lVbJrJ~%u<p*7(Dh}10$@~PAW>&v^+SCyS&qzL9d7j6W+yRu!<-^LLT
z5wmn)@#6hBLV<2lDTqc%2O>jO0As?=DN2o$0B^r^R(PUF$h=n;a5{}W0Pwd=2483+
zB>+RekfOw)1Dlel=>$0oJ0Ww@bsZ|r7F*)63lxJbTSbWQj|f>jy*!lIYsUnz6Tpj{
olmKBOeFn0ERdJ8(4<!PB0L}v`#4MX$RR91007*qoM6N<$f?o$$ZU6uP


From 1b59fb9f5e7f1bd6077d82ce2f1bf049356ca369 Mon Sep 17 00:00:00 2001
From: AwareFoxy <vgstecker@gmail.com>
Date: Sun, 10 Nov 2024 11:53:01 +0100
Subject: [PATCH 08/17] rename + remove THE

---
 .../_CorvaxNext/interaction/offer-item-system.ftl  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Locale/ru-RU/_CorvaxNext/interaction/offer-item-system.ftl b/Resources/Locale/ru-RU/_CorvaxNext/interaction/offer-item-system.ftl
index 92713010741..29b28cacb4e 100644
--- a/Resources/Locale/ru-RU/_CorvaxNext/interaction/offer-item-system.ftl
+++ b/Resources/Locale/ru-RU/_CorvaxNext/interaction/offer-item-system.ftl
@@ -2,12 +2,12 @@ offer-item-empty-hand = У тебя в руках нет ничего, что т
 
 offer-item-full-hand = Ваша рука не свободна для получения предмета.
 
-offer-item-try-give = Вы предлагаете {THE($item)}  {$target}
-offer-item-try-give-target = {$user} предлагает вам {THE($item)}
+offer-item-try-give = Вы предлагаете {($item)}  {$target}
+offer-item-try-give-target = {$user} предлагает вам {($item)}
 
-offer-item-give = Вы отдали {THE($item)}  {$target}
-offer-item-give-other = {$user} отдал {THE($item)}  {$target}
-offer-item-give-target = {$user} отдал вам {THE($item)}
+offer-item-give = Вы отдали {($item)}  {$target}
+offer-item-give-or = {$user} отдал {($item)}  {$target}
+offer-item-give-target = {$user} отдал вам {($item)}
 
-offer-item-no-give = Вы перестаёте предлагать {THE($item)}  {$target}
-offer-item-no-give-target = {$user} больше не предлагает вам {THE($item)}
+offer-item-no-give = Вы перестаёте предлагать {($item)}  {$target}
+offer-item-no-give-target = {$user} больше не предлагает вам {($item)}

From cd480a839f846f78aeb009dbfc3c8ecde4d90dc1 Mon Sep 17 00:00:00 2001
From: AwareFoxy <vgstecker@gmail.com>
Date: Sun, 10 Nov 2024 11:55:07 +0100
Subject: [PATCH 09/17] fix1

---
 .../{ => _corvaxnext}/interaction/offer-item-system.ftl           | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename Resources/Locale/ru-RU/_CorvaxNext/{ => _corvaxnext}/interaction/offer-item-system.ftl (100%)

diff --git a/Resources/Locale/ru-RU/_CorvaxNext/interaction/offer-item-system.ftl b/Resources/Locale/ru-RU/_CorvaxNext/_corvaxnext/interaction/offer-item-system.ftl
similarity index 100%
rename from Resources/Locale/ru-RU/_CorvaxNext/interaction/offer-item-system.ftl
rename to Resources/Locale/ru-RU/_CorvaxNext/_corvaxnext/interaction/offer-item-system.ftl

From d213bc60574d145ef0b3d591b559e5ed17c7a2e1 Mon Sep 17 00:00:00 2001
From: AwareFoxy <vgstecker@gmail.com>
Date: Sun, 10 Nov 2024 11:56:07 +0100
Subject: [PATCH 10/17] fix 2

---
 .../_corvaxnext/interaction/offer-item-system.ftl                 | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename Resources/Locale/ru-RU/{_CorvaxNext => }/_corvaxnext/interaction/offer-item-system.ftl (100%)

diff --git a/Resources/Locale/ru-RU/_CorvaxNext/_corvaxnext/interaction/offer-item-system.ftl b/Resources/Locale/ru-RU/_corvaxnext/interaction/offer-item-system.ftl
similarity index 100%
rename from Resources/Locale/ru-RU/_CorvaxNext/_corvaxnext/interaction/offer-item-system.ftl
rename to Resources/Locale/ru-RU/_corvaxnext/interaction/offer-item-system.ftl

From 67a9e46bae26a3c47196428bf354a8bea7ef718f Mon Sep 17 00:00:00 2001
From: AwareFoxy <vgstecker@gmail.com>
Date: Sun, 10 Nov 2024 12:04:24 +0100
Subject: [PATCH 11/17] fix linter

---
 .../_corvaxnext/interaction/offer-item-system.ftl  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Locale/ru-RU/_corvaxnext/interaction/offer-item-system.ftl b/Resources/Locale/ru-RU/_corvaxnext/interaction/offer-item-system.ftl
index 29b28cacb4e..92713010741 100644
--- a/Resources/Locale/ru-RU/_corvaxnext/interaction/offer-item-system.ftl
+++ b/Resources/Locale/ru-RU/_corvaxnext/interaction/offer-item-system.ftl
@@ -2,12 +2,12 @@ offer-item-empty-hand = У тебя в руках нет ничего, что т
 
 offer-item-full-hand = Ваша рука не свободна для получения предмета.
 
-offer-item-try-give = Вы предлагаете {($item)}  {$target}
-offer-item-try-give-target = {$user} предлагает вам {($item)}
+offer-item-try-give = Вы предлагаете {THE($item)}  {$target}
+offer-item-try-give-target = {$user} предлагает вам {THE($item)}
 
-offer-item-give = Вы отдали {($item)}  {$target}
-offer-item-give-or = {$user} отдал {($item)}  {$target}
-offer-item-give-target = {$user} отдал вам {($item)}
+offer-item-give = Вы отдали {THE($item)}  {$target}
+offer-item-give-other = {$user} отдал {THE($item)}  {$target}
+offer-item-give-target = {$user} отдал вам {THE($item)}
 
-offer-item-no-give = Вы перестаёте предлагать {($item)}  {$target}
-offer-item-no-give-target = {$user} больше не предлагает вам {($item)}
+offer-item-no-give = Вы перестаёте предлагать {THE($item)}  {$target}
+offer-item-no-give-target = {$user} больше не предлагает вам {THE($item)}

From 3c6c53a1c140da69ef4dc6037de7254555ac4cd3 Mon Sep 17 00:00:00 2001
From: AwareFoxy <135021509+AwareFoxy@users.noreply.github.com>
Date: Sun, 10 Nov 2024 12:56:47 +0100
Subject: [PATCH 12/17] Update Resources/Locale/ru-RU/alerts/alerts.ftl

---
 Resources/Locale/ru-RU/alerts/alerts.ftl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Locale/ru-RU/alerts/alerts.ftl b/Resources/Locale/ru-RU/alerts/alerts.ftl
index 645a813bd68..b5ee9bed5cc 100644
--- a/Resources/Locale/ru-RU/alerts/alerts.ftl
+++ b/Resources/Locale/ru-RU/alerts/alerts.ftl
@@ -74,5 +74,5 @@ alerts-revenant-essence-name = Эссенция
 alerts-revenant-essence-desc = Сила душ. Поддерживает вас и используется при использовании способностей. Медленно восстанавливается с течением времени.
 alerts-revenant-corporeal-name = Материальность
 alerts-revenant-corporeal-desc = Вы физически воплотились. Окружающие могут видеть и наносить вам вред.
-alerts-offer-name = передать
+alerts-offer-name = получить
 alerts-offer-desc = кто-то передаёт вам предмет

From cf0284353d9f8c2aa0a6f262d81dc321a1312cef Mon Sep 17 00:00:00 2001
From: AwareFoxy <135021509+AwareFoxy@users.noreply.github.com>
Date: Sun, 10 Nov 2024 13:01:14 +0100
Subject: [PATCH 13/17] Update Resources/Locale/ru-RU/alerts/alerts.ftl

Co-authored-by: FN <37689533+FireNameFN@users.noreply.github.com>
---
 Resources/Locale/ru-RU/alerts/alerts.ftl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Locale/ru-RU/alerts/alerts.ftl b/Resources/Locale/ru-RU/alerts/alerts.ftl
index b5ee9bed5cc..e671f878069 100644
--- a/Resources/Locale/ru-RU/alerts/alerts.ftl
+++ b/Resources/Locale/ru-RU/alerts/alerts.ftl
@@ -75,4 +75,4 @@ alerts-revenant-essence-desc = Сила душ. Поддерживает вас
 alerts-revenant-corporeal-name = Материальность
 alerts-revenant-corporeal-desc = Вы физически воплотились. Окружающие могут видеть и наносить вам вред.
 alerts-offer-name = получить
-alerts-offer-desc = кто-то передаёт вам предмет
+alerts-offer-desc = Кто-то передаёт вам предмет.

From 5b1c5bc4bd4aec3438cb7ae97bb6db3257684035 Mon Sep 17 00:00:00 2001
From: AwareFoxy <135021509+AwareFoxy@users.noreply.github.com>
Date: Sun, 10 Nov 2024 13:02:52 +0100
Subject: [PATCH 14/17] Update Resources/Locale/ru-RU/alerts/alerts.ftl

Co-authored-by: FN <37689533+FireNameFN@users.noreply.github.com>
---
 Resources/Locale/ru-RU/alerts/alerts.ftl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Locale/ru-RU/alerts/alerts.ftl b/Resources/Locale/ru-RU/alerts/alerts.ftl
index e671f878069..e77dd9c14a0 100644
--- a/Resources/Locale/ru-RU/alerts/alerts.ftl
+++ b/Resources/Locale/ru-RU/alerts/alerts.ftl
@@ -74,5 +74,5 @@ alerts-revenant-essence-name = Эссенция
 alerts-revenant-essence-desc = Сила душ. Поддерживает вас и используется при использовании способностей. Медленно восстанавливается с течением времени.
 alerts-revenant-corporeal-name = Материальность
 alerts-revenant-corporeal-desc = Вы физически воплотились. Окружающие могут видеть и наносить вам вред.
-alerts-offer-name = получить
+alerts-offer-name = Получить
 alerts-offer-desc = Кто-то передаёт вам предмет.

From faec5383bc4d95902f0c821c8b6c8c7416a4d9d6 Mon Sep 17 00:00:00 2001
From: AwareFoxy <135021509+AwareFoxy@users.noreply.github.com>
Date: Sun, 10 Nov 2024 15:38:08 +0100
Subject: [PATCH 15/17] Apply suggestions from code review

---
 Content.Client/Options/UI/Tabs/MiscTab.xaml                    | 2 +-
 Content.Client/Options/UI/Tabs/MiscTab.xaml.cs                 | 2 +-
 Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl         | 2 +-
 Resources/Textures/_CorvaxNext/Alerts/offer_item.rsi/meta.json | 2 +-
 Resources/keybinds.yml                                         | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Content.Client/Options/UI/Tabs/MiscTab.xaml b/Content.Client/Options/UI/Tabs/MiscTab.xaml
index c738e4fac15..f81281e724a 100644
--- a/Content.Client/Options/UI/Tabs/MiscTab.xaml
+++ b/Content.Client/Options/UI/Tabs/MiscTab.xaml
@@ -22,7 +22,7 @@
                        StyleClasses="LabelKeyText"/>
                 <CheckBox Name="ShowHeldItemCheckBox" Text="{Loc 'ui-options-show-held-item'}" />
                 <CheckBox Name="ShowCombatModeIndicatorsCheckBox" Text="{Loc 'ui-options-show-combat-mode-indicators'}" />
-                <CheckBox Name="ShowOfferModeIndicatorsCheckBox" Text="{Loc 'ui-options-show-offer-mode-indicators'}" />
+                <CheckBox Name="ShowOfferModeIndicatorsCheckBox" Text="{Loc 'ui-options-show-offer-mode-indicators'}" /> <!-- Corvax-Next-Offer -->
                 <Label Text="{Loc 'ui-options-general-storage'}"
                        StyleClasses="LabelKeyText"/>
                 <CheckBox Name="OpaqueStorageWindowCheckBox" Text="{Loc 'ui-options-opaque-storage-window'}" />
diff --git a/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs b/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs
index 50820e0b435..835c250c6d3 100644
--- a/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs
@@ -1,6 +1,6 @@
 using System.Linq;
 using Content.Client.UserInterface.Screens;
-using Content.Shared._CorvaxNext.NextVars;
+using Content.Shared._CorvaxNext.NextVars; // Corvax-Next-Offer
 using Content.Shared.CCVar;
 using Content.Shared.HUD;
 using Robust.Client.AutoGenerated;
diff --git a/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl b/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl
index efef631c92c..aef8d7e9325 100644
--- a/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl
+++ b/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl
@@ -260,5 +260,5 @@ ui-options-colorblind-friendly = Режим для дальтоников
 ui-options-reduced-motion = Снижение интенсивности визуальных эффектов
 ui-options-chat-window-opacity = Прозрачность окна чата
 ui-options-screen-shake-intensity = Интенсивность дрожания экрана
-ui-options-show-offer-mode-indicators = показывать индикатор передачи предмета
+ui-options-show-offer-mode-indicators = Показывать индикатор передачи предмета
 ui-options-function-offer-item = Передать что-либо
diff --git a/Resources/Textures/_CorvaxNext/Alerts/offer_item.rsi/meta.json b/Resources/Textures/_CorvaxNext/Alerts/offer_item.rsi/meta.json
index 9b5f9361314..0513aeb3e06 100644
--- a/Resources/Textures/_CorvaxNext/Alerts/offer_item.rsi/meta.json
+++ b/Resources/Textures/_CorvaxNext/Alerts/offer_item.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Original icon taken from https://github.com/ss220-space/Paradise/blob/master220/icons/mob/screen_alert.dmi, modified by Mocho",
+  "copyright": "Original icon taken from https://github.com/ss220-space/Paradise/blob/master220/icons/mob/screen_alert.dmi, modified by Mocho, resprited by AwareFoxy",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/keybinds.yml b/Resources/keybinds.yml
index 3d6bcc2b8d1..153d7c35b61 100644
--- a/Resources/keybinds.yml
+++ b/Resources/keybinds.yml
@@ -584,6 +584,6 @@ binds:
   type: State
   key: MouseRight
   canFocus: true
-- function: OfferItem # Ataraxia
+- function: OfferItem # Corvax-Next-Offer
   type: State
   key: F

From dbeef7f8ec2f9dd92e336a34ed7ade75a730e0d6 Mon Sep 17 00:00:00 2001
From: AwareFoxy <vgstecker@gmail.com>
Date: Sun, 10 Nov 2024 15:42:51 +0100
Subject: [PATCH 16/17] vzyat

---
 .../Alerts/offer_item.rsi/offer_item.png        | Bin 738 -> 745 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/Resources/Textures/_CorvaxNext/Alerts/offer_item.rsi/offer_item.png b/Resources/Textures/_CorvaxNext/Alerts/offer_item.rsi/offer_item.png
index 25a58166da1fcbaa1f59516e0d370b30be58d74b..6215d2e53ff3a450c60ab851fef947a933c38c34 100644
GIT binary patch
delta 708
zcmV;#0z3WU1?dHlF@K{;L_t(oh3%HhZqrZ@hQBy9aY!9<tD8$Hg@#gu#5*AI0;~YR
z!jAw5Hetgx8`y!w)(cny;sM|t*mRME4Q<*cO%<gVnixA~(K?Ev#K%o5l|}#6nKR>=
ze`d~{V>rbLBjBafi-zN_je;H+M>Yz&XADWiu-}1E&;x@G2Y>a0dm>DT4EnR`UwiEh
z(~lx`qzd@S^vEq3tiYfw3LvV`i9=Yz+Yg?_!rENZm96IL`Hyc3E2Hf1J${`%@Z0(H
z_Gv@pU)X}MHrKq8nI^BLSV&JZ5zj7r1ivmPa#cBzTagpFjXMvY&x`yErvPAQr$snC
zDYTOlxu1D$3V(2rq#z}zAgHn@fxC}hTm{(t(<TX2x7)O;<y&6gNRmXiYqPuC5)uYM
z3qq;crNwNT<XHtp38MtzT<-GMQT9eb50utx?CtIJ_U=C^-WZF3UNoGGsW=_8Lo%Te
z3Wd3p$&ikm897>d(Qp>h)2M0;RgJNjO*0YC{uqk@fPXB9kmV5VP8-uSu`Qdaq&Ad<
z8(fkCSe6BVWp~MIDbKq=cnC{t>*Q30NF<77+q5?8sFP7(3%zJK+iSl9YG&R6=yq*>
zZ#0-mrm!rFO1(i|OL_Vij^QwrYmEaE@cG?K0P<RjN?kbi;}KAlNN>HqYqGUkxmK?2
z2h)oNKz}dzOwv2!u?PTI)?XZFzm;F!zglW8mu_+}<HMe5zZiK227fSCn@uvYSWo}$
zL-G4K0SDn(f&Q%8HoXdn;I<>DDpcwX&nMYe3xdHQ;Gckt>UR6+{{zF|9=zkgp$S}w
zM**DUBH@dG<2cO5qMkN-(QrhU&M^3TjsZfU5IyDEhARe)f<DyFG)>{{*AHK_+c%CQ
q1NYmx1Vj_yo4{e=m+&e63;Y8wC>nQ?V|^L`0000<MNUMnLSTYTX;d-*

delta 701
zcmV;u0z&=i1>yyeF@Ky%L_t(oh3%HTZqrZ{$A58Z?2tO-t8P9@DKwNKB;Emu7hnPe
zgC7A9EMei(3v3{<dVmoS4*>7L(jf^8ZQ3SH6{R0EF;2|TI*OviHwl$s=zsF{J@=fS
z&$;Jb!-@W}0)CT*X}R9Bl{W&Dj;*{gG>#-9>|Z=+-1~0Oe19+4*Z}?NcV?KD>lZ+z
zsc{#GGBPgA*cs?oe+K;O{a;E*d-L9tXh>hEdt;}*e)j#V{Ms=4I}cxGj{LShynb90
z`4^TTq%YJjrDw_MNtRNxOvN&*KEbcb@oZU+XV>I-cI(#tr;8&0BW=RHy#}Gsw9rnD
zXTRt48Nfx7f`1gCgdoel0Jk4Jy9}`Xt4RVV?>1?ai#Pn%NRmXS(`J9aAp{0N36$jg
z%5o+};<SpYhERiWCVTPoFncR+1PYrK4i5IZ@9sV_uT2DCn3j7!8KY&lNW^s%CB%hv
znpF7I&|Wu8%Uw#%qG?eyEy{8x#Z)ZwZ6W{wSyqr`g@0zNiEZ1ooi;NGeISGvT#^Df
zjst+x?vT@yzK4@=6Baf$$!aR$a0I8_rm<Z`n~nfG7^da!Zu|&n=|vZy(`oZ_tHxX+
ziQ_nwsx@+Y(%1h)Ct<NtJA#0ZZ=M5?)032{!nU6bKvl!t=gobao%Pa{V&yQHVOjv)
z;ByK8FMpm00Kjp6<GP2X{Pgz4N`19(oueM_zmmt%&^^$9kFVG3q@&U9{Fis;*GU5Q
z%QpkPU)5~W&45T=IkK8csapHHKO%r&FbIqe;HkXZ6kg90b%D3>jzePuoQp*O+~a~6
z3BYw-=A#i`8^g3*(V;U)BmWaBibAon<qZQ?-ZmI$XWO>$^y}3~z1!1{Lj(8Pc>tmg
j7#Uz(jS76C|3ZHNZ}AU-q+Wj100000NkvXXu0mjf>vmf4


From 122bc291ca22d837aab01d2cef96ef3eb215797b Mon Sep 17 00:00:00 2001
From: AwareFoxy <135021509+AwareFoxy@users.noreply.github.com>
Date: Mon, 11 Nov 2024 00:37:14 +0100
Subject: [PATCH 17/17] Apply suggestions from code review

---
 .../ru-RU/_corvaxnext/interaction/offer-item-system.ftl       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Locale/ru-RU/_corvaxnext/interaction/offer-item-system.ftl b/Resources/Locale/ru-RU/_corvaxnext/interaction/offer-item-system.ftl
index 92713010741..94dbe640ef8 100644
--- a/Resources/Locale/ru-RU/_corvaxnext/interaction/offer-item-system.ftl
+++ b/Resources/Locale/ru-RU/_corvaxnext/interaction/offer-item-system.ftl
@@ -1,6 +1,6 @@
-offer-item-empty-hand = У тебя в руках нет ничего, что ты мог бы отдать!
+offer-item-empty-hand = У вас в руках ничего нет!
 
-offer-item-full-hand = Ваша рука не свободна для получения предмета.
+offer-item-full-hand = Ваши руки заняты!
 
 offer-item-try-give = Вы предлагаете {THE($item)}  {$target}
 offer-item-try-give-target = {$user} предлагает вам {THE($item)}