From e2c43cf1155447673793038ae21800e6659e4bc1 Mon Sep 17 00:00:00 2001
From: Hero010h <163765999+Hero010h@users.noreply.github.com>
Date: Thu, 26 Dec 2024 17:43:45 +0300
Subject: [PATCH] =?UTF-8?q?=D0=AF=D1=89=D0=B8=D0=BA=D0=B8=20=D0=B3=D0=BE?=
 =?UTF-8?q?=D1=82=D0=BE=D0=B2=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Belt/clothingBeltUtilityImproved.yml      |  2 +-
 .../Specific/Medical/expanded_medkit.yml      |  2 +-
 .../Structures/Storage/CleanersLocker.yml     | 33 ++++++++++++++++---
 .../Structures/Storage/SenorsLockers.yml      | 15 +++++----
 4 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/Resources/Prototypes/_White/Entities/Clothing/Belt/clothingBeltUtilityImproved.yml b/Resources/Prototypes/_White/Entities/Clothing/Belt/clothingBeltUtilityImproved.yml
index b4bcd14018..66bc00f9a4 100644
--- a/Resources/Prototypes/_White/Entities/Clothing/Belt/clothingBeltUtilityImproved.yml
+++ b/Resources/Prototypes/_White/Entities/Clothing/Belt/clothingBeltUtilityImproved.yml
@@ -10,4 +10,4 @@
       - id: ImprovedScrewdriver
       - id: ImprovedWirecutter
       - id: ImprovedWelder
-      - id: NetworkConfigurator
+      - id: Multitool
diff --git a/Resources/Prototypes/_White/Entities/Objects/Specific/Medical/expanded_medkit.yml b/Resources/Prototypes/_White/Entities/Objects/Specific/Medical/expanded_medkit.yml
index 3c0d2d62ec..574f7abbf9 100644
--- a/Resources/Prototypes/_White/Entities/Objects/Specific/Medical/expanded_medkit.yml
+++ b/Resources/Prototypes/_White/Entities/Objects/Specific/Medical/expanded_medkit.yml
@@ -1,7 +1,7 @@
 - type: entity
   parent: Medkit
   id: ExpandedMedkit
-  name: expanded medkit
+  name: расширенная аптечка
   components:
     - type: Sprite
       sprite: White/Specific/expmedkit.rsi
diff --git a/Resources/Prototypes/_White/Entities/Structures/Storage/CleanersLocker.yml b/Resources/Prototypes/_White/Entities/Structures/Storage/CleanersLocker.yml
index 5ebdb62092..b84452ede9 100644
--- a/Resources/Prototypes/_White/Entities/Structures/Storage/CleanersLocker.yml
+++ b/Resources/Prototypes/_White/Entities/Structures/Storage/CleanersLocker.yml
@@ -1,7 +1,7 @@
 - type: entity
-  id: LockerHeadCleaner
-  parent: BaseSenorsLocker
-  name: head cleaner's locker
+  id: LockerCleaner
+  parent: BaseSeniorsLocker
+  name: шкаф уборщика
   components:
   - type: Appearance
   - type: EntityStorageVisuals
@@ -9,4 +9,29 @@
     stateDoorOpen: head_cleaner_open
     stateDoorClosed: head_cleaner_door
   - type: AccessReader
-    access: [ [ "Janitor" ] ]
\ No newline at end of file
+    access: [ [ "Janitor" ] ]
+    
+- type: entity
+  id: LockerCleanerFilled
+  parent: LockerCleaner
+  suffix: Filled
+  components:
+  - type: StorageFill
+    contents:
+      - id: MopItem
+        amount: 2
+      - id: BoxMousetrap
+        amount: 2
+      - id: WetFloorSign
+        amount: 3
+      - id: TrashBag
+        amount: 2
+      - id: LightReplacer
+      - id: BoxLightMixed
+      - id: Holoprojector
+      - id: SoapNT
+        amount: 2
+      - id: FlashlightLantern
+        amount: 2
+      - id: Plunger
+        amount: 2
\ No newline at end of file
diff --git a/Resources/Prototypes/_White/Entities/Structures/Storage/SenorsLockers.yml b/Resources/Prototypes/_White/Entities/Structures/Storage/SenorsLockers.yml
index c3e3562945..6bca59642d 100644
--- a/Resources/Prototypes/_White/Entities/Structures/Storage/SenorsLockers.yml
+++ b/Resources/Prototypes/_White/Entities/Structures/Storage/SenorsLockers.yml
@@ -1,5 +1,5 @@
 - type: entity
-  id: BaseSenorsLocker
+  id: BaseSeniorsLocker
   parent: LockerBaseSecure
   abstract: true
   name: base senors locker
@@ -11,7 +11,7 @@
 
 - type: entity
   id: LockerVeteran
-  parent: BaseSenorsLocker
+  parent: BaseSeniorsLocker
   name: шкаф ветерана
   components:
   - type: Appearance
@@ -52,7 +52,7 @@
 
 - type: entity
   id: LockerBrigadier
-  parent: BaseSenorsLocker
+  parent: BaseSeniorsLocker
   name: шкаф бригадира
   components:
   - type: Appearance
@@ -94,7 +94,7 @@
 
 - type: entity
   id: LockerMedicalOfficer
-  parent: BaseSenorsLocker
+  parent: BaseSeniorsLocker
   name: шкаф медицинского офицера
   components:
   - type: Appearance
@@ -142,7 +142,7 @@
     
 - type: entity
   id: LockerCargoHunter
-  parent: BaseSenorsLocker
+  parent: BaseSeniorsLocker
   name: шкаф охотника карго
   components:
   - type: Appearance
@@ -177,7 +177,7 @@
 
 - type: entity
   id: LockerLeadResearcher
-  parent: BaseSenorsLocker
+  parent: BaseSeniorsLocker
   name: шкаф ведущего исследователя
   components:
   - type: Appearance
@@ -191,9 +191,11 @@
 - type: entity
   id: LockerLeadResearcherFilled
   parent: LockerLeadResearcher
+  suffix: Filled
   components:
   - type: StorageFill
     contents:
+      - id: AnomalyLocator
       - id: ClothingHandsGlovesLatex
       - id: ClothingHeadsetScience
       - id: ClothingMaskSterile
@@ -201,5 +203,4 @@
       - id: AnomalyScanner
       - id: NodeScanner
       - id: NetworkConfigurator
-        prob: 0.5
       - id: ClothingShoesBootsMagSci
\ No newline at end of file