ПТ | убрал окончание Metus у айдишников прототипов головного убора (#3738)

Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/head/hats.ftl

@@ -82,42 +82,4 @@ ent-ClothingHeadHatSwanOne = Alex
     .desc = Ha-ha-ha...We had a nice walk.
 ent-ClothingHeadHatChefBlackToque = chef's black toque
     .desc = Worn at the edges but proudly holds its shape, a symbol of skill and many hours spent in the kitchen.
-# Metus caps
-ent-ClothingHeadHatCapPrisonDoctorMetus = prison doctor cap
-    .desc = Heavy, clean, its wearer is used to deciding who lives and who dies.
-ent-ClothingHeadHatCapPrisonChefMetus = prison chef cap
-    .desc = Old but well-kept, belongs to those who survived feeding monsters and commanding even over pots.
-ent-ClothingHeadHatCapPrisonEngineerMetus = prison engineer cap
-    .desc = Tough and precise, fits those who, for the 220th time, keep the power system running while others go insane.
-ent-ClothingHeadHatCapPrisonScientistMetus = prison scientist cap
-    .desc = Covered in reagent stains and a strange smell, on the faded stripe where an access mark once was, there are now only traces of those who crossed the boundaries of science.
-ent-ClothingHeadHatCapPrisonWorkerMetus = prison worker cap
-    .desc = Fabric darkened by ore dust, burn marks along the edge, as if worn by those who stood closest to what should not breathe.
-ent-ClothingHeadHatCapPrisonTraineeMetus = prison trainee hat
-    .desc = Stylish orange prison trainee hat.
-# Metus berets
-ent-ClothingHeadHatBeretPrisonDoctorMetus = prison doctor beret
-    .desc = Soft, reserved like its owner, used to cold bodies and warm indifference.
-ent-ClothingHeadHatBeretPrisonChefMetus = prison chef beret
-    .desc = Fits tightly, reveals one who learned to keep order even among cons and knives.
-ent-ClothingHeadHatBeretPrisonEngineerMetus = prison engineer beret
-    .desc = Sits straight, practical, points to one who knows the prison layout by heart.
-ent-ClothingHeadHatBeretPrisonScientistMetus = prison scientist beret
-    .desc = Neat but dull, belongs to those who have understood too much and now just pretend to work.
-ent-ClothingHeadHatBeretPrisonWorkerMetus = prison worker beret
-    .desc = Crooked, but worn with pride, for its wearer has worked for many more than once.
-ent-ClothingHeadHatBeretPrisonTraineeMetus = prison trainee beret
-    .desc = Fresh and new, still unaware of the weight of long service, marked with orange color showing the path to the future.
-# Metus caps
-ent-ClothingHeadCapPrisonDoctorMetus = prison doctor cap
-    .desc = Simple and clean, but cracked from washing, a symbol for those who heal the broken by the system.
-ent-ClothingHeadCapPrisonChefMetus = prison chef cap
-    .desc = Cheap fabric, soaked with smoke and sweat, belongs to those who feed the prison and barely survive on its scents.
-ent-ClothingHeadCapPrisonEngineerMetus = prison engineer cap
-    .desc = Greasy and burnt, points to those who try to fix the prison while others decide who to blame.
-ent-ClothingHeadCapPrisonScientistMetus = prison scientist cap
-    .desc = Worn low, a sign of one who carries samples but doesn't make discoveries.
-ent-ClothingHeadCapPrisonWorkerMetus = prison worker cap
-    .desc = Rough and worn, always dirty, worn by those who are first in line for orders and last at the exit.
-ent-ClothingHeadCapPrisonTraineeMetus = prison trainee cap
-    .desc = Simple and clean, but new, a symbol for those who are just starting their path in the prison system.
+

Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/prison/head/hats.ftl

@@ -0,0 +1,42 @@
+ent-ClothingHeadHatCapPrisonDoctor = prison doctor cap
+    .desc = Heavy, clean, its wearer is used to deciding who lives and who dies.
+ent-ClothingHeadHatCapPrisonChef = prison chef cap
+    .desc = Old but well-kept, belongs to those who survived feeding monsters and commanding even over pots.
+ent-ClothingHeadHatCapPrisonEngineer = prison engineer cap
+    .desc = Tough and precise, fits those who, for the 220th time, keep the power system running while others go insane.
+ent-ClothingHeadHatCapPrisonScientist = prison scientist cap
+    .desc = Covered in reagent stains and a strange smell, on the faded stripe where an access mark once was, there are now only traces of those who crossed the boundaries of science.
+ent-ClothingHeadHatCapPrisonWorker = prison worker cap
+    .desc = Fabric darkened by ore dust, burn marks along the edge, as if worn by those who stood closest to what should not breathe.
+ent-ClothingHeadHatCapPrisonTrainee = prison trainee cap
+    .desc = Stylish orange prison trainee cap.
+
+# Prison berets
+ent-ClothingHeadHatBeretPrisonDoctor = prison doctor beret
+    .desc = Soft, reserved like its owner, used to cold bodies and warm indifference.
+ent-ClothingHeadHatBeretPrisonChef = prison chef beret
+    .desc = Fits tightly, reveals one who learned to keep order even among cons and knives.
+ent-ClothingHeadHatBeretPrisonEngineer = prison engineer beret
+    .desc = Sits straight, practical, points to one who knows the prison layout by heart.
+ent-ClothingHeadHatBeretPrisonScientist = prison scientist beret
+    .desc = Neat but dull, belongs to those who have understood too much and now just pretend to work.
+ent-ClothingHeadHatBeretPrisonWorker = prison worker beret
+    .desc = Crooked, but worn with pride, for its wearer has worked for many more than once.
+ent-ClothingHeadHatBeretPrisonTrainee = prison trainee beret
+    .desc = Fresh and new, still unaware of the weight of long service, marked with orange color showing the path to the future.
+
+# Prison caps (alternate cap entries)
+ent-ClothingHeadCapPrisonDoctor = prison doctor cap
+    .desc = Simple and clean, but cracked from washing, a symbol for those who heal the broken by the system.
+ent-ClothingHeadCapPrisonChef = prison chef cap
+    .desc = Cheap fabric, soaked with smoke and sweat, belongs to those who feed the prison and barely survive on its scents.
+ent-ClothingHeadCapPrisonEngineer = prison engineer cap
+    .desc = Greasy and burnt, points to those who try to fix the prison while others decide who to blame.
+ent-ClothingHeadCapPrisonScientist = prison scientist cap
+    .desc = Worn low, a sign of one who carries samples but doesn't make discoveries.
+ent-ClothingHeadCapPrisonWorker = prison worker cap
+    .desc = Rough and worn, always dirty, worn by those who are first in line for orders and last at the exit.
+ent-ClothingHeadCapPrisonTrainee = prison trainee cap
+    .desc = Simple and clean, but new, a symbol for those who are just starting their path in the prison system.
+
+

Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/head/hats.ftl

@@ -84,42 +84,3 @@ ent-ClothingHeadHatSwanOne = Алекс
     .desc = Ха-ха-ха...Мы неплохо погуляли.
 ent-ClothingHeadHatChefBlackToque = чёрный поварской колпак
     .desc = Потёртый по краям, но гордо держит форму, символ мастерства и многих часов работы на кухне.
-# фуражки Метус
-ent-ClothingHeadHatCapPrisonDoctorMetus = фуражка тюремного доктора
-    .desc = Тяжёлая, чистая, носитель её привык решать, кому жить, а кому нет.
-ent-ClothingHeadHatCapPrisonChefMetus = фуражка тюремного повара
-    .desc = Старая, но ухоженная, принадлежит тем, кто сумел выжить, кормя чудовищ, параллельно командуя даже над кастрюлями.
-ent-ClothingHeadHatCapPrisonEngineerMetus = фуражка тюремного инженера
-    .desc = Жёсткая и точная, подходит тем, кто уже в 220-й раз держит систему электропитания в полном порядке, пока остальные сходят с ума.
-ent-ClothingHeadHatCapPrisonScientistMetus = фуражка тюремного учёного
-    .desc = Покрыта пятнами реагентов и странным запахом, а на выцветшей полосе, где когда-то была маркировка допуска, теперь лишь следы тех, кто переступал границы науки.
-ent-ClothingHeadHatCapPrisonWorkerMetus = фуражка тюремного разнорабочего
-    .desc = Ткань потемнела от рудной пыли, а по краю следы ожогов, будто её носили те, кто стоял ближе всех к тому, что не должно было дышать.
-ent-ClothingHeadHatCapPrisonTraineeMetus = фуражка тюремного стажёра
-    .desc = Стильная оранжевая фуражка тюремного стажёра.
-# береты Метус
-ent-ClothingHeadHatBeretPrisonDoctorMetus = берет тюремного доктора
-    .desc = Мягкий, сдержанный, как и его владелец, привыкший к холодным телам и тёплому равнодушию.
-ent-ClothingHeadHatBeretPrisonChefMetus = берет тюремного повара
-    .desc = Плотно сидит, выдаёт того, кто научился держать порядок даже среди зэков и ножей.
-ent-ClothingHeadHatBeretPrisonEngineerMetus = берет тюремного инженера
-    .desc = Ровно посажен, практичный, указывает на того, кто знает схему тюрьмы наизусть.
-ent-ClothingHeadHatBeretPrisonScientistMetus = берет тюремного учёного
-    .desc = Аккуратный, но тусклый, принадлежит тем, кто слишком многое понял и теперь просто делает вид, что работает.
-ent-ClothingHeadHatBeretPrisonWorkerMetus = берет тюремного разнорабочего
-    .desc = Перекошенный, но ношен с гордостью, ибо её носитель отработал за многих не один раз.
-ent-ClothingHeadHatBeretPrisonTraineeMetus = берет тюремного стажёра
-    .desc = Свежий и новый, ещё не знает тяжести долгой службы, отмечен оранжевым цветом, показывающим путь к будущему.
-# кепки Метус
-ent-ClothingHeadCapPrisonDoctorMetus = кепка тюремного доктора
-    .desc = Простая и чистая, но треснутая от стирок, как символ тех, кто лечит сломанных системой.
-ent-ClothingHeadCapPrisonChefMetus = кепка тюремного повара
-    .desc = Дешевая ткань, пропитанная гарью и потом, принадлежит тем, кто кормит тюрьму и сам едва живёт на её запахах.
-ent-ClothingHeadCapPrisonEngineerMetus = кепка тюремного инженера
-    .desc = Замасленная и пожжённая, указывает на тех, кто пытается чинить тюрягу, пока другие решают, кого винить.
-ent-ClothingHeadCapPrisonScientistMetus = кепка тюремного учёного
-    .desc = Носится низко, как знак того, кто таскает образцы, а не делает открытия.
-ent-ClothingHeadCapPrisonWorkerMetus = кепка тюремного разнорабочего
-    .desc = Грубая и потёртая, всегда в грязи, носят её те, кто первые в очереди за приказами и последние у выхода.
-ent-ClothingHeadCapPrisonTraineeMetus = кепка тюремного стажёра
-    .desc = Простая и чистая, но новая, символ для тех, кто только начинает свой путь в системе тюрьмы.

Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/prison/head/hats.ftl

@@ -0,0 +1,39 @@
+
+ent-ClothingHeadHatCapPrisonDoctor = фуражка тюремного доктора
+    .desc = Тяжёлая, чистая, носитель её привык решать, кому жить, а кому нет.
+ent-ClothingHeadHatCapPrisonChef = фуражка тюремного повара
+    .desc = Старая, но ухоженная, принадлежит тем, кто сумел выжить, кормя чудовищ, параллельно командуя даже над кастрюлями.
+ent-ClothingHeadHatCapPrisonEngineer = фуражка тюремного инженера
+    .desc = Жёсткая и точная, подходит тем, кто уже в 220-й раз держит систему электропитания в полном порядке, пока остальные сходят с ума.
+ent-ClothingHeadHatCapPrisonScientist = фуражка тюремного учёного
+    .desc = Покрыта пятнами реагентов и странным запахом, а на выцветшей полосе, где когда-то была маркировка допуска, теперь лишь следы тех, кто переступал границы науки.
+ent-ClothingHeadHatCapPrisonWorker = фуражка тюремного разнорабочего
+    .desc = Ткань потемнела от рудной пыли, а по краю следы ожогов, будто её носили те, кто стоял ближе всех к тому, что не должно было дышать.
+ent-ClothingHeadHatCapPrisonTrainee = фуражка тюремного стажёра
+    .desc = Стильная оранжевая фуражка тюремного стажёра.
+
+ent-ClothingHeadHatBeretPrisonDoctor = берет тюремного доктора
+    .desc = Мягкий, сдержанный, как и его владелец, привыкший к холодным телам и тёплому равнодушию.
+ent-ClothingHeadHatBeretPrisonChef = берет тюремного повара
+    .desc = Плотно сидит, выдаёт того, кто научился держать порядок даже среди зэков и ножей.
+ent-ClothingHeadHatBeretPrisonEngineer = берет тюремного инженера
+    .desc = Ровно посажен, практичный, указывает на того, кто знает схему тюрьмы наизусть.
+ent-ClothingHeadHatBeretPrisonScientist = берет тюремного учёного
+    .desc = Аккуратный, но тусклый, принадлежит тем, кто слишком многое понял и теперь просто делает вид, что работает.
+ent-ClothingHeadHatBeretPrisonWorker = берет тюремного разнорабочего
+    .desc = Перекошенный, но ношен с гордостью, ибо её носитель отработал за многих не один раз.
+ent-ClothingHeadHatBeretPrisonTrainee = берет тюремного стажёра
+    .desc = Свежий и новый, ещё не знает тяжести долгой службы, отмечен оранжевым цветом, показывающим путь к будущему.
+
+ent-ClothingHeadCapPrisonDoctor = кепка тюремного доктора
+    .desc = Простая и чистая, но треснутая от стирок, как символ тех, кто лечит сломанных системой.
+ent-ClothingHeadCapPrisonChef = кепка тюремного повара
+    .desc = Дешевая ткань, пропитанная гарью и потом, принадлежит тем, кто кормит тюрьму и сам едва живёт на её запахах.
+ent-ClothingHeadCapPrisonEngineer = кепка тюремного инженера
+    .desc = Замасленная и пожжённая, указывает на тех, кто пытается чинить тюрягу, пока другие решают, кого винить.
+ent-ClothingHeadCapPrisonScientist = кепка тюремного учёного
+    .desc = Носится низко, как знак того, кто таскает образцы, а не делает открытия.
+ent-ClothingHeadCapPrisonWorker = кепка тюремного разнорабочего
+    .desc = Грубая и потёртая, всегда в грязи, носят её те, кто первые в очереди за приказами и последние у выхода.
+ent-ClothingHeadCapPrisonTrainee = кепка тюремного стажёра
+    .desc = Простая и чистая, но новая, символ для тех, кто только начинает свой путь в системе тюрьмы.

Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hats.yml

@@ -156,9 +156,9 @@
 
 - type: entity
   parent: ClothingHeadPrisonGuard
-  id: ClothingHeadHatCapPrisonDoctorMetus
+  id: ClothingHeadHatCapPrisonDoctor
   name: prison doctor hat
-  suffix: Metus
+  suffix: Prison
   description: Stylish blue prison doctor hat.
   components:
   - type: Sprite
@@ -175,9 +175,9 @@
 
 - type: entity
   parent: ClothingHeadPrisonGuard
-  id: ClothingHeadHatCapPrisonChefMetus
+  id: ClothingHeadHatCapPrisonChef
   name: prison chef hat
-  suffix: Metus
+  suffix: Prison
   description: Stylish white prison chef hat.
   components:
   - type: Sprite
@@ -194,9 +194,9 @@
 
 - type: entity
   parent: ClothingHeadPrisonGuard
-  id: ClothingHeadHatCapPrisonEngineerMetus
+  id: ClothingHeadHatCapPrisonEngineer
   name: prison engineer hat
-  suffix: Metus
+  suffix: Prison
   description: Stylish yellow prison engineer hat.
   components:
   - type: Sprite
@@ -213,9 +213,9 @@
 
 - type: entity
   parent: ClothingHeadPrisonGuard
-  id: ClothingHeadHatCapPrisonScientistMetus
+  id: ClothingHeadHatCapPrisonScientist
   name: prison scientist hat
-  suffix: Metus
+  suffix: Prison
   description: Stylish purple prison scientist hat.
   components:
   - type: Sprite
@@ -232,9 +232,9 @@
 
 - type: entity
   parent: ClothingHeadPrisonGuard
-  id: ClothingHeadHatCapPrisonWorkerMetus
+  id: ClothingHeadHatCapPrisonWorker
   name: prison worker hat
-  suffix: Metus
+  suffix: Prison
   description: Stylish red prison worker hat.
   components:
   - type: Sprite
@@ -262,9 +262,9 @@
 
 - type: entity
   parent: ClothingHeadHatBeretPrisonGuard
-  id: ClothingHeadHatBeretPrisonDoctorMetus
+  id: ClothingHeadHatBeretPrisonDoctor
   name: prison doctor beret
-  suffix: Metus
+  suffix: Prison
   components:
   - type: Sprite
     layers:
@@ -290,9 +290,9 @@
 
 - type: entity
   parent: ClothingHeadHatBeretPrisonGuard
-  id: ClothingHeadHatBeretPrisonChefMetus
+  id: ClothingHeadHatBeretPrisonChef
   name: prison chef beret
-  suffix: Metus
+  suffix: Prison
   components:
   - type: Sprite
     layers:
@@ -318,9 +318,9 @@
 
 - type: entity
   parent: ClothingHeadHatBeretPrisonGuard
-  id: ClothingHeadHatBeretPrisonEngineerMetus
+  id: ClothingHeadHatBeretPrisonEngineer
   name: prison engineer beret
-  suffix: Metus
+  suffix: Prison
   components:
   - type: Sprite
     layers:
@@ -346,9 +346,9 @@
 
 - type: entity
   parent: ClothingHeadHatBeretPrisonGuard
-  id: ClothingHeadHatBeretPrisonScientistMetus
+  id: ClothingHeadHatBeretPrisonScientist
   name: prison scientist beret
-  suffix: Metus
+  suffix: Prison
   components:
   - type: Sprite
     layers:
@@ -374,9 +374,9 @@
 
 - type: entity
   parent: ClothingHeadHatBeretPrisonGuard
-  id: ClothingHeadHatBeretPrisonWorkerMetus
+  id: ClothingHeadHatBeretPrisonWorker
   name: prison worker beret
-  suffix: Metus
+  suffix: Prison
   components:
   - type: Sprite
     layers:
@@ -402,9 +402,9 @@
 
 - type: entity
   parent: ClothingHeadHatBeretPrisonGuard
-  id: ClothingHeadHatBeretPrisonTraineeMetus
+  id: ClothingHeadHatBeretPrisonTrainee
   name: prison trainee beret
-  suffix: Metus
+  suffix: Prison
   components:
   - type: Sprite
     layers:
@@ -430,9 +430,9 @@
 
 - type: entity
   parent: ClothingHeadPrisonGuard
-  id: ClothingHeadHatCapPrisonTraineeMetus
+  id: ClothingHeadHatCapPrisonTrainee
   name: prison trainee hat
-  suffix: Metus
+  suffix: Prison
   description: Stylish orange prison trainee hat.
   components:
   - type: Sprite
@@ -465,10 +465,10 @@
 
 - type: entity
   parent: ClothingHeadCapPrisonGuard
-  id: ClothingHeadCapPrisonDoctorMetus
+  id: ClothingHeadCapPrisonDoctor
   name: prison doctor cap
   description: Heavy, clean, its wearer is used to deciding who lives and who dies.
-  suffix: Metus
+  suffix: Prison
   components:
   - type: Sprite
     layers:
@@ -494,10 +494,10 @@
 
 - type: entity
   parent: ClothingHeadCapPrisonGuard
-  id: ClothingHeadCapPrisonChefMetus
+  id: ClothingHeadCapPrisonChef
   name: prison chef cap
   description: Old but well-kept, belongs to those who survived feeding monsters and commanding even over pots.
-  suffix: Metus
+  suffix: Prison
   components:
   - type: Sprite
     layers:
@@ -523,10 +523,10 @@
 
 - type: entity
   parent: ClothingHeadCapPrisonGuard
-  id: ClothingHeadCapPrisonEngineerMetus
+  id: ClothingHeadCapPrisonEngineer
   name: prison engineer cap
   description: Tough and precise, fits those who, for the 220th time, keep the power system running while others go insane.
-  suffix: Metus
+  suffix: Prison
   components:
   - type: Sprite
     layers:
@@ -552,10 +552,10 @@
 
 - type: entity
   parent: ClothingHeadCapPrisonGuard
-  id: ClothingHeadCapPrisonScientistMetus
+  id: ClothingHeadCapPrisonScientist
   name: prison scientist cap
   description: Covered in reagent stains and a strange smell, on the faded stripe where an access mark once was, there are now only traces of those who crossed the boundaries of science.
-  suffix: Metus
+  suffix: Prison
   components:
   - type: Sprite
     layers:
@@ -581,10 +581,10 @@
 
 - type: entity
   parent: ClothingHeadCapPrisonGuard
-  id: ClothingHeadCapPrisonWorkerMetus
+  id: ClothingHeadCapPrisonWorker
   name: prison worker cap
   description: Fabric darkened by ore dust, burn marks along the edge, as if worn by those who stood closest to what should not breathe.
-  suffix: Metus
+  suffix: Prison
   components:
   - type: Sprite
     layers:
@@ -610,10 +610,10 @@
 
 - type: entity
   parent: ClothingHeadCapPrisonGuard
-  id: ClothingHeadCapPrisonTraineeMetus
+  id: ClothingHeadCapPrisonTrainee
   name: prison trainee cap
   description: Simple and clean, but new, a symbol for those who are just starting their path in the prison system.
-  suffix: Metus
+  suffix: Prison
   components:
   - type: Sprite
     layers:

Resources/Prototypes/_Sunrise/Loadouts/Jobs/PlanetPrison/planet_prisoner.yml

@@ -14,12 +14,12 @@
 # PDA
 
 - type: loadout
-  id: PlanetPrisoner-PlanetPrisonerPDAScreenH
+  id: PlanetPrisonerPDAScreenH
   equipment:
     id: PlanetPrisonerPDAScreenH
 
 - type: loadout
-  id: PlanetPrisoner-PlanetPrisonerPDAScreenHCracked
+  id: PlanetPrisonerPDAScreenHCracked
   effects:
   - !type:JobRequirementLoadoutEffect
     requirement:
@@ -30,7 +30,7 @@
     id: PlanetPrisonerPDAScreenHCracked
 
 - type: loadout
-  id: PlanetPrisoner-PlanetPrisonerPDAScreenX
+  id: PlanetPrisonerPDAScreenX
   effects:
   - !type:JobRequirementLoadoutEffect
     requirement:
@@ -41,7 +41,7 @@
     id: PlanetPrisonerPDAScreenX
 
 - type: loadout
-  id: PlanetPrisoner-PlanetPrisonerPDAScreenXCracked
+  id: PlanetPrisonerPDAScreenXCracked
   effects:
   - !type:JobRequirementLoadoutEffect
     requirement:

Resources/Prototypes/_Sunrise/Loadouts/Jobs/PlanetPrison/prison_chef.yml

@@ -1,7 +1,7 @@
 # Head
 
 - type: loadout
-  id: PrisonChef-ClothingHeadCapPrisonChefMetus
+  id: PrisonChefCap
   effects:
   - !type:JobRequirementLoadoutEffect
     requirement:
@@ -9,10 +9,10 @@
       role: JobPrisonChef
       time: 7200 # 2 hrs
   equipment:
-    head: ClothingHeadCapPrisonChefMetus
+    head: ClothingHeadCapPrisonChef
 
 - type: loadout
-  id: PrisonChef-ClothingHeadHatBeretPrisonChefMetus
+  id: PrisonChefBeret
   effects:
   - !type:JobRequirementLoadoutEffect
     requirement:
@@ -20,10 +20,10 @@
       role: JobPrisonChef
       time: 25200 # 7 hrs
   equipment:
-    head: ClothingHeadHatBeretPrisonChefMetus
+    head: ClothingHeadHatBeretPrisonChef
 
 - type: loadout
-  id: PrisonChef-ClothingHeadHatCapPrisonChefMetus
+  id: PrisonChefHat
   effects:
   - !type:JobRequirementLoadoutEffect
     requirement:
@@ -31,16 +31,16 @@
       role: JobPrisonChef
       time: 54000 # 15 hrs
   equipment:
-    head: ClothingHeadHatCapPrisonChefMetus
+    head: ClothingHeadHatCapPrisonChef
 
 - type: loadout
-  id: PrisonChef-ClothingHeadHatChef
+  id: PrisonChefChefHat
   equipment:
     head: ClothingHeadHatChef
   groupBy: "Toque"
 
 - type: loadout
-  id: PrisonChef-ClothingHeadHatChefBlackToque
+  id: PrisonChefBlackToque
   effects:
   - !type:JobRequirementLoadoutEffect
     requirement:

Resources/Prototypes/_Sunrise/Loadouts/Jobs/PlanetPrison/prison_doctor.yml

@@ -1,12 +1,12 @@
 # Head
 
 - type: loadout
-  id: PrisonDoctor-ClothingHeadCapPrisonDoctorMetus
+  id: PrisonDoctorCap
   equipment:
-    head: ClothingHeadCapPrisonDoctorMetus
+    head: ClothingHeadCapPrisonDoctor
 
 - type: loadout
-  id: PrisonDoctor-ClothingHeadHatBeretPrisonDoctorMetus
+  id: PrisonDoctorBeret
   effects:
   - !type:JobRequirementLoadoutEffect
     requirement:
@@ -14,10 +14,10 @@
       role: JobPrisonDoctor
       time: 25200 # 7 часов
   equipment:
-    head: ClothingHeadHatBeretPrisonDoctorMetus
+    head: ClothingHeadHatBeretPrisonDoctor
 
 - type: loadout
-  id: PrisonDoctor-ClothingHeadHatCapPrisonDoctorMetus
+  id: PrisonDoctorHat
   effects:
   - !type:JobRequirementLoadoutEffect
     requirement:
@@ -25,7 +25,7 @@
       role: JobPrisonDoctor
       time: 54000 # 15 часов
   equipment:
-    head: ClothingHeadHatCapPrisonDoctorMetus
+    head: ClothingHeadHatCapPrisonDoctor
 
 # Рабочая униформа
 

Resources/Prototypes/_Sunrise/Loadouts/Jobs/PlanetPrison/prison_engineer.yml

@@ -1,12 +1,12 @@
 # Head
 
 - type: loadout
-  id: PrisonEngineer-ClothingHeadCapPrisonEngineerMetus
+  id: PrisonEngineerCap
   equipment:
-    head: ClothingHeadCapPrisonEngineerMetus
+    head: ClothingHeadCapPrisonEngineer
 
 - type: loadout
-  id: PrisonEngineer-ClothingHeadHatBeretPrisonEngineerMetus
+  id: PrisonEngineerBeret
   effects:
   - !type:JobRequirementLoadoutEffect
     requirement:
@@ -14,10 +14,10 @@
       role: JobPrisonEngineer
       time: 25200 # 7 часов
   equipment:
-    head: ClothingHeadHatBeretPrisonEngineerMetus
+    head: ClothingHeadHatBeretPrisonEngineer
 
 - type: loadout
-  id: PrisonEngineer-ClothingHeadHatCapPrisonEngineerMetus
+  id: PrisonEngineerHat
   effects:
   - !type:JobRequirementLoadoutEffect
     requirement:
@@ -25,17 +25,17 @@
       role: JobPrisonEngineer
       time: 54000 # 15 часов
   equipment:
-    head: ClothingHeadHatCapPrisonEngineerMetus
+    head: ClothingHeadHatCapPrisonEngineer
 
 # PDA
 
 - type: loadout
-  id: PrisonEngineer-PrisonEngineerPDAScreenZap
+  id: PrisonEngineerPDAScreenZap
   equipment:
     id: PrisonEngineerPDAScreenZap
 
 - type: loadout
-  id: PrisonEngineer-PrisonEngineerPDAScreenPoint
+  id: PrisonEngineerPDAScreenPoint
   effects:
   - !type:JobRequirementLoadoutEffect
     requirement:

Resources/Prototypes/_Sunrise/Loadouts/Jobs/PlanetPrison/prison_inspector.yml

@@ -1,7 +1,7 @@
 # Head
 
 - type: loadout
-  id: PrisonInspector-ClothingHeadHatBowlerHat
+  id: PrisonInspectorBowlerHat
   effects:
   - !type:JobRequirementLoadoutEffect
     requirement:
@@ -13,7 +13,7 @@
 
 
 - type: loadout
-  id: PrisonInspector-ClothingHeadHatIAA
+  id: PrisonInspectorIAAHat
   effects:
   - !type:JobRequirementLoadoutEffect
     requirement:
@@ -24,7 +24,7 @@
     head: ClothingHeadHatIAA
 
 - type: loadout
-  id: PrisonInspector-ClothingHeadHatDetGadget
+  id: PrisonInspectorDetGadget
   effects:
   - !type:JobRequirementLoadoutEffect
     requirement:
@@ -37,12 +37,12 @@
 # Glasses
 
 - type: loadout
-  id: PrisonInspector-ClothingEyesGlassesSunglasses
+  id: PrisonInspectorSunglasses
   equipment:
     eyes: ClothingEyesGlassesSunglasses
 
 - type: loadout
-  id: PrisonInspector-ClothingEyesGlassesNoir
+  id: PrisonInspectorNoirGlasses
   effects:
   - !type:JobRequirementLoadoutEffect
     requirement:

Resources/Prototypes/_Sunrise/Loadouts/Jobs/PlanetPrison/prison_scientist.yml

@@ -1,12 +1,12 @@
 # Head
 
 - type: loadout
-  id: PrisonScientist-ClothingHeadCapPrisonScientistMetus
+  id: PrisonScientistCap
   equipment:
-    head: ClothingHeadCapPrisonScientistMetus
+    head: ClothingHeadCapPrisonScientist
 
 - type: loadout
-  id: PrisonScientist-ClothingHeadHatBeretPrisonScientistMetus
+  id: PrisonScientistBeret
   effects:
   - !type:JobRequirementLoadoutEffect
     requirement:
@@ -14,10 +14,10 @@
       role: JobPrisonScientist
       time: 25200 # 7 часов
   equipment:
-    head: ClothingHeadHatBeretPrisonScientistMetus
+    head: ClothingHeadHatBeretPrisonScientist
 
 - type: loadout
-  id: PrisonScientist-ClothingHeadHatCapPrisonScientistMetus
+  id: PrisonScientistHat
   effects:
   - !type:JobRequirementLoadoutEffect
     requirement:
@@ -25,7 +25,7 @@
       role: JobPrisonScientist
       time: 54000 # 15 часов
   equipment:
-    head: ClothingHeadHatCapPrisonScientistMetus
+    head: ClothingHeadHatCapPrisonScientist
 
 # Рабочая униформа
 

Resources/Prototypes/_Sunrise/Loadouts/Jobs/PlanetPrison/prison_trainee.yml

@@ -1,12 +1,12 @@
 # Head
 
 - type: loadout
-  id: PrisonTrainee-ClothingHeadCapPrisonTraineeMetus
+  id: PrisonTraineeCap
   equipment:
-    head: ClothingHeadCapPrisonTraineeMetus
+    head: ClothingHeadCapPrisonTrainee
 
 - type: loadout
-  id: PrisonTrainee-ClothingHeadHatBeretPrisonTraineeMetus
+  id: PrisonTraineeBeret
   effects:
   - !type:JobRequirementLoadoutEffect
     requirement:
@@ -14,10 +14,10 @@
       role: JobPrisonTrainee
       time: 25200 # 7 часов
   equipment:
-    head: ClothingHeadHatBeretPrisonTraineeMetus
+    head: ClothingHeadHatBeretPrisonTrainee
 
 - type: loadout
-  id: PrisonTrainee-ClothingHeadHatCapPrisonTraineeMetus
+  id: PrisonTraineeHat
   effects:
   - !type:JobRequirementLoadoutEffect
     requirement:
@@ -25,17 +25,17 @@
       role: JobPrisonTrainee
       time: 54000 # 15 часов
   equipment:
-    head: ClothingHeadHatCapPrisonTraineeMetus
+    head: ClothingHeadHatCapPrisonTrainee
 
 # PDA
 
 - type: loadout
-  id: PrisonTrainee-PrisonTraineePDAPartial
+  id: PrisonTraineePDAPartial
   equipment:
     id: PrisonTraineePDAPartial
 
 - type: loadout
-  id: PrisonTrainee-PrisonTraineePDAAdvanced
+  id: PrisonTraineePDAAdvanced
   effects:
   - !type:JobRequirementLoadoutEffect
     requirement:
@@ -46,7 +46,7 @@
     id: PrisonTraineePDAAdvanced
 
 - type: loadout
-  id: PrisonTrainee-PrisonTraineePDAComplete
+  id: PrisonTraineePDAComplete
   effects:
   - !type:JobRequirementLoadoutEffect
     requirement:

Resources/Prototypes/_Sunrise/Loadouts/Jobs/PlanetPrison/prison_worker.yml

@@ -1,12 +1,12 @@
 # Head
 
 - type: loadout
-  id: PrisonWorker-ClothingHeadCapPrisonWorkerMetus
+  id: PrisonWorkerCap
   equipment:
-    head: ClothingHeadCapPrisonWorkerMetus
+    head: ClothingHeadCapPrisonWorker
 
 - type: loadout
-  id: PrisonWorker-ClothingHeadHatBeretPrisonWorkerMetus
+  id: PrisonWorkerBeret
   effects:
   - !type:JobRequirementLoadoutEffect
     requirement:
@@ -14,10 +14,10 @@
       role: JobPrisonWorker
       time: 25200 # 7 часов
   equipment:
-    head: ClothingHeadHatBeretPrisonWorkerMetus
+    head: ClothingHeadHatBeretPrisonWorker
 
 - type: loadout
-  id: PrisonWorker-ClothingHeadHatCapPrisonWorkerMetus
+  id: PrisonWorkerHat
   effects:
   - !type:JobRequirementLoadoutEffect
     requirement:
@@ -25,7 +25,7 @@
       role: JobPrisonWorker
       time: 54000 # 15 часов
   equipment:
-    head: ClothingHeadHatCapPrisonWorkerMetus
+    head: ClothingHeadHatCapPrisonWorker
 
 # Рабочая униформа
 

Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/planet_prison_security.yml

@@ -1,7 +1,7 @@
 # Neck
 
 - type: loadout
-  id: PlanetPrisonSecurity-MasterHandheldCamera
+  id: PlanetPrisonSecurityMasterHandheldCamera
   effects:
   - !type:JobRequirementLoadoutEffect
     requirement:

Resources/Prototypes/_Sunrise/Loadouts/loadout_groups.yml

@@ -1382,10 +1382,10 @@
   minLimit: 1
   maxLimit: 1
   loadouts:
-  - PlanetPrisoner-PlanetPrisonerPDAScreenH
-  - PlanetPrisoner-PlanetPrisonerPDAScreenHCracked
-  - PlanetPrisoner-PlanetPrisonerPDAScreenX
-  - PlanetPrisoner-PlanetPrisonerPDAScreenXCracked
+  - PlanetPrisonerPDAScreenH
+  - PlanetPrisonerPDAScreenHCracked
+  - PlanetPrisonerPDAScreenX
+  - PlanetPrisonerPDAScreenXCracked
 
 # Planet Prison - General Security
 
@@ -1395,7 +1395,7 @@
   minLimit: 0
   maxLimit: 1
   loadouts:
-  - PlanetPrisonSecurity-MasterHandheldCamera
+  - PlanetPrisonSecurityMasterHandheldCamera
 
 # Planet Prison - Inspector
 
@@ -1405,9 +1405,9 @@
   minLimit: 0
   maxLimit: 1
   loadouts:
-  - PrisonInspector-ClothingHeadHatBowlerHat
-  - PrisonInspector-ClothingHeadHatIAA
-  - PrisonInspector-ClothingHeadHatDetGadget
+  - PrisonInspectorBowlerHat
+  - PrisonInspectorIAAHat
+  - PrisonInspectorDetGadget
 
 
 - type: loadoutGroup
@@ -1416,8 +1416,8 @@
   minLimit: 1
   maxLimit: 1
   loadouts:
-  - PrisonInspector-ClothingEyesGlassesSunglasses
-  - PrisonInspector-ClothingEyesGlassesNoir
+  - PrisonInspectorSunglasses
+  - PrisonInspectorNoirGlasses
 
 # Planet Prison - Head Security
 - type: loadoutGroup
@@ -1426,9 +1426,9 @@
   minLimit: 1
   maxLimit: 1
   loadouts:
-  - PrisonDoctor-ClothingHeadCapPrisonDoctorMetus
-  - PrisonDoctor-ClothingHeadHatBeretPrisonDoctorMetus
-  - PrisonDoctor-ClothingHeadHatCapPrisonDoctorMetus
+  - PrisonDoctorCap
+  - PrisonDoctorBeret
+  - PrisonDoctorHat
 
 - type: loadoutGroup
   id: PrisonChefHead
@@ -1436,11 +1436,11 @@
   minLimit: 1
   maxLimit: 1
   loadouts:
-  - PrisonChef-ClothingHeadHatChef
-  - PrisonChef-ClothingHeadCapPrisonChefMetus
-  - PrisonChef-ClothingHeadHatBeretPrisonChefMetus
-  - PrisonChef-ClothingHeadHatCapPrisonChefMetus
-  - PrisonChef-ClothingHeadHatChefBlackToque
+  - PrisonChefChefHat
+  - PrisonChefCap
+  - PrisonChefBeret
+  - PrisonChefHat
+  - PrisonChefBlackToque
 
 - type: loadoutGroup
   id: PrisonEngineerHead
@@ -1448,9 +1448,9 @@
   minLimit: 1
   maxLimit: 1
   loadouts:
-  - PrisonEngineer-ClothingHeadCapPrisonEngineerMetus
-  - PrisonEngineer-ClothingHeadHatBeretPrisonEngineerMetus
-  - PrisonEngineer-ClothingHeadHatCapPrisonEngineerMetus
+  - PrisonEngineerCap
+  - PrisonEngineerBeret
+  - PrisonEngineerHat
 
 - type: loadoutGroup
   id: PrisonEngineerPDA
@@ -1458,8 +1458,8 @@
   minLimit: 1
   maxLimit: 1
   loadouts:
-  - PrisonEngineer-PrisonEngineerPDAScreenZap
-  - PrisonEngineer-PrisonEngineerPDAScreenPoint
+  - PrisonEngineerPDAScreenZap
+  - PrisonEngineerPDAScreenPoint
 
 - type: loadoutGroup
   id: PrisonScientistHead
@@ -1467,9 +1467,9 @@
   minLimit: 1
   maxLimit: 1
   loadouts:
-  - PrisonScientist-ClothingHeadCapPrisonScientistMetus
-  - PrisonScientist-ClothingHeadHatBeretPrisonScientistMetus
-  - PrisonScientist-ClothingHeadHatCapPrisonScientistMetus
+  - PrisonScientistCap
+  - PrisonScientistBeret
+  - PrisonScientistHat
 
 - type: loadoutGroup
   id: PrisonWorkerHead
@@ -1477,9 +1477,9 @@
   minLimit: 1
   maxLimit: 1
   loadouts:
-  - PrisonWorker-ClothingHeadCapPrisonWorkerMetus
-  - PrisonWorker-ClothingHeadHatBeretPrisonWorkerMetus
-  - PrisonWorker-ClothingHeadHatCapPrisonWorkerMetus
+  - PrisonWorkerCap
+  - PrisonWorkerBeret
+  - PrisonWorkerHat
 
 - type: loadoutGroup
   id: PrisonTraineeHead
@@ -1487,9 +1487,9 @@
   minLimit: 1
   maxLimit: 1
   loadouts:
-  - PrisonTrainee-ClothingHeadCapPrisonTraineeMetus
-  - PrisonTrainee-ClothingHeadHatBeretPrisonTraineeMetus
-  - PrisonTrainee-ClothingHeadHatCapPrisonTraineeMetus
+  - PrisonTraineeCap
+  - PrisonTraineeBeret
+  - PrisonTraineeHat
 
 - type: loadoutGroup
   id: PrisonTraineePDA
@@ -1497,9 +1497,9 @@
   minLimit: 1
   maxLimit: 1
   loadouts:
-  - PrisonTrainee-PrisonTraineePDAPartial
-  - PrisonTrainee-PrisonTraineePDAAdvanced
-  - PrisonTrainee-PrisonTraineePDAComplete
+  - PrisonTraineePDAPartial
+  - PrisonTraineePDAAdvanced
+  - PrisonTraineePDAComplete
 
 # Prison Uniform Groups
 

Resources/Prototypes/_Sunrise/Recipes/Lathes/metus_clothing_recipes.yml

@@ -47,7 +47,7 @@
 - type: latheRecipe
   parent: BaseHatRecipe
   id: ClothingHeadHatBeretPrisonDoctorMetus
-  result: ClothingHeadHatBeretPrisonDoctorMetus
+  result: ClothingHeadHatBeretPrisonDoctor
   materials:
     Cloth: 1500
     Durathread: 1500
@@ -55,7 +55,7 @@
 - type: latheRecipe
   parent: BaseHatRecipe
   id: ClothingHeadHatCapPrisonDoctorMetus
-  result: ClothingHeadHatCapPrisonDoctorMetus
+  result: ClothingHeadHatCapPrisonDoctor
   materials:
     Cloth: 3000
     Durathread: 3000
@@ -63,7 +63,7 @@
 - type: latheRecipe
   parent: BaseHatRecipe
   id: ClothingHeadCapPrisonDoctorMetus
-  result: ClothingHeadCapPrisonDoctorMetus
+  result: ClothingHeadCapPrisonDoctor
   materials:
     Cloth: 300
     Durathread: 200
@@ -71,7 +71,7 @@
 - type: latheRecipe
   parent: BaseHatRecipe
   id: ClothingHeadHatBeretPrisonChefMetus
-  result: ClothingHeadHatBeretPrisonChefMetus
+  result: ClothingHeadHatBeretPrisonChef
   materials:
     Cloth: 1500
     Durathread: 1500
@@ -79,7 +79,7 @@
 - type: latheRecipe
   parent: BaseHatRecipe
   id: ClothingHeadHatCapPrisonChefMetus
-  result: ClothingHeadHatCapPrisonChefMetus
+  result: ClothingHeadHatCapPrisonChef
   materials:
     Cloth: 3000
     Durathread: 3000
@@ -87,7 +87,7 @@
 - type: latheRecipe
   parent: BaseHatRecipe
   id: ClothingHeadCapPrisonChefMetus
-  result: ClothingHeadCapPrisonChefMetus
+  result: ClothingHeadCapPrisonChef
   materials:
     Cloth: 300
     Durathread: 200
@@ -95,7 +95,7 @@
 - type: latheRecipe
   parent: BaseHatRecipe
   id: ClothingHeadHatBeretPrisonEngineerMetus
-  result: ClothingHeadHatBeretPrisonEngineerMetus
+  result: ClothingHeadHatBeretPrisonEngineer
   materials:
     Cloth: 1500
     Durathread: 1500
@@ -103,7 +103,7 @@
 - type: latheRecipe
   parent: BaseHatRecipe
   id: ClothingHeadHatCapPrisonEngineerMetus
-  result: ClothingHeadHatCapPrisonEngineerMetus
+  result: ClothingHeadHatCapPrisonEngineer
   materials:
     Cloth: 3000
     Durathread: 3000
@@ -111,7 +111,7 @@
 - type: latheRecipe
   parent: BaseHatRecipe
   id: ClothingHeadCapPrisonEngineerMetus
-  result: ClothingHeadCapPrisonEngineerMetus
+  result: ClothingHeadCapPrisonEngineer
   materials:
     Cloth: 300
     Durathread: 200
@@ -119,7 +119,7 @@
 - type: latheRecipe
   parent: BaseHatRecipe
   id: ClothingHeadHatBeretPrisonScientistMetus
-  result: ClothingHeadHatBeretPrisonScientistMetus
+  result: ClothingHeadHatBeretPrisonScientist
   materials:
     Cloth: 1500
     Durathread: 1500
@@ -127,7 +127,7 @@
 - type: latheRecipe
   parent: BaseHatRecipe
   id: ClothingHeadHatCapPrisonScientistMetus
-  result: ClothingHeadHatCapPrisonScientistMetus
+  result: ClothingHeadHatCapPrisonScientist
   materials:
     Cloth: 3000
     Durathread: 3000
@@ -135,7 +135,7 @@
 - type: latheRecipe
   parent: BaseHatRecipe
   id: ClothingHeadCapPrisonScientistMetus
-  result: ClothingHeadCapPrisonScientistMetus
+  result: ClothingHeadCapPrisonScientist
   materials:
     Cloth: 300
     Durathread: 200
@@ -143,7 +143,7 @@
 - type: latheRecipe
   parent: BaseHatRecipe
   id: ClothingHeadHatBeretPrisonWorkerMetus
-  result: ClothingHeadHatBeretPrisonWorkerMetus
+  result: ClothingHeadHatBeretPrisonWorker
   materials:
     Cloth: 1500
     Durathread: 1500
@@ -151,7 +151,7 @@
 - type: latheRecipe
   parent: BaseHatRecipe
   id: ClothingHeadHatCapPrisonWorkerMetus
-  result: ClothingHeadHatCapPrisonWorkerMetus
+  result: ClothingHeadHatCapPrisonWorker
   materials:
     Cloth: 3000
     Durathread: 3000
@@ -159,7 +159,7 @@
 - type: latheRecipe
   parent: BaseHatRecipe
   id: ClothingHeadCapPrisonWorkerMetus
-  result: ClothingHeadCapPrisonWorkerMetus
+  result: ClothingHeadCapPrisonWorker
   materials:
     Cloth: 300
     Durathread: 200

Resources/Prototypes/_Sunrise/Roles/Jobs/PlanetPrison/prison_doctor.yml

@@ -51,7 +51,7 @@
   job: PrisonDoctor
   equipment:
     jumpsuit: ClothingUniformJumpsuitPrisonDoctor
-    head: ClothingHeadHatBeretPrisonDoctorMetus
+    head: ClothingHeadHatBeretPrisonDoctor
     ears: ClothingHeadsetMedical
     eyes: ClothingEyesGlassesSunglasses
     gloves: ClothingHandsGlovesCombat

Resources/Prototypes/_Sunrise/Roles/Jobs/PlanetPrison/prison_engineer.yml

@@ -48,7 +48,7 @@
   job: PrisonEngineer
   equipment:
     jumpsuit: ClothingUniformJumpsuitPrisonEngineer
-    head: ClothingHeadHatCapPrisonWorkerMetus
+    head: ClothingHeadHatCapPrisonEngineer
     ears: ClothingHeadsetJEngineering
     eyes: ClothingEyesGlassesSunglasses
     gloves: ClothingHandsGlovesCombat

Resources/Prototypes/_Sunrise/Roles/Jobs/PlanetPrison/prison_scientist.yml

@@ -47,7 +47,7 @@
   job: PrisonScientist
   equipment:
     jumpsuit: ClothingUniformJumpsuitPrisonScientistVeteran
-    head: ClothingHeadHatCapPrisonScientistMetus
+    head: ClothingHeadHatCapPrisonScientist
     ears: ClothingHeadsetScience
     eyes: ClothingEyesGlassesSunglasses
     gloves: ClothingHandsGlovesCombat

Resources/Prototypes/_Sunrise/Roles/Jobs/PlanetPrison/prison_trainee.yml

@@ -39,7 +39,7 @@
   job: PrisonTrainee
   equipment:
     jumpsuit: ClothingUniformJumpsuitPrisonTrainee
-    head: ClothingHeadHatBeretPrisonTraineeMetus
+    head: ClothingHeadHatBeretPrisonTrainee
     ears: ClothingHeadsetSecurity
     eyes: ClothingEyesGlassesSunglasses
     gloves: ClothingHandsGlovesCombat

Resources/Prototypes/_Sunrise/Roles/Jobs/PlanetPrison/prison_worker.yml

@@ -64,7 +64,7 @@
   job: PrisonWorker
   equipment:
     jumpsuit: ClothingUniformJumpsuitPrisonWorker
-    head: ClothingHeadCapPrisonWorkerMetus
+    head: ClothingHeadCapPrisonWorker
     ears: ClothingHeadsetSecurity
     eyes: ClothingEyesGlassesSunglasses
     gloves: ClothingHandsGlovesCombat