merging issues

SerbiaStrong-220 · Mar 9, 2025 · 7c34ccf · 7c34ccf
1 parent 1d127b3
commit 7c34ccf
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 24 deletions.
diff --git a/Resources/Locale/en-US/forensics/forensics.ftl b/Resources/Locale/en-US/forensics/forensics.ftl
@@ -1,7 +1,7 @@
 forensic-scanner-interface-title = Forensic scanner
 forensic-scanner-interface-fingerprints = Fingerprints
 forensic-scanner-interface-fibers = Fibers
-forensic-scanner-interface-micro-fibers = Microfibers #SS220 Micro_fibers
+forensic-scanner-interface-micro-fibers = Microfibers
 forensic-scanner-interface-dnas = DNAs
 forensic-scanner-interface-residues = Residues
 forensic-scanner-interface-no-data = No scan data available
@@ -14,11 +14,11 @@ forensic-pad-gloves = {CAPITALIZE($target)} is wearing gloves.
 forensic-pad-start-scan-target = {CAPITALIZE($user)} is trying to take a sample of your fingerprints.
 forensic-pad-start-scan-user = You start taking a sample of {CAPITALIZE($target)}'s fingerprints.
 forensic-pad-already-used = This pad has already been used.
-forensic-pad-verb-text = Get samples #SS220 Micro_fibers
-forensic-pad-verb-message = Perform a samples extraction #SS220 Micro_fibers
-forensic-pad-verb-no-sapmles = Object don't have any samples to take #SS220 Micro_fibers
+forensic-pad-verb-text = Get samples
+forensic-pad-verb-message = Perform a samples extraction
+forensic-pad-verb-no-sapmles = Object don't have any samples to take
 forensic-scanner-match-fiber = Match in fiber found!
-forensic-scanner-match-micro-fiber = Match in microfiber found! #SS220 Micro_fibers
+forensic-scanner-match-micro-fiber = Match in microfiber found!
 forensic-scanner-match-fingerprint = Match in fingerprint found!
 forensic-scanner-match-none = No matches found!
 forensic-scanner-printer-not-ready = Printer is not ready yet.

diff --git a/Resources/Locale/ru-RU/forensics/forensics.ftl b/Resources/Locale/ru-RU/forensics/forensics.ftl
@@ -1,7 +1,7 @@
 forensic-scanner-interface-title = Криминалистический сканер
 forensic-scanner-interface-fingerprints = Отпечатки
 forensic-scanner-interface-fibers = Волокна
-forensic-scanner-interface-micro-fibers = Микроволокна #SS220 Micro_fibers
+forensic-scanner-interface-micro-fibers = Микроволокна
 forensic-scanner-interface-dnas = ДНК
 forensic-scanner-interface-residues = Остатки
 forensic-scanner-interface-no-data = Нет данных для сканирования
@@ -14,11 +14,11 @@ forensic-pad-gloves = { CAPITALIZE($target) } носит перчатки.
 forensic-pad-start-scan-target = { CAPITALIZE($user) } пытается снять отпечатки ваших пальцев.
 forensic-pad-start-scan-user = Вы начинаете снимать отпечатки пальцев { CAPITALIZE($target) }.
 forensic-pad-already-used = Эта пластинка уже использована.
-forensic-pad-verb-text = Получить образцы #SS220 Micro_fibers
-forensic-pad-verb-message = Выполнить отбор образцов #SS220 Micro_fibers
-forensic-pad-verb-no-sapmles = Объект не имеет образцов для взятия. #SS220 Micro_fibers
+forensic-pad-verb-text = Получить образцы
+forensic-pad-verb-message = Выполнить отбор образцов
+forensic-pad-verb-no-sapmles = Объект не имеет образцов для взятия.
 forensic-scanner-match-fiber = Найдены совпадения по волокнам!
-forensic-scanner-match-micro-fiber = Найдены совпадения по микроволокнам! #SS220 Micro_fibers
+forensic-scanner-match-micro-fiber = Найдены совпадения по микроволокнам!
 forensic-scanner-match-fingerprint = Найдены совпадения по отпечаткам пальцев!
 forensic-scanner-match-none = Совпадений не найдено!
 forensic-scanner-printer-not-ready = Принтер не готов.

diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
@@ -452,7 +452,7 @@
     maxItemSize: Huge
   #SS220-underused-uplinks-stuff end
 #SS220 Micro_fibers start
-- type: MicroFiber
+  - type: MicroFiber
     microFiberMaterial: micro-fibers-reinforced-textile
     microFiberColor: micro-fibers-black
 #SS220 Micro_fibers end

diff --git a/Resources/Prototypes/Entities/Clothing/Back/specific.yml b/Resources/Prototypes/Entities/Clothing/Back/specific.yml
@@ -19,7 +19,7 @@
         enum.ChameleonUiKey.Key:
           type: ChameleonBoundUserInterface
 # Corvax-HiddenDesc-Start
-    - type: HiddenDescription 
+    - type: HiddenDescription
       entries:
       - label: corvax-hidden-desc-Chameleon-syndicate
         whitelistMind:
@@ -34,7 +34,7 @@
           - Borg
 # Corvax-HiddenDesc-End
 #SS220 Micro_fibers start
-- type: MicroFiber
+    - type: MicroFiber
       microFiberMaterial: micro-fibers-chameleon
 #SS220 Micro_fibers end
 
@@ -44,7 +44,7 @@
   name: backpack water tank
   description: Holds a large amount of fluids. Supplies to spray nozzles in your hands, and has a slot on the side for said spray nozzles.
   components:
-  - type: EmitSoundOnLand ##new sound_drop effect, add MIXnikita 
+  - type: EmitSoundOnLand ##new sound_drop effect, add MIXnikita
     sound:
       path: /Audio/SS220/Effects/Drop/clothing_bag_tank.ogg
       params:

diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -498,11 +498,6 @@
 #          - PepperShaker
 #    sprite: Clothing/Belt/belt_overlay.rsi
 #  - type: Appearance
-#SS220 Micro_fibers start
-  - type: MicroFiber
-    microFiberMaterial: micro-fibers-synthetic
-    microFiberColor: micro-fibers-white
-#SS220 Micro_fibers end
 
 - type: entity
   parent: [ClothingBeltStorageBase, ContentsExplosionResistanceBase]

diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
@@ -197,10 +197,11 @@
       Unsexed: MaleMedic
   #ss220 special_sounds end
 #SS220 Micro_fibers start
-- type: MicroFiber
+  - type: MicroFiber
     microFiberMaterial: micro-fibers-spunbond
     microFiberColor: micro-fibers-white
 #SS220 Micro_fibers end
+
 - type: entity
   parent: [ClothingOuterStorageFoldableBaseOpened, ClothingOuterCoatLab]
   id: ClothingOuterCoatLabOpened
@@ -228,7 +229,7 @@
       Unsexed: MaleMedic
   #ss220 special_sounds end
 #SS220 Micro_fibers start
-- type: MicroFiber
+  - type: MicroFiber
     microFiberMaterial: micro-fibers-spunbond
     microFiberColor: micro-fibers-white
 #SS220 Micro_fibers end
@@ -260,7 +261,7 @@
       Unsexed: MaleMedic
   #ss220 special_sounds end
 #SS220 Micro_fibers start
-- type: MicroFiber
+  - type: MicroFiber
     microFiberMaterial: micro-fibers-spunbond
     microFiberColor: micro-fibers-white
 #SS220 Micro_fibers end
@@ -292,7 +293,7 @@
       Unsexed: MaleMedic
   #ss220 special_sounds end
 #SS220 Micro_fibers start
-- type: MicroFiber
+  - type: MicroFiber
     microFiberMaterial: micro-fibers-spunbond
     microFiberColor: micro-fibers-white
 #SS220 Micro_fibers end
@@ -452,7 +453,7 @@
   #ss220 handheld radio on outer clothing end
 # SS220 new hood end
 #SS220 Micro_fibers start
-- type: MicroFiber
+  - type: MicroFiber
     microFiberMaterial: micro-fibers-reinforced-cotton
     microFiberColor: micro-fibers-red
 #SS220 Micro_fibers end