diff --git a/Resources/Locale/ru-RU/_corvaxnext/job/job-description.ftl b/Resources/Locale/ru-RU/_corvaxnext/job/job-description.ftl new file mode 100644 index 00000000000..40eeccfa663 --- /dev/null +++ b/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 = Обучайте новых сотрудников основам проведения обысков, арестов, тюремного заключения и правильной стрельбе из огнестрельного оружия. diff --git a/Resources/Locale/ru-RU/_corvaxnext/job/job-names.ftl b/Resources/Locale/ru-RU/_corvaxnext/job/job-names.ftl new file mode 100644 index 00000000000..cf09adaded2 --- /dev/null +++ b/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 = инструктор СБ diff --git a/Resources/Locale/ru-RU/_corvaxnext/preferences/loadout-groups.ftl b/Resources/Locale/ru-RU/_corvaxnext/preferences/loadout-groups.ftl index 6c6a70d1736..d7347426ab5 100644 --- a/Resources/Locale/ru-RU/_corvaxnext/preferences/loadout-groups.ftl +++ b/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 = Ведущий врач, обувь diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/entities/markers/spawners/jobs.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/entities/markers/spawners/jobs.ftl new file mode 100644 index 00000000000..d43a357a840 --- /dev/null +++ b/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 } diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index f31d85414d4..a586f70d40d 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -2064,6 +2064,7 @@ whitelist: - Zookeeper - Scientist + - SeniorResearcher # Corvax-Next-MentorRoles - ResearchDirector - Chef diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 7e013a5e55d..54504aa799e 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/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 diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml index a31aacf1e53..78116c16932 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml +++ b/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 diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml index 9b4eeec89bf..19e105b3773 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml +++ b/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 diff --git a/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml b/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml index e89802e9c12..378faa272e2 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml +++ b/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 diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml index 869e47f6bcc..63a23946ec7 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml +++ b/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 diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 7c977e5b448..4311ccf167f 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/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 diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index 970acf4ed9f..3e87f478ef2 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -85,6 +85,7 @@ roles: - AtmosphericTechnician - ChiefEngineer + - SeniorEngineer # Corvax-Next-MentorRoles - StationEngineer - TechnicalAssistant @@ -100,6 +101,7 @@ - MedicalIntern - Psychologist - Paramedic + - SeniorPhysician # Corvax-Next-MentorRoles - type: department id: Security @@ -111,6 +113,7 @@ - HeadOfSecurity - SecurityCadet - SecurityOfficer + - SeniorOfficer # Corvax-Next-MentorRoles - Brigmedic # Corvax-Next-Brigmedic - Pilot # Corvax-Pilot - Detective @@ -123,6 +126,7 @@ color: "#D381C9" roles: - ResearchDirector + - SeniorResearcher # Corvax-Next-MentorRoles - Scientist - ResearchAssistant diff --git a/Resources/Prototypes/_CorvaxNext/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/_CorvaxNext/Entities/Markers/Spawners/jobs.yml new file mode 100644 index 00000000000..a8589f41f91 --- /dev/null +++ b/Resources/Prototypes/_CorvaxNext/Entities/Markers/Spawners/jobs.yml @@ -0,0 +1,47 @@ +- 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: seniorresearcher + +- type: entity + id: SpawnPointSeniorOfficer + parent: SpawnPointJobBase + name: seniorofficer + components: + - type: SpawnPoint + job_id: SeniorOfficer + - type: Sprite + layers: + - state: green + - state: seniorofficer diff --git a/Resources/Prototypes/_CorvaxNext/Loadouts/loadout_groups.yml b/Resources/Prototypes/_CorvaxNext/Loadouts/loadout_groups.yml index 763b748ba16..eda456dc324 100644 --- a/Resources/Prototypes/_CorvaxNext/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/_CorvaxNext/Loadouts/loadout_groups.yml @@ -1,4 +1,93 @@ +# Engineering +- type: loadoutGroup + id: SeniorEngineerHead + name: loadout-group-senior-engineer-head + loadouts: + - SeniorEngineerBeret + +- type: loadoutGroup + id: SeniorEngineerJumpsuit + name: loadout-group-senior-engineer-jumpsuit + loadouts: + - SeniorEngineerJumpsuit + - SeniorEngineerJumpskirt + +- type: loadoutGroup + id: SeniorEngineerBackpack + name: loadout-group-senior-engineer-backpack + loadouts: + - StationEngineerBackpack + - StationEngineerSatchel + - StationEngineerDuffel + - AtmosphericTechnicianBackpack + - AtmosphericTechnicianSatchel + - AtmosphericTechnicianDuffel + +- type: loadoutGroup + id: SeniorEngineerOuterClothing + name: loadout-group-senior-engineer-outerclothing + minLimit: 0 + loadouts: + - StationEngineerOuterVest + - StationEngineerWintercoat + - AtmosphericTechnicianWintercoat + +- type: loadoutGroup + id: SeniorEngineerShoes + name: loadout-group-senior-engineer-shoes + loadouts: + - WorkBoots + - EngineeringWinterBoots + +# Science +- type: loadoutGroup + id: SeniorResearcherHead + name: loadout-group-senior-researcher-head + minLimit: 0 + loadouts: + - ScientificBeret + +- type: loadoutGroup + id: SeniorResearcherJumpsuit + name: loadout-group-senior-researcher-jumpsuit + loadouts: + - SeniorResearcherJumpsuit + - SeniorResearcherJumpskirt + +- type: loadoutGroup + id: SeniorResearcherBackpack + name: loadout-group-senior-researcher-backpack + loadouts: + - ScientistBackpack + - ScientistSatchel + - ScientistDuffel + +- type: loadoutGroup + id: SeniorResearcherOuterClothing + name: loadout-group-senior-researcher-outerclothing + minLimit: 0 + loadouts: + - SeniorResearcherLabCoat + +- type: loadoutGroup + id: SeniorResearcherShoes + name: loadout-group-senior-researcher-shoes + loadouts: + - WhiteShoes + - BlackShoes + - ScienceWinterBoots + +- type: loadoutGroup + id: SeniorResearcherGloves + name: loadout-group-senior-researcher-gloves + minLimit: 0 + loadouts: + - LatexGloves + - PurpleGloves + - RobohandsGloves + # Security +#Brigmedic - type: loadoutGroup id: BrigmedicHead name: loadout-group-brigmedic-head @@ -30,3 +119,86 @@ - BrigmedicOuterClothingCoat - BrigmedicOuterClothingLab - BrigmedicOuterClothingVest + +#SeniorOfficer +- type: loadoutGroup + id: SeniorOfficerHead + name: loadout-group-senior-officer-head + minLimit: 0 + loadouts: + - SecurityBeret + - SecurityHat + +- type: loadoutGroup + id: SeniorOfficerJumpsuit + name: loadout-group-senior-officer-jumpsuit + loadouts: + - SeniorOfficerJumpsuit + - SeniorOfficerJumpskirt + +- type: loadoutGroup + id: SeniorOfficerBackpack + name: loadout-group-senior-officer-backpack + loadouts: + - SecurityBackpack + - SecuritySatchel + - SecurityDuffel + +- type: loadoutGroup + id: SeniorOfficerBelt + name: loadout-group-senior-officer-belt + loadouts: + - SecurityBelt + - SecurityWebbing + +- type: loadoutGroup + id: SeniorOfficerOuterClothing + name: loadout-group-senior-officer-outerclothing + loadouts: + - ArmorVest + - ArmorVestSlim + - SecurityOfficerWintercoat + +- type: loadoutGroup + id: SeniorOfficerShoes + name: loadout-group-senior-officer-shoes + loadouts: + - JackBoots + - SecurityWinterBoots + +# Medical +- type: loadoutGroup + id: SeniorPhysicianHead + name: loadout-group-senior-physician-head + minLimit: 0 + loadouts: + - SeniorPhysicianBeret + +- type: loadoutGroup + id: SeniorPhysicianJumpsuit + name: loadout-group-senior-physician-jumpsuit + loadouts: + - SeniorPhysicianJumpsuit + - SeniorPhysicianJumpskirt + +- type: loadoutGroup + id: SeniorPhysicianOuterClothing + name: loadout-group-senior-physician-outerclothing + minLimit: 0 + loadouts: + - SeniorPhysicianLabCoat + +- type: loadoutGroup + id: SeniorPhysicianBackpack + name: loadout-group-senior-physician-backpack + loadouts: + - MedicalDoctorBackpack + - MedicalDoctorSatchel + - MedicalDoctorDuffel + +- type: loadoutGroup + id: SeniorPhysicianShoes + name: loadout-group-senior-physician-shoes + loadouts: + - WhiteShoes + - MedicalWinterBoots diff --git a/Resources/Prototypes/_CorvaxNext/Loadouts/role_loadouts.yml b/Resources/Prototypes/_CorvaxNext/Loadouts/role_loadouts.yml index 0208f18542e..bbbd44bb6d0 100644 --- a/Resources/Prototypes/_CorvaxNext/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/_CorvaxNext/Loadouts/role_loadouts.yml @@ -1,3 +1,34 @@ +# Engineering +- type: roleLoadout + id: JobSeniorEngineer + groups: + - GroupTankHarness + - SeniorEngineerHead + - SeniorEngineerJumpsuit + - SeniorEngineerBackpack + - SeniorEngineerOuterClothing + - SeniorEngineerShoes + - SurvivalExtended + - Trinkets + - GroupSpeciesBreathTool + +# Science +- type: roleLoadout + id: JobSeniorResearcher + groups: + - GroupTankHarness + - SeniorResearcherHead + - SeniorResearcherJumpsuit + - SeniorResearcherBackpack + - SeniorResearcherOuterClothing + - SeniorResearcherGloves + - SeniorResearcherShoes + - Glasses + - Survival + - Trinkets + - GroupSpeciesBreathTool + +# Security - type: roleLoadout id: JobBrigmedic groups: @@ -9,3 +40,34 @@ - Survival - Trinkets - GroupSpeciesBreathTool + +- type: roleLoadout + id: JobSeniorOfficer + groups: + - SeniorOfficerHead + - SeniorOfficerJumpsuit + - SeniorOfficerBackpack + - SeniorOfficerOuterClothing + - SeniorOfficerShoes + - SeniorOfficerBelt + - SurvivalSecurity + - Trinkets + - SecurityStar + - GroupSpeciesBreathToolSecurity + +# Medical +- type: roleLoadout + id: JobSeniorPhysician + groups: + - GroupTankHarness + - SeniorPhysicianHead + - MedicalMask + - SeniorPhysicianJumpsuit + - MedicalGloves + - SeniorPhysicianBackpack + - SeniorPhysicianOuterClothing + - SeniorPhysicianShoes + - Glasses + - SurvivalMedical + - Trinkets + - GroupSpeciesBreathToolMedical diff --git a/Resources/Prototypes/_CorvaxNext/Roles/Jobs/Engineering/senior_engineer.yml b/Resources/Prototypes/_CorvaxNext/Roles/Jobs/Engineering/senior_engineer.yml new file mode 100644 index 00000000000..c6948e49cde --- /dev/null +++ b/Resources/Prototypes/_CorvaxNext/Roles/Jobs/Engineering/senior_engineer.yml @@ -0,0 +1,33 @@ +- type: job + id: SeniorEngineer + name: job-name-senior-engineer + description: job-description-senior-engineer + playTimeTracker: JobSeniorEngineer + requirements: + - !type:RoleTimeRequirement + role: JobAtmosphericTechnician + time: 21600 #6 hrs + - !type:RoleTimeRequirement + role: JobStationEngineer + time: 21600 #6 hrs + - !type:DepartmentTimeRequirement + department: Engineering + time: 216000 # 60 hrs + weight: 9 + startingGear: SeniorEngineerGear + icon: "JobIconSeniorEngineer" + supervisors: job-supervisors-ce + access: + - Maintenance + - Engineering + - External + - Atmospherics + +- type: startingGear + id: SeniorEngineerGear + equipment: + shoes: ClothingShoesBootsWork + id: SeniorEngineerPDA + eyes: ClothingEyesGlassesMeson + belt: ClothingBeltUtilityEngineering + ears: ClothingHeadsetEngineering diff --git a/Resources/Prototypes/_CorvaxNext/Roles/Jobs/Medical/senior_physician.yml b/Resources/Prototypes/_CorvaxNext/Roles/Jobs/Medical/senior_physician.yml new file mode 100644 index 00000000000..1031d0aaf80 --- /dev/null +++ b/Resources/Prototypes/_CorvaxNext/Roles/Jobs/Medical/senior_physician.yml @@ -0,0 +1,31 @@ +- type: job + id: SeniorPhysician + name: job-name-senior-physician + description: job-description-senior-physician + playTimeTracker: JobSeniorPhysician + requirements: + - !type:RoleTimeRequirement + role: JobChemist + time: 21600 #6 hrs + - !type:RoleTimeRequirement + role: JobMedicalDoctor + time: 21600 #6 hrs + - !type:DepartmentTimeRequirement + department: Medical + time: 216000 # 60 hrs + weight: 9 + startingGear: SeniorPhysicianGear + icon: "JobIconSeniorPhysician" + supervisors: job-supervisors-cmo + access: + - Medical + - Maintenance + - Chemistry + +- type: startingGear + id: SeniorPhysicianGear + equipment: + shoes: ClothingShoesColorBlack + id: SeniorPhysicianPDA + ears: ClothingHeadsetMedical + belt: ClothingBeltMedicalFilled diff --git a/Resources/Prototypes/_CorvaxNext/Roles/Jobs/Science/senior_researcher.yml b/Resources/Prototypes/_CorvaxNext/Roles/Jobs/Science/senior_researcher.yml new file mode 100644 index 00000000000..2ff0566037c --- /dev/null +++ b/Resources/Prototypes/_CorvaxNext/Roles/Jobs/Science/senior_researcher.yml @@ -0,0 +1,23 @@ +- type: job + id: SeniorResearcher + name: job-name-senior-researcher + description: job-description-senior-researcher + playTimeTracker: JobSeniorResearcher + requirements: + - !type:DepartmentTimeRequirement + department: Science + time: 216000 #60 hrs + weight: 9 + startingGear: SeniorResearcherGear + icon: "JobIconSeniorResearcher" + supervisors: job-supervisors-rd + access: + - Research + - Maintenance + +- type: startingGear + id: SeniorResearcherGear + equipment: + shoes: ClothingShoesColorBlack + id: SeniorResearcherPDA + ears: ClothingHeadsetScience diff --git a/Resources/Prototypes/_CorvaxNext/Roles/Jobs/Security/senior_officer.yml b/Resources/Prototypes/_CorvaxNext/Roles/Jobs/Security/senior_officer.yml new file mode 100644 index 00000000000..bcfcd02e008 --- /dev/null +++ b/Resources/Prototypes/_CorvaxNext/Roles/Jobs/Security/senior_officer.yml @@ -0,0 +1,45 @@ +- type: job + id: SeniorOfficer + name: job-name-senior-officer + description: job-description-senior-officer + playTimeTracker: JobSeniorOfficer + requirements: + - !type:RoleTimeRequirement + role: JobWarden + time: 21600 #6 hrs + - !type:RoleTimeRequirement + role: JobDetective + time: 7200 #2 hrs + - !type:RoleTimeRequirement + role: JobSecurityOfficer + time: 21600 #6 hrs + - !type:DepartmentTimeRequirement + department: Security + time: 216000 # 60 hrs + weight: 9 + startingGear: SeniorOfficerGear + icon: "JobIconSeniorOfficer" + supervisors: job-supervisors-hos + canBeAntag: false + access: + - Security + - Brig + - Maintenance + - Service + - External + special: + - !type:AddImplantSpecial + implants: [ MindShieldImplant ] + +- type: startingGear + id: SeniorOfficerGear + equipment: + shoes: ClothingShoesBootsCombatFilled + eyes: ClothingEyesGlassesSecurity + id: SeniorOfficerPDA + ears: ClothingHeadsetSecurity + pocket1: WeaponPistolMk58 + storage: + back: + - Flash + - MagazinePistol diff --git a/Resources/Prototypes/_CorvaxNext/Roles/play_time_trackers.yml b/Resources/Prototypes/_CorvaxNext/Roles/play_time_trackers.yml index c1f40833b1f..37ebe80ffa1 100644 --- a/Resources/Prototypes/_CorvaxNext/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/_CorvaxNext/Roles/play_time_trackers.yml @@ -1,2 +1,14 @@ - type: playTimeTracker id: JobBrigmedic + +- type: playTimeTracker + id: JobSeniorEngineer + +- type: playTimeTracker + id: JobSeniorOfficer + +- type: playTimeTracker + id: JobSeniorPhysician + +- type: playTimeTracker + id: JobSeniorResearcher