diff --git a/Resources/Locale/ru-RU/_sunrise/job/job-desc.ftl b/Resources/Locale/ru-RU/_sunrise/job/job-desc.ftl index cbd29784a33..e1ea8d27a59 100644 --- a/Resources/Locale/ru-RU/_sunrise/job/job-desc.ftl +++ b/Resources/Locale/ru-RU/_sunrise/job/job-desc.ftl @@ -1,4 +1,8 @@ +job-descriiption-iaa = Вы ревизор, присланный центральным командованием для того, чтобы убедиться, что весь персонал работает эффективно и в интересах корпорации. job-description-magistrat = Вы само правосудие станции, ваша задача судить всех крупных нарушителей порядка. job-description-centcomop = Не одобряйте эвакуацию. Не одобряйте ОБР. Делите зарплату экипажа станций на 0. +job-description-senior-engineer = Обучайте новых инженеров основам работы двигателей, ремонта, атмосферы и энергоснабжения станции. +job-description-senior-researcher = Обучайте новых ученых основам печати предметов, исследования артефактов и аномальных объектов. +job-description-senior-physician = Обучайте новых медиков основам ухода за ранеными, химии, диагностике больных и избавлению от мертвых. +job-description-senior-officer = Обучите новых кадетов основам обыска, проведения арестов, времени пребывания в тюрьме и правильной стрельбе из огнестрельного оружия. job-description-blueshield = Ваша главная задача - защита глав. Помните, вы не офицер службы безопасности. -job-description-iaa = душнила diff --git a/Resources/Locale/ru-RU/_sunrise/job/job-names.ftl b/Resources/Locale/ru-RU/_sunrise/job/job-names.ftl index 2e6dbc5692b..a73bf0588c6 100644 --- a/Resources/Locale/ru-RU/_sunrise/job/job-names.ftl +++ b/Resources/Locale/ru-RU/_sunrise/job/job-names.ftl @@ -1,3 +1,4 @@ +job-name-iaa = агент внутренних дел job-name-magistrat = магистрат job-name-centcomop = оператор Центком job-name-blueshield = офицер «Синий Щит» @@ -5,3 +6,13 @@ job-name-iaa = агент внутренних дел JobCentCommOfficial = представитель Центком JobMagistrat = магистрат + +job-name-senior-engineer = ведущий инженер +job-name-senior-researcher = ведущий учёный +job-name-senior-physician = ведущий врач +job-name-senior-officer = инструктор СБ + +JobSeniorEngineer = ведущий инженер +JobSeniorOfficer = инструктор СБ +JobSeniorPhysician = ведущий врач +JobSeniorResearcher = ведущий учёный diff --git a/Resources/Locale/ru-RU/_sunrise/preferences/loadout-groups.ftl b/Resources/Locale/ru-RU/_sunrise/preferences/loadout-groups.ftl index 93b5872bcf4..aa006d346cc 100644 --- a/Resources/Locale/ru-RU/_sunrise/preferences/loadout-groups.ftl +++ b/Resources/Locale/ru-RU/_sunrise/preferences/loadout-groups.ftl @@ -10,3 +10,7 @@ loadout-group-security-trinkets = Безделушки СБ loadout-group-corporate-law = Корпоративный Закон loadout-group-centcomm-operator-jumpsuit = Униформа ОЦК loadout-group-centcomm-operator-head-hat = Головой убор ОЦК +loadout-group-senior-officer-jumpsuit = Униформа инструктора СБ +loadout-group-senior-researcher-jumpsuit = Униформа ведущего учёного +loadout-group-senior-physician-jumpsuit = Униформа ведущего врача +loadout-group-senior-engineer-jumpsuit = Униформа ведущего инженера diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/back/backpacks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/back/backpacks.ftl index ae6153ce6d9..c1ebe683fb6 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/back/backpacks.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/back/backpacks.ftl @@ -4,3 +4,5 @@ ent-ClothingDeathSquadronBackpack = рюкзак эскадрона смерти .desc = Вместительный рюкзак использующий технологию БлюСпейс. ent-ClothingBackpackCE = рюкзак старшего инженера .desc = Технически продвинутый рюкзак. +ent-ClothingBackpackBlueShield = рюкзак офицера «синий щит» + .desc = На стиле. diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 3717116c36d..f8d431b574f 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -1706,6 +1706,7 @@ whitelist: - Zookeeper - Scientist + - SeniorResearcher # Sunrise-Senior - ResearchDirector - Chef diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 880f2293b1f..e3914415b0e 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -637,6 +637,11 @@ - JobIconSecurityCadet - JobIconZookeeper - JobIconVisitor + - JobIconBrigmedic # Sunrise-Roles + - JobIconSeniorPhysician # Sunrise-Senior + - JobIconSeniorOfficer # Sunrise-Senior + - JobIconSeniorEngineer # Sunrise-Senior + - JobIconSeniorResearcher # Sunrise-Senior - type: ActivatableUI key: enum.AgentIDCardUiKey.Key inHandsOnly: true @@ -800,6 +805,8 @@ layers: - state: default - state: idseniorengineer + - type: PresetIdCard # Sunrise-Senior + job: SeniorEngineer # Sunrise-Senior - type: entity parent: ResearchIDCard @@ -810,6 +817,8 @@ layers: - state: default - state: idseniorresearcher + - type: PresetIdCard # Sunrise-Senior + job: SeniorResearcher # Sunrise-Senior - type: entity parent: MedicalIDCard @@ -820,6 +829,8 @@ layers: - state: default - state: idseniorphysician + - type: PresetIdCard # Sunrise-Senior + job: SeniorPhysician # Sunrise-Senior - type: entity parent: SecurityIDCard @@ -830,6 +841,8 @@ layers: - state: default - state: idseniorofficer + - type: PresetIdCard # Sunrise-Senior + job: SeniorOfficer # Sunrise-Senior - 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 62da9f6e318..95b13a7045e 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml @@ -1,23 +1,3 @@ -# Senior times -- type: loadoutEffectGroup - id: SeniorEngineering - effects: - - !type:JobRequirementLoadoutEffect - requirement: - !type:RoleTimeRequirement - role: JobAtmosphericTechnician - time: 36000 # 10 hrs Sunrise-RoleTime - - !type:JobRequirementLoadoutEffect - requirement: - !type:RoleTimeRequirement - role: JobStationEngineer - time: 36000 # 10 hrs Sunrise-RoleTime - - !type:JobRequirementLoadoutEffect - requirement: - !type:DepartmentTimeRequirement - department: Engineering - time: 108000 # 30 hrs Sunrise-RoleTime - # Head - type: loadout id: StationEngineerHardhatYellow @@ -46,18 +26,6 @@ equipment: head: ClothingHeadHatHardhatRed -- type: loadout - id: SeniorEngineerBeret - equipment: EngineeringBeret - effects: - - !type:GroupLoadoutEffect - proto: SeniorEngineering - -- type: startingGear - id: EngineeringBeret - equipment: - head: ClothingHeadHatBeretEngineering - # Jumpsuit - type: loadout id: StationEngineerJumpsuit @@ -95,34 +63,6 @@ equipment: jumpsuit: ClothingUniformJumpsuitEngineeringHazard -- type: loadout - id: SeniorEngineerJumpsuit - equipment: SeniorEngineerJumpsuit - effects: - - !type:GroupLoadoutEffect - proto: SeniorEngineering - - !type:GroupLoadoutEffect - proto: MaleMoment - -- type: startingGear - id: SeniorEngineerJumpsuit - equipment: - jumpsuit: ClothingUniformJumpsuitSeniorEngineer - -- type: loadout - id: SeniorEngineerJumpskirt - equipment: SeniorEngineerJumpskirt - effects: - - !type:GroupLoadoutEffect - proto: SeniorEngineering - - !type:GroupLoadoutEffect - proto: WomanMoment - -- type: startingGear - id: SeniorEngineerJumpskirt - equipment: - jumpsuit: ClothingUniformJumpskirtSeniorEngineer - # Back - type: loadout id: StationEngineerBackpack @@ -188,25 +128,3 @@ id: EngineeringWinterBoots equipment: shoes: ClothingShoesBootsWinterEngi - -# ID -- type: loadout - id: StationEngineerPDA - equipment: StationEngineerPDA - -- type: startingGear - id: StationEngineerPDA - equipment: - id: EngineerPDA - -- type: loadout - id: SeniorEngineerPDA - equipment: SeniorEngineerPDA - effects: - - !type:GroupLoadoutEffect - proto: SeniorEngineering - -- type: startingGear - id: SeniorEngineerPDA - equipment: - id: SeniorEngineerPDA diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml index d2706014065..77b5b183fc7 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml @@ -31,17 +31,17 @@ # Head -- type: loadout - id: SeniorPhysicianBeret - equipment: SeniorPhysicianBeret - effects: - - !type:GroupLoadoutEffect - proto: SeniorPhysician +# - type: loadout +# id: SeniorPhysicianBeret +# equipment: SeniorPhysicianBeret +# effects: +# - !type:GroupLoadoutEffect +# proto: SeniorPhysician -- type: startingGear - id: SeniorPhysicianBeret - equipment: - head: ClothingHeadHatBeretSeniorPhysician +# - type: startingGear +# id: SeniorPhysicianBeret +# equipment: +# head: ClothingHeadHatBeretSeniorPhysician - type: loadout id: MedicalHeadMirror @@ -218,18 +218,6 @@ equipment: outerClothing: ClothingOuterWinterMed -- type: loadout - id: SeniorPhysicianLabCoat - equipment: SeniorPhysicianLabCoat - effects: - - !type:GroupLoadoutEffect - proto: SeniorPhysician - -- type: startingGear - id: SeniorPhysicianLabCoat - equipment: - outerClothing: ClothingOuterCoatLabSeniorPhysician - # Shoes - type: loadout id: MedicalWinterBoots @@ -240,28 +228,6 @@ equipment: shoes: ClothingShoesBootsWinterMed -# ID -- type: loadout - id: MedicalDoctorPDA - equipment: MedicalDoctorPDA - -- type: startingGear - id: MedicalDoctorPDA - equipment: - id: MedicalPDA - -- type: loadout - id: SeniorPhysicianPDA - equipment: SeniorPhysicianPDA - effects: - - !type:GroupLoadoutEffect - proto: SeniorPhysician - -- type: startingGear - id: SeniorPhysicianPDA - equipment: - id: SeniorPhysicianPDA - # Gloves - type: loadout id: NitrileGloves diff --git a/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml b/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml index b75d627bb95..312a5e242e2 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml @@ -1,27 +1,5 @@ -# Senior Time -- type: loadoutEffectGroup - id: SeniorResearcher - effects: - - !type:JobRequirementLoadoutEffect - requirement: - !type:DepartmentTimeRequirement - department: Science - time: 216000 #60 hrs - # Head -- type: loadout - id: ScientificBeret - equipment: ScientificBeret - effects: - - !type:GroupLoadoutEffect - proto: SeniorResearcher - -- type: startingGear - id: ScientificBeret - equipment: - head: ClothingHeadHatBeretRND - - type: loadout id: RoboticistCap equipment: RoboticistCap @@ -100,34 +78,6 @@ equipment: jumpsuit: ClothingUniformJumpskirtRoboticist -- type: loadout - id: SeniorResearcherJumpsuit - equipment: SeniorResearcherJumpsuit - effects: - - !type:GroupLoadoutEffect - proto: SeniorResearcher - - !type:GroupLoadoutEffect - proto: MaleMoment - -- type: startingGear - id: SeniorResearcherJumpsuit - equipment: - jumpsuit: ClothingUniformJumpsuitSeniorResearcher - -- type: loadout - id: SeniorResearcherJumpskirt - equipment: SeniorResearcherJumpskirt - effects: - - !type:GroupLoadoutEffect - proto: SeniorResearcher - - !type:GroupLoadoutEffect - proto: WomanMoment - -- type: startingGear - id: SeniorResearcherJumpskirt - equipment: - jumpsuit: ClothingUniformJumpskirtSeniorResearcher - # Back - type: loadout id: ScientistBackpack @@ -242,25 +192,3 @@ id: ScienceWinterBoots equipment: shoes: ClothingShoesBootsWinterSci - -# ID -- type: loadout - id: ScientistPDA - equipment: ScientistPDA - -- type: startingGear - id: ScientistPDA - equipment: - id: SciencePDA - -- type: loadout - id: SeniorResearcherPDA - equipment: SeniorResearcherPDA - effects: - - !type:GroupLoadoutEffect - proto: SeniorResearcher - -- type: startingGear - id: SeniorResearcherPDA - equipment: - id: SeniorResearcherPDA diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml index 998673a0a1e..7ea5c97d1df 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml @@ -1,18 +1,3 @@ -# Senior Time -- type: loadoutEffectGroup - id: SeniorOfficer - effects: - - !type:JobRequirementLoadoutEffect - requirement: - !type:RoleTimeRequirement - role: JobWarden - time: 36000 # 10 hrs Sunrise-RoleTime - - !type:JobRequirementLoadoutEffect - requirement: - !type:DepartmentTimeRequirement - department: Security - time: 216000 # 60 hrs - # Head - type: loadout id: SecurityHelmet @@ -90,34 +75,6 @@ equipment: jumpsuit: ClothingUniformJumpskirtSecGrey -- type: loadout - id: SeniorOfficerJumpsuit - equipment: SeniorOfficerJumpsuit - effects: - - !type:GroupLoadoutEffect - proto: SeniorOfficer - - !type:GroupLoadoutEffect - proto: MaleMoment - -- type: startingGear - id: SeniorOfficerJumpsuit - equipment: - jumpsuit: ClothingUniformJumpsuitSeniorOfficer - -- type: loadout - id: SeniorOfficerJumpskirt - equipment: SeniorOfficerJumpskirt - effects: - - !type:GroupLoadoutEffect - proto: SeniorOfficer - - !type:GroupLoadoutEffect - proto: WomanMoment - -- type: startingGear - id: SeniorOfficerJumpskirt - equipment: - jumpsuit: ClothingUniformJumpskirtSeniorOfficer - # Back - type: loadout id: SecurityBackpack @@ -220,25 +177,3 @@ id: SecurityWinterBoots equipment: shoes: ClothingShoesBootsWinterSecFilled - -# PDA -- type: loadout - id: SecurityPDA - equipment: SecurityPDA - -- type: startingGear - id: SecurityPDA - equipment: - id: SecurityPDA - -- type: loadout - id: SeniorOfficerPDA - equipment: SeniorOfficerPDA - effects: - - !type:GroupLoadoutEffect - proto: SeniorOfficer - -- type: startingGear - id: SeniorOfficerPDA - equipment: - id: SeniorOfficerPDA diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 44c9980b69c..244f3d83e3e 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -660,7 +660,6 @@ - StationEngineerHardhatYellow - StationEngineerHardhatOrange - StationEngineerHardhatRed - - SeniorEngineerBeret - type: loadoutGroup id: StationEngineerJumpsuit @@ -669,8 +668,6 @@ - StationEngineerJumpsuit - StationEngineerJumpskirt - StationEngineerHazardsuit - - SeniorEngineerJumpsuit - - SeniorEngineerJumpskirt - type: loadoutGroup id: StationEngineerBackpack @@ -695,13 +692,6 @@ - WorkBoots - EngineeringWinterBoots -- type: loadoutGroup - id: StationEngineerID - name: loadout-group-station-engineer-id - loadouts: - - StationEngineerPDA - - SeniorEngineerPDA - - type: loadoutGroup id: AtmosphericTechnicianJumpsuit name: loadout-group-atmospheric-technician-jumpsuit @@ -804,8 +794,6 @@ - ScientistJumpskirt - RoboticistJumpsuit - RoboticistJumpskirt - - SeniorResearcherJumpsuit - - SeniorResearcherJumpskirt - type: loadoutGroup id: ScientistBackpack @@ -825,7 +813,6 @@ - ScienceWintercoat - RoboticistLabCoat - RoboticistWintercoat - - SeniorResearcherLabCoat - type: loadoutGroup id: ScientistShoes @@ -844,13 +831,6 @@ - PurpleGloves - RobohandsGloves -- type: loadoutGroup - id: ScientistPDA - name: loadout-group-scientist-id - loadouts: - - ScientistPDA - - SeniorResearcherPDA - - type: loadoutGroup id: ResearchAssistantJumpsuit name: loadout-group-research-assistant-jumpsuit @@ -932,8 +912,6 @@ - SecurityJumpskirt - SecurityJumpsuitGrey - SecurityJumpskirtGrey - - SeniorOfficerJumpsuit - - SeniorOfficerJumpskirt - type: loadoutGroup id: SecurityBackpack @@ -966,13 +944,6 @@ - JackBoots - SecurityWinterBoots -- type: loadoutGroup - id: SecurityPDA - name: loadout-group-security-id - loadouts: - - SecurityPDA - - SeniorOfficerPDA - - type: loadoutGroup id: DetectiveHead name: loadout-group-detective-head @@ -1069,7 +1040,6 @@ minLimit: 0 loadouts: - MedicalBeret - - SeniorPhysicianBeret - MedicalHeadMirror - BlueSurgeryCap - GreenSurgeryCap @@ -1082,8 +1052,6 @@ loadouts: - MedicalDoctorJumpsuit - MedicalDoctorJumpskirt - - SeniorPhysicianJumpsuit - - SeniorPhysicianJumpskirt - MedicalBlueScrubs - MedicalGreenScrubs - MedicalPurpleScrubs @@ -1095,7 +1063,6 @@ loadouts: - RegularLabCoat - MedicalDoctorWintercoat - - SeniorPhysicianLabCoat - type: loadoutGroup id: MedicalBackpack @@ -1112,13 +1079,6 @@ - WhiteShoes - MedicalWinterBoots -- type: loadoutGroup - id: MedicalDoctorPDA - name: loadout-group-medical-doctor-id - loadouts: - - MedicalDoctorPDA - - SeniorPhysicianPDA - - type: loadoutGroup id: MedicalGloves name: loadout-group-medical-gloves diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index eedc7846d00..928e80b5f79 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -309,7 +309,6 @@ - StationEngineerBackpack - StationEngineerOuterClothing - StationEngineerShoes - - StationEngineerID - Trinkets - SurvivalExtended # Sunrise-start @@ -363,7 +362,6 @@ - ScientistOuterClothing - ScientistGloves - ScientistShoes - - ScientistPDA - Glasses - Trinkets - Survival @@ -434,7 +432,6 @@ - SecurityBackpack - SecurityOuterClothing - SecurityShoes - - SecurityPDA - SecurityBelt - Trinkets - SurvivalSecurity @@ -507,7 +504,6 @@ - MedicalBackpack - MedicalDoctorOuterClothing - MedicalShoes - - MedicalDoctorPDA - Glasses - Trinkets - SurvivalMedical diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml index a997a78ac38..3a2314b3460 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml @@ -23,6 +23,7 @@ eyes: ClothingEyesGlassesMeson belt: ClothingBeltUtilityEngineering ears: ClothingHeadsetEngineering + id: EngineerPDA #storage: #back: #- Stuff diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml index c523c3c45ae..9b999f7ef46 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml @@ -21,6 +21,7 @@ equipment: ears: ClothingHeadsetMedical belt: ClothingBeltMedicalFilled + id: MedicalPDA #storage: #back: #- Stuff diff --git a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml index 82e75a35e45..b0609a51277 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml @@ -18,6 +18,7 @@ id: ScientistGear equipment: ears: ClothingHeadsetScience + id: SciencePDA #storage: #back: #- Stuff diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml index 27df58bcd00..37210096d6d 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml @@ -30,6 +30,7 @@ eyes: ClothingEyesGlassesSecurity ears: ClothingHeadsetSecurity pocket1: WeaponPistolMk58 + id: SecurityPDA storage: back: - Flash diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index f0550a0d154..8c8c39f8129 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -55,6 +55,7 @@ roles: - AtmosphericTechnician - ChiefEngineer + - SeniorEngineer # Sunrise-Senior - StationEngineer - TechnicalAssistant @@ -65,6 +66,7 @@ roles: - Chemist - ChiefMedicalOfficer + - SeniorPhysician # Sunrise-Senior - MedicalDoctor - MedicalIntern - Psychologist @@ -77,6 +79,7 @@ weight: 20 roles: - HeadOfSecurity + - SeniorOfficer # Sunrise-Senior - SecurityCadet - SecurityOfficer - Detective @@ -89,6 +92,7 @@ color: "#D381C9" roles: - ResearchDirector + - SeniorResearcher # Sunrise-Senior - Scientist - ResearchAssistant diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Back/backpacks.yml index ec0f1118dcc..9c31a31064e 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Back/backpacks.yml @@ -36,8 +36,8 @@ - type: entity parent: ClothingBackpack id: ClothingBackpackBlueShield - name: рюкзак офицера «синий щит» - description: На стиле. + name: blue shield's backpack + description: Superior. components: - type: Sprite sprite: _Sunrise/Clothing/Back/Backpacks/blueshield.rsi diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/armor.yml index b04c5cdd13f..258e3aa0de5 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/armor.yml @@ -8,6 +8,9 @@ sprite: _Sunrise/Clothing/OuterClothing/Armor/centcom_naval_carapace.rsi - type: Clothing sprite: _Sunrise/Clothing/OuterClothing/Armor/centcom_naval_carapace.rsi + - type: ClothingSpeedModifier + walkModifier: 1 + sprintModifier: 1 - type: Armor modifiers: coefficients: diff --git a/Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/jobs.yml index b0d44278283..5cfe7782ac7 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/jobs.yml @@ -63,3 +63,51 @@ layers: - state: green - state: centcom + +- 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/_Sunrise/Loadouts/Jobs/Engineering/senior_engineer.yml b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Engineering/senior_engineer.yml new file mode 100644 index 00000000000..89730908ad3 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Engineering/senior_engineer.yml @@ -0,0 +1,23 @@ +- type: loadout + id: JumpsuitSeniorEngineer + equipment: JumpsuitSeniorEngineer + effects: + - !type:GroupLoadoutEffect + proto: MaleMoment + +- type: startingGear + id: JumpsuitSeniorEngineer + equipment: + jumpsuit: ClothingUniformJumpsuitSeniorEngineer + +- type: loadout + id: JumpskirtSeniorEngineer + equipment: JumpskirtSeniorEngineer + effects: + - !type:GroupLoadoutEffect + proto: WomanMoment + +- type: startingGear + id: JumpskirtSeniorEngineer + equipment: + jumpsuit: ClothingUniformJumpskirtSeniorEngineer diff --git a/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Medical/senior_physician.yml b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Medical/senior_physician.yml new file mode 100644 index 00000000000..f7147a82e11 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Medical/senior_physician.yml @@ -0,0 +1,23 @@ +- type: loadout + id: JumpsuitSeniorPhysician + equipment: JumpsuitSeniorPhysician + effects: + - !type:GroupLoadoutEffect + proto: MaleMoment + +- type: startingGear + id: JumpsuitSeniorPhysician + equipment: + jumpsuit: ClothingUniformJumpsuitSeniorPhysician + +- type: loadout + id: JumpskirtSeniorPhysician + equipment: JumpskirtSeniorPhysician + effects: + - !type:GroupLoadoutEffect + proto: WomanMoment + +- type: startingGear + id: JumpskirtSeniorPhysician + equipment: + jumpsuit: ClothingUniformJumpskirtSeniorPhysician diff --git a/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Science/senior_researcher.yml b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Science/senior_researcher.yml new file mode 100644 index 00000000000..74f05deb6b2 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Science/senior_researcher.yml @@ -0,0 +1,23 @@ +- type: loadout + id: JumpsuitSeniorResearcher + equipment: JumpsuitSeniorResearcher + effects: + - !type:GroupLoadoutEffect + proto: MaleMoment + +- type: startingGear + id: JumpsuitSeniorResearcher + equipment: + jumpsuit: ClothingUniformJumpsuitSeniorResearcher + +- type: loadout + id: JumpskirtSeniorResearcher + equipment: JumpskirtSeniorResearcher + effects: + - !type:GroupLoadoutEffect + proto: WomanMoment + +- type: startingGear + id: JumpskirtSeniorResearcher + equipment: + jumpsuit: ClothingUniformJumpskirtSeniorResearcher diff --git a/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Security/senior_officer.yml b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Security/senior_officer.yml new file mode 100644 index 00000000000..2f2390e140e --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Security/senior_officer.yml @@ -0,0 +1,23 @@ +- type: loadout + id: JumpsuitSeniorOfficer + equipment: JumpsuitSeniorOfficer + effects: + - !type:GroupLoadoutEffect + proto: MaleMoment + +- type: startingGear + id: JumpsuitSeniorOfficer + equipment: + jumpsuit: ClothingUniformJumpsuitSeniorOfficer + +- type: loadout + id: JumpskirtSeniorOfficer + equipment: JumpskirtSeniorOfficer + effects: + - !type:GroupLoadoutEffect + proto: WomanMoment + +- type: startingGear + id: JumpskirtSeniorOfficer + equipment: + jumpsuit: ClothingUniformJumpskirtSeniorOfficer diff --git a/Resources/Prototypes/_Sunrise/Loadouts/loadout_groups.yml b/Resources/Prototypes/_Sunrise/Loadouts/loadout_groups.yml index 2cf293b80a4..32852d356d9 100644 --- a/Resources/Prototypes/_Sunrise/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/_Sunrise/Loadouts/loadout_groups.yml @@ -172,3 +172,31 @@ - ChiefEngineerBackpack - ChiefEngineerSatchel - ChiefEngineerDuffel + +- type: loadoutGroup + id: SeniorOfficerJumpsuit + name: loadout-group-senior-officer-jumpsuit + loadouts: + - JumpsuitSeniorOfficer + - JumpskirtSeniorOfficer + +- type: loadoutGroup + id: SeniorResearcherJumpsuit + name: loadout-group-senior-researcher-jumpsuit + loadouts: + - JumpsuitSeniorResearcher + - JumpskirtSeniorResearcher + +- type: loadoutGroup + id: SeniorPhysicianJumpsuit + name: loadout-group-senior-physician-jumpsuit + loadouts: + - JumpsuitSeniorPhysician + - JumpskirtSeniorPhysician + +- type: loadoutGroup + id: SeniorEngineerJumpsuit + name: loadout-group-senior-engineer-jumpsuit + loadouts: + - JumpsuitSeniorEngineer + - JumpskirtSeniorEngineer diff --git a/Resources/Prototypes/_Sunrise/Loadouts/role_loadouts.yml b/Resources/Prototypes/_Sunrise/Loadouts/role_loadouts.yml index 7152d3d0446..34c0bde0793 100644 --- a/Resources/Prototypes/_Sunrise/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/_Sunrise/Loadouts/role_loadouts.yml @@ -66,3 +66,60 @@ - Bra - Pants - Socks + +- type: roleLoadout + id: JobSeniorOfficer + groups: + - SeniorOfficerJumpsuit + - SecurityBackpack + - SecurityBelt + - SecurityTrinkets + - SecurityOuterClothing + - SecurityShoes + - SurvivalSecurity + - Trinkets + - Bra + - Pants + - Socks + +- type: roleLoadout + id: JobSeniorResearcher + groups: + - SeniorResearcherJumpsuit + - ScientistBackpack + - ScientistGloves + - ScientistShoes + - Glasses + - Survival + - Trinkets + - Bra + - Pants + - Socks + +- type: roleLoadout + id: JobSeniorPhysician + groups: + - SeniorPhysicianJumpsuit + - MedicalBackpack + - MedicalGloves + - MedicalMask + - MedicalShoes + - SurvivalMedical + - Trinkets + - Glasses + - Bra + - Pants + - Socks + +- type: roleLoadout + id: JobSeniorEngineer + groups: + - SeniorEngineerJumpsuit + - StationEngineerBackpack + - StationEngineerOuterClothing + - StationEngineerShoes + - SurvivalExtended + - Trinkets + - Bra + - Pants + - Socks diff --git a/Resources/Prototypes/_Sunrise/Maps/box.yml b/Resources/Prototypes/_Sunrise/Maps/box.yml index 12d2dda9d75..e933cf2e9c6 100644 --- a/Resources/Prototypes/_Sunrise/Maps/box.yml +++ b/Resources/Prototypes/_Sunrise/Maps/box.yml @@ -65,4 +65,8 @@ IAA: [ 1, 1 ] Lawyer: [ 2, 2 ] Magistrat: [ 1, 1 ] - + # Sunrise-Senior + SeniorEngineer: [ 1, 1 ] + SeniorPhysician: [ 1, 1 ] + SeniorResearcher: [ 1, 1 ] + SeniorOfficer: [ 1, 1 ] diff --git a/Resources/Prototypes/_Sunrise/Maps/delta.yml b/Resources/Prototypes/_Sunrise/Maps/delta.yml index 6c8012fa065..3fc2d03e4be 100644 --- a/Resources/Prototypes/_Sunrise/Maps/delta.yml +++ b/Resources/Prototypes/_Sunrise/Maps/delta.yml @@ -60,3 +60,8 @@ BlueShield: [ 1, 1 ] # security Brigmedic: [ 1, 1 ] + # Sunrise-Senior + SeniorEngineer: [ 1, 1 ] + SeniorPhysician: [ 1, 1 ] + SeniorResearcher: [ 1, 1 ] + SeniorOfficer: [ 1, 1 ] diff --git a/Resources/Prototypes/_Sunrise/Maps/fland.yml b/Resources/Prototypes/_Sunrise/Maps/fland.yml index 5ccb69cf0bf..b97ecfdafde 100644 --- a/Resources/Prototypes/_Sunrise/Maps/fland.yml +++ b/Resources/Prototypes/_Sunrise/Maps/fland.yml @@ -66,3 +66,8 @@ IAA: [ 1, 1 ] Lawyer: [ 2, 2 ] Magistrat: [ 1, 1 ] + # Sunrise-Senior + SeniorEngineer: [ 1, 1 ] + SeniorPhysician: [ 1, 1 ] + SeniorResearcher: [ 1, 1 ] + SeniorOfficer: [ 1, 1 ] diff --git a/Resources/Prototypes/_Sunrise/Maps/marathon.yml b/Resources/Prototypes/_Sunrise/Maps/marathon.yml index efd6c9c5766..aaeb991c7dc 100644 --- a/Resources/Prototypes/_Sunrise/Maps/marathon.yml +++ b/Resources/Prototypes/_Sunrise/Maps/marathon.yml @@ -65,3 +65,8 @@ IAA: [ 1, 1 ] Lawyer: [ 2, 2 ] Magistrat: [ 1, 1 ] + # Sunrise-Senior + SeniorEngineer: [ 1, 1 ] + SeniorPhysician: [ 1, 1 ] + SeniorResearcher: [ 1, 1 ] + SeniorOfficer: [ 1, 1 ] diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/CentralCommand/centcom_official.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/CentralCommand/centcom_official.yml index f3dffaef3d2..59e30f60df6 100644 --- a/Resources/Prototypes/_Sunrise/Roles/Jobs/CentralCommand/centcom_official.yml +++ b/Resources/Prototypes/_Sunrise/Roles/Jobs/CentralCommand/centcom_official.yml @@ -28,7 +28,7 @@ head: ClothingHeadHatCentcom eyes: ClothingEyesGlassesSunglasses gloves: ClothingHandsGlovesColorBlack - outerClothing: ClothingOuterArmorBasic + outerClothing: ClothingOuterArmorCentcomCarapace id: CentcomPDA ears: ClothingHeadsetAltCentCom belt: WeaponPistolN1984 diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/Engineering/senior_engineer.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/Engineering/senior_engineer.yml new file mode 100644 index 00000000000..586af69c2a3 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/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 + startingGear: SeniorEngineerGear + icon: "JobIconSeniorEngineer" + supervisors: job-supervisors-ce + access: + - Maintenance + - Engineering + - External + - Atmospherics + +- type: startingGear + id: SeniorEngineerGear + equipment: + head: ClothingHeadHatBeretEngineering + id: SeniorEngineerPDA + eyes: ClothingEyesGlassesMeson + belt: ClothingBeltUtilityEngineering + ears: ClothingHeadsetEngineering diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/Law/iaa.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/Law/iaa.yml index 2ef6f07cc5e..4a35b6b891f 100644 --- a/Resources/Prototypes/_Sunrise/Roles/Jobs/Law/iaa.yml +++ b/Resources/Prototypes/_Sunrise/Roles/Jobs/Law/iaa.yml @@ -1,6 +1,7 @@ - type: job id: IAA name: job-name-iaa + description: job-description-iaa playTimeTracker: JobIAA requirements: - !type:DepartmentTimeRequirement diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/Medical/senior_physician.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/Medical/senior_physician.yml new file mode 100644 index 00000000000..1ae6ad39a25 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/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 + startingGear: SeniorPhysicianGear + icon: "JobIconSeniorPhysician" + supervisors: job-supervisors-cmo + access: + - Medical + - Maintenance + - Chemistry + +- type: startingGear + id: SeniorPhysicianGear + equipment: + head: ClothingHeadHatBeretSeniorPhysician + id: SeniorPhysicianPDA + ears: ClothingHeadsetMedical + belt: ClothingBeltMedicalFilled + outerClothing: ClothingOuterCoatLabSeniorPhysician diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/Science/senior_researcher.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/Science/senior_researcher.yml new file mode 100644 index 00000000000..2be3ad935f9 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/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 + startingGear: SeniorResearcherGear + icon: "JobIconSeniorResearcher" + supervisors: job-supervisors-rd + access: + - Research + - Maintenance + +- type: startingGear + id: SeniorResearcherGear + equipment: + head: ClothingHeadHatBeretRND + id: SeniorResearcherPDA + ears: ClothingHeadsetScience + outerClothing: ClothingOuterCoatLabSeniorResearcher diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/Security/senior_officer.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/Security/senior_officer.yml new file mode 100644 index 00000000000..53d2f595529 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Roles/Jobs/Security/senior_officer.yml @@ -0,0 +1,40 @@ +- 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 + 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: + eyes: ClothingEyesGlassesSecurity + head: ClothingHeadHatBeretSecurity + id: SeniorOfficerPDA + ears: ClothingHeadsetSecurity + pocket1: WeaponPistolMk58 diff --git a/Resources/Prototypes/_Sunrise/Roles/play_time_trackers.yml b/Resources/Prototypes/_Sunrise/Roles/play_time_trackers.yml index 3eaea1f91a2..869cdbc4f21 100644 --- a/Resources/Prototypes/_Sunrise/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/_Sunrise/Roles/play_time_trackers.yml @@ -15,3 +15,15 @@ - type: playTimeTracker id: JobBlueShield + +- type: playTimeTracker + id: JobSeniorEngineer + +- type: playTimeTracker + id: JobSeniorOfficer + +- type: playTimeTracker + id: JobSeniorPhysician + +- type: playTimeTracker + id: JobSeniorResearcher