New loadout rnd academy (#2275)

* loadout-academy

* Update loadout_groups.yml

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

@@ -15,4 +15,16 @@ ent-ClothingUniformJumpskirtMilitaryFeldsher = униформа военного
     .desc = Это отнюдь не красная окраска...
     .suffix = За время в игре
 ent-ClothingUniformWhiteJumpskirtCaptain = белая юбка-комбинезон капитана
-    .desc = Это белый костюм с золотыми украшениями, на погонах одна золотая звезда - "Майор".
+    .desc = Это белый костюм с золотыми украшениями, на погонах одна золотая звезда - "Майор".
+ent-ClothingUniformJumpskirtBachelor = форма выпускника бакалавриата
+    .desc = Напрасно студенты ждут друга в пивной, наука без жертв не бывает.
+    .suffix = За время в игре
+ent-ClothingUniformJumpskirtPhdCandidate = форма кандидата наук
+    .desc = Студенты, приготовиться к лекции.
+    .suffix = За время в игре
+ent-ClothingUniformJumpskirtAssociateProfessor = форма доцента
+    .desc = Коллеги, поступил новый грант!
+    .suffix = За время в игре
+ent-ClothingUniformJumpskirtProfessor = форма профессора
+    .desc = А теперь рубрика "эксперимент"!
+    .suffix = За время в игре

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

@@ -51,3 +51,15 @@ ent-ClothingUniformJumpsuitJanitorJR = комбинезон уборщика Jun
 ent-ClothingUniformJumpsuitClassicClowns = классические портки клоуна
     .suffix = Классика, За время в игре
     .desc = Более старый дизайн комбинезона, полюбившийся многим Хонкам. Унисекс!
+ent-ClothingUniformJumpsuitBachelor = форма выпускника бакалавриата
+    .desc = Напрасно студенты ждут друга в пивной, наука без жертв не бывает.
+    .suffix = За время в игре
+ent-ClothingUniformJumpsuitPhdCandidate = форма кандидата наук
+    .desc = Студенты, приготовиться к лекции.
+    .suffix = За время в игре
+ent-ClothingUniformJumpsuitAssociateProfessor = форма доцента
+    .desc = Коллеги, поступил новый грант!
+    .suffix = За время в игре
+ent-ClothingUniformJumpsuitProfessor = форма профессора
+    .desc = А теперь рубрика "эксперимент"!
+    .suffix = За время в игре

Resources/Prototypes/Loadouts/loadout_groups.yml

@@ -1020,6 +1020,8 @@
   - ResearchDirectorJumpsuit
   - ResearchDirectorJumpskirt
 #SS220-RD-New-Loadout-begin
+  - ResearchDirectorJumpsuitProfessor #SS220-loadout-academy
+  - ResearchDirectorJumpskirtProfessor #SS220-loadout-academy
   - ClothingUniformJumpsuitRDAlt
 
 - type: loadoutGroup
@@ -1076,6 +1078,8 @@
   - ScientistJumpsuitTurtleneckAlt
   - ScientistJumpskirtTurtleneck
   - ScientistJumpskirtTurtleneckAlt #SS220-MoreTurtleneck-End
+  - ScientistJumpsuitPhdCandidate #SS220-loadout-academy
+  - ScientistJumpskirtPhdCandidate #SS220-loadout-academy
 
 - type: loadoutGroup
   id: ScientistBackpack
@@ -1128,6 +1132,8 @@
   loadouts:
   - WhiteJumpsuit
   - WhiteJumpskirt
+  - ResearchAssistantBachelor #SS220-loadout-academy
+  - ResearchAssistantBachelorSkirt #SS220-loadout-academy
   - ResearchAssistantJumpsuitTurtleneck #SS220-MoreTurtleneck-Begin
   - ResearchAssistantJumpsuitTurtleneckAlt
   - ResearchAssistantJumpskirtTurtleneck

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

@@ -214,3 +214,57 @@
     sprite: SS220/Clothing/Uniforms/Jumpskirt/whitecaptain.rsi
   - type: Clothing
     sprite: SS220/Clothing/Uniforms/Jumpskirt/whitecaptain.rsi
+
+  #RND / РНД
+
+# Ассистент
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpskirtBachelor
+  name: bachelor's graduation uniform
+  description: In vain students wait for a friend in the pub, Science is not without sacrifice.
+  suffix: For playtime
+  components:
+  - type: Sprite
+    sprite: SS220/Clothing/Uniforms/Jumpskirt/assistant_bachelor_uniform.rsi
+  - type: Clothing
+    sprite: SS220/Clothing/Uniforms/Jumpskirt/assistant_bachelor_uniform.rsi
+
+# Ученый
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpskirtPhdCandidate
+  name: phd candidate uniform
+  description: Students, prepare for a lecture.
+  suffix: For playtime
+  components:
+  - type: Sprite
+    sprite: SS220/Clothing/Uniforms/Jumpskirt/phd_candidate.rsi
+  - type: Clothing
+    sprite: SS220/Clothing/Uniforms/Jumpskirt/phd_candidate.rsi
+
+# Ведущий учёный
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpskirtAssociateProfessor
+  name: assistant professor's uniform
+  description:
+  suffix: For playtime
+  components:
+  - type: Sprite
+    sprite: SS220/Clothing/Uniforms/Jumpskirt/associate_professor.rsi
+  - type: Clothing
+    sprite: SS220/Clothing/Uniforms/Jumpskirt/associate_professor.rsi
+
+# Научрук
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpskirtProfessor
+  name: professor's uniform
+  description:
+  suffix: For playtime
+  components:
+  - type: Sprite
+    sprite: SS220/Clothing/Uniforms/Jumpskirt/professor.rsi
+  - type: Clothing
+    sprite: SS220/Clothing/Uniforms/Jumpskirt/professor.rsi

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

@@ -572,3 +572,57 @@
   - type: Clothing
     sprite: SS220/Clothing/Uniforms/Jumpsuit/redsoldier.rsi
 # WMT Ebent end
+
+  #RND / РНД
+
+# Ассистент
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitBachelor
+  name: bachelor's graduation uniform
+  description: In vain students wait for a friend in the pub, Science is not without sacrifice.
+  suffix: For playtime
+  components:
+  - type: Sprite
+    sprite: SS220/Clothing/Uniforms/Jumpsuit/assistant_bachelor_uniform.rsi
+  - type: Clothing
+    sprite: SS220/Clothing/Uniforms/Jumpsuit/assistant_bachelor_uniform.rsi
+
+# Ученый
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitPhdCandidate
+  name: phd candidate uniform
+  description: Students, prepare for a lecture.
+  suffix: For playtime
+  components:
+  - type: Sprite
+    sprite: SS220/Clothing/Uniforms/Jumpsuit/phd_candidate.rsi
+  - type: Clothing
+    sprite: SS220/Clothing/Uniforms/Jumpsuit/phd_candidate.rsi
+
+# Ведущий учёный
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitAssociateProfessor
+  name: assistant professor's uniform
+  description:
+  suffix: For playtime
+  components:
+  - type: Sprite
+    sprite: SS220/Clothing/Uniforms/Jumpsuit/associate_professor.rsi
+  - type: Clothing
+    sprite: SS220/Clothing/Uniforms/Jumpsuit/associate_professor.rsi
+
+# Научрук
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitProfessor
+  name: professor's uniform
+  description:
+  suffix: For playtime
+  components:
+  - type: Sprite
+    sprite: SS220/Clothing/Uniforms/Jumpsuit/professor.rsi
+  - type: Clothing
+    sprite: SS220/Clothing/Uniforms/Jumpsuit/professor.rsi

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

@@ -8,6 +8,15 @@
       role: JobResearchAssistant
       time: 108000 # 30 hrs
 
+- type: loadoutEffectGroup
+  id: ResearchAssistantBachelor
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobResearchAssistant
+      time: 72000 # 20 hrs
+
 # Jumpsuit
 - type: loadout
   id: ResearchAssistantJumpsuitTurtleneck
@@ -40,3 +49,19 @@
     proto: ResearchAssistantTurtleneck
   equipment:
     jumpsuit: ClothingUniformJumpskirtTurtleAltColorWhite
+
+- type: loadout
+  id: ResearchAssistantBachelor
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ResearchAssistantBachelor
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitBachelor
+
+- type: loadout
+  id: ResearchAssistantBachelorSkirt
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ResearchAssistantBachelor
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtBachelor

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

@@ -8,6 +8,15 @@
       role: JobResearchDirector
       time: 180000 # 30 hrs
 
+- type: loadoutEffectGroup
+  id: ResearchDirectorProfessor
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobResearchDirector
+      time: 72000 # 20 hrs
+
 # Jumpsuit
 - type: loadout
   id: ClothingUniformJumpsuitRDAlt
@@ -17,6 +26,22 @@
   equipment:
     jumpsuit: ClothingUniformJumpsuitRDAlt
 
+- type: loadout
+  id: ResearchDirectorJumpsuitProfessor
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ResearchDirectorProfessor
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitProfessor
+
+- type: loadout
+  id: ResearchDirectorJumpskirtProfessor
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ResearchDirectorProfessor
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtProfessor
+
 # PDA
 - type: loadout
   id: AltRnDDirPDA

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

@@ -8,6 +8,15 @@
       role: JobScientist
       time: 108000 # 30 hrs
 
+- type: loadoutEffectGroup
+  id: ScientistPhdCandidate
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobScientist
+      time: 180000 # 50 hrs
+
 # Glasses
 - type: loadout
   id: CyberRnDVisor
@@ -50,6 +59,22 @@
   equipment:
     jumpsuit: ClothingUniformJumpskirtTurtleAltColorPurple
 
+- type: loadout
+  id: ScientistJumpsuitPhdCandidate
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ScientistPhdCandidate
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitPhdCandidate
+
+- type: loadout
+  id: ScientistJumpskirtPhdCandidate
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ScientistPhdCandidate
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtPhdCandidate
+
 # Outerclothing
 - type: loadout
   id: CyberJacketRnD

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

@@ -1,3 +1,13 @@
+# Job Time
+- type: loadoutEffectGroup
+  id: SeniorResearcherAssociateProfessor
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobSeniorResearcher
+      time: 72000 # 20 hrs
+
 # Head
 - type: loadout
   id: HatSeniorSciensist
@@ -15,6 +25,22 @@
   equipment:
     jumpsuit: ClothingUniformJumpskirtSeniorResearcher
 
+- type: loadout
+  id: SeniorSciensistJumpsuitAssociateProfessor
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: SeniorResearcherAssociateProfessor
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitAssociateProfessor
+
+- type: loadout
+  id: SeniorSciensistJumpskirtAssociateProfessor
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: SeniorResearcherAssociateProfessor
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtAssociateProfessor
+
 # Outer
 - type: loadout
   id: SeniorSciensistLabCoat

Resources/Prototypes/SS220/Loadouts/loadout_groups.yml

@@ -480,6 +480,8 @@
   loadouts:
   - SeniorSciensistJumpsuit
   - SeniorSciensistJumpskirt
+  - SeniorSciensistJumpsuitAssociateProfessor #SS220-loadout-academy
+  - SeniorSciensistJumpskirtAssociateProfessor #SS220-loadout-academy
 
 - type: loadoutGroup
   id: SeniorSciensistOuterClothing

Resources/Textures/SS220/Clothing/Uniforms/Jumpskirt/assistant_bachelor_uniform.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": "Sprited by dinazewwr (Discord) for SS220",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "equipped-INNERCLOTHING-monkey",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}