From 68bcdfdc706d0119fa8fff0ef2edac28f5d44c97 Mon Sep 17 00:00:00 2001 From: DragonDidlo <111651007+DragonDidlo@users.noreply.github.com> Date: Wed, 18 Mar 2026 13:21:44 +0300 Subject: [PATCH 1/2] new_age_job --- .../chief_technical_specialist.yml | 5 ++++ .../Roles/Jobs/Administration/director.yml | 11 +++++-- .../Administration/head_of_medical_sector.yml | 23 +++++++++------ .../Jobs/Administration/personnel_officer.yml | 29 +++++++++++-------- .../scientific_service_director.yml | 5 ++++ .../Administration/security_commander.yml | 5 ++++ .../senior_logistics_officer.yml | 5 ++++ ...xternal_administrative_zone_commandant.yml | 5 ++++ .../external_administrative_zone_officer.yml | 5 ++++ .../field_medical_specialist.yml | 5 ++++ ...r_external_administrative_zone_officer.yml | 9 ++++-- ...r_external_administrative_zone_officer.yml | 5 ++++ .../electrical_technical_specialist.yml | 11 +++++-- .../general_technical_specialist.yml | 11 +++++-- .../lead_technical_specialist.yml | 11 +++++-- .../technical_trainee.yml | 6 ++++ .../ethics_committee_representative.yml | 7 ++++- .../botanist_phytogeneticist.yml | 6 ++++ .../gastronomic_specialist.yml | 6 ++++ .../service_personnel.yml | 6 ++++ .../LogisticsService/logistics_officer.yml | 9 ++++-- .../Jobs/MedicalService/hospital_intern.yml | 6 ++++ .../MedicalService/medical_specialist.yml | 5 ++++ .../pharmaceutical_specialist.yml | 5 ++++ .../Jobs/MedicalService/psychotherapist.yml | 9 ++++-- .../senior_medical_specialist.yml | 5 ++++ .../anomarchology_researcher.yml | 5 ++++ .../ScientificService/junior_researcher.yml | 9 ++++-- .../ScientificService/lead_researcher.yml | 5 ++++ .../production_specialist.yml | 5 ++++ .../heavy_containment_zone_commandant.yml | 5 ++++ .../heavy_containment_zone_officer.yml | 5 ++++ .../junior_heavy_containment_zone_officer.yml | 9 ++++-- .../senior_heavy_containment_zone_officer.yml | 5 ++++ 34 files changed, 219 insertions(+), 44 deletions(-) diff --git a/Resources/Prototypes/_Scp/Roles/Jobs/Administration/chief_technical_specialist.yml b/Resources/Prototypes/_Scp/Roles/Jobs/Administration/chief_technical_specialist.yml index 3acf43d858..71fb51b69e 100644 --- a/Resources/Prototypes/_Scp/Roles/Jobs/Administration/chief_technical_specialist.yml +++ b/Resources/Prototypes/_Scp/Roles/Jobs/Administration/chief_technical_specialist.yml @@ -7,6 +7,11 @@ - !type:DepartmentTimeRequirement department: EngineeringTechnicalService time: 54000 + - !type:AgeRequirement + requiredAge: 35 + - !type:AgeRequirement + requiredAge: 75 + inverted: true weight: 940 icon: JobChiefTechnicalSpecialist supervisors: job-supervisors-director diff --git a/Resources/Prototypes/_Scp/Roles/Jobs/Administration/director.yml b/Resources/Prototypes/_Scp/Roles/Jobs/Administration/director.yml index e712a0e5e3..4267682487 100644 --- a/Resources/Prototypes/_Scp/Roles/Jobs/Administration/director.yml +++ b/Resources/Prototypes/_Scp/Roles/Jobs/Administration/director.yml @@ -4,9 +4,14 @@ description: job-description-director playTimeTracker: JobDirector requirements: - - !type:DepartmentTimeRequirement - department: Administration - time: 54000 + - !type:DepartmentTimeRequirement + department: Administration + time: 54000 + - !type:AgeRequirement + requiredAge: 35 + - !type:AgeRequirement + requiredAge: 85 + inverted: true weight: 965 icon: JobDirector joinNotifyCrew: true diff --git a/Resources/Prototypes/_Scp/Roles/Jobs/Administration/head_of_medical_sector.yml b/Resources/Prototypes/_Scp/Roles/Jobs/Administration/head_of_medical_sector.yml index 3c1a9f90ae..e17c34e79c 100644 --- a/Resources/Prototypes/_Scp/Roles/Jobs/Administration/head_of_medical_sector.yml +++ b/Resources/Prototypes/_Scp/Roles/Jobs/Administration/head_of_medical_sector.yml @@ -4,15 +4,20 @@ description: job-description-head-of-medical-sector playTimeTracker: JobHeadOfMedicalSector requirements: - - !type:RoleTimeRequirement - role: JobMedicalSpecialist - time: 7200 - - !type:RoleTimeRequirement - role: JobPharmaceuticalSpecialist - time: 10800 - - !type:DepartmentTimeRequirement - department: MedicalService - time: 36000 + - !type:RoleTimeRequirement + role: JobMedicalSpecialist + time: 7200 + - !type:RoleTimeRequirement + role: JobPharmaceuticalSpecialist + time: 10800 + - !type:DepartmentTimeRequirement + department: MedicalService + time: 36000 + - !type:AgeRequirement + requiredAge: 35 + - !type:AgeRequirement + requiredAge: 85 + inverted: true weight: 945 icon: JobHeadOfMedicalSector supervisors: job-supervisors-director diff --git a/Resources/Prototypes/_Scp/Roles/Jobs/Administration/personnel_officer.yml b/Resources/Prototypes/_Scp/Roles/Jobs/Administration/personnel_officer.yml index 2bc211120d..5d22a7042e 100644 --- a/Resources/Prototypes/_Scp/Roles/Jobs/Administration/personnel_officer.yml +++ b/Resources/Prototypes/_Scp/Roles/Jobs/Administration/personnel_officer.yml @@ -4,18 +4,23 @@ description: job-description-personnel-officer playTimeTracker: JobPersonnelOfficer requirements: - - !type:DepartmentTimeRequirement - department: ExternalAdministrativeZoneSecurityService - time: 18000 - - !type:DepartmentTimeRequirement - department: MedicalService - time: 18000 - - !type:DepartmentTimeRequirement - department: EngineeringTechnicalService - time: 18000 - - !type:DepartmentTimeRequirement - department: Administration - time: 18000 + - !type:DepartmentTimeRequirement + department: ExternalAdministrativeZoneSecurityService + time: 18000 + - !type:DepartmentTimeRequirement + department: MedicalService + time: 18000 + - !type:DepartmentTimeRequirement + department: EngineeringTechnicalService + time: 18000 + - !type:DepartmentTimeRequirement + department: Administration + time: 18000 + - !type:AgeRequirement + requiredAge: 31 + - !type:AgeRequirement + requiredAge: 85 + inverted: true weight: 950 icon: JobPersonnelOfficer supervisors: job-supervisors-director diff --git a/Resources/Prototypes/_Scp/Roles/Jobs/Administration/scientific_service_director.yml b/Resources/Prototypes/_Scp/Roles/Jobs/Administration/scientific_service_director.yml index 375d012bfc..8ed74a5090 100644 --- a/Resources/Prototypes/_Scp/Roles/Jobs/Administration/scientific_service_director.yml +++ b/Resources/Prototypes/_Scp/Roles/Jobs/Administration/scientific_service_director.yml @@ -7,6 +7,11 @@ - !type:DepartmentTimeRequirement department: ScientificService time: 54000 + - !type:AgeRequirement + requiredAge: 35 + - !type:AgeRequirement + requiredAge: 85 + inverted: true weight: 960 icon: JobScientificServiceDirector supervisors: job-supervisors-director diff --git a/Resources/Prototypes/_Scp/Roles/Jobs/Administration/security_commander.yml b/Resources/Prototypes/_Scp/Roles/Jobs/Administration/security_commander.yml index 6a5ea00341..a1ad9d8274 100644 --- a/Resources/Prototypes/_Scp/Roles/Jobs/Administration/security_commander.yml +++ b/Resources/Prototypes/_Scp/Roles/Jobs/Administration/security_commander.yml @@ -10,6 +10,11 @@ - !type:DepartmentTimeRequirement department: ExternalAdministrativeZoneSecurityService time: 36000 + - !type:AgeRequirement + requiredAge: 31 + - !type:AgeRequirement + requiredAge: 75 + inverted: true weight: 955 icon: JobSecurityCommander supervisors: job-supervisors-director diff --git a/Resources/Prototypes/_Scp/Roles/Jobs/Administration/senior_logistics_officer.yml b/Resources/Prototypes/_Scp/Roles/Jobs/Administration/senior_logistics_officer.yml index 937d38974b..ff6ea7590b 100644 --- a/Resources/Prototypes/_Scp/Roles/Jobs/Administration/senior_logistics_officer.yml +++ b/Resources/Prototypes/_Scp/Roles/Jobs/Administration/senior_logistics_officer.yml @@ -7,6 +7,11 @@ - !type:RoleTimeRequirement role: JobLogisticsOfficer time: 36000 + - !type:AgeRequirement + requiredAge: 29 + - !type:AgeRequirement + requiredAge: 75 + inverted: true weight: 935 icon: JobSeniorLogisticsOfficer supervisors: job-supervisors-director diff --git a/Resources/Prototypes/_Scp/Roles/Jobs/CommandantSquad/external_administrative_zone_commandant.yml b/Resources/Prototypes/_Scp/Roles/Jobs/CommandantSquad/external_administrative_zone_commandant.yml index 202a8866b9..0853b5ff7a 100644 --- a/Resources/Prototypes/_Scp/Roles/Jobs/CommandantSquad/external_administrative_zone_commandant.yml +++ b/Resources/Prototypes/_Scp/Roles/Jobs/CommandantSquad/external_administrative_zone_commandant.yml @@ -7,6 +7,11 @@ - !type:DepartmentTimeRequirement department: ExternalAdministrativeZoneSecurityService time: 43200 + - !type:AgeRequirement + requiredAge: 29 + - !type:AgeRequirement + requiredAge: 65 + inverted: true icon: JobExternalAdministrativeZoneCommandant supervisors: job-supervisors-security-commander canBeAntag: false diff --git a/Resources/Prototypes/_Scp/Roles/Jobs/CommandantSquad/external_administrative_zone_officer.yml b/Resources/Prototypes/_Scp/Roles/Jobs/CommandantSquad/external_administrative_zone_officer.yml index fd2f30a10e..1aa287c493 100644 --- a/Resources/Prototypes/_Scp/Roles/Jobs/CommandantSquad/external_administrative_zone_officer.yml +++ b/Resources/Prototypes/_Scp/Roles/Jobs/CommandantSquad/external_administrative_zone_officer.yml @@ -7,6 +7,11 @@ - !type:DepartmentTimeRequirement department: ExternalAdministrativeZoneSecurityService time: 14400 + - !type:AgeRequirement + requiredAge: 27 + - !type:AgeRequirement + requiredAge: 65 + inverted: true icon: JobExternalAdministrativeZoneOfficer supervisors: job-supervisors-external-administrative-zone-commandant canBeAntag: false diff --git a/Resources/Prototypes/_Scp/Roles/Jobs/CommandantSquad/field_medical_specialist.yml b/Resources/Prototypes/_Scp/Roles/Jobs/CommandantSquad/field_medical_specialist.yml index a60d40b0a4..ad1027479c 100644 --- a/Resources/Prototypes/_Scp/Roles/Jobs/CommandantSquad/field_medical_specialist.yml +++ b/Resources/Prototypes/_Scp/Roles/Jobs/CommandantSquad/field_medical_specialist.yml @@ -10,6 +10,11 @@ - !type:DepartmentTimeRequirement department: MedicalService time: 10800 + - !type:AgeRequirement + requiredAge: 29 + - !type:AgeRequirement + requiredAge: 75 + inverted: true icon: JobAmnesthesiologist supervisors: job-supervisors-heavy-containment-zone-commandant canBeAntag: false diff --git a/Resources/Prototypes/_Scp/Roles/Jobs/CommandantSquad/junior_external_administrative_zone_officer.yml b/Resources/Prototypes/_Scp/Roles/Jobs/CommandantSquad/junior_external_administrative_zone_officer.yml index de8fc66ffd..7a8e1df966 100644 --- a/Resources/Prototypes/_Scp/Roles/Jobs/CommandantSquad/junior_external_administrative_zone_officer.yml +++ b/Resources/Prototypes/_Scp/Roles/Jobs/CommandantSquad/junior_external_administrative_zone_officer.yml @@ -4,8 +4,13 @@ description: job-description-junior-external-administrative-zone-officer playTimeTracker: JobJuniorExternalAdministrativeZoneOfficer requirements: - - !type:OverallPlaytimeRequirement - time: 7200 + - !type:OverallPlaytimeRequirement + time: 7200 + - !type:AgeRequirement + requiredAge: 23 + - !type:AgeRequirement + requiredAge: 45 + inverted: true icon: JobJuniorExternalAdministrativeZoneOfficer supervisors: job-supervisors-external-administrative-zone-commandant canBeAntag: false diff --git a/Resources/Prototypes/_Scp/Roles/Jobs/CommandantSquad/senior_external_administrative_zone_officer.yml b/Resources/Prototypes/_Scp/Roles/Jobs/CommandantSquad/senior_external_administrative_zone_officer.yml index 203577a659..8a18a40994 100644 --- a/Resources/Prototypes/_Scp/Roles/Jobs/CommandantSquad/senior_external_administrative_zone_officer.yml +++ b/Resources/Prototypes/_Scp/Roles/Jobs/CommandantSquad/senior_external_administrative_zone_officer.yml @@ -7,6 +7,11 @@ - !type:DepartmentTimeRequirement department: ExternalAdministrativeZoneSecurityService time: 36000 + - !type:AgeRequirement + requiredAge: 29 + - !type:AgeRequirement + requiredAge: 65 + inverted: true icon: JobSeniorExternalAdministrativeZoneOfficer supervisors: job-supervisors-external-administrative-zone-commandant canBeAntag: false diff --git a/Resources/Prototypes/_Scp/Roles/Jobs/EngineeringTechnicalService/electrical_technical_specialist.yml b/Resources/Prototypes/_Scp/Roles/Jobs/EngineeringTechnicalService/electrical_technical_specialist.yml index a4ee490b18..97a15483fd 100644 --- a/Resources/Prototypes/_Scp/Roles/Jobs/EngineeringTechnicalService/electrical_technical_specialist.yml +++ b/Resources/Prototypes/_Scp/Roles/Jobs/EngineeringTechnicalService/electrical_technical_specialist.yml @@ -4,9 +4,14 @@ description: job-description-electrical-technical-specialist playTimeTracker: JobElectricalTechnicalSpecialist requirements: - - !type:DepartmentTimeRequirement - department: EngineeringTechnicalService - time: 18000 + - !type:DepartmentTimeRequirement + department: EngineeringTechnicalService + time: 18000 + - !type:AgeRequirement + requiredAge: 29 + - !type:AgeRequirement + requiredAge: 75 + inverted: true icon: JobElectricalTechnicalSpecialist supervisors: job-supervisors-chief-technical-specialist displayWeight: 10 diff --git a/Resources/Prototypes/_Scp/Roles/Jobs/EngineeringTechnicalService/general_technical_specialist.yml b/Resources/Prototypes/_Scp/Roles/Jobs/EngineeringTechnicalService/general_technical_specialist.yml index 6a488aa9ce..3e7451ed38 100644 --- a/Resources/Prototypes/_Scp/Roles/Jobs/EngineeringTechnicalService/general_technical_specialist.yml +++ b/Resources/Prototypes/_Scp/Roles/Jobs/EngineeringTechnicalService/general_technical_specialist.yml @@ -4,9 +4,14 @@ description: job-description-general-technical-specialist playTimeTracker: JobGeneralTechnicalSpecialist requirements: - - !type:DepartmentTimeRequirement - department: EngineeringTechnicalService - time: 7200 + - !type:DepartmentTimeRequirement + department: EngineeringTechnicalService + time: 7200 + - !type:AgeRequirement + requiredAge: 27 + - !type:AgeRequirement + requiredAge: 75 + inverted: true icon: JobGeneralTechnicalSpecialist supervisors: job-supervisors-chief-technical-specialist displayWeight: 10 diff --git a/Resources/Prototypes/_Scp/Roles/Jobs/EngineeringTechnicalService/lead_technical_specialist.yml b/Resources/Prototypes/_Scp/Roles/Jobs/EngineeringTechnicalService/lead_technical_specialist.yml index 1a1e8eb52c..0c10f7665e 100644 --- a/Resources/Prototypes/_Scp/Roles/Jobs/EngineeringTechnicalService/lead_technical_specialist.yml +++ b/Resources/Prototypes/_Scp/Roles/Jobs/EngineeringTechnicalService/lead_technical_specialist.yml @@ -4,9 +4,14 @@ description: job-description-lead-technical-specialist playTimeTracker: JobLeadTechnicalSpecialist requirements: - - !type:DepartmentTimeRequirement - department: EngineeringTechnicalService - time: 36000 + - !type:DepartmentTimeRequirement + department: EngineeringTechnicalService + time: 36000 + - !type:AgeRequirement + requiredAge: 30 + - !type:AgeRequirement + requiredAge: 75 + inverted: true icon: JobLeadTechnicalSpecialist supervisors: job-supervisors-chief-technical-specialist displayWeight: 30 diff --git a/Resources/Prototypes/_Scp/Roles/Jobs/EngineeringTechnicalService/technical_trainee.yml b/Resources/Prototypes/_Scp/Roles/Jobs/EngineeringTechnicalService/technical_trainee.yml index 2d3fb16e9e..9ed16a4aa0 100644 --- a/Resources/Prototypes/_Scp/Roles/Jobs/EngineeringTechnicalService/technical_trainee.yml +++ b/Resources/Prototypes/_Scp/Roles/Jobs/EngineeringTechnicalService/technical_trainee.yml @@ -3,6 +3,12 @@ name: job-name-technical-trainee description: job-description-technical-trainee playTimeTracker: JobTechnicalTrainee + requirements: + - !type:AgeRequirement + requiredAge: 25 + - !type:AgeRequirement + requiredAge: 45 + inverted: true icon: JobTechnicalTrainee supervisors: job-supervisors-chief-technical-specialist canBeAntag: true diff --git a/Resources/Prototypes/_Scp/Roles/Jobs/EthicsCommittee/ethics_committee_representative.yml b/Resources/Prototypes/_Scp/Roles/Jobs/EthicsCommittee/ethics_committee_representative.yml index 107e7b7212..42574f46b2 100644 --- a/Resources/Prototypes/_Scp/Roles/Jobs/EthicsCommittee/ethics_committee_representative.yml +++ b/Resources/Prototypes/_Scp/Roles/Jobs/EthicsCommittee/ethics_committee_representative.yml @@ -4,7 +4,12 @@ description: job-description-ethics-committee-representative playTimeTracker: JobEthicsCommitteeRepresentative requirements: - - !type:DiscordRoleRequirement + - !type:DiscordRoleRequirement + - !type:AgeRequirement + requiredAge: 32 + - !type:AgeRequirement + requiredAge: 85 + inverted: true weight: 860 icon: JobEthicsCommitteeRepresentative supervisors: job-supervisors-ethics-committee diff --git a/Resources/Prototypes/_Scp/Roles/Jobs/FoodAndSanitationService/botanist_phytogeneticist.yml b/Resources/Prototypes/_Scp/Roles/Jobs/FoodAndSanitationService/botanist_phytogeneticist.yml index ecd618ce33..753ffccd2e 100644 --- a/Resources/Prototypes/_Scp/Roles/Jobs/FoodAndSanitationService/botanist_phytogeneticist.yml +++ b/Resources/Prototypes/_Scp/Roles/Jobs/FoodAndSanitationService/botanist_phytogeneticist.yml @@ -3,6 +3,12 @@ name: job-name-botanist-phytogeneticist description: job-description-botanist-phytogeneticist playTimeTracker: JobBotanistPhytogeneticist + requirements: + - !type:AgeRequirement + requiredAge: 22 + - !type:AgeRequirement + requiredAge: 85 + inverted: true icon: JobBotanistPhytogeneticist supervisors: job-supervisors-personnel-officer weight: 730 diff --git a/Resources/Prototypes/_Scp/Roles/Jobs/FoodAndSanitationService/gastronomic_specialist.yml b/Resources/Prototypes/_Scp/Roles/Jobs/FoodAndSanitationService/gastronomic_specialist.yml index 1b44f71266..2b54c2ddcc 100644 --- a/Resources/Prototypes/_Scp/Roles/Jobs/FoodAndSanitationService/gastronomic_specialist.yml +++ b/Resources/Prototypes/_Scp/Roles/Jobs/FoodAndSanitationService/gastronomic_specialist.yml @@ -3,6 +3,12 @@ name: job-name-gastronomic-specialist description: job-description-gastronomic-specialist playTimeTracker: JobGastronomicSpecialist + requirements: + - !type:AgeRequirement + requiredAge: 22 + - !type:AgeRequirement + requiredAge: 85 + inverted: true icon: JobGastronomicSpecialist supervisors: job-supervisors-personnel-officer weight: 735 diff --git a/Resources/Prototypes/_Scp/Roles/Jobs/FoodAndSanitationService/service_personnel.yml b/Resources/Prototypes/_Scp/Roles/Jobs/FoodAndSanitationService/service_personnel.yml index e3c41ad59e..1057a6a8a1 100644 --- a/Resources/Prototypes/_Scp/Roles/Jobs/FoodAndSanitationService/service_personnel.yml +++ b/Resources/Prototypes/_Scp/Roles/Jobs/FoodAndSanitationService/service_personnel.yml @@ -3,6 +3,12 @@ name: job-name-service-personnel description: job-description-service-personnel playTimeTracker: JobServicePersonnel + requirements: + - !type:AgeRequirement + requiredAge: 20 + - !type:AgeRequirement + requiredAge: 85 + inverted: true icon: JobServicePersonnel supervisors: job-supervisors-personnel-officer weight: 725 diff --git a/Resources/Prototypes/_Scp/Roles/Jobs/LogisticsService/logistics_officer.yml b/Resources/Prototypes/_Scp/Roles/Jobs/LogisticsService/logistics_officer.yml index cb77bd23a0..79b314fe41 100644 --- a/Resources/Prototypes/_Scp/Roles/Jobs/LogisticsService/logistics_officer.yml +++ b/Resources/Prototypes/_Scp/Roles/Jobs/LogisticsService/logistics_officer.yml @@ -4,8 +4,13 @@ description: job-description-logistics-officer playTimeTracker: JobLogisticsOfficer requirements: - - !type:OverallPlaytimeRequirement - time: 3600 + - !type:OverallPlaytimeRequirement + time: 3600 + - !type:AgeRequirement + requiredAge: 24 + - !type:AgeRequirement + requiredAge: 75 + inverted: true icon: JobLogisticsOfficer supervisors: job-supervisors-senior-logistics-officer displayWeight: 0 diff --git a/Resources/Prototypes/_Scp/Roles/Jobs/MedicalService/hospital_intern.yml b/Resources/Prototypes/_Scp/Roles/Jobs/MedicalService/hospital_intern.yml index b1bc355c0e..94812c17cc 100644 --- a/Resources/Prototypes/_Scp/Roles/Jobs/MedicalService/hospital_intern.yml +++ b/Resources/Prototypes/_Scp/Roles/Jobs/MedicalService/hospital_intern.yml @@ -3,6 +3,12 @@ name: job-name-hospital-intern description: job-description-hospital-intern playTimeTracker: JobHospitalIntern + requirements: + - !type:AgeRequirement + requiredAge: 25 + - !type:AgeRequirement + requiredAge: 45 + inverted: true icon: JobHospitalIntern supervisors: job-supervisors-head-of-medical-sector canBeAntag: true diff --git a/Resources/Prototypes/_Scp/Roles/Jobs/MedicalService/medical_specialist.yml b/Resources/Prototypes/_Scp/Roles/Jobs/MedicalService/medical_specialist.yml index 3ed8f91954..cbbc37be84 100644 --- a/Resources/Prototypes/_Scp/Roles/Jobs/MedicalService/medical_specialist.yml +++ b/Resources/Prototypes/_Scp/Roles/Jobs/MedicalService/medical_specialist.yml @@ -7,6 +7,11 @@ - !type:DepartmentTimeRequirement department: MedicalService time: 7200 + - !type:AgeRequirement + requiredAge: 29 + - !type:AgeRequirement + requiredAge: 75 + inverted: true icon: JobMedicalSpecialist supervisors: job-supervisors-head-of-medical-sector displayWeight: 20 diff --git a/Resources/Prototypes/_Scp/Roles/Jobs/MedicalService/pharmaceutical_specialist.yml b/Resources/Prototypes/_Scp/Roles/Jobs/MedicalService/pharmaceutical_specialist.yml index bc359764c6..75075229f0 100644 --- a/Resources/Prototypes/_Scp/Roles/Jobs/MedicalService/pharmaceutical_specialist.yml +++ b/Resources/Prototypes/_Scp/Roles/Jobs/MedicalService/pharmaceutical_specialist.yml @@ -7,6 +7,11 @@ - !type:DepartmentTimeRequirement department: MedicalService time: 10800 + - !type:AgeRequirement + requiredAge: 29 + - !type:AgeRequirement + requiredAge: 75 + inverted: true icon: JobPharmaceuticalSpecialist supervisors: job-supervisors-head-of-medical-sector displayWeight: 30 diff --git a/Resources/Prototypes/_Scp/Roles/Jobs/MedicalService/psychotherapist.yml b/Resources/Prototypes/_Scp/Roles/Jobs/MedicalService/psychotherapist.yml index ddc0870dd7..cf36e676e9 100644 --- a/Resources/Prototypes/_Scp/Roles/Jobs/MedicalService/psychotherapist.yml +++ b/Resources/Prototypes/_Scp/Roles/Jobs/MedicalService/psychotherapist.yml @@ -4,8 +4,13 @@ description: job-description-psychotherapist playTimeTracker: JobPsychotherapist requirements: - - !type:OverallPlaytimeRequirement - time: 7200 + - !type:OverallPlaytimeRequirement + time: 7200 + - !type:AgeRequirement + requiredAge: 27 + - !type:AgeRequirement + requiredAge: 85 + inverted: true icon: JobPsychotherapist supervisors: job-supervisors-head-of-medical-sector displayWeight: 10 # Sunrise diff --git a/Resources/Prototypes/_Scp/Roles/Jobs/MedicalService/senior_medical_specialist.yml b/Resources/Prototypes/_Scp/Roles/Jobs/MedicalService/senior_medical_specialist.yml index 60c2956505..430dcdd243 100644 --- a/Resources/Prototypes/_Scp/Roles/Jobs/MedicalService/senior_medical_specialist.yml +++ b/Resources/Prototypes/_Scp/Roles/Jobs/MedicalService/senior_medical_specialist.yml @@ -7,6 +7,11 @@ - !type:DepartmentTimeRequirement department: MedicalService time: 36000 + - !type:AgeRequirement + requiredAge: 30 + - !type:AgeRequirement + requiredAge: 75 + inverted: true icon: JobSeniorMedicalSpecialist supervisors: job-supervisors-head-of-medical-sector displayWeight: 35 diff --git a/Resources/Prototypes/_Scp/Roles/Jobs/ScientificService/anomarchology_researcher.yml b/Resources/Prototypes/_Scp/Roles/Jobs/ScientificService/anomarchology_researcher.yml index fd2ae0c16d..080c01369d 100644 --- a/Resources/Prototypes/_Scp/Roles/Jobs/ScientificService/anomarchology_researcher.yml +++ b/Resources/Prototypes/_Scp/Roles/Jobs/ScientificService/anomarchology_researcher.yml @@ -7,6 +7,11 @@ - !type:DepartmentTimeRequirement department: ScientificService time: 10800 + - !type:AgeRequirement + requiredAge: 27 + - !type:AgeRequirement + requiredAge: 85 + inverted: true icon: JobAnomarchologyResearcher supervisors: job-supervisors-scientific-service-director displayWeight: 10 diff --git a/Resources/Prototypes/_Scp/Roles/Jobs/ScientificService/junior_researcher.yml b/Resources/Prototypes/_Scp/Roles/Jobs/ScientificService/junior_researcher.yml index e4f96a32e0..c05eafd8c8 100644 --- a/Resources/Prototypes/_Scp/Roles/Jobs/ScientificService/junior_researcher.yml +++ b/Resources/Prototypes/_Scp/Roles/Jobs/ScientificService/junior_researcher.yml @@ -4,8 +4,13 @@ description: job-description-junior-researcher playTimeTracker: JobJuniorResearcher requirements: - - !type:OverallPlaytimeRequirement - time: 3600 + - !type:OverallPlaytimeRequirement + time: 3600 + - !type:AgeRequirement + requiredAge: 22 + - !type:AgeRequirement + requiredAge: 45 + inverted: true icon: JobJuniorResearcher supervisors: job-supervisors-scientific-service-director canBeAntag: true diff --git a/Resources/Prototypes/_Scp/Roles/Jobs/ScientificService/lead_researcher.yml b/Resources/Prototypes/_Scp/Roles/Jobs/ScientificService/lead_researcher.yml index 59f841b1a3..a815b90571 100644 --- a/Resources/Prototypes/_Scp/Roles/Jobs/ScientificService/lead_researcher.yml +++ b/Resources/Prototypes/_Scp/Roles/Jobs/ScientificService/lead_researcher.yml @@ -7,6 +7,11 @@ - !type:DepartmentTimeRequirement department: ScientificService time: 36000 + - !type:AgeRequirement + requiredAge: 30 + - !type:AgeRequirement + requiredAge: 85 + inverted: true icon: JobLeadResearcher supervisors: job-supervisors-scientific-service-director displayWeight: 35 diff --git a/Resources/Prototypes/_Scp/Roles/Jobs/ScientificService/production_specialist.yml b/Resources/Prototypes/_Scp/Roles/Jobs/ScientificService/production_specialist.yml index 00985db112..ba38f9b6e0 100644 --- a/Resources/Prototypes/_Scp/Roles/Jobs/ScientificService/production_specialist.yml +++ b/Resources/Prototypes/_Scp/Roles/Jobs/ScientificService/production_specialist.yml @@ -10,6 +10,11 @@ - !type:DepartmentTimeRequirement department: EngineeringTechnicalService time: 10800 + - !type:AgeRequirement + requiredAge: 25 + - !type:AgeRequirement + requiredAge: 75 + inverted: true icon: JobProductionSpecialist supervisors: job-supervisors-scientific-service-director displayWeight: 10 diff --git a/Resources/Prototypes/_Scp/Roles/Jobs/SpecialPurposeSquad/heavy_containment_zone_commandant.yml b/Resources/Prototypes/_Scp/Roles/Jobs/SpecialPurposeSquad/heavy_containment_zone_commandant.yml index d3fcaa47cb..65c605a4d3 100644 --- a/Resources/Prototypes/_Scp/Roles/Jobs/SpecialPurposeSquad/heavy_containment_zone_commandant.yml +++ b/Resources/Prototypes/_Scp/Roles/Jobs/SpecialPurposeSquad/heavy_containment_zone_commandant.yml @@ -7,6 +7,11 @@ - !type:DepartmentTimeRequirement department: HeavyContainmentSecurityService time: 43200 + - !type:AgeRequirement + requiredAge: 29 + - !type:AgeRequirement + requiredAge: 65 + inverted: true icon: JobHeavyContainmentZoneCommandant supervisors: job-supervisors-security-commander canBeAntag: false diff --git a/Resources/Prototypes/_Scp/Roles/Jobs/SpecialPurposeSquad/heavy_containment_zone_officer.yml b/Resources/Prototypes/_Scp/Roles/Jobs/SpecialPurposeSquad/heavy_containment_zone_officer.yml index 496326553e..c9248a855e 100644 --- a/Resources/Prototypes/_Scp/Roles/Jobs/SpecialPurposeSquad/heavy_containment_zone_officer.yml +++ b/Resources/Prototypes/_Scp/Roles/Jobs/SpecialPurposeSquad/heavy_containment_zone_officer.yml @@ -7,6 +7,11 @@ - !type:DepartmentTimeRequirement department: HeavyContainmentSecurityService time: 14400 + - !type:AgeRequirement + requiredAge: 27 + - !type:AgeRequirement + requiredAge: 65 + inverted: true icon: JobHeavyContainmentZoneOfficer supervisors: job-supervisors-heavy-containment-zone-commandant canBeAntag: false diff --git a/Resources/Prototypes/_Scp/Roles/Jobs/SpecialPurposeSquad/junior_heavy_containment_zone_officer.yml b/Resources/Prototypes/_Scp/Roles/Jobs/SpecialPurposeSquad/junior_heavy_containment_zone_officer.yml index 8b5b9b3f36..d1e102296e 100644 --- a/Resources/Prototypes/_Scp/Roles/Jobs/SpecialPurposeSquad/junior_heavy_containment_zone_officer.yml +++ b/Resources/Prototypes/_Scp/Roles/Jobs/SpecialPurposeSquad/junior_heavy_containment_zone_officer.yml @@ -4,8 +4,13 @@ description: job-description-junior-heavy-containment-zone-officer playTimeTracker: JobJuniorHeavyContainmentZoneOfficer requirements: - - !type:OverallPlaytimeRequirement - time: 7200 + - !type:OverallPlaytimeRequirement + time: 7200 + - !type:AgeRequirement + requiredAge: 23 + - !type:AgeRequirement + requiredAge: 45 + inverted: true icon: JobJuniorHeavyContainmentZoneOfficer supervisors: job-supervisors-heavy-containment-zone-commandant canBeAntag: false diff --git a/Resources/Prototypes/_Scp/Roles/Jobs/SpecialPurposeSquad/senior_heavy_containment_zone_officer.yml b/Resources/Prototypes/_Scp/Roles/Jobs/SpecialPurposeSquad/senior_heavy_containment_zone_officer.yml index b83ff2489c..5ceef4b710 100644 --- a/Resources/Prototypes/_Scp/Roles/Jobs/SpecialPurposeSquad/senior_heavy_containment_zone_officer.yml +++ b/Resources/Prototypes/_Scp/Roles/Jobs/SpecialPurposeSquad/senior_heavy_containment_zone_officer.yml @@ -7,6 +7,11 @@ - !type:DepartmentTimeRequirement department: HeavyContainmentSecurityService time: 36000 + - !type:AgeRequirement + requiredAge: 29 + - !type:AgeRequirement + requiredAge: 65 + inverted: true icon: JobSeniorHeavyContainmentZoneOfficer supervisors: job-supervisors-heavy-containment-zone-commandant canBeAntag: false From b62645854f97000a00ac3d60aaf4f3d9f8b293b4 Mon Sep 17 00:00:00 2001 From: DragonDidlo <111651007+DragonDidlo@users.noreply.github.com> Date: Wed, 18 Mar 2026 16:04:40 +0300 Subject: [PATCH 2/2] maxAge MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Я БЛЯТЬ ЕЛЕ НАШЁЛ ЭТУ ХРЕНЬ С maxAge --- Resources/Prototypes/Species/dwarf.yml | 1 + Resources/Prototypes/Species/human.yml | 1 + .../Prototypes/_Scp/Roles/Jobs/Administration/director.yml | 3 --- .../_Scp/Roles/Jobs/Administration/head_of_medical_sector.yml | 3 --- .../_Scp/Roles/Jobs/Administration/personnel_officer.yml | 3 --- .../Roles/Jobs/Administration/scientific_service_director.yml | 3 --- .../Jobs/EthicsCommittee/ethics_committee_representative.yml | 3 --- .../Jobs/FoodAndSanitationService/botanist_phytogeneticist.yml | 3 --- .../Jobs/FoodAndSanitationService/gastronomic_specialist.yml | 3 --- .../Roles/Jobs/FoodAndSanitationService/service_personnel.yml | 3 --- .../_Scp/Roles/Jobs/MedicalService/psychotherapist.yml | 3 --- .../Roles/Jobs/ScientificService/anomarchology_researcher.yml | 3 --- .../_Scp/Roles/Jobs/ScientificService/lead_researcher.yml | 3 --- 13 files changed, 2 insertions(+), 33 deletions(-) diff --git a/Resources/Prototypes/Species/dwarf.yml b/Resources/Prototypes/Species/dwarf.yml index c2e1a25291..2daf3bb63d 100644 --- a/Resources/Prototypes/Species/dwarf.yml +++ b/Resources/Prototypes/Species/dwarf.yml @@ -28,3 +28,4 @@ buttScan: sprite: /Textures/_Sunrise/CopyMachine/butts_scans.rsi state: human + maxAge: 85 # Fire-Edit diff --git a/Resources/Prototypes/Species/human.yml b/Resources/Prototypes/Species/human.yml index b3d260b08f..190f2571da 100644 --- a/Resources/Prototypes/Species/human.yml +++ b/Resources/Prototypes/Species/human.yml @@ -20,6 +20,7 @@ buttScan: sprite: /Textures/_Sunrise/CopyMachine/butts_scans.rsi state: human + maxAge: 85 # Fire-Edit # The lack of a layer means that # this person cannot have round-start anything diff --git a/Resources/Prototypes/_Scp/Roles/Jobs/Administration/director.yml b/Resources/Prototypes/_Scp/Roles/Jobs/Administration/director.yml index 4267682487..81729c3b75 100644 --- a/Resources/Prototypes/_Scp/Roles/Jobs/Administration/director.yml +++ b/Resources/Prototypes/_Scp/Roles/Jobs/Administration/director.yml @@ -9,9 +9,6 @@ time: 54000 - !type:AgeRequirement requiredAge: 35 - - !type:AgeRequirement - requiredAge: 85 - inverted: true weight: 965 icon: JobDirector joinNotifyCrew: true diff --git a/Resources/Prototypes/_Scp/Roles/Jobs/Administration/head_of_medical_sector.yml b/Resources/Prototypes/_Scp/Roles/Jobs/Administration/head_of_medical_sector.yml index e17c34e79c..b113238e94 100644 --- a/Resources/Prototypes/_Scp/Roles/Jobs/Administration/head_of_medical_sector.yml +++ b/Resources/Prototypes/_Scp/Roles/Jobs/Administration/head_of_medical_sector.yml @@ -15,9 +15,6 @@ time: 36000 - !type:AgeRequirement requiredAge: 35 - - !type:AgeRequirement - requiredAge: 85 - inverted: true weight: 945 icon: JobHeadOfMedicalSector supervisors: job-supervisors-director diff --git a/Resources/Prototypes/_Scp/Roles/Jobs/Administration/personnel_officer.yml b/Resources/Prototypes/_Scp/Roles/Jobs/Administration/personnel_officer.yml index 5d22a7042e..e50f7e9cdc 100644 --- a/Resources/Prototypes/_Scp/Roles/Jobs/Administration/personnel_officer.yml +++ b/Resources/Prototypes/_Scp/Roles/Jobs/Administration/personnel_officer.yml @@ -18,9 +18,6 @@ time: 18000 - !type:AgeRequirement requiredAge: 31 - - !type:AgeRequirement - requiredAge: 85 - inverted: true weight: 950 icon: JobPersonnelOfficer supervisors: job-supervisors-director diff --git a/Resources/Prototypes/_Scp/Roles/Jobs/Administration/scientific_service_director.yml b/Resources/Prototypes/_Scp/Roles/Jobs/Administration/scientific_service_director.yml index 8ed74a5090..344e626f1a 100644 --- a/Resources/Prototypes/_Scp/Roles/Jobs/Administration/scientific_service_director.yml +++ b/Resources/Prototypes/_Scp/Roles/Jobs/Administration/scientific_service_director.yml @@ -9,9 +9,6 @@ time: 54000 - !type:AgeRequirement requiredAge: 35 - - !type:AgeRequirement - requiredAge: 85 - inverted: true weight: 960 icon: JobScientificServiceDirector supervisors: job-supervisors-director diff --git a/Resources/Prototypes/_Scp/Roles/Jobs/EthicsCommittee/ethics_committee_representative.yml b/Resources/Prototypes/_Scp/Roles/Jobs/EthicsCommittee/ethics_committee_representative.yml index 42574f46b2..85386c36d7 100644 --- a/Resources/Prototypes/_Scp/Roles/Jobs/EthicsCommittee/ethics_committee_representative.yml +++ b/Resources/Prototypes/_Scp/Roles/Jobs/EthicsCommittee/ethics_committee_representative.yml @@ -7,9 +7,6 @@ - !type:DiscordRoleRequirement - !type:AgeRequirement requiredAge: 32 - - !type:AgeRequirement - requiredAge: 85 - inverted: true weight: 860 icon: JobEthicsCommitteeRepresentative supervisors: job-supervisors-ethics-committee diff --git a/Resources/Prototypes/_Scp/Roles/Jobs/FoodAndSanitationService/botanist_phytogeneticist.yml b/Resources/Prototypes/_Scp/Roles/Jobs/FoodAndSanitationService/botanist_phytogeneticist.yml index 753ffccd2e..2532c0cbe6 100644 --- a/Resources/Prototypes/_Scp/Roles/Jobs/FoodAndSanitationService/botanist_phytogeneticist.yml +++ b/Resources/Prototypes/_Scp/Roles/Jobs/FoodAndSanitationService/botanist_phytogeneticist.yml @@ -6,9 +6,6 @@ requirements: - !type:AgeRequirement requiredAge: 22 - - !type:AgeRequirement - requiredAge: 85 - inverted: true icon: JobBotanistPhytogeneticist supervisors: job-supervisors-personnel-officer weight: 730 diff --git a/Resources/Prototypes/_Scp/Roles/Jobs/FoodAndSanitationService/gastronomic_specialist.yml b/Resources/Prototypes/_Scp/Roles/Jobs/FoodAndSanitationService/gastronomic_specialist.yml index 2b54c2ddcc..6bfb424675 100644 --- a/Resources/Prototypes/_Scp/Roles/Jobs/FoodAndSanitationService/gastronomic_specialist.yml +++ b/Resources/Prototypes/_Scp/Roles/Jobs/FoodAndSanitationService/gastronomic_specialist.yml @@ -6,9 +6,6 @@ requirements: - !type:AgeRequirement requiredAge: 22 - - !type:AgeRequirement - requiredAge: 85 - inverted: true icon: JobGastronomicSpecialist supervisors: job-supervisors-personnel-officer weight: 735 diff --git a/Resources/Prototypes/_Scp/Roles/Jobs/FoodAndSanitationService/service_personnel.yml b/Resources/Prototypes/_Scp/Roles/Jobs/FoodAndSanitationService/service_personnel.yml index 1057a6a8a1..85883c4d5f 100644 --- a/Resources/Prototypes/_Scp/Roles/Jobs/FoodAndSanitationService/service_personnel.yml +++ b/Resources/Prototypes/_Scp/Roles/Jobs/FoodAndSanitationService/service_personnel.yml @@ -6,9 +6,6 @@ requirements: - !type:AgeRequirement requiredAge: 20 - - !type:AgeRequirement - requiredAge: 85 - inverted: true icon: JobServicePersonnel supervisors: job-supervisors-personnel-officer weight: 725 diff --git a/Resources/Prototypes/_Scp/Roles/Jobs/MedicalService/psychotherapist.yml b/Resources/Prototypes/_Scp/Roles/Jobs/MedicalService/psychotherapist.yml index cf36e676e9..296439d843 100644 --- a/Resources/Prototypes/_Scp/Roles/Jobs/MedicalService/psychotherapist.yml +++ b/Resources/Prototypes/_Scp/Roles/Jobs/MedicalService/psychotherapist.yml @@ -8,9 +8,6 @@ time: 7200 - !type:AgeRequirement requiredAge: 27 - - !type:AgeRequirement - requiredAge: 85 - inverted: true icon: JobPsychotherapist supervisors: job-supervisors-head-of-medical-sector displayWeight: 10 # Sunrise diff --git a/Resources/Prototypes/_Scp/Roles/Jobs/ScientificService/anomarchology_researcher.yml b/Resources/Prototypes/_Scp/Roles/Jobs/ScientificService/anomarchology_researcher.yml index 080c01369d..541131d71c 100644 --- a/Resources/Prototypes/_Scp/Roles/Jobs/ScientificService/anomarchology_researcher.yml +++ b/Resources/Prototypes/_Scp/Roles/Jobs/ScientificService/anomarchology_researcher.yml @@ -9,9 +9,6 @@ time: 10800 - !type:AgeRequirement requiredAge: 27 - - !type:AgeRequirement - requiredAge: 85 - inverted: true icon: JobAnomarchologyResearcher supervisors: job-supervisors-scientific-service-director displayWeight: 10 diff --git a/Resources/Prototypes/_Scp/Roles/Jobs/ScientificService/lead_researcher.yml b/Resources/Prototypes/_Scp/Roles/Jobs/ScientificService/lead_researcher.yml index a815b90571..782b3d57c8 100644 --- a/Resources/Prototypes/_Scp/Roles/Jobs/ScientificService/lead_researcher.yml +++ b/Resources/Prototypes/_Scp/Roles/Jobs/ScientificService/lead_researcher.yml @@ -9,9 +9,6 @@ time: 36000 - !type:AgeRequirement requiredAge: 30 - - !type:AgeRequirement - requiredAge: 85 - inverted: true icon: JobLeadResearcher supervisors: job-supervisors-scientific-service-director displayWeight: 35