Пофиксил халаты (#551)

space-sunrise · Oct 30, 2024 · fe62f00 · fe62f00
1 parent 2b9a350
commit fe62f00
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 11 deletions.
diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/outerclothing/coats.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/outerclothing/coats.ftl
@@ -28,6 +28,8 @@ ent-ClothingOuterCoatCEOvercoatWhite = пальто старшего инжен
     .desc = Пальто Старшего Инженера. Роскошное пальто с позолоченными вставками, делающие вид, что защищает вас от каких-либо угроз.
 ent-ClothingOuterCoatCMOOvercoat = лабораторный халат главного врача
     .desc = На 99% состоит из Нитрила.
+ent-ClothingOuterCoatLabCMOOvercoatOpened = { ent-ClothingOuterCoatCMOOvercoat }
+    .desc = { ent-ClothingOuterCoatCMOOvercoat.desc }
 ent-ClothingOuterCoatCaptainOvercoat = капитанская шинель
     .desc = Селанная специально под замеры действующего капитана и сделанный лучшими швеями NanoTrasen.
 ent-ClothingOuterEliteCoatHOP = шинель главы персонала
@@ -40,6 +42,8 @@ ent-ClothingOuterCoatQM = тёплое пальто
     .desc = Удобное пальто созданное из лёгкой ткани дикого лиаруса, место обитания которого является лавовая планета №468, позволяет придерживаться стиля современных времён.
 ent-ClothingOuterCoatLabResearchDirector = халат научного руководителя
     .desc = Плотный халат, защищающий своего носителя от струи кислоты и плавленой плазмы. Имеет фиолетовые и голубые ленты на плечах и поясе.
+ent-ClothingOuterCoatLabResearchDirectorOpened = { ent-ClothingOuterCoatLabResearchDirector }
+    .desc = { ent-ClothingOuterCoatLabResearchDirector.desc }
 ent-ClothingOuterCoatHoSOvercoat = бронированная шинель
     .desc = Довольно старая вещь для этих времён, навевающая старые воспоминания...
 ent-ClothingOuterCoatUSSPOvercoatBlack = бронированная шинель СССП

diff --git a/Resources/Locale/ru-RU/_prototypes/entities/clothing/outerclothing/coats.ftl b/Resources/Locale/ru-RU/_prototypes/entities/clothing/outerclothing/coats.ftl
@@ -72,8 +72,12 @@ ent-ClothingOuterCoatAMG = медицинский бронехалат
     .desc = Вариация медицинского халата с элементами бронежилета. Выглядит странно, но вашему сердечку ничего не угрожает.
 ent-ClothingOuterCoatLabSeniorResearcher = лабораторный халат ведущего учёного
     .desc = Халат, защищающий от небольших разливов химикатов. Имеет фиолетовый воротник и отделку на запястьях.
+ent-ClothingOuterCoatLabSeniorResearcherOpened = { ent-ClothingOuterCoatLabSeniorResearcher }
+    .desc = { ent-ClothingOuterCoatLabSeniorResearcher.desc }
 ent-ClothingOuterCoatLabSeniorPhysician = лабораторный халат ведущего врача
     .desc = Халат, защищающий от небольших разливов химикатов. Имеет светло-голубые рукава и оранжевую отделку на талии.
+ent-ClothingOuterCoatLabSeniorPhysicianOpened = { ent-ClothingOuterCoatLabSeniorPhysician }
+    .desc = { ent-ClothingOuterCoatLabSeniorPhysician.desc }
 ent-ClothingOuterCoatSpaceAsshole = куртка космического мудака
     .desc = И вот он был...
 ent-ClothingOuterCoatExpensive = дорогая шуба

diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
@@ -417,7 +417,7 @@
         Caustic: 0.75
 
 - type: entity
-  parent: ClothingOuterStorageBase
+  parent: ClothingOuterStorageFoldableBase #Sunrise-edit
   id: ClothingOuterCoatLabSeniorResearcher
   name: senior researcher lab coat
   description: A suit that protects against minor chemical spills. Has a purple collar and wrist trims.
@@ -431,8 +431,15 @@
       coefficients:
         Caustic: 0.75
 
+#Sunrise-start
 - type: entity
-  parent: ClothingOuterStorageBase
+  parent: [ClothingOuterStorageFoldableBaseOpened, ClothingOuterCoatLabSeniorResearcher]
+  id: ClothingOuterCoatLabSeniorResearcherOpened
+  name: senior researcher lab coat
+#Sunrise-end
+
+- type: entity
+  parent: ClothingOuterStorageFoldableBase #Sunrise-edit
   id: ClothingOuterCoatLabSeniorPhysician
   name: senior physician lab coat
   description: A suit that protects against minor chemical spills. Has light blue sleeves and an orange waist trim.
@@ -446,6 +453,13 @@
       coefficients:
         Caustic: 0.75
 
+#Sunrise-start
+- type: entity
+  parent: [ClothingOuterStorageFoldableBaseOpened, ClothingOuterCoatLabSeniorPhysician]
+  id: ClothingOuterCoatLabSeniorPhysicianOpened
+  name: senior physician lab coat
+#Sunrise-end
+
 - type: entity
   parent: ClothingOuterStorageBase
   id: ClothingOuterCoatSpaceAsshole

diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/coats.yml
@@ -174,9 +174,9 @@
     sprite: _Sunrise/Clothing/OuterClothing/Coats/cecoat.rsi
   - type: Clothing
     sprite: _Sunrise/Clothing/OuterClothing/Coats/cecoat.rsi
-    
+
 - type: entity
-  parent: ClothingOuterStorageBase
+  parent: ClothingOuterStorageFoldableBase
   id: ClothingOuterCoatCMOOvercoat
   name: chief medical officer's lab coat
   description: 99% Nitrile.
@@ -185,7 +185,12 @@
     sprite: _Sunrise/Clothing/OuterClothing/Coats/cmo.rsi
   - type: Clothing
     sprite: _Sunrise/Clothing/OuterClothing/Coats/cmo.rsi
-
+
+- type: entity
+  parent: [ClothingOuterStorageFoldableBaseOpened, ClothingOuterCoatCMOOvercoat]
+  id: ClothingOuterCoatLabCMOOvercoatOpened
+  name: cmo lab coat
+
 - type: entity
   parent: ClothingOuterStorageBase
   id: ClothingOuterEliteCoatHOP
@@ -225,7 +230,7 @@
     sprite: _Sunrise/Clothing/OuterClothing/Coats/iaacoat.rsi
   - type: Clothing
     sprite: _Sunrise/Clothing/OuterClothing/Coats/iaacoat.rsi
-    
+
 - type: entity
   parent: ClothingOuterStorageBase
   id: ClothingOuterCoatQM
@@ -238,7 +243,7 @@
     sprite: _Sunrise/Clothing/OuterClothing/Coats/qmcoat.rsi
 
 - type: entity
-  parent: ClothingOuterStorageBase
+  parent: ClothingOuterStorageFoldableBase
   id: ClothingOuterCoatLabResearchDirector
   name: research director's lab coat
   description: A thick robe that protects its wearer from acid jets and fused plasma. It has purple and blue ribbons on the shoulders and waistband.
@@ -252,6 +257,12 @@
       coefficients:
         Caustic: 0.75
 
+- type: entity
+  parent: [ClothingOuterStorageFoldableBaseOpened, ClothingOuterCoatLabResearchDirector]
+  id: ClothingOuterCoatLabResearchDirectorOpened
+  name: research director lab coat
+
+
 - type: entity
   parent: ClothingOuterStorageBase
   id: ClothingOuterCoatHoSOvercoat
@@ -269,7 +280,7 @@
         Slash: 0.7
         Piercing: 0.4
         Heat: 0.7
-        
+
 - type: entity
   parent: ClothingOuterBase
   id: ClothingOuterAerostaticBomberJacket
@@ -280,7 +291,7 @@
     sprite: _Sunrise/Clothing/OuterClothing/Coats/kim.rsi
   - type: Clothing
     sprite: _Sunrise/Clothing/OuterClothing/Coats/kim.rsi
-    
+
 - type: entity
   parent: ClothingOuterBase
   id: ClothingOuterDiscoAssBlazer
@@ -291,7 +302,7 @@
     sprite: _Sunrise/Clothing/OuterClothing/Coats/disco.rsi
   - type: Clothing
     sprite: _Sunrise/Clothing/OuterClothing/Coats/disco.rsi
-    
+
 - type: entity
   parent: ClothingOuterStorageBase
   id: ClothingOuterCoatCaptainOvercoat
@@ -334,4 +345,4 @@
   - type: Sprite
     sprite: _Sunrise/Clothing/OuterClothing/Coats/atmosian.rsi
   - type: Clothing
-    sprite: _Sunrise/Clothing/OuterClothing/Coats/atmosian.rsi
+    sprite: _Sunrise/Clothing/OuterClothing/Coats/atmosian.rsi