ПТ | новые спрайты одежды Охраны + юбка + по папкам рассортировал (#3735)

Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/uniforms/jumpskirts.ftl

@@ -10,8 +10,6 @@ ent-ClothingUniformJumpskirtSchool = school skirt
     .desc = Stylish and comfortable school skirt.
 ent-ClothingUniformJumpskirtBlueShield = blueshield's jumpskirt
     .desc = Baby...
-ent-ClothingUniformJumpskirtPrisonerGrey = prisoner's jumpskirt
-    .desc = Why isn't it orange?
 ent-ClothingUniformJumpskirtGuard = prison guard's jumpskirt
     .desc = Why isn't it red?
 ent-ClothingUniformJumpskirtPilot = security pilot's jumpskirt

Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/uniforms/jumpsuits.ftl

@@ -16,8 +16,6 @@ ent-ClothingUniformJumpsuitBlueShield = blueshield's uniform
     .desc = On style.
 ent-ClothingUniformJumpsuitNTRG = NTRG's uniform
     .desc = On style.
-ent-ClothingUniformJumpsuitPrisonerGrey = prisoner's suit
-    .desc = Why isn't it orange?
 ent-ClothingUniformJumpsuitPrisonGuard = prison guard's suit
     .desc = Why isn't it red?
 ent-ClothingUniformJumpsuitPilot = security pilot's suit
@@ -82,21 +80,7 @@ ent-ClothingUniformJumpsuitCaptainWhite = captain's white uniform
     .desc = Crisp, shiny, and 100% allergic to grease. Causes uncontrollable saluting and paperwork cravings.
 ent-ClothingUniformJumpsuitCaptainBlack = captain's black uniform
     .desc = For when you need to look like a legend, not a laundry accident. Hides coffee stains and questionable decisions.
-# Metus jumpsuits
-ent-UniformPrisonGuardMetus = prison guard uniform
-    .desc = { ent-ClothingUniformJumpsuitHoSOld.desc }
-ent-UniformPrisonDoctorMetus = prison doctor uniform
-    .desc = The fabric is partly faded and darkened, with stains from medical fluids on the sleeves, as if the material absorbed heavy operations.
-ent-UniformPrisonChefMetus = prison chef uniform
-    .desc = The fabric is soaked with grease and soot, with stains from constant contact with stoves and pots, slightly worn where the habit of order is stronger than fatigue.
-ent-UniformPrisonEngineerMetus = prison engineer uniform
-    .desc = The material is dense and slightly worn on the elbows and knees, with dark stains of unknown origin, as if it absorbed the scents of abandoned prison places.
-ent-UniformPrisonScientistMetus = prison scientist uniform
-    .desc = Dark streaks from reagents on the shoulders and chest, small spots of chemical mixes, the fabric seems to preserve the memory of experiments best left unsaid.
-ent-UniformPrisonWorkerMetus = prison worker uniform
-    .desc = The fabric is wounded by ore dust and fine scratches, elbows and knees are slightly rubbed, it smells of metal and damp mines, as if it holds encounters with the unknown.
 ent-ClothingUniformPunksuit = punksuit
     .desc = Challenge the dress code!
-ent-UniformPrisonTraineeMetus = prison trainee uniform
-    .desc = Fresh fabric, still bearing the marks of training, with a hint of orange that marks the path of a future guard.
+
 

Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/uniforms/prison/jumpskirt/prisoner.ftl

@@ -0,0 +1,2 @@
+ent-ClothingUniformJumpskirtPrisonerGrey = prisoner's jumpskirt
+    .desc = Why isn't it orange?

Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/uniforms/prison/jumpskirt/regular.ftl

@@ -0,0 +1,17 @@
+ent-ClothingUniformJumpskirtPrisonChef = prison chef jumpskirt
+    .desc = Professional culinary attire with practical design, the hem carrying faint aromas of meals prepared in the shadow of high walls.
+
+ent-ClothingUniformJumpskirtPrisonDoctor = prison doctor jumpskirt
+    .desc = Clinical white fabric with functional cut, designed for swift movement during medical crises where every second counts in a locked-down facility.
+
+ent-ClothingUniformJumpskirtPrisonEngineer = prison engineer jumpskirt
+    .desc = Utility-focused design with tool belts in mind, bearing subtle scorch marks from emergency repairs when systems fail under maximum security.
+
+ent-ClothingUniformJumpskirtPrisonScientist = prison scientist jumpskirt
+    .desc = Research-grade material with protective coatings, marked by the faint chemical signatures of experiments conducted under constant surveillance.
+
+ent-ClothingUniformJumpskirtPrisonWorker = prison worker jumpskirt
+    .desc = Heavy-duty construction with extra padding, carrying the weight of labor performed in depths where hope sometimes gets buried with the ore.
+
+ent-ClothingUniformJumpskirtPrisonTrainee = prison trainee jumpskirt
+    .desc = Regulation uniform with perfect tailoring, representing new recruits learning that in this line of work, mistakes can have permanent consequences.

Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/uniforms/prison/jumpskirt/veteran.ftl

@@ -0,0 +1,17 @@
+ent-ClothingUniformJumpskirtPrisonChefVeteran = veteran prison chef jumpskirt
+    .desc = Masterfully tailored skirt uniform for seasoned culinary experts, bearing the proud marks of countless perfectly executed meals and the wisdom of years spent mastering prison cuisine.
+
+ent-ClothingUniformJumpskirtPrisonDoctorVeteran = veteran prison doctor jumpskirt
+    .desc = Enhanced medical skirt uniform with additional pockets and reinforced stitching, bearing the subtle wear of countless emergency interventions in maximum security.
+
+ent-ClothingUniformJumpskirtPrisonEngineerVeteran = veteran prison engineer jumpskirt
+    .desc = Battle-hardened engineering skirt uniform worn by master technicians who've kept the facility's systems running through countless crises, their expertise forged in the fires of emergency repairs.
+
+ent-ClothingUniformJumpskirtPrisonScientistVeteran = veteran prison scientist jumpskirt
+    .desc = Prestigious research skirt uniform for distinguished scientists whose groundbreaking work has advanced prison research, bearing the subtle scars of years spent pushing the boundaries of knowledge in confinement.
+
+ent-ClothingUniformJumpskirtPrisonTraineeVeteran = veteran prison trainee jumpskirt
+    .desc = Seasoned training skirt uniform for experienced mentors who have guided countless recruits through their first challenging days, their wisdom earned through years of shaping the next generation of guards.
+
+ent-ClothingUniformJumpskirtPrisonWorkerVeteran = veteran prison worker jumpskirt
+    .desc = Time-honored labor skirt uniform for master craftsmen who've spent decades perfecting their trade in the depths, their calloused hands and weathered fabric telling tales of uncountable shifts in the unforgiving mines.

Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/uniforms/prison/jumpsuit/prisoner.ftl

@@ -0,0 +1,2 @@
+ent-ClothingUniformJumpsuitPrisonerGrey = prisoner's jumpsuit
+    .desc = Why isn't it orange?

Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/uniforms/prison/jumpsuit/regular.ftl

@@ -0,0 +1,17 @@
+ent-ClothingUniformJumpsuitPrisonChef = prison chef jumpsuit
+    .desc = Crisp and functional attire for culinary duties, the fabric bearing subtle marks from countless meals prepared behind cold steel bars.
+
+ent-ClothingUniformJumpsuitPrisonDoctor = prison doctor jumpsuit
+    .desc = Sterile white fabric with reinforced seams, designed for medical emergencies in high-security environments where trust is a luxury.
+
+ent-ClothingUniformJumpsuitPrisonEngineer = prison engineer jumpsuit
+    .desc = Reinforced canvas with tool-resistant fabric, marked by the sparks and grime of maintaining order in a facility where breakdowns can mean chaos.
+
+ent-ClothingUniformJumpsuitPrisonScientist = prison scientist jumpsuit
+    .desc = Laboratory-grade fabric with chemical-resistant properties, faintly stained from experimental procedures conducted under the watchful eyes of armed guards.
+
+ent-ClothingUniformJumpsuitPrisonWorker = prison worker jumpsuit
+    .desc = Durable workwear with reinforced knees and elbows, carrying the dust and echoes of deep mining operations where freedom is just a collapsed tunnel away.
+
+ent-ClothingUniformJumpsuitPrisonTrainee = prison trainee jumpsuit
+    .desc = Freshly issued uniform with crisp lines and minimal wear, representing the first steps into a world where authority must be earned through vigilance and steel.

Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/uniforms/prison/jumpsuit/veteran.ftl

@@ -0,0 +1,17 @@
+ent-ClothingUniformJumpsuitPrisonDoctorVeteran = veteran prison doctor jumpsuit
+    .desc = Enhanced medical uniform with additional pockets and reinforced stitching, bearing the subtle wear of countless emergency interventions in maximum security.
+
+ent-ClothingUniformJumpsuitPrisonChefVeteran = veteran prison chef jumpsuit
+    .desc = Masterfully tailored uniform for seasoned culinary experts, bearing the proud marks of countless perfectly executed meals and the wisdom of years spent mastering prison cuisine.
+
+ent-ClothingUniformJumpsuitPrisonEngineerVeteran = veteran prison engineer jumpsuit
+    .desc = Battle-hardened engineering uniform worn by master technicians who've kept the facility's systems running through countless crises, their expertise forged in the fires of emergency repairs.
+
+ent-ClothingUniformJumpsuitPrisonScientistVeteran = veteran prison scientist jumpsuit
+    .desc = Prestigious research uniform for distinguished scientists whose groundbreaking work has advanced prison research, bearing the subtle scars of years spent pushing the boundaries of knowledge in confinement.
+
+ent-ClothingUniformJumpsuitPrisonTraineeVeteran = veteran prison trainee jumpsuit
+    .desc = Seasoned training uniform for experienced mentors who have guided countless recruits through their first challenging days, their wisdom earned through years of shaping the next generation of guards.
+
+ent-ClothingUniformJumpsuitPrisonWorkerVeteran = veteran prison worker jumpsuit
+    .desc = Time-honored labor uniform for master craftsmen who've spent decades perfecting their trade in the depths, their calloused hands and weathered fabric telling tales of uncountable shifts in the unforgiving mines.

Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/uniforms/jumpskirts.ftl

@@ -10,8 +10,6 @@ ent-ClothingUniformJumpskirtSchool = школьная юбка
     .desc = Стильная и удобная школьная юбка.
 ent-ClothingUniformJumpskirtBlueShield = юбка-комбинезон офицера «Синий щит»
     .desc = Детка...
-ent-ClothingUniformJumpskirtPrisonerGrey = юбка-комбинезон заключённой
-    .desc = Почему она не оранжевая?
 ent-ClothingUniformJumpskirtGuard = юбка-комбинезон охраны
     .desc = Почему она не красная?
 ent-ClothingUniformJumpskirtPilot = юбка комбинезон пилота Службы Безопасности
@@ -37,7 +35,7 @@ ent-ClothingUniformBlackBrideDressFlower = тёмное свадебное пл
 ent-ClothingUniformWhiteGroomSuit = светлый свадебный костюм
     .desc = Изысканный костюм. Силуэт, словно сотканный из утреннего света, воплощает чистоту обещаний.
 ent-ClothingUniformBlackGroomSuit = тёмный свадебный костюм
-    .desc = Изысканный костюм. Безупречный крой и благородный матовый оттенок подчеркивают таинственность момента.
+    .desc = Изысканный костюм. Безупречный крой и благородный матовый оттенок подчеркивает таинственность момента.
 ent-ClothingUniformJumpskirtCapTurtleneck = черенок капитана
     .desc = Истинный черенок капитана.
 ent-ClothingUniformJumpskirtHoPTurtleneck = черенок начальника персонала

Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/uniforms/jumpsuits.ftl

@@ -16,8 +16,6 @@ ent-ClothingUniformJumpsuitBlueShield = комбинезон офицера «С
     .desc = На стиле.
 ent-ClothingUniformJumpsuitNTRG = униформа ИСН
     .desc = Черная, как космическая бездна, и строгая, как сам Закон, униформа ИСН — это не просто одежда, а символ абсолютного авторитета.
-ent-ClothingUniformJumpsuitPrisonerGrey = комбинезон заключённого
-    .desc = Почему он не оранжевый?
 ent-ClothingUniformJumpsuitPrisonGuard = комбинезон охранника
     .desc = Почему он не красный?
 ent-ClothingUniformJumpsuitPilot = комбинезон пилота Службы Безопасности
@@ -88,21 +86,6 @@ ent-ClothingUniformJumpsuitCaptainWhite = белый комбинезон кап
     .desc = Хрустящий, блестящий и на 100% аллергичный к мазуту. Вызывает неконтролируемые салюты и тягу к бумажкам.
 ent-ClothingUniformJumpsuitCaptainBlack = чёрный комбинезон капитана
     .desc = Когда нужно выглядеть как легенда, а не как несчастный случай в прачечной. Прячет пятна кофе и сомнительные решения.
-# комбинезоны Метус
-ent-UniformPrisonGuardMetus = комбинезон тюремного охранника
-    .desc = { ent-ClothingUniformJumpsuitHoSOld.desc }
-ent-UniformPrisonDoctorMetus = комбинезон тюремного доктора
-    .desc = Ткань местами выгорела и потемнела, на рукавах пятна от лекарственных жидкостей, материал будто впитал тяжёлые операции.
-ent-UniformPrisonChefMetus = комбинезон тюремного повара
-    .desc = Ткань пропитана жиром и копотью, на рукавах пятна от постоянного контакта с плитой и кастрюлями, слегка вытертые в местах, где привычка к порядку сильнее усталости.
-ent-UniformPrisonEngineerMetus = комбинезон тюремного инженера
-    .desc = Материал плотный и слегка вытертый на локтях и коленях, на ткани тёмные пятна неизвестного происхождения, будто впитал запахи заброшенных мест тюрьмы.
-ent-UniformPrisonScientistMetus = комбинезон тюремного учёного
-    .desc = По плечам и груди тёмные разводы от реагентов, мелкие пятна химических смесей, ткань будто хранит память об экспериментах, о которых лучше молчать.
-ent-UniformPrisonWorkerMetus = комбинезон тюремного разнорабочего
-    .desc = Ткань изранена рудной пылью и мелкими царапинами, локти и колени слегка вытерты, пахнет металлом и сыростью шахт, словно хранит встречи с неизвестным.
 ent-ClothingUniformPunksuit = панк-костюм
     .desc = Брось вызов гардеробу!
 
-ent-UniformPrisonTraineeMetus = комбинезон тюремного стажёра
-    .desc = Свежая ткань, ещё хранящая следы обучения, с намёком на оранжевый цвет, отмечающий путь будущего охранника.

Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/uniforms/prison/jumpskirt/prisoner.ftl

@@ -0,0 +1,2 @@
+ent-ClothingUniformJumpskirtPrisonerGrey = юбка-комбинезон заключённой
+    .desc = Почему она не оранжевая?

Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/uniforms/prison/jumpskirt/regular.ftl

@@ -0,0 +1,17 @@
+ent-ClothingUniformJumpskirtPrisonChef = юбка-комбинезон тюремного повара
+    .desc = Профессиональная кулинарная одежда с практичным дизайном, подол несёт слабые ароматы трапез, приготовленных в тени высоких стен.
+
+ent-ClothingUniformJumpskirtPrisonDoctor = юбка-комбинезон тюремного врача
+    .desc = Клиническая белая ткань с функциональным покроем, предназначенная для быстрого движения во время медицинских кризисов, где каждая секунда на счету в закрытом учреждении.
+
+ent-ClothingUniformJumpskirtPrisonEngineer = юбка-комбинезон тюремного инженера
+    .desc = Дизайн, ориентированный на утилитарность с ремнями для инструментов, несущий слабые следы ожогов от экстренных ремонтов, когда системы выходят из строя под максимальной охраной.
+
+ent-ClothingUniformJumpskirtPrisonScientist = юбка-комбинезон тюремного учёного
+    .desc = Материал исследовательского качества с защитными покрытиями, отмеченный слабыми химическими сигнатурами экспериментов, проводимых под постоянным наблюдением.
+
+ent-ClothingUniformJumpskirtPrisonWorker = юбка-комбинезон тюремного разнорабочего
+    .desc = Тяжёлая конструкция с дополнительной набивкой, несущая вес труда, выполняемого в глубинах, где свобода находится всего в одном обвале туннеля.
+
+ent-ClothingUniformJumpskirtPrisonTrainee = юбка-комбинезон тюремного стажёра
+    .desc = Регулярная униформа с идеальной подгонкой, представляющая новобранцев, обучающихся тому, что в этой работе ошибки могут иметь постоянные последствия.

Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/uniforms/prison/jumpskirt/veteran.ftl

@@ -0,0 +1,17 @@
+ent-ClothingUniformJumpskirtPrisonChefVeteran = ветеранская юбка-комбинезон тюремного повара
+    .desc = Мастерски сшитая юбка-униформа для опытных кулинарных экспертов, несущая гордые отметины бесчисленных идеально приготовленных блюд и мудрость лет, проведённых в освоении тюремной кухни.
+
+ent-ClothingUniformJumpskirtPrisonDoctorVeteran = ветеранская юбка-комбинезон тюремного врача
+    .desc = Улучшенная медицинская юбка-униформа с дополнительными карманами и усиленной строчкой, несущая лёгкий износ от бесчисленных вмешательств в чрезвычайных ситуациях максимальной безопасности.
+
+ent-ClothingUniformJumpskirtPrisonEngineerVeteran = ветеранская юбка-комбинезон тюремного инженера
+    .desc = Закалённая в боях инженерная юбка-униформа, носимая мастерами-техниками, которые поддерживали работу систем учреждения сквозь бесчисленные кризисы, их опыт закалён в огне аварийных ремонтов.
+
+ent-ClothingUniformJumpskirtPrisonScientistVeteran = ветеранская юбка-комбинезон тюремного учёного
+    .desc = Престижная исследовательская юбка-униформа для выдающихся учёных, чья новаторская работа продвинула тюремные исследования, несущая тонкие шрамы лет, проведённых в расширении границ знаний в заключении.
+
+ent-ClothingUniformJumpskirtPrisonTraineeVeteran = ветеранская юбка-комбинезон тюремного стажёра
+    .desc = Опытная тренировочная юбка-униформа для опытных наставников, которые провели бесчисленных новобранцев через их первые сложные дни, их мудрость заработана годами формирования следующего поколения охранников.
+
+ent-ClothingUniformJumpskirtPrisonWorkerVeteran = ветеранская юбка-комбинезон тюремного разнорабочего
+    .desc = Почитаемая трудовая юбка-униформа для мастеров-ремесленников, которые провели десятилетия в совершенствовании своего ремесла в глубинах, их мозолистые руки и выветрившаяся ткань рассказывают истории о несчётных сменах в безжалостных шахтах.

Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/uniforms/prison/jumpsuit/prisoner.ftl

@@ -0,0 +1,2 @@
+ent-ClothingUniformJumpsuitPrisonerGrey = комбинезон заключённого
+    .desc = Почему он не оранжевый?

Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/uniforms/prison/jumpsuit/regular.ftl

@@ -0,0 +1,17 @@
+ent-ClothingUniformJumpsuitPrisonChef = комбинезон тюремного повара
+    .desc = Аккуратная и функциональная одежда для кулинарных обязанностей, ткань несёт лёгкие следы от бесчисленных трапез, приготовленных за холодными стальными прутьями.
+
+ent-ClothingUniformJumpsuitPrisonDoctor = комбинезон тюремного врача
+    .desc = Стерильная белая ткань с усиленными швами, предназначенная для медицинских чрезвычайных ситуаций в условиях высокой безопасности, где доверие является роскошью.
+
+ent-ClothingUniformJumpsuitPrisonEngineer = комбинезон тюремного инженера
+    .desc = Усиленная парусина с устойчивой к инструментам тканью, отмеченная искрами и грязью поддержания порядка в учреждении, где поломки могут означать хаос.
+
+ent-ClothingUniformJumpsuitPrisonScientist = комбинезон тюремного учёного
+    .desc = Ткань лабораторного качества с химически-устойчивыми свойствами, слегка окрашенная от экспериментальных процедур, проводимых под пристальным наблюдением вооружённой охраны.
+
+ent-ClothingUniformJumpsuitPrisonWorker = комбинезон тюремного разнорабочего
+    .desc = Прочная рабочая одежда с усиленными коленями и локтями, несущая пыль и эхо глубоких горных работ, где свобода находится всего в одном обвале туннеля.
+
+ent-ClothingUniformJumpsuitPrisonTrainee = комбинезон тюремного стажёра
+    .desc = Только что выданная униформа с чёткими линиями и минимальным износом, представляющая первые шаги в мир, где авторитет нужно заслужить бдительностью и сталью.

Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/uniforms/prison/jumpsuit/veteran.ftl

@@ -0,0 +1,17 @@
+ent-ClothingUniformJumpsuitPrisonDoctorVeteran = ветеранский комбинезон тюремного врача
+    .desc = Улучшенная медицинская униформа с дополнительными карманами и усиленной строчкой, несущая лёгкий износ от бесчисленных вмешательств в чрезвычайных ситуациях максимальной безопасности.
+
+ent-ClothingUniformJumpsuitPrisonChefVeteran = ветеранский комбинезон тюремного повара
+    .desc = Мастерски сшитая униформа для опытных кулинарных экспертов, несущая гордые отметины бесчисленных идеально приготовленных блюд и мудрость лет, проведённых в освоении тюремной кухни.
+
+ent-ClothingUniformJumpsuitPrisonEngineerVeteran = ветеранский комбинезон тюремного инженера
+    .desc = Закалённая в боях инженерная униформа, носимая мастерами-техниками, которые поддерживали работу систем учреждения сквозь бесчисленные кризисы, их опыт закалён в огне аварийных ремонтов.
+
+ent-ClothingUniformJumpsuitPrisonScientistVeteran = ветеранский комбинезон тюремного учёного
+    .desc = Престижная исследовательская униформа для выдающихся учёных, чья новаторская работа продвинула тюремные исследования, несущая тонкие шрамы лет, проведённых в расширении границ знаний в заключении.
+
+ent-ClothingUniformJumpsuitPrisonTraineeVeteran = ветеранский комбинезон тюремного стажёра
+    .desc = Опытная тренировочная униформа для опытных наставников, которые провели бесчисленных новобранцев через их первые сложные дни, их мудрость заработана годами формирования следующего поколения охранников.
+
+ent-ClothingUniformJumpsuitPrisonWorkerVeteran = ветеранский комбинезон тюремного разнорабочего
+    .desc = Почитаемая трудовая униформа для мастеров-ремесленников, которые провели десятилетия в совершенствовании своего ремесла в глубинах, их мозолистые руки и выветрившаяся ткань рассказывают истории о несчётных сменах в безжалостных шахтах.

Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/Prison/jumpskirts/base.yml

@@ -0,0 +1,23 @@
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpskirtPrisonRegularBase
+  name: prison regular jumpskirt
+  description: A standard skirt uniform worn by prison staff in their daily duties.
+  suffix: Prison
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Clothing/Uniforms/Prison/Jumpskirt/regular.rsi
+  - type: Clothing
+    sprite: _Sunrise/Clothing/Uniforms/Prison/Jumpskirt/regular.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpskirtPrisonVeteranBase
+  name: prison veteran jumpskirt
+  description: A distinguished skirt uniform worn by experienced prison staff who have proven their dedication through years of service.
+  suffix: Prison
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Clothing/Uniforms/Prison/Jumpskirt/veteran.rsi
+  - type: Clothing
+    sprite: _Sunrise/Clothing/Uniforms/Prison/Jumpskirt/veteran.rsi

Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/Prison/jumpskirts/chef.yml

@@ -0,0 +1,55 @@
+- type: entity
+  parent: ClothingUniformJumpskirtPrisonRegularBase
+  id: ClothingUniformJumpskirtPrisonChef
+  name: prison chef jumpskirt
+  description: Professional culinary attire with practical design, the hem carrying faint aromas of meals prepared in the shadow of high walls.
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+    - state: overlay-icon
+      color: "#ffffff"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+      - state: overlay-inhand-left
+        color: "#ffffff"
+      right:
+      - state: inhand-right
+      - state: overlay-inhand-right
+        color: "#ffffff"
+  - type: Clothing
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+      - state: overlay-equipped
+        color: "#ffffff"
+
+- type: entity
+  parent: ClothingUniformJumpskirtPrisonVeteranBase
+  id: ClothingUniformJumpskirtPrisonChefVeteran
+  name: veteran prison chef jumpskirt
+  description: Masterfully tailored skirt uniform for seasoned culinary experts, bearing the proud marks of countless perfectly executed meals and the wisdom of years spent mastering prison cuisine.
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+    - state: overlay-icon
+      color: "#ffffff"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+      - state: overlay-inhand-left
+        color: "#ffffff"
+      right:
+      - state: inhand-right
+      - state: overlay-inhand-right
+        color: "#ffffff"
+  - type: Clothing
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+      - state: overlay-equipped
+        color: "#ffffff"

Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/Prison/jumpskirts/doctor.yml

@@ -0,0 +1,55 @@
+- type: entity
+  parent: ClothingUniformJumpskirtPrisonRegularBase
+  id: ClothingUniformJumpskirtPrisonDoctor
+  name: prison doctor jumpskirt
+  description: Clinical white fabric with functional cut, designed for swift movement during medical crises where every second counts in a locked-down facility.
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+    - state: overlay-icon
+      color: "#99D2FF"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+      - state: overlay-inhand-left
+        color: "#99D2FF"
+      right:
+      - state: inhand-right
+      - state: overlay-inhand-right
+        color: "#99D2FF"
+  - type: Clothing
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+      - state: overlay-equipped
+        color: "#99D2FF"
+
+- type: entity
+  parent: ClothingUniformJumpskirtPrisonVeteranBase
+  id: ClothingUniformJumpskirtPrisonDoctorVeteran
+  name: veteran prison doctor jumpskirt
+  description: Enhanced medical skirt uniform with additional pockets and reinforced stitching, bearing the subtle wear of countless emergency interventions in maximum security.
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+    - state: overlay-icon
+      color: "#99D2FF"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+      - state: overlay-inhand-left
+        color: "#99D2FF"
+      right:
+      - state: inhand-right
+      - state: overlay-inhand-right
+        color: "#99D2FF"
+  - type: Clothing
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+      - state: overlay-equipped
+        color: "#99D2FF"

Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/Prison/jumpskirts/engineer.yml

@@ -0,0 +1,55 @@
+- type: entity
+  parent: ClothingUniformJumpskirtPrisonRegularBase
+  id: ClothingUniformJumpskirtPrisonEngineer
+  name: prison engineer jumpskirt
+  description: Utility-focused design with tool belts in mind, bearing subtle scorch marks from emergency repairs when systems fail under maximum security.
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+    - state: overlay-icon
+      color: "#ffd900"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+      - state: overlay-inhand-left
+        color: "#ffd900"
+      right:
+      - state: inhand-right
+      - state: overlay-inhand-right
+        color: "#ffd900"
+  - type: Clothing
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+      - state: overlay-equipped
+        color: "#ffd900"
+
+- type: entity
+  parent: ClothingUniformJumpskirtPrisonVeteranBase
+  id: ClothingUniformJumpskirtPrisonEngineerVeteran
+  name: veteran prison engineer jumpskirt
+  description: Battle-hardened engineering skirt uniform worn by master technicians who've kept the facility's systems running through countless crises, their expertise forged in the fires of emergency repairs.
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+    - state: overlay-icon
+      color: "#ffd900"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+      - state: overlay-inhand-left
+        color: "#ffd900"
+      right:
+      - state: inhand-right
+      - state: overlay-inhand-right
+        color: "#ffd900"
+  - type: Clothing
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+      - state: overlay-equipped
+        color: "#ffd900"

Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/Prison/jumpskirts/prisoner.yml

@@ -0,0 +1,10 @@
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpskirtPrisonerGrey
+  name: prisoner's jumpskirt
+  description: Why isn't it orange?
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Clothing/Uniforms/Prison/Jumpskirt/prisoner.rsi
+  - type: Clothing
+    sprite: _Sunrise/Clothing/Uniforms/Prison/Jumpskirt/prisoner.rsi

Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/Prison/jumpskirts/scientist.yml

@@ -0,0 +1,55 @@
+- type: entity
+  parent: ClothingUniformJumpskirtPrisonRegularBase
+  id: ClothingUniformJumpskirtPrisonScientist
+  name: prison scientist jumpskirt
+  description: Research-grade material with protective coatings, marked by the faint chemical signatures of experiments conducted under constant surveillance.
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+    - state: overlay-icon
+      color: "#9d1edd"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+      - state: overlay-inhand-left
+        color: "#9d1edd"
+      right:
+      - state: inhand-right
+      - state: overlay-inhand-right
+        color: "#9d1edd"
+  - type: Clothing
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+      - state: overlay-equipped
+        color: "#9d1edd"
+
+- type: entity
+  parent: ClothingUniformJumpskirtPrisonVeteranBase
+  id: ClothingUniformJumpskirtPrisonScientistVeteran
+  name: veteran prison scientist jumpskirt
+  description: Prestigious research skirt uniform for distinguished scientists whose groundbreaking work has advanced prison research, bearing the subtle scars of years spent pushing the boundaries of knowledge in confinement.
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+    - state: overlay-icon
+      color: "#9d1edd"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+      - state: overlay-inhand-left
+        color: "#9d1edd"
+      right:
+      - state: inhand-right
+      - state: overlay-inhand-right
+        color: "#9d1edd"
+  - type: Clothing
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+      - state: overlay-equipped
+        color: "#9d1edd"

Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/Prison/jumpskirts/trainee.yml

@@ -0,0 +1,55 @@
+- type: entity
+  parent: ClothingUniformJumpskirtPrisonRegularBase
+  id: ClothingUniformJumpskirtPrisonTrainee
+  name: prison trainee jumpskirt
+  description: Regulation uniform with perfect tailoring, representing new recruits learning that in this line of work, mistakes can have permanent consequences.
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+    - state: overlay-icon
+      color: "#ff8c00"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+      - state: overlay-inhand-left
+        color: "#ff8c00"
+      right:
+      - state: inhand-right
+      - state: overlay-inhand-right
+        color: "#ff8c00"
+  - type: Clothing
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+      - state: overlay-equipped
+        color: "#ff8c00"
+
+- type: entity
+  parent: ClothingUniformJumpskirtPrisonVeteranBase
+  id: ClothingUniformJumpskirtPrisonTraineeVeteran
+  name: veteran prison trainee jumpskirt
+  description: Seasoned training skirt uniform for experienced mentors who have guided countless recruits through their first challenging days, their wisdom earned through years of shaping the next generation of guards.
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+    - state: overlay-icon
+      color: "#ff8c00"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+      - state: overlay-inhand-left
+        color: "#ff8c00"
+      right:
+      - state: inhand-right
+      - state: overlay-inhand-right
+        color: "#ff8c00"
+  - type: Clothing
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+      - state: overlay-equipped
+        color: "#ff8c00"

Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/Prison/jumpskirts/worker.yml

@@ -0,0 +1,55 @@
+- type: entity
+  parent: ClothingUniformJumpskirtPrisonRegularBase
+  id: ClothingUniformJumpskirtPrisonWorker
+  name: prison worker jumpskirt
+  description: Heavy-duty construction with extra padding, carrying the weight of labor performed in depths where hope sometimes gets buried with the ore.
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+    - state: overlay-icon
+      color: "#df0400"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+      - state: overlay-inhand-left
+        color: "#df0400"
+      right:
+      - state: inhand-right
+      - state: overlay-inhand-right
+        color: "#df0400"
+  - type: Clothing
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+      - state: overlay-equipped
+        color: "#df0400"
+
+- type: entity
+  parent: ClothingUniformJumpskirtPrisonVeteranBase
+  id: ClothingUniformJumpskirtPrisonWorkerVeteran
+  name: veteran prison worker jumpskirt
+  description: Time-honored labor skirt uniform for master craftsmen who've spent decades perfecting their trade in the depths, their calloused hands and weathered fabric telling tales of uncountable shifts in the unforgiving mines.
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+    - state: overlay-icon
+      color: "#df0400"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+      - state: overlay-inhand-left
+        color: "#df0400"
+      right:
+      - state: inhand-right
+      - state: overlay-inhand-right
+        color: "#df0400"
+  - type: Clothing
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+      - state: overlay-equipped
+        color: "#df0400"

Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/Prison/jumpsuits/base.yml

@@ -0,0 +1,24 @@
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitPrisonRegularBase
+  name: prison regular uniform
+  description: A standard uniform worn by prison staff in their daily duties.
+  suffix: Prison
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Clothing/Uniforms/Prison/Jumpsuit/regular.rsi
+  - type: Clothing
+    sprite: _Sunrise/Clothing/Uniforms/Prison/Jumpsuit/regular.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitPrisonVeteranBase
+  name: prison veteran uniform
+  description: A distinguished uniform worn by experienced prison staff who have proven their dedication through years of service.
+  suffix: Prison
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Clothing/Uniforms/Prison/Jumpsuit/veteran.rsi
+  - type: Clothing
+    sprite: _Sunrise/Clothing/Uniforms/Prison/Jumpsuit/veteran.rsi
+

Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/Prison/jumpsuits/chef.yml

@@ -0,0 +1,55 @@
+- type: entity
+  parent: ClothingUniformJumpsuitPrisonRegularBase
+  id: ClothingUniformJumpsuitPrisonChef
+  name: prison chef jumpsuit
+  description: Crisp and functional attire for culinary duties, the fabric bearing subtle marks from countless meals prepared behind cold steel bars.
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+    - state: overlay-icon
+      color: "#ffffff"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+      - state: overlay-inhand-left
+        color: "#ffffff"
+      right:
+      - state: inhand-right
+      - state: overlay-inhand-right
+        color: "#ffffff"
+  - type: Clothing
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+      - state: overlay-equipped
+        color: "#ffffff"
+
+- type: entity
+  parent: ClothingUniformJumpsuitPrisonVeteranBase
+  id: ClothingUniformJumpsuitPrisonChefVeteran
+  name: veteran prison chef jumpsuit
+  description: Masterfully tailored uniform for seasoned culinary experts, bearing the proud marks of countless perfectly executed meals and the wisdom of years spent mastering prison cuisine.
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+    - state: overlay-icon
+      color: "#ffffff"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+      - state: overlay-inhand-left
+        color: "#ffffff"
+      right:
+      - state: inhand-right
+      - state: overlay-inhand-right
+        color: "#ffffff"
+  - type: Clothing
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+      - state: overlay-equipped
+        color: "#ffffff"

Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/Prison/jumpsuits/doctor.yml

@@ -0,0 +1,55 @@
+- type: entity
+  parent: ClothingUniformJumpsuitPrisonRegularBase
+  id: ClothingUniformJumpsuitPrisonDoctor
+  name: prison doctor jumpsuit
+  description: Sterile white fabric with reinforced seams, designed for medical emergencies in high-security environments where trust is a luxury.
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+    - state: overlay-icon
+      color: "#99D2FF"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+      - state: overlay-inhand-left
+        color: "#99D2FF"
+      right:
+      - state: inhand-right
+      - state: overlay-inhand-right
+        color: "#99D2FF"
+  - type: Clothing
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+      - state: overlay-equipped
+        color: "#99D2FF"
+
+- type: entity
+  parent: ClothingUniformJumpsuitPrisonVeteranBase
+  id: ClothingUniformJumpsuitPrisonDoctorVeteran
+  name: veteran prison doctor jumpsuit
+  description: Enhanced medical uniform with additional pockets and reinforced stitching, bearing the subtle wear of countless emergency interventions in maximum security.
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+    - state: overlay-icon
+      color: "#99D2FF"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+      - state: overlay-inhand-left
+        color: "#99D2FF"
+      right:
+      - state: inhand-right
+      - state: overlay-inhand-right
+        color: "#99D2FF"
+  - type: Clothing
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+      - state: overlay-equipped
+        color: "#99D2FF"

Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/Prison/jumpsuits/engineer.yml

@@ -0,0 +1,55 @@
+- type: entity
+  parent: ClothingUniformJumpsuitPrisonRegularBase
+  id: ClothingUniformJumpsuitPrisonEngineer
+  name: prison engineer jumpsuit
+  description: Reinforced canvas with tool-resistant fabric, marked by the sparks and grime of maintaining order in a facility where breakdowns can mean chaos.
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+    - state: overlay-icon
+      color: "#ffd900"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+      - state: overlay-inhand-left
+        color: "#ffd900"
+      right:
+      - state: inhand-right
+      - state: overlay-inhand-right
+        color: "#ffd900"
+  - type: Clothing
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+      - state: overlay-equipped
+        color: "#ffd900"
+
+- type: entity
+  parent: ClothingUniformJumpsuitPrisonVeteranBase
+  id: ClothingUniformJumpsuitPrisonEngineerVeteran
+  name: veteran prison engineer jumpsuit
+  description: Battle-hardened engineering uniform worn by master technicians who've kept the facility's systems running through countless crises, their expertise forged in the fires of emergency repairs.
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+    - state: overlay-icon
+      color: "#ffd900"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+      - state: overlay-inhand-left
+        color: "#ffd900"
+      right:
+      - state: inhand-right
+      - state: overlay-inhand-right
+        color: "#ffd900"
+  - type: Clothing
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+      - state: overlay-equipped
+        color: "#ffd900"

Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/Prison/jumpsuits/prisoner.yml

@@ -0,0 +1,10 @@
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitPrisonerGrey
+  name: prisoner's jumpsuit
+  description: Why isn't it orange?
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Clothing/Uniforms/Prison/Jumpsuit/prisoner.rsi
+  - type: Clothing
+    sprite: _Sunrise/Clothing/Uniforms/Prison/Jumpsuit/prisoner.rsi

Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/Prison/jumpsuits/scientist.yml

@@ -0,0 +1,55 @@
+- type: entity
+  parent: ClothingUniformJumpsuitPrisonRegularBase
+  id: ClothingUniformJumpsuitPrisonScientist
+  name: prison scientist jumpsuit
+  description: Laboratory-grade fabric with chemical-resistant properties, faintly stained from experimental procedures conducted under the watchful eyes of armed guards.
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+    - state: overlay-icon
+      color: "#9d1edd"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+      - state: overlay-inhand-left
+        color: "#9d1edd"
+      right:
+      - state: inhand-right
+      - state: overlay-inhand-right
+        color: "#9d1edd"
+  - type: Clothing
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+      - state: overlay-equipped
+        color: "#9d1edd"
+
+- type: entity
+  parent: ClothingUniformJumpsuitPrisonVeteranBase
+  id: ClothingUniformJumpsuitPrisonScientistVeteran
+  name: veteran prison scientist jumpsuit
+  description: Prestigious research uniform for distinguished scientists whose groundbreaking work has advanced prison research, bearing the subtle scars of years spent pushing the boundaries of knowledge in confinement.
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+    - state: overlay-icon
+      color: "#9d1edd"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+      - state: overlay-inhand-left
+        color: "#9d1edd"
+      right:
+      - state: inhand-right
+      - state: overlay-inhand-right
+        color: "#9d1edd"
+  - type: Clothing
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+      - state: overlay-equipped
+        color: "#9d1edd"

Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/Prison/jumpsuits/trainee.yml

@@ -0,0 +1,55 @@
+- type: entity
+  parent: ClothingUniformJumpsuitPrisonRegularBase
+  id: ClothingUniformJumpsuitPrisonTrainee
+  name: prison trainee jumpsuit
+  description: Freshly issued uniform with crisp lines and minimal wear, representing the first steps into a world where authority must be earned through vigilance and steel.
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+    - state: overlay-icon
+      color: "#ff8c00"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+      - state: overlay-inhand-left
+        color: "#ff8c00"
+      right:
+      - state: inhand-right
+      - state: overlay-inhand-right
+        color: "#ff8c00"
+  - type: Clothing
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+      - state: overlay-equipped
+        color: "#ff8c00"
+
+- type: entity
+  parent: ClothingUniformJumpsuitPrisonVeteranBase
+  id: ClothingUniformJumpsuitPrisonTraineeVeteran
+  name: veteran prison trainee jumpsuit
+  description: Seasoned training uniform for experienced mentors who have guided countless recruits through their first challenging days, their wisdom earned through years of shaping the next generation of guards.
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+    - state: overlay-icon
+      color: "#ff8c00"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+      - state: overlay-inhand-left
+        color: "#ff8c00"
+      right:
+      - state: inhand-right
+      - state: overlay-inhand-right
+        color: "#ff8c00"
+  - type: Clothing
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+      - state: overlay-equipped
+        color: "#ff8c00"

Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/Prison/jumpsuits/worker.yml

@@ -0,0 +1,55 @@
+- type: entity
+  parent: ClothingUniformJumpsuitPrisonRegularBase
+  id: ClothingUniformJumpsuitPrisonWorker
+  name: prison worker jumpsuit
+  description: Durable workwear with reinforced knees and elbows, carrying the dust and echoes of deep mining operations where freedom is just a collapsed tunnel away.
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+    - state: overlay-icon
+      color: "#df0400"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+      - state: overlay-inhand-left
+        color: "#df0400"
+      right:
+      - state: inhand-right
+      - state: overlay-inhand-right
+        color: "#df0400"
+  - type: Clothing
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+      - state: overlay-equipped
+        color: "#df0400"
+
+- type: entity
+  parent: ClothingUniformJumpsuitPrisonVeteranBase
+  id: ClothingUniformJumpsuitPrisonWorkerVeteran
+  name: veteran prison worker jumpsuit
+  description: Time-honored labor uniform for master craftsmen who've spent decades perfecting their trade in the depths, their calloused hands and weathered fabric telling tales of uncountable shifts in the unforgiving mines.
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+    - state: overlay-icon
+      color: "#df0400"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+      - state: overlay-inhand-left
+        color: "#df0400"
+      right:
+      - state: inhand-right
+      - state: overlay-inhand-right
+        color: "#df0400"
+  - type: Clothing
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+      - state: overlay-equipped
+        color: "#df0400"

Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/jumpskirts.yml

@@ -65,17 +65,6 @@
   - type: Clothing
     sprite: _Sunrise/Clothing/Uniforms/Jumpskirt/blueshield.rsi
 
-- type: entity
-  parent: ClothingUniformBase
-  id: ClothingUniformJumpskirtPrisonerGrey
-  name: prisoner's jumpskirt
-  description: Why isn't it orange?
-  components:
-  - type: Sprite
-    sprite: _Sunrise/Clothing/Uniforms/Jumpskirt/prisoner.rsi
-  - type: Clothing
-    sprite: _Sunrise/Clothing/Uniforms/Jumpskirt/prisoner.rsi
-
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpskirtGuard

Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/jumpsuits.yml

@@ -97,17 +97,6 @@
   - type: Clothing
     sprite: _Sunrise/Clothing/Uniforms/Jumpsuit/ntrg_suit.rsi
 
-- type: entity
-  parent: ClothingUniformBase
-  id: ClothingUniformJumpsuitPrisonerGrey
-  name: prisoner's suit
-  description: Why isn't it orange?
-  components:
-  - type: Sprite
-    sprite: _Sunrise/Clothing/Uniforms/Jumpsuit/prisoner.rsi
-  - type: Clothing
-    sprite: _Sunrise/Clothing/Uniforms/Jumpsuit/prisoner.rsi
-
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitPrisonGuard
@@ -443,156 +432,6 @@
   - type: Clothing
     sprite: _Sunrise/Clothing/Uniforms/Jumpsuit/metatontishka.rsi
 
-- type: entity
-  parent: ClothingUniformBase
-  id: UniformPrisonGuardMetus
-  name: prison guard uniform
-  description: The fabric is partly faded and darkened, with stains from medical fluids on the sleeves, as if the material absorbed heavy operations.
-  suffix: Metus
-  components:
-  - type: Sprite
-    sprite: _Sunrise/Clothing/Uniforms/Jumpsuit/prisonguard_metus.rsi
-    layers:
-    - state: icon
-  - type: Item
-    inhandVisuals:
-      left:
-      - state: inhand-left
-      right:
-      - state: inhand-right
-  - type: Clothing
-    sprite: _Sunrise/Clothing/Uniforms/Jumpsuit/prisonguard_metus.rsi
-    clothingVisuals:
-      jumpsuit:
-      - state: equipped-INNERCLOTHING
-
-- type: entity
-  parent: UniformPrisonGuardMetus
-  id: UniformPrisonDoctorMetus
-  name: prison doctor uniform
-  description: The fabric is soaked with grease and soot, with stains from constant contact with stoves and pots, slightly worn where the habit of order is stronger than fatigue.
-  components:
-  - type: Sprite
-    layers:
-    - state: icon
-    - state: overlay-icon
-      color: "#99D2FF"
-  - type: Item
-    inhandVisuals:
-      left:
-      - state: inhand-left
-      - state: overlay-inhand-left
-        color: "#99D2FF"
-      right:
-      - state: inhand-right
-      - state: overlay-inhand-right
-        color: "#99D2FF"
-  - type: Clothing
-    clothingVisuals:
-      jumpsuit:
-      - state: equipped-INNERCLOTHING
-      - state: overlay-equipped
-        color: "#99D2FF"
-
-- type: entity
-  parent: UniformPrisonGuardMetus
-  id: UniformPrisonChefMetus
-  name: prison chef uniform
-  description: The material is dense and slightly worn on the elbows and knees, with dark stains of unknown origin, as if it absorbed the scents of abandoned prison places.
-  components:
-  - type: Sprite
-    layers:
-    - state: icon
-    - state: overlay-icon
-      color: "#ffffff"
-  - type: Clothing
-    clothingVisuals:
-      jumpsuit:
-      - state: equipped-INNERCLOTHING
-      - state: overlay-equipped
-        color: "#ffffff"
-
-- type: entity
-  parent: UniformPrisonGuardMetus
-  id: UniformPrisonEngineerMetus
-  name: prison engineer uniform
-  description: Dark streaks from reagents on the shoulders and chest, small spots of chemical mixes, the fabric seems to preserve the memory of experiments best left unsaid.
-  components:
-  - type: Sprite
-    layers:
-    - state: icon
-    - state: overlay-icon
-      color: "#ffd900"
-  - type: Clothing
-    clothingVisuals:
-      jumpsuit:
-      - state: equipped-INNERCLOTHING
-      - state: overlay-equipped
-        color: "#ffd900"
-
-- type: entity
-  parent: UniformPrisonGuardMetus
-  id: UniformPrisonScientistMetus
-  name: prison scientist uniform
-  description: The fabric is wounded by ore dust and fine scratches, elbows and knees are slightly rubbed, it smells of metal and damp mines, as if it holds encounters with the unknown.
-  components:
-  - type: Sprite
-    layers:
-    - state: icon
-    - state: overlay-icon
-      color: "#9d1edd"
-  - type: Clothing
-    clothingVisuals:
-      jumpsuit:
-      - state: equipped-INNERCLOTHING
-      - state: overlay-equipped
-        color: "#9d1edd"
-
-- type: entity
-  parent: UniformPrisonGuardMetus
-  id: UniformPrisonWorkerMetus
-  name: prison worker uniform
-  description: The fabric is wounded by ore dust and fine scratches, elbows and knees are slightly rubbed, it smells of metal and damp mines, as if it holds encounters with the unknown.
-  components:
-  - type: Sprite
-    layers:
-    - state: icon
-    - state: overlay-icon
-      color: "#df0400"
-  - type: Clothing
-    clothingVisuals:
-      jumpsuit:
-      - state: equipped-INNERCLOTHING
-      - state: overlay-equipped
-        color: "#df0400"
-
-- type: entity
-  parent: UniformPrisonGuardMetus
-  id: UniformPrisonTraineeMetus
-  name: prison trainee uniform
-  description: Fresh fabric, still bearing the marks of training, with a hint of orange that marks the path of a future guard.
-  components:
-  - type: Sprite
-    layers:
-    - state: icon
-    - state: overlay-icon
-      color: "#ff8c00"
-  - type: Item
-    inhandVisuals:
-      left:
-      - state: inhand-left
-      - state: overlay-inhand-left
-        color: "#ff8c00"
-      right:
-      - state: inhand-right
-      - state: overlay-inhand-right
-        color: "#ff8c00"
-  - type: Clothing
-    clothingVisuals:
-      jumpsuit:
-      - state: equipped-INNERCLOTHING
-      - state: overlay-equipped
-        color: "#ff8c00"
 
 - type: entity
   parent: ClothingUniformBase

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

@@ -16,32 +16,32 @@
 - type: latheRecipe
   parent: BaseJumpsuitRecipe
   id: UniformPrisonGuardMetus
-  result: UniformPrisonGuardMetus
+  result: ClothingUniformJumpsuitPrisonGuard
 
 - type: latheRecipe
   parent: BaseJumpsuitRecipe
   id: UniformPrisonDoctorMetus
-  result: UniformPrisonDoctorMetus
+  result: ClothingUniformJumpsuitPrisonDoctor
 
 - type: latheRecipe
   parent: BaseJumpsuitRecipe
   id: UniformPrisonChefMetus
-  result: UniformPrisonChefMetus
+  result: ClothingUniformJumpsuitPrisonChef
 
 - type: latheRecipe
   parent: BaseJumpsuitRecipe
   id: UniformPrisonEngineerMetus
-  result: UniformPrisonEngineerMetus
+  result: ClothingUniformJumpsuitPrisonEngineer
 
 - type: latheRecipe
   parent: BaseJumpsuitRecipe
   id: UniformPrisonScientistMetus
-  result: UniformPrisonScientistMetus
+  result: ClothingUniformJumpsuitPrisonScientist
 
 - type: latheRecipe
   parent: BaseJumpsuitRecipe
   id: UniformPrisonWorkerMetus
-  result: UniformPrisonWorkerMetus
+  result: ClothingUniformJumpsuitPrisonWorker
 
 # Metus hats/caps/berets per role (non-command hats)
 - type: latheRecipe

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

@@ -35,7 +35,7 @@
   id: PrisonChefGear
   equipment:
     id: PrisonChefPDA
-    jumpsuit: UniformPrisonChefMetus
+    jumpsuit: ClothingUniformJumpsuitPrisonChef
     ears: ClothingHeadsetSecurity
     eyes: ClothingEyesGlassesSunglasses
     mask: ClothingMaskItalianMoustache
@@ -51,7 +51,7 @@
   id: PrisonChefChameleonOutfit
   job: PrisonChef
   equipment:
-    jumpsuit: UniformPrisonChefMetus
+    jumpsuit: ClothingUniformJumpsuitPrisonChef
     head: ClothingHeadHatChefBlackToque
     ears: ClothingHeadsetService
     eyes: ClothingEyesGlassesSunglasses

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

@@ -36,7 +36,7 @@
   id: PrisonDoctorGear
   equipment:
     id: PrisonDoctorPDA
-    jumpsuit: UniformPrisonDoctorMetus
+    jumpsuit: ClothingUniformJumpsuitPrisonDoctor
     ears: ClothingHeadsetSecurity
     eyes: ClothingEyesGlassesSunglasses
     gloves: ClothingHandsGlovesCombat
@@ -51,7 +51,7 @@
   id: PrisonDoctorChameleonOutfit
   job: PrisonDoctor
   equipment:
-    jumpsuit: UniformPrisonDoctorMetus
+    jumpsuit: ClothingUniformJumpsuitPrisonDoctor
     head: ClothingHeadHatBeretPrisonDoctorMetus
     ears: ClothingHeadsetMedical
     eyes: ClothingEyesGlassesSunglasses

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

@@ -33,7 +33,7 @@
 - type: startingGear
   id: PrisonEngineerGear
   equipment:
-    jumpsuit: UniformPrisonEngineerMetus
+    jumpsuit: ClothingUniformJumpsuitPrisonEngineer
     ears: ClothingHeadsetJEngineering
     eyes: ClothingEyesGlassesSunglasses
     gloves: ClothingHandsGlovesCombat
@@ -48,7 +48,7 @@
   id: PrisonEngineerChameleonOutfit
   job: PrisonEngineer
   equipment:
-    jumpsuit: UniformPrisonEngineerMetus
+    jumpsuit: ClothingUniformJumpsuitPrisonEngineer
     head: ClothingHeadHatCapPrisonWorkerMetus
     ears: ClothingHeadsetJEngineering
     eyes: ClothingEyesGlassesSunglasses

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

@@ -32,7 +32,7 @@
   id: PrisonScientistGear
   equipment:
     id: PrisonScientistPDA
-    jumpsuit: UniformPrisonScientistMetus
+    jumpsuit: ClothingUniformJumpsuitPrisonScientistVeteran
     ears: ClothingHeadsetSecurity
     eyes: ClothingEyesGlassesSunglasses
     gloves: ClothingHandsGlovesCombat
@@ -47,7 +47,7 @@
   id: PrisonScientistChameleonOutfit
   job: PrisonScientist
   equipment:
-    jumpsuit: UniformPrisonScientistMetus
+    jumpsuit: ClothingUniformJumpsuitPrisonScientistVeteran
     head: ClothingHeadHatCapPrisonScientistMetus
     ears: ClothingHeadsetScience
     eyes: ClothingEyesGlassesSunglasses

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

@@ -24,7 +24,7 @@
 - type: startingGear
   id: PrisonTraineeGear
   equipment:
-    jumpsuit: UniformPrisonTraineeMetus
+    jumpsuit: ClothingUniformJumpsuitPrisonTrainee
     ears: ClothingHeadsetSecurity
     eyes: ClothingEyesGlassesSunglasses
     gloves: ClothingHandsGlovesCombat
@@ -39,7 +39,7 @@
   id: PrisonTraineeChameleonOutfit
   job: PrisonTrainee
   equipment:
-    jumpsuit: UniformPrisonTraineeMetus
+    jumpsuit: ClothingUniformJumpsuitPrisonTrainee
     head: ClothingHeadHatBeretPrisonTraineeMetus
     ears: ClothingHeadsetSecurity
     eyes: ClothingEyesGlassesSunglasses

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

@@ -49,7 +49,7 @@
   id: PrisonWorkerGear
   equipment:
     id: PrisonWorkerPDA
-    jumpsuit: UniformPrisonWorkerMetus
+    jumpsuit: ClothingUniformJumpsuitPrisonWorker
     ears: ClothingHeadsetSecurity
     eyes: ClothingEyesGlassesSunglasses
     gloves: ClothingHandsGlovesCombat
@@ -64,7 +64,7 @@
   id: PrisonWorkerChameleonOutfit
   job: PrisonWorker
   equipment:
-    jumpsuit: UniformPrisonWorkerMetus
+    jumpsuit: ClothingUniformJumpsuitPrisonWorker
     head: ClothingHeadCapPrisonWorkerMetus
     ears: ClothingHeadsetSecurity
     eyes: ClothingEyesGlassesSunglasses

Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/prisonguard.rsi/meta.json

@@ -1,26 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-4.0",
-    "copyright": "Hyenh",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "icon"
-        },
-        {
-            "name": "inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "inhand-right",
-            "directions": 4
-        },
-        {
-            "name": "equipped-INNERCLOTHING",
-            "directions": 4
-        }
-    ]
-}

Resources/Textures/_Sunrise/Clothing/Uniforms/Prison/Jumpskirt/regular.rsi/meta.json

@@ -0,0 +1,41 @@
+{
+  "version": 1,
+  "license": "CLA",
+  "copyright": "© SUNRISE, An EULA/CLA with a hosting restriction, full text: https://github.com/space-sunrise/space-station-14/blob/master/CLA.txt",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+	{
+      "name": "overlay-icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+	{
+      "name": "overlay-equipped",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "overlay-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "overlay-inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/_Sunrise/Clothing/Uniforms/Prison/Jumpskirt/veteran.rsi/meta.json

@@ -0,0 +1,41 @@
+{
+  "version": 1,
+  "license": "CLA",
+  "copyright": "© SUNRISE, An EULA/CLA with a hosting restriction, full text: https://github.com/space-sunrise/space-station-14/blob/master/CLA.txt",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+	{
+      "name": "overlay-icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+	{
+      "name": "overlay-equipped",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "overlay-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "overlay-inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/_Sunrise/Clothing/Uniforms/Prison/Jumpsuit/veteran.rsi/meta.json

@@ -0,0 +1,45 @@
+{
+  "version": 1,
+  "license": "CLA",
+  "copyright": "© SUNRISE, An EULA/CLA with a hosting restriction, full text: https://github.com/space-sunrise/space-station-14/blob/master/CLA.txt",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+	{
+      "name": "overlay-icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "equipped-INNERCLOTHING-digi",
+      "directions": 4
+    },
+	{
+      "name": "overlay-equipped",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "overlay-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "overlay-inhand-right",
+      "directions": 4
+    }
+  ]
+}