From 778b283b4dd6c5555f90546750dec8347920e7a1 Mon Sep 17 00:00:00 2001
From: ThereDrD0 <88589686+ThereDrD0@users.noreply.github.com>
Date: Sun, 24 Mar 2024 19:34:19 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=BB=D1=83=D1=82?=
 =?UTF-8?q?=D0=B0=20=D1=88=D0=BA=D0=B0=D1=84=D0=BE=D0=B2=20=D0=BF=D0=BE=20?=
 =?UTF-8?q?=D0=BE=D1=82=D0=B7=D1=8B=D0=B2=D0=B0=D0=BC=20=D0=BC=D0=B0=D0=BF?=
 =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B0=20(#244)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: fix mime and clown lockers localization

* fix: fix double medal case in captain locker

* fix: fix double ce magboots

* fix: fix medical locker description
---
 .../structures/storage/closets/lockers/lockers.ftl     | 10 +++++-----
 .../Prototypes/Catalog/Fills/Lockers/dressers.yml      |  1 -
 Resources/Prototypes/Catalog/Fills/Lockers/heads.yml   |  3 ---
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/closets/lockers/lockers.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/closets/lockers/lockers.ftl
index a9c29274d6..b66bd34f3e 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/closets/lockers/lockers.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/closets/lockers/lockers.ftl
@@ -38,7 +38,7 @@ ent-LockerMedicine = шкаф для медикаментов
     .desc = Битком набит медицинскими штуками.
     .suffix = { "" }
 ent-LockerMedical = шкаф врача
-    .desc = { ent-LockerBase.desc }
+    .desc = Содержит рабочую экипировку медицинского работника.
     .suffix = { "" }
 ent-LockerChemistry = шкаф химика
     .desc = { ent-LockerBase.desc }
@@ -73,9 +73,9 @@ ent-LockerSyndicatePersonal = оружейный шкаф
 ent-LockerInspector = шкаф инспектора
     .desc = Содержит уникальный гардероб по последнему слову моды.
     .suffix = { "" }
-ent-LockerMime = шкаф клоуна
-    .desc = Содержит рабочую экипировку станционного клоуна. Для хранения смешного
-    .suffix = { "" }
-ent-LockerClown = шкаф мима
+ent-LockerMime = шкаф мима
     .desc = Содержит рабочую экипировку станционного мима.
     .suffix = { "" }
+ent-LockerClown = шкаф клоуна
+    .desc = Содержит рабочую экипировку станционного клоуна. Для хранения смешного
+    .suffix = { "" }
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
index a5aea77122..a49ef7b7a3 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
@@ -36,7 +36,6 @@
       - id: ClothingHeadsetAltEngineering
       - id: ClothingHeadHatHardhatWhite
       - id: ClothingHandsGlovesColorYellow
-      - id: ClothingShoesBootsMagAdv
 
 - type: entity
   id: DresserChiefMedicalOfficerFilled
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
index 77cbaff856..fc27962d1e 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -38,7 +38,6 @@
       - id: MedalCase
       - id: CommandBudgetCard
       - id: CommandBudgetPinPaper
-      - id: MedalCase
       - id: ClothingOuterHardsuitCap
       - id: OxygenTankFilled
 
@@ -64,7 +63,6 @@
     - id: MedalCase
     - id: CommandBudgetCard
     - id: CommandBudgetPinPaper
-    - id: MedalCase
 
 - type: entity
   id: LockerCaptainFilledNoLaser
@@ -88,7 +86,6 @@
     - id: MedalCase
     - id: CommandBudgetCard
     - id: CommandBudgetPinPaper
-    - id: MedalCase
 
 - type: entity
   id: LockerHeadOfPersonnelFilled