Возвращение Менторских ролей

Resources/Locale/ru-RU/_corvaxnext/job/job-description.ftl

@@ -0,0 +1,4 @@
+job-description-senior-engineer = Обучайте новых инженеров основам работы двигателя станции, ремонта, атмосферных условий и мощности.
+job-description-senior-researcher = Обучайте начинающих учёных основам печати предметов, исследования артефактов и аномальных объектов.
+job-description-senior-physician = Обучайте новых медиков основам ухода за ранеными, химии, диагностике заболеваний и утилизации трупов.
+job-description-senior-officer = Обучайте новых сотрудников основам проведения обысков, арестов, тюремного заключения и правильной стрельбе из огнестрельного оружия.

Resources/Locale/ru-RU/_corvaxnext/job/job-names.ftl

@@ -0,0 +1,10 @@
+job-name-senior-engineer = ведущий инженер
+job-name-senior-researcher = ведущий учёный
+job-name-senior-physician = ведущий врач
+job-name-senior-officer = инструктор СБ
+
+# Role timers
+JobSeniorEngineer = ведущий инженер
+JobSeniorOfficer = ведущий учёный
+JobSeniorPhysician = ведущий врач
+JobSeniorResearcher = инструктор СБ

Resources/Locale/ru-RU/_corvaxnext/preferences/loadout-groups.ftl

@@ -1,5 +1,33 @@
+# Engineering
+loadout-group-senior-engineer-head = Ведущий инженер, голова
+loadout-group-senior-engineer-jumpsuit = Ведущий инженер, комбинезон
+loadout-group-senior-engineer-backpack = Ведущий инженер, рюкзак
+loadout-group-senior-engineer-outerclothing = Ведущий инженер, верхняя одежда
+loadout-group-senior-engineer-shoes = Ведущий инженер, обувь
+
+# Science
+loadout-group-senior-researcher-head = Ведущий учёный, голова
+loadout-group-senior-researcher-jumpsuit = Ведущий учёный, комбинезон
+loadout-group-senior-researcher-outerclothing = Ведущий учёный, верхняя одежда
+loadout-group-senior-researcher-backpack = Ведущий учёный, рюкзак
+loadout-group-senior-researcher-shoes = Ведущий учёный, обувь
+loadout-group-senior-researcher-gloves = Ведущий учёный, перчатки
+
 # Security
 loadout-group-brigmedic-head = Бригмедик, голова
 loadout-group-brigmedic-jumpsuit = Бригмедик, комбинезон
 loadout-group-brigmedic-backpack = Бригмедик, верхняя одежда
 loadout-group-brigmedic-outerclothing = Бригмедик, рюкзак
+loadout-group-senior-officer-head = Инструктор СБ, голова
+loadout-group-senior-officer-jumpsuit = Инструктор СБ, комбинезон
+loadout-group-senior-officer-backpack = Инструктор СБ, рюкзак
+loadout-group-senior-officer-belt = Инструктор СБ, пояс
+loadout-group-senior-officer-outerclothing = Инструктор СБ, верхняя одежда
+loadout-group-senior-officer-shoes = Инструктор СБ, обувь
+
+# Medical
+loadout-group-senior-physician-head = Ведущий врач, голова
+loadout-group-senior-physician-jumpsuit = Ведущий врач, комбинезон
+loadout-group-senior-physician-outerclothing = Ведущий врач, верхняя одежда
+loadout-group-senior-physician-backpack = Ведущий врач, рюкзак
+loadout-group-senior-physician-shoes = Ведущий врач, обувь

Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/entities/markers/spawners/jobs.ftl

@@ -0,0 +1,8 @@
+ent-SpawnPointSeniorEngineer = ведущий инженер
+    .desc = { ent-SpawnPointJobBase.desc }
+ent-SpawnPointSeniorPhysician = ведущий врач
+    .desc = { ent-SpawnPointJobBase.desc }
+ent-SpawnPointSeniorResearcher = ведущий учёный
+    .desc = { ent-SpawnPointJobBase.desc }
+ent-SpawnPointSeniorOfficer = инструктор СБ
+    .desc = { ent-SpawnPointJobBase.desc }

Resources/Prototypes/Catalog/uplink_catalog.yml

@@ -2064,6 +2064,7 @@
     whitelist:
     - Zookeeper
     - Scientist
+    - SeniorResearcher # Corvax-Next-MentorRoles
     - ResearchDirector
     - Chef
 

Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml

@@ -770,6 +770,8 @@
     layers:
     - state: default
     - state: idseniorengineer
+  - type: PresetIdCard # Corvax-Next-MentorRoles
+    job: SeniorEngineer # Corvax-Next-MentorRoles
 
 - type: entity
   parent: ResearchIDCard
@@ -780,6 +782,8 @@
     layers:
     - state: default
     - state: idseniorresearcher
+  - type: PresetIdCard # Corvax-Next-MentorRoles
+    job: SeniorResearcher # Corvax-Next-MentorRoles
 
 - type: entity
   parent: MedicalIDCard
@@ -790,6 +794,8 @@
     layers:
     - state: default
     - state: idseniorphysician
+  - type: PresetIdCard # Corvax-Next-MentorRoles
+    job: SeniorPhysician # Corvax-Next-MentorRoles
 
 - type: entity
   parent: SecurityIDCard
@@ -800,6 +806,8 @@
     layers:
     - state: default
     - state: idseniorofficer
+  - type: PresetIdCard # Corvax-Next-MentorRoles
+    job: SeniorOfficer # Corvax-Next-MentorRoles
 
 - type: entity
   parent: IDCardStandard

Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml

@@ -42,9 +42,9 @@
 - type: loadout
   id: SeniorEngineerBeret
   startingGear: EngineeringBeret
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: SeniorEngineering
+  #effects: Corvax-Next-MentorRoles
+  #- !type:GroupLoadoutEffect
+  #  proto: SeniorEngineering
 
 # Jumpsuit
 - type: loadout
@@ -64,17 +64,17 @@
 
 - type: loadout
   id: SeniorEngineerJumpsuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: SeniorEngineering
+  #effects: Corvax-Next-MentorRoles
+  #- !type:GroupLoadoutEffect
+  #  proto: SeniorEngineering
   equipment:
     jumpsuit: ClothingUniformJumpsuitSeniorEngineer
 
 - type: loadout
   id: SeniorEngineerJumpskirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: SeniorEngineering
+  #effects: Corvax-Next-MentorRoles
+  #- !type:GroupLoadoutEffect
+  #  proto: SeniorEngineering
   equipment:
     jumpsuit: ClothingUniformJumpskirtSeniorEngineer
 

Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml

@@ -33,9 +33,9 @@
 
 - type: loadout
   id: SeniorPhysicianBeret
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: SeniorPhysician
+  #effects: Corvax-Next-MentorRoles
+  #- !type:GroupLoadoutEffect
+  #  proto: SeniorPhysician
   equipment:
     head: ClothingHeadHatBeretSeniorPhysician
 
@@ -85,17 +85,17 @@
 
 - type: loadout
   id: SeniorPhysicianJumpsuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: SeniorPhysician
+  #effects: Corvax-Next-MentorRoles
+  #- !type:GroupLoadoutEffect
+  #  proto: SeniorPhysician
   equipment:
     jumpsuit: ClothingUniformJumpsuitSeniorPhysician
 
 - type: loadout
   id: SeniorPhysicianJumpskirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: SeniorPhysician
+  #effects: Corvax-Next-MentorRoles
+  #- !type:GroupLoadoutEffect
+  #  proto: SeniorPhysician
   equipment:
     jumpsuit: ClothingUniformJumpskirtSeniorPhysician
 
@@ -138,9 +138,9 @@
 
 - type: loadout
   id: SeniorPhysicianLabCoat
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: SeniorPhysician
+  #effects: Corvax-Next-MentorRoles
+  #- !type:GroupLoadoutEffect
+  #  proto: SeniorPhysician
   equipment:
     outerClothing: ClothingOuterCoatLabSeniorPhysician
 

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

@@ -17,9 +17,9 @@
 - type: loadout
   id: ScientificBeret
   startingGear: ScientificBeret
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: SeniorResearcher
+  #effects: Corvax-Next-MentorRoles
+  #- !type:GroupLoadoutEffect
+   # proto: SeniorResearcher
 
 - type: loadout
   id: RoboticistCap
@@ -61,17 +61,17 @@
 
 - type: loadout
   id: SeniorResearcherJumpsuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: SeniorResearcher
+  #effects: Corvax-Next-MentorRoles
+  #- !type:GroupLoadoutEffect
+  #  proto: SeniorResearcher
   equipment:
     jumpsuit: ClothingUniformJumpsuitSeniorResearcher
 
 - type: loadout
   id: SeniorResearcherJumpskirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: SeniorResearcher
+  #effects: Corvax-Next-MentorRoles
+  #- !type:GroupLoadoutEffect
+  #  proto: SeniorResearcher
   equipment:
     jumpsuit: ClothingUniformJumpskirtSeniorResearcher
 
@@ -119,9 +119,9 @@
 
 - type: loadout
   id: SeniorResearcherLabCoat
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: SeniorResearcher
+  #effects: Corvax-Next-MentorRoles
+  #- !type:GroupLoadoutEffect
+  #  proto: SeniorResearcher
   equipment:
     outerClothing: ClothingOuterCoatLabSeniorResearcher
 

Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml

@@ -67,22 +67,22 @@
 
 - type: loadout
   id: TrooperUniform
-  equipment: 
+  equipment:
     jumpsuit: ClothingUniformSecurityTrooper
 
 - type: loadout
   id: SeniorOfficerJumpsuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: SeniorOfficer
+  #effects: Corvax-Next-MentorRoles
+  #- !type:GroupLoadoutEffect
+  #  proto: SeniorOfficer
   equipment:
     jumpsuit: ClothingUniformJumpsuitSeniorOfficer
 
 - type: loadout
   id: SeniorOfficerJumpskirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: SeniorOfficer
+  #effects: Corvax-Next-MentorRoles
+  #- !type:GroupLoadoutEffect
+  #  proto: SeniorOfficer
   equipment:
     jumpsuit: ClothingUniformJumpskirtSeniorOfficer
 

Resources/Prototypes/Loadouts/loadout_groups.yml

@@ -749,7 +749,7 @@
   - StationEngineerHardhatYellow
   - StationEngineerHardhatOrange
   - StationEngineerHardhatRed
-  - SeniorEngineerBeret
+  #- SeniorEngineerBeret Corvax-Next-MentorRoles
 
 - type: loadoutGroup
   id: StationEngineerJumpsuit
@@ -758,8 +758,8 @@
   - StationEngineerJumpsuit
   - StationEngineerJumpskirt
   - StationEngineerHazardsuit
-  - SeniorEngineerJumpsuit
-  - SeniorEngineerJumpskirt
+  #- SeniorEngineerJumpsuit Corvax-Next-MentorRoles
+  #- SeniorEngineerJumpskirt Corvax-Next-MentorRoles
 
 - type: loadoutGroup
   id: StationEngineerBackpack
@@ -789,7 +789,7 @@
   name: loadout-group-station-engineer-id
   loadouts:
   - StationEngineerPDA
-  - SeniorEngineerPDA
+  #- SeniorEngineerPDA Corvax-Next-MentorRoles
 
 - type: loadoutGroup
   id: AtmosphericTechnicianJumpsuit
@@ -880,7 +880,7 @@
   loadouts:
   - RoboticistCap
   - SkullBandana
-  - ScientificBeret
+  #- ScientificBeret Corvax-Next-MentorRoles
 
 - type: loadoutGroup
   id: ScientistNeck
@@ -897,8 +897,8 @@
   - ScientistJumpskirt
   - RoboticistJumpsuit
   - RoboticistJumpskirt
-  - SeniorResearcherJumpsuit
-  - SeniorResearcherJumpskirt
+  #- SeniorResearcherJumpsuit Corvax-Next-MentorRoles
+  #- SeniorResearcherJumpskirt Corvax-Next-MentorRoles
 
 - type: loadoutGroup
   id: ScientistBackpack
@@ -918,7 +918,7 @@
   - ScienceWintercoat
   - RoboticistLabCoat
   - RoboticistWintercoat
-  - SeniorResearcherLabCoat
+  #- SeniorResearcherLabCoat Corvax-Next-MentorRoles
 
 - type: loadoutGroup
   id: ScientistShoes
@@ -942,7 +942,7 @@
   name: loadout-group-scientist-id
   loadouts:
   - ScientistPDA
-  - SeniorResearcherPDA
+  #- SeniorResearcherPDA Corvax-Next-MentorRoles
 
 - type: loadoutGroup
   id: ResearchAssistantJumpsuit
@@ -1030,8 +1030,8 @@
   - SecurityJumpskirt
   - SecurityJumpsuitGrey
   - SecurityJumpskirtGrey
-  - SeniorOfficerJumpsuit
-  - SeniorOfficerJumpskirt
+  #- SeniorOfficerJumpsuit Corvax-Next-MentorRoles
+  #- SeniorOfficerJumpskirt Corvax-Next-MentorRoles
   - TrooperUniform
 
 - type: loadoutGroup
@@ -1070,7 +1070,7 @@
   name: loadout-group-security-id
   loadouts:
   - SecurityPDA
-  - SeniorOfficerPDA
+  #- SeniorOfficerPDA Corvax-Next-MentorRoles
 
 - type: loadoutGroup
   id: DetectiveHead
@@ -1176,7 +1176,7 @@
   minLimit: 0
   loadouts:
   - MedicalBeret
-  - SeniorPhysicianBeret
+  #- SeniorPhysicianBeret Corvax-Next-MentorRoles
   - MedicalHeadMirror
   - BlueSurgeryCap
   - GreenSurgeryCap
@@ -1189,8 +1189,8 @@
   loadouts:
   - MedicalDoctorJumpsuit
   - MedicalDoctorJumpskirt
-  - SeniorPhysicianJumpsuit
-  - SeniorPhysicianJumpskirt
+  #- SeniorPhysicianJumpsuit Corvax-Next-MentorRoles
+  #- SeniorPhysicianJumpskirt Corvax-Next-MentorRoles
   - MedicalBlueScrubs
   - MedicalGreenScrubs
   - MedicalPurpleScrubs
@@ -1202,7 +1202,7 @@
   loadouts:
   - RegularLabCoat
   - MedicalDoctorWintercoat
-  - SeniorPhysicianLabCoat
+  #- SeniorPhysicianLabCoat Corvax-Next-MentorRoles
 
 - type: loadoutGroup
   id: MedicalBackpack
@@ -1224,7 +1224,7 @@
   name: loadout-group-medical-doctor-id
   loadouts:
   - MedicalDoctorPDA
-  - SeniorPhysicianPDA
+  #- SeniorPhysicianPDA Corvax-Next-MentorRoles
 
 - type: loadoutGroup
   id: MedicalGloves