[ПЕРЕНОС] Ведущие роли

Resources/Locale/ru-RU/ADT/Job/job-description.ftl

@@ -5,3 +5,11 @@ job-description-roboticist = Собирайте боргов, мехов, обс
 job-description-magistrat = Самый грозный и богатый на станции.
 
 job-description-ADTBlueShieldOfficer = Защищайте капитана и глав отделов от опасностей, а прежде всего - от них самих.
+
+job-description-senior-physician = Обучайте новых врачей основам оказания помощи раненым, химии, диагностике больных и утилизации трупов.
+
+job-description-senior-researcher = Обучайте новых учёных основам печати предметов, исследования артефактов и аномальных объектов.
+
+job-description-senior-engineer = Обучайте новых инженеров основам работы силовых установок, ремонту, атмосферике и энергоснабжению станции. 
+
+job-description-senior-officer = Обучать новых офицеров основам обыска и задержания, срокам заключения и правильному обращению с огнестрельным оружием.

Resources/Locale/ru-RU/ADT/Job/job-names.ftl

@@ -7,6 +7,18 @@ JobRoboticist = Робототехник
 job-name-magistrat = Магистрат
 JobMagistrat = Магистрат
 
+job-name-senior-physician = Ведущий врач
+JobADTSeniorPhysician = Ведущий врач
+
+job-name-senior-researcher = Доцент
+JobADTSeniorResearcher = Доцент
+
+job-name-senior-engineer = Бригадир 
+JobADTSeniorEngineer = Бригадир 
+
+job-name-senior-officer = Офицер-Инструктор
+JobADTSeniorOfficer = Офицер-Инструктор
+
 job-name-ADTBlueShieldOfficer = Офицер Синего Щита
 JobADTBlueShieldOfficer = Офицер Синего Щита
 
@@ -15,3 +27,4 @@ job-name-ADTSpaceSecOfficer = офицер SPACE SEC
 job-name-ADTSpaceSecPilot = пилот SPACE SEC
 job-name-ADTSpaceSecCommander = командир SPACE SEC
 job-name-ADTSpaceSecService = сотрудник SPACE SEC
+

Resources/Locale/ru-RU/ADT/prototypes/Entities/Markers/Spawners/jobs.ftl

@@ -9,3 +9,15 @@ ent-SpawnADTBlueShieldOfficer = офицер синего щита
 
 ent-SpawnADTBrigMedic = бригмедик
     .desc = { ent-SpawnPointJobBase.desc }
+
+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/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpskirts.ftl

@@ -106,7 +106,7 @@ ent-ClothingUniformJumpskirtOfLife = юбка жизни
     .desc = Юбка, символизирующая позитив и радость нашей жизни.
 ent-ClothingUniformJumpskirtSeniorEngineer = юбка-комбинезон ведущего инженера
     .desc = Признак мастерства и престижа инженерного отдела.
-ent-ClothingUniformJumpskirtSeniorResearcher = юбка-комбинезон ведущего учёного
+ent-ClothingUniformJumpskirtSeniorResearcher = юбка-комбинезон доцента
     .desc = Признак мастерства и престижа научного отдела.
 ent-ClothingUniformJumpskirtSeniorPhysician = юбка-комбинезон ведущего врача
     .desc = Признак мастерства и престижа медицинского отдела.

Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl

@@ -197,7 +197,7 @@ ent-ClothingUniformJumpsuitFlannel = фланелевый комбинезон
     .desc = Пахнет так, будто кто-то жарил на гриле.
 ent-ClothingUniformJumpsuitSeniorEngineer = комбинезон ведущего инженера
     .desc = Признак мастерства и престижа инженерного отдела.
-ent-ClothingUniformJumpsuitSeniorResearcher = комбинезон ведущего учёного
+ent-ClothingUniformJumpsuitSeniorResearcher = комбинезон доцента
     .desc = Признак мастерства и престижа научного отдела.
 ent-ClothingUniformJumpsuitSeniorPhysician = комбинезон ведущего врача
     .desc = Признак мастерства и престижа медицинского отдела.

Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml

@@ -76,3 +76,15 @@
       - id: MagazinePistol
 #      - id: ADTSpaceLaw
       # - id: SpaceCash500
+
+- type: entity
+  noSpawn: true
+  parent: ClothingBackpackSecurity
+  id: ADTClothingBackpackSeniorSecurityFilled
+  components:
+  - type: StorageFill
+    contents:
+      - id: SpeedLoaderMagnum
+      - id: SpeedLoaderMagnum
+      - id: SmokeGrenade
+      - id: SmokeGrenade

Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml

@@ -33,4 +33,14 @@
 #      - id: ADTSpaceLaw
       # - id: SpaceCash500
 
-
+- type: entity
+  noSpawn: true
+  parent: ClothingBackpackDuffelSecurity
+  id: ADTClothingBackpackDuffelSeniorSecurityFilled
+  components:
+  - type: StorageFill
+    contents:
+      - id: SpeedLoaderMagnum
+      - id: SpeedLoaderMagnum
+      - id: SmokeGrenade
+      - id: SmokeGrenade

Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/satchel.yml

@@ -30,3 +30,15 @@
       - id: MagazinePistol
 #      - id: ADTSpaceLaw
       # - id: SpaceCash500
+
+- type: entity
+  noSpawn: true
+  parent: ClothingBackpackSatchelSecurity
+  id: ADTClothingBackpackSatchelSeniorSecurityFilled
+  components:
+  - type: StorageFill
+    contents:
+      - id: SpeedLoaderMagnum
+      - id: SpeedLoaderMagnum
+      - id: SmokeGrenade
+      - id: SmokeGrenade

Resources/Prototypes/ADT/Entities/Markers/Spawners/jobs.yml

@@ -68,3 +68,52 @@
       layers:
         - state: green
         - state: blueshield
+
+- type: entity
+  id: SpawnPointSeniorEngineer
+  parent: SpawnPointJobBase
+  name: seniorengineer
+  components:
+  - type: SpawnPoint
+    job_id: SeniorEngineer
+  - type: Sprite
+    layers:
+      - state: green
+      - state: seniorengineer
+
+- type: entity
+  id: SpawnPointSeniorPhysician
+  parent: SpawnPointJobBase
+  name: seniorphysician
+  components:
+  - type: SpawnPoint
+    job_id: SeniorPhysician
+  - type: Sprite
+    layers:
+      - state: green
+      - state: seniorphysician
+
+
+- type: entity
+  id: SpawnPointSeniorResearcher
+  parent: SpawnPointJobBase
+  name: seniorresearcher
+  components:
+  - type: SpawnPoint
+    job_id: SeniorResearcher
+  - type: Sprite
+    layers:
+      - state: green
+      - state: 
+
+- type: entity
+  id: SpawnPointSeniorOfficer
+  parent: SpawnPointJobBase
+  name: seniorofficer
+  components:
+  - type: SpawnPoint
+    job_id: SeniorOfficer
+  - type: Sprite
+    layers:
+      - state: green
+      - state: seniorofficer

Resources/Prototypes/ADT/Loadouts/Jobs/Security/senior_officer.yml

@@ -0,0 +1,23 @@
+# Рюкзаки начало
+- type: loadout
+  id: ADTSeniorOfficerBackpack
+  equipment:
+    back: ADTClothingBackpackSeniorSecurityFilled
+
+- type: loadout
+  id: ADTSeniorOfficerSatchel
+  equipment:
+    back: ADTClothingBackpackSatchelSeniorSecurityFilled
+
+- type: loadout
+  id: ADTSeniorOfficerDuffel
+  equipment:
+    back: ADTClothingBackpackDuffelSeniorSecurityFilled
+# Рюкзаки конец
+
+# Пуленепробиваемый бронежилет начало
+- type: loadout
+  id: ADTSeniorOfficerArmor
+  equipment:
+    outerClothing: ClothingOuterArmorBulletproof
+# Пуленепробиваемый конец

Resources/Prototypes/ADT/Loadouts/loadout_groups.yml

@@ -95,6 +95,34 @@
   - PurpleGloves
   - RobohandsGloves
 
+- type: loadoutGroup
+  id: ADTSeniorScientistJumpsuit
+  name: loadout-group-scientist-jumpsuit
+  loadouts:
+  - ScientistJumpsuit
+  - ScientistJumpskirt
+  - SeniorResearcherJumpsuit
+  - SeniorResearcherJumpskirt
+
+- type: loadoutGroup
+  id: ADTSeniorScientistGloves
+  name: loadout-group-scientist-gloves
+  minLimit: 0
+  loadouts:
+  - LatexGloves
+  - NitrileGloves
+  - PurpleGloves
+
+- type: loadoutGroup
+  id: ADTSeniorScientistOuterClothing
+  name: loadout-group-scientist-outerclothing
+  minLimit: 0
+  loadouts:
+  - RegularLabCoat
+  - ScienceLabCoat
+  - ScienceWintercoat
+  - SeniorResearcherLabCoat
+
 #Blueshield
 
 - type: loadoutGroup
@@ -134,3 +162,22 @@
   - ADTBlueshieldBackpack
   - ADTBlueshieldSatchel
   - ADTBlueshieldDuffel
+
+# Security Senior
+
+- type: loadoutGroup
+  id: ADTSeniorSecurityBackpack
+  name: loadout-group-security-backpack
+  loadouts:
+  - ADTSeniorOfficerBackpack
+  - ADTSeniorOfficerSatchel
+  - ADTSeniorOfficerDuffel
+
+- type: loadoutGroup
+  id: ADTSeniorSecurityOuterClothing
+  name: loadout-group-security-outerclothing
+  loadouts:
+  - ArmorVest
+  - ArmorVestSlim
+  - SecurityOfficerWintercoat
+  - ADTSeniorOfficerArmor

Resources/Prototypes/ADT/Loadouts/role_loadouts.yml

@@ -57,3 +57,62 @@
   - SurvivalSecurity
   - Trinkets
   - GroupSpeciesBreathToolSecurity
+
+- type: roleLoadout
+  id: JobADTSeniorPhysician
+  groups:
+  - Inventory # Corvax-Loadouts
+  - GroupTankHarness
+  - MedicalDoctorHead
+  - MedicalMask
+  - MedicalDoctorJumpsuit
+  - MedicalGloves
+  - MedicalBackpack
+  - MedicalDoctorOuterClothing
+  - MedicalDoctorJumpsuit
+  - Trinkets
+  - SurvivalMedical
+  - GroupSpeciesBreathToolMedical
+  - MedicalShoes
+
+- type: roleLoadout
+  id: JobADTSeniorResearcher
+  groups:
+  - Inventory # Corvax-Loadouts
+  - GroupTankHarness
+  - ScientistHead
+  - Glasses
+  - ADTSeniorScientistJumpsuit
+  - ADTSeniorScientistGloves
+  - ScientistBackpack
+  - ADTSeniorScientistOuterClothing
+  - ScientistShoes
+  - Survival
+  - Trinkets
+
+- type: roleLoadout
+  id: JobADTSeniorEngineer
+  groups:
+  - Inventory # Corvax-Loadouts
+  - GroupTankHarness
+  - StationEngineerHead
+  - StationEngineerJumpsuit
+  - StationEngineerOuterClothing
+  - StationEngineerBackpack
+  - StationEngineerShoes
+  - Survival
+  - Trinkets
+
+- type: roleLoadout
+  id: JobADTSeniorOfficer
+  groups:
+  - Inventory # Corvax-Loadouts
+  - GroupTankHarness
+  - SecurityHead
+  - SecurityJumpsuit
+  - ADTSeniorSecurityOuterClothing
+  - SecurityBelt
+  - ADTSeniorSecurityBackpack
+  - SecurityShoes
+  - SurvivalSecurity
+  - Trinkets

Resources/Prototypes/ADT/Maps/ADTMaps/adt_astra.yml

@@ -41,6 +41,7 @@
             AtmosphericTechnician: [ 2, 3 ]
             StationEngineer: [ 4, 5 ]
             TechnicalAssistant: [ 3, 4 ]
+            # ADTSeniorEngineer: [ 1, 1 ] # ADT-roles
             # medical
             ChiefMedicalOfficer: [ 1, 1 ]
             Paramedic: [ 1, 1 ]
@@ -49,12 +50,14 @@
             MedicalIntern: [ 3, 4 ]
             Psychologist: [ 1, 1 ]
             ADTPathologist: [ 1, 1 ] #ADT-Roles
+            # ADTSeniorPhysician: [ 1, 1 ] #ADT-Roles
             # science
             ResearchDirector: [ 1, 1 ]
             Scientist: [ 5, 6 ]
             ResearchAssistant: [ 3, 4 ]
             Borg: [ 2, 2 ]
             ADTRoboticist: [ 1, 2 ] #ADT-Roles
+            # ADTSeniorResearcher: [ 1, 1 ] # ADT-roles
             # security
             HeadOfSecurity: [ 1, 1 ]
             Warden: [ 1, 1 ]
@@ -63,6 +66,7 @@
             SecurityOfficer: [ 6, 6 ]
             SecurityCadet: [ 3, 4 ]
             Brigmedic: [ 1, 1 ] #ADT-Roles
+            # ADTSeniorOfficer: [ 1, 1 ] # ADT-Roles
             # cargo
             Quartermaster: [ 1, 1 ]
             SalvageSpecialist: [ 3, 3 ]

Resources/Prototypes/ADT/Maps/ADTMaps/adt_avrite.yml

@@ -41,6 +41,7 @@
             AtmosphericTechnician: [ 3, 3 ]
             StationEngineer: [ 4, 5 ]
             TechnicalAssistant: [ 2, 3 ]
+            # ADTSeniorEngineer: [ 1, 1 ] # ADT-roles
             # medical
             ChiefMedicalOfficer: [ 1, 1 ]
             Paramedic: [ 1, 1 ]
@@ -49,12 +50,14 @@
             MedicalIntern: [ 3, 4 ]
             Psychologist: [ 1, 1 ]
             ADTPathologist: [ 1, 1 ] #ADT-Roles
+            # ADTSeniorPhysician: [ 1, 1 ] #ADT-Roles
             # science
             ResearchDirector: [ 1, 1 ]
             Scientist: [ 5, 6 ]
             ResearchAssistant: [ 3, 4 ]
             Borg: [ 2, 3 ]
             ADTRoboticist: [ 1, 2 ] #ADT-Roles
+            # ADTSeniorResearcher: [ 1, 1 ] # ADT-roles
             # security
             HeadOfSecurity: [ 1, 1 ]
             Warden: [ 1, 1 ]
@@ -63,6 +66,7 @@
             SecurityCadet: [ 4, 6 ]
             Pilot: [ 1, 1]
             Brigmedic: [ 1, 1 ] #ADT-Roles
+            # ADTSeniorOfficer: [ 1, 1 ] # ADT-Roles
             # cargo
             Quartermaster: [ 1, 1 ]
             SalvageSpecialist: [ 4, 4 ]