From 28112f32f70644d3d1b25b9c9f0e847bdc3ec29c Mon Sep 17 00:00:00 2001
From: CaypenNow <66198468+CaypenNow@users.noreply.github.com>
Date: Mon, 18 Mar 2024 03:20:34 +0500
Subject: [PATCH 1/2] Clumsy tweak (#217)

* tweak: delete gun on clumsy

* fix: fix
---
 Content.Server/Weapons/Ranged/Systems/GunSystem.cs      | 2 ++
 Resources/Locale/ru-RU/locales-new/autotranslate-56.ftl | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
index 3e5a768d69..11d7d7adc2 100644
--- a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
+++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
@@ -91,6 +91,8 @@ public sealed partial class GunSystem : SharedGunSystem
                     Audio.PlayPvs(clumsy.ClumsySound, gunUid);
 
                     PopupSystem.PopupEntity(Loc.GetString("gun-clumsy"), user.Value);
+                    _adminLogger.Add(LogType.EntityDelete, LogImpact.Medium, $"{Loc.GetString("clumsy-gun-delete-log", ("prettyUser", ToPrettyString(user.Value)), ("prettyGun", ToPrettyString(gunUid)))}");
+                    Del(gunUid);
                     userImpulse = false;
                     return;
                 }
diff --git a/Resources/Locale/ru-RU/locales-new/autotranslate-56.ftl b/Resources/Locale/ru-RU/locales-new/autotranslate-56.ftl
index a4d7b42611..662dad5304 100644
--- a/Resources/Locale/ru-RU/locales-new/autotranslate-56.ftl
+++ b/Resources/Locale/ru-RU/locales-new/autotranslate-56.ftl
@@ -7,4 +7,5 @@ ent-Dresser = комод
 ent-ZipLock = зип пакет
   .desc = Предназначен для хранения улик.
 ent-BoxZipLocks = коробка зип пакетов
-  .desc = Заполнена зип пакетами. Обрадуйте детектива!
\ No newline at end of file
+  .desc = Заполнена зип пакетами. Обрадуйте детектива!
+clumsy-gun-delete-log = В следствии неуклюжести во время стрельбы от { $prettyUser }, было удалено { $prettyGun }
\ No newline at end of file

From 729f1ce7c4adca7e316e8824d1679a56378b9848 Mon Sep 17 00:00:00 2001
From: RavmorganButOnCocaine <valtos@nextmail.ru>
Date: Sun, 17 Mar 2024 22:21:37 +0000
Subject: [PATCH 2/2] Automatic changelog update

---
 Resources/Changelog/ChangelogWhite.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/Resources/Changelog/ChangelogWhite.yml b/Resources/Changelog/ChangelogWhite.yml
index 0ecc7074e6..190083b214 100644
--- a/Resources/Changelog/ChangelogWhite.yml
+++ b/Resources/Changelog/ChangelogWhite.yml
@@ -2400,3 +2400,14 @@
   id: 201
   time: '2024-03-17T01:25:45.0000000+00:00'
   url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/214
+- author: CaypenNow
+  changes:
+  - message: "\u041F\u0440\u0438 \u0441\u0442\u0440\u0435\u043B\u044C\u0431\u0435\
+      \ \u043A\u043B\u043E\u0443\u043D \u0441\u043D\u043E\u0432\u0430 \u0443\u0434\
+      \u0430\u043B\u044F\u0435\u0442 \u043E\u0440\u0443\u0436\u0438\u0435, \u0430\
+      \ \u043D\u0435 \u043F\u0440\u043E\u0441\u0442\u043E \u0432\u044B\u0431\u0440\
+      \u0430\u0441\u044B\u0432\u0430\u0435\u0442 \u0435\u0433\u043E."
+    type: Tweak
+  id: 202
+  time: '2024-03-17T22:20:34.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/217