From 276915fb44304c6605c17fe86864c97e99f50c6b Mon Sep 17 00:00:00 2001
From: BIGZi0348 <118811750+BIGZi0348@users.noreply.github.com>
Date: Tue, 17 Sep 2024 20:41:24 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=BF=D0=BE=D0=BF?=
 =?UTF-8?q?=D0=BE=D0=BB=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B7=D0=B0=D1=80?=
 =?UTF-8?q?=D1=8F=D0=B4=D0=BE=D0=B2=20=D0=A0=D0=A6=D0=94=20=D0=B8=D1=81?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D1=83=D1=8F=20=D1=81=D1=82=D0=B0?=
 =?UTF-8?q?=D0=BA=D0=B8=20=D1=80=D0=B5=D1=81=D1=83=D1=80=D1=81=D0=BE=D0=B2?=
 =?UTF-8?q?=20(#699)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Фиксики

* Спасли Валеру от банкротства
---
 Content.Shared/RCD/Systems/RCDAmmoSystem.cs     | 17 ++++++++++++++++-
 .../en-US/rcd/components/rcd-ammo-component.ftl |  1 +
 .../ru-RU/rcd/components/rcd-ammo-component.ftl |  3 ++-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/Content.Shared/RCD/Systems/RCDAmmoSystem.cs b/Content.Shared/RCD/Systems/RCDAmmoSystem.cs
index 159da03d1b..b1d1f2d233 100644
--- a/Content.Shared/RCD/Systems/RCDAmmoSystem.cs
+++ b/Content.Shared/RCD/Systems/RCDAmmoSystem.cs
@@ -63,6 +63,21 @@ public sealed class RCDAmmoSystem : EntitySystem
 
         var user = args.User;
         args.Handled = true;
+
+        // WD edit start
+        TryComp<StackComponent>(uid, out var stackComponent);
+        if (stackComponent != null)
+        {
+            var realValue = (int) (stackComponent.Count * comp.ChargeCountModifier);
+            comp.Charges = realValue;
+            if (realValue == 0)
+            {
+                _popup.PopupClient(Loc.GetString("rcd-ammo-component-after-interact-not-enough"), target, user);
+                return;
+            }
+        }
+        // WD edit end
+
         var count = Math.Min(charges.MaxCharges - charges.Charges, comp.Charges);
         if (count <= 0)
         {
@@ -73,7 +88,7 @@ public sealed class RCDAmmoSystem : EntitySystem
         _popup.PopupClient(Loc.GetString("rcd-ammo-component-after-interact-refilled"), target, user);
 
         // WD edit start
-        if (TryComp<StackComponent>(uid, out var stackComponent))
+        if (stackComponent != null)
         {
             var spent = (int) (count / comp.ChargeCountModifier) == 0 ? 1 : (int) (count / comp.ChargeCountModifier);
             _stack.SetCount(uid, stackComponent.Count - spent);
diff --git a/Resources/Locale/en-US/rcd/components/rcd-ammo-component.ftl b/Resources/Locale/en-US/rcd/components/rcd-ammo-component.ftl
index e65a9b3147..20039ecafb 100644
--- a/Resources/Locale/en-US/rcd/components/rcd-ammo-component.ftl
+++ b/Resources/Locale/en-US/rcd/components/rcd-ammo-component.ftl
@@ -1,3 +1,4 @@
 rcd-ammo-component-on-examine = It holds {$charges} charges.
 rcd-ammo-component-after-interact-full = The RCD is full!
 rcd-ammo-component-after-interact-refilled = You refill the RCD.
+rcd-ammo-component-after-interact-not-enough = Not enough material for charge.
diff --git a/Resources/Locale/ru-RU/rcd/components/rcd-ammo-component.ftl b/Resources/Locale/ru-RU/rcd/components/rcd-ammo-component.ftl
index b16b4b88ad..7c95fa6b0b 100644
--- a/Resources/Locale/ru-RU/rcd/components/rcd-ammo-component.ftl
+++ b/Resources/Locale/ru-RU/rcd/components/rcd-ammo-component.ftl
@@ -1,6 +1,7 @@
 rcd-ammo-component-on-examine = Оно содержит { $charges } зарядов.
-rcd-ammo-component-after-interact-full = РЦд полностью заряжена!
+rcd-ammo-component-after-interact-full = РЦД полностью заряжен!
 rcd-ammo-component-after-interact-refilled = Вы перезаряжаете РЦД.
 rcd-ammo-component-on-examine-text = Содержит { $ammo } зарядов.
 rcd-ammo-component-after-interact-full-text = РЦД полностью заряжен!
 rcd-ammo-component-after-interact-refilled-text = Вы перезаряжаете РЦД.
+rcd-ammo-component-after-interact-not-enough = Недостаточно материала для заряда.