well done

Resources/Locale/ru-RU/ss220/clothing/Jumpskirt/jumpskirt.ftl

@@ -31,3 +31,9 @@ ent-ClothingUniformJumpskirtProfessor = форма профессора
 ent-ClothingUniformJumpskirtWarehouseman = рабочий комбинезон-юбка заведующего складом
     .desc = Практичный, удобный, не стесняющий движения и главное стильный юбка-комбинезон. У вас с ним связаны плохие воспоминания о прошлом начальнике
     .suffix = За время в игре
+ent-ClothingUniformJumpskirtTechAssistant = юбка-комбинезон технического ассистента
+    .desc = Юбка-комбинезон для самых юных инженеров.
+ent-ClothingUniformJumpskirtResearchAssistant = юбка-комбинезон научного ассистента
+    .desc = Юбка-комбинезон для самых юных ученых.
+ent-ClothingUniformJumpskirtIntern = юбка-комбинезон интерна
+    .desc = Юбка-комбинезон для самых юных врачей.

Resources/Locale/ru-RU/ss220/clothing/Jumpsuit/jumpsuit.ftl

@@ -63,3 +63,9 @@ ent-ClothingUniformJumpsuitAssociateProfessor = форма доцента
 ent-ClothingUniformJumpsuitProfessor = форма профессора
     .desc = А теперь рубрика "эксперимент"!
     .suffix = За время в игре
+ent-ClothingUniformJumpsuitTechAssistant = комбинезон технического ассистента
+    .desc = Комбинезон для самых юных инженеров.
+ent-ClothingUniformJumpsuitResearchAssistant = комбинезон научного ассистента
+    .desc = Комбинезон для самых юных ученых.
+ent-ClothingUniformJumpsuitIntern = юбка-комбинезон интерна
+    .desc = Юбка-комбинезон для самых юных врачей.

Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml

@@ -4,6 +4,8 @@
     ClothingBackpackDuffelEngineering: 3
     ClothingBackpackSatchelEngineering: 3
     ClothingBackpackEngineering: 3
+    ClothingUniformJumpsuitTechAssistant: 3 #ss220 new assistant uniforms
+    ClothingUniformJumpskirtTechAssistant: 3 #ss220 new assistant uniforms
     ClothingUniformJumpsuitEngineering: 3
     ClothingUniformJumpskirtEngineering: 3
     ClothingUniformJumpsuitEngineeringHazard: 3

Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml

@@ -4,6 +4,8 @@
     ClothingBackpackDuffelMedical: 4
     ClothingBackpackMedical: 4
     ClothingBackpackSatchelMedical: 4
+    ClothingUniformJumpsuitIntern: 4 #ss220 new assistant uniforms
+    ClothingUniformJumpskirtIntern: 4 #ss220 new assistant uniforms
     ClothingUniformJumpsuitMedicalDoctor: 4
     ClothingUniformJumpskirtMedicalDoctor: 4
     ClothingBeltMedical: 4
@@ -19,7 +21,7 @@
     UniformScrubsColorGreen: 4
     UniformScrubsColorBlue: 4
     UniformScrubsColorPurple: 4
-    ClothingHeadHatSurgcapGreen: 4 
+    ClothingHeadHatSurgcapGreen: 4
     ClothingHeadHatSurgcapBlue: 4
     ClothingHeadHatSurgcapPurple: 4
     ClothingShoesBootsWinterMed: 2

Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml

@@ -4,6 +4,8 @@
     ClothingBackpackScience: 3
     ClothingBackpackSatchelScience: 3
     ClothingBackpackDuffelScience: 3
+    ClothingUniformJumpsuitResearchAssistant: 3 #ss220 new assistant uniforms
+    ClothingUniformJumpskirtResearchAssistant: 3 #ss220 new assistant uniforms
     ClothingUniformJumpsuitScientist: 3
     ClothingUniformJumpskirtScientist: 3
     ClothingUniformJumpsuitScientistFormal: 3

Resources/Prototypes/Loadouts/loadout_groups.yml

@@ -895,6 +895,8 @@
   id: TechnicalAssistantJumpsuit
   name: loadout-group-technical-assistant-jumpsuit
   loadouts:
+  - TechAssistantJumpsuit #SS220 new assistant uniforms
+  - TechAssistantJumpskirt #SS220 new assistant uniforms
   - YellowJumpsuit
   - YellowJumpskirt
   - TechnicalAssistantJumpsuitTurtleneck #SS220-MoreTurtleneck-Begin
@@ -1132,6 +1134,8 @@
   id: ResearchAssistantJumpsuit
   name: loadout-group-research-assistant-jumpsuit
   loadouts:
+  - ResearchAssistantJumpsuit #SS220 new assistant uniforms
+  - ResearchAssistantJumpskirt #SS220 new assistant uniforms
   - WhiteJumpsuit
   - WhiteJumpskirt
   - ResearchAssistantBachelor #SS220-loadout-academy
@@ -1483,6 +1487,8 @@
   id: MedicalInternJumpsuit
   name: loadout-group-medical-intern-jumpsuit
   loadouts:
+  - InternJumpsuit #SS220 new assistant uniforms
+  - InternJumpskirt #SS220 new assistant uniforms
   - WhiteJumpsuit
   - WhiteJumpskirt
   - MedicalInternJumpsuitTurtleneck #SS220-MoreTurtleneck-Begin

Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Jumpskirt/assistant_uniforms.yml

@@ -0,0 +1,34 @@
+# © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpskirtTechAssistant
+  name: technical assistant's jumpskirt
+  description: Suit for female technical assistants.
+  components:
+  - type: Sprite
+    sprite: SS220/Clothing/Uniforms/Jumpskirt/tech_assist.rsi
+  - type: Clothing
+    sprite: SS220/Clothing/Uniforms/Jumpskirt/tech_assist.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpskirtResearchAssistant
+  name: research assistant's jumpskirt
+  description: Suit for female research assistants.
+  components:
+  - type: Sprite
+    sprite: SS220/Clothing/Uniforms/Jumpskirt/science_assist.rsi
+  - type: Clothing
+    sprite: SS220/Clothing/Uniforms/Jumpskirt/science_assist.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpskirtIntern
+  name: intern's jumpskirt
+  description: Suit for female medical interns.
+  components:
+  - type: Sprite
+    sprite: SS220/Clothing/Uniforms/Jumpskirt/intern.rsi
+  - type: Clothing
+    sprite: SS220/Clothing/Uniforms/Jumpskirt/intern.rsi

Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Jumpsuit/assistant_uniforms.yml

@@ -0,0 +1,34 @@
+# © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitTechAssistant
+  name: technical assistant's jumpsuit
+  description: Suit for technical assistants.
+  components:
+  - type: Sprite
+    sprite: SS220/Clothing/Uniforms/Jumpsuit/tech_assist.rsi
+  - type: Clothing
+    sprite: SS220/Clothing/Uniforms/Jumpsuit/tech_assist.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitResearchAssistant
+  name: research assistant's jumpsuit
+  description: Suit for research assistants.
+  components:
+  - type: Sprite
+    sprite: SS220/Clothing/Uniforms/Jumpsuit/science_assist.rsi
+  - type: Clothing
+    sprite: SS220/Clothing/Uniforms/Jumpsuit/science_assist.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitIntern
+  name: intern's jumpsuit
+  description: Suit for medical interns.
+  components:
+  - type: Sprite
+    sprite: SS220/Clothing/Uniforms/Jumpsuit/intern.rsi
+  - type: Clothing
+    sprite: SS220/Clothing/Uniforms/Jumpsuit/intern.rsi

Resources/Prototypes/SS220/Loadouts/Jobs/Engineering/technical_assistant.yml

@@ -9,6 +9,16 @@
       time: 108000 # 30 hrs
 
 # Jumpsuit
+- type: loadout
+  id: TechAssistantJumpsuit
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitTechAssistant
+
+- type: loadout
+  id: TechAssistantJumpskirt
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtTechAssistant
+
 - type: loadout
   id: TechnicalAssistantJumpsuitTurtleneck
   effects:

Resources/Prototypes/SS220/Loadouts/Jobs/Medical/medical_intern.yml

@@ -9,6 +9,16 @@
       time: 108000 # 30 hrs
 
 # Jumpsuit
+- type: loadout
+  id: InternJumpsuit
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitIntern
+
+- type: loadout
+  id: InternJumpskirt
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtIntern
+
 - type: loadout
   id: MedicalInternJumpsuitTurtleneck
   effects:

Resources/Prototypes/SS220/Loadouts/Jobs/Science/research_assistant.yml

@@ -18,6 +18,16 @@
       time: 72000 # 20 hrs
 
 # Jumpsuit
+- type: loadout
+  id: ResearchAssistantJumpsuit
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitResearchAssistant
+
+- type: loadout
+  id: ResearchAssistantJumpskirt
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtResearchAssistant
+
 - type: loadout
   id: ResearchAssistantJumpsuitTurtleneck
   effects:

Resources/Textures/SS220/Clothing/Uniforms/Jumpskirt/intern.rsi/meta.json

@@ -0,0 +1,30 @@
+{
+  "version": 1,
+  "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt",
+  "copyright": "Made by vimenant2 (discord) for SS220",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "equipped-INNERCLOTHING-monkey",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/SS220/Clothing/Uniforms/Jumpskirt/science_assist.rsi/meta.json

@@ -0,0 +1,30 @@
+{
+  "version": 1,
+  "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt",
+  "copyright": "Made by vimenant2 (discord) for SS220",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "equipped-INNERCLOTHING-monkey",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/SS220/Clothing/Uniforms/Jumpskirt/tech_assist.rsi/meta.json

@@ -0,0 +1,30 @@
+{
+  "version": 1,
+  "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt",
+  "copyright": "Made by vimenant2 (discord) for SS220",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "equipped-INNERCLOTHING-monkey",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/intern.rsi/meta.json

@@ -0,0 +1,30 @@
+{
+  "version": 1,
+  "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt",
+  "copyright": "Made by vimenant2 (discord) for SS220",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "equipped-INNERCLOTHING-monkey",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/science_assist.rsi/meta.json

@@ -0,0 +1,30 @@
+{
+  "version": 1,
+  "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt",
+  "copyright": "Made by vimenant2 (discord) for SS220",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "equipped-INNERCLOTHING-monkey",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/tech_assist.rsi/meta.json

@@ -0,0 +1,30 @@
+{
+  "version": 1,
+  "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt",
+  "copyright": "Made by vimenant2 (discord) for SS220",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "equipped-INNERCLOTHING-monkey",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}