diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml index b2fef23c64..cc262380e4 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml @@ -3,6 +3,7 @@ name: job-name-brigmedic description: job-description-brigmedic playTimeTracker: JobBrigmedic + setPreference: false # Parkstation-Playtime requirements: - !type:DepartmentTimeRequirement department: Medical diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml index aa9bb2828b..049d4304cc 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml @@ -3,6 +3,7 @@ name: job-name-mantis description: job-description-mantis playTimeTracker: JobForensicMantis + setPreference: false # Parkstation-Playtime requirements: - !type:OverallPlaytimeRequirement time: 18000 diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml index 7f16cf1644..358cf19700 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml @@ -4,9 +4,10 @@ description: job-description-chaplain playTimeTracker: JobChaplain requirements: + # Parkstation-Playtime - !type:DepartmentTimeRequirement department: Epistemics # DeltaV - Epistemics Department replacing Science - time: 14400 #DeltaV 4 hours + time: 3600 # 1 hour startingGear: ChaplainGear icon: "JobIconChaplain" supervisors: job-supervisors-rd diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml index 3a50f20320..dc3783faf2 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -5,20 +5,18 @@ playTimeTracker: JobHeadOfPersonnel antagAdvantage: 6 # DeltaV - Reduced TC: Head of Staff requirements: - - !type:RoleTimeRequirement - role: JobChef - time: 14400 # DeltaV - 4 hours - - !type:RoleTimeRequirement - role: JobBartender - time: 14400 # DeltaV - 4 hours - - !type:RoleTimeRequirement - role: JobJanitor - time: 14400 # DeltaV - 4 hours - - !type:DepartmentTimeRequirement # DeltaV - Civilian dept time requirement - department: Civilian - time: 72000 # 20 hours - - !type:OverallPlaytimeRequirement # DeltaV - Playtime requirement - time: 90000 # 25 hours + # Parkstation-Playtime + - !type:DepartmentTimeRequirement + department: Engineering + time: 3600 # 1 hour + - !type:DepartmentTimeRequirement + department: Medical + time: 3600 # 1 hour + - !type:DepartmentTimeRequirement + department: Security + time: 3600 # 1 hour + - !type:OverallPlaytimeRequirement + time: 86400 # 24 hours weight: 10 # DeltaV - Changed HoP weight from 20 to 10 due to them not being more important than other Heads startingGear: HoPGear icon: "JobIconHeadOfPersonnel" diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml index a188e93388..3ba0513140 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml @@ -5,9 +5,10 @@ playTimeTracker: JobAtmosphericTechnician antagAdvantage: 10 # DeltaV - Reduced TC: External Access + Fireaxe + Free Hardsuit requirements: + # Parkstation-Playtime - !type:DepartmentTimeRequirement department: Engineering - time: 36000 # DeltaV - 10 hours + time: 21600 # 6 hours startingGear: AtmosphericTechnicianGear icon: "JobIconAtmosphericTechnician" supervisors: job-supervisors-ce diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml index 3b9b9dfece..658f09d5a1 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml @@ -4,17 +4,18 @@ description: job-description-ce playTimeTracker: JobChiefEngineer requirements: + # Parkstation-Playtime - !type:RoleTimeRequirement role: JobAtmosphericTechnician - time: 36000 # DeltaV - 10 hours -# - !type:RoleTimeRequirement # DeltaV - No Station Engineer time requirement -# role: JobStationEngineer -# time: 21600 #6 hrs + time: 21600 # 6 hours + - !type:RoleTimeRequirement + role: JobSalvageSpecialist + time: 7200 # 2 hours - !type:DepartmentTimeRequirement department: Engineering - time: 90000 # DeltaV - 25 hours -# - !type:OverallPlaytimeRequirement -# time: 72000 # DeltaV - 20 hours + time: 36000 # 10 hours + - !type:OverallPlaytimeRequirement + time: 86400 # 24 hours weight: 10 startingGear: ChiefEngineerGear icon: "JobIconChiefEngineer" diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml index 40f991dac3..f7ee9e9e4d 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml @@ -5,9 +5,9 @@ playTimeTracker: JobStationEngineer antagAdvantage: 3 # DeltaV - Reduced TC: External Access + Engineering requirements: - - !type:DepartmentTimeRequirement - department: Engineering - time: 14400 #4 hrs + # Parkstation-Playtime + - !type:OverallPlaytimeRequirement + time: 7200 # 2 hours startingGear: StationEngineerGear icon: "JobIconStationEngineer" supervisors: job-supervisors-ce diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml index 9f9889fdae..f36dd0420a 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml @@ -3,6 +3,7 @@ name: job-name-technical-assistant description: job-description-technical-assistant playTimeTracker: JobTechnicalAssistant + setPreference: false # Parkstation-Playtime antagAdvantage: 3 # DeltaV - Reduced TC: External Access + Engineering requirements: - !type:OverallPlaytimeRequirement # DeltaV - to prevent griefers from taking the role. diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml index f151921b7a..6fcee832db 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml @@ -3,6 +3,7 @@ name: job-name-chemist description: job-description-chemist playTimeTracker: JobChemist + setPreference: false # Parkstation-Playtime requirements: - !type:DepartmentTimeRequirement department: Medical diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml index 44a7dd50ad..6de15a14ce 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml @@ -7,17 +7,12 @@ playTimeTracker: JobChiefMedicalOfficer antagAdvantage: 6 # DeltaV - Reduced TC: Head of Staff requirements: - - !type:RoleTimeRequirement - role: JobChemist - time: 14400 #DeltaV 4 hrs -# - !type:RoleTimeRequirement # DeltaV - No Medical Doctor time requirement -# role: JobMedicalDoctor -# time: 21600 #6 hrs + # Parkstation-Playtime - !type:DepartmentTimeRequirement department: Medical - time: 43200 # DeltaV - 12 hours + time: 18000 # 5 hours - !type:OverallPlaytimeRequirement - time: 72000 # DeltaV - 20 hours + time: 86400 # 24 hours weight: 10 startingGear: CMOGear icon: "JobIconChiefMedicalOfficer" diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml index 1242324c0a..4fdf6bd2c9 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml @@ -3,10 +3,10 @@ name: job-name-doctor description: job-description-doctor playTimeTracker: JobMedicalDoctor - requirements: - - !type:DepartmentTimeRequirement - department: Medical - time: 14400 #4 hrs + # requirements: # Parkstation-Playtime + # - !type:DepartmentTimeRequirement + # department: Medical + # time: 14400 #4 hrs startingGear: DoctorGear icon: "JobIconMedicalDoctor" supervisors: job-supervisors-cmo diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml index 468d9632a0..08084825d0 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml @@ -3,6 +3,7 @@ name: job-name-intern description: job-description-intern playTimeTracker: JobMedicalIntern + setPreference: false # Parkstation-Playtime requirements: # - !type:DepartmentTimeRequirement # DeltaV - Removes time limit # department: Medical diff --git a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml index b7d18ba1aa..aea401f474 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml @@ -3,6 +3,7 @@ name: job-name-paramedic description: job-description-paramedic playTimeTracker: JobParamedic + setPreference: false # Parkstation-Playtime antagAdvantage: 2 # DeltaV - Reduced TC: External Access requirements: # - !type:RoleTimeRequirement # DeltaV - No Medical Doctor time requirement diff --git a/Resources/Prototypes/Roles/Jobs/Science/borg.yml b/Resources/Prototypes/Roles/Jobs/Science/borg.yml index fe82911005..9847632843 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/borg.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/borg.yml @@ -4,8 +4,9 @@ description: job-description-borg playTimeTracker: JobBorg requirements: + # Parkstation-Playtime - !type:OverallPlaytimeRequirement - time: 216000 #60 hrs + time: 28800 # 8 hours canBeAntag: false icon: JobIconBorg supervisors: job-supervisors-rd diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml index bff76fd7bd..b8cb51232a 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml @@ -3,6 +3,7 @@ name: job-name-research-assistant description: job-description-research-assistant playTimeTracker: JobResearchAssistant + setPreference: false # Parkstation-Playtime requirements: # - !type:DepartmentTimeRequirement # DeltaV - Removes time limit # department: Science diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index a230d447ce..83826c4374 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -5,11 +5,12 @@ playTimeTracker: JobResearchDirector antagAdvantage: 6 # DeltaV - Reduced TC: Head of Staff requirements: + # Parkstation-Playtime - !type:DepartmentTimeRequirement - department: Epistemics # DeltaV - Epistemics Department replacing Science - time: 54000 # DeltaV - 15 hours + department: Epistemics + time: 18000 # 5 hours - !type:OverallPlaytimeRequirement - time: 72000 # DeltaV - 20 hours + time: 86400 # 24 hours weight: 10 startingGear: ResearchDirectorGear icon: "JobIconResearchDirector" diff --git a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml index fe00a72abb..9815c44fba 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml @@ -3,10 +3,10 @@ name: job-name-scientist description: job-description-scientist playTimeTracker: JobScientist - requirements: - - !type:DepartmentTimeRequirement - department: Epistemics # DeltaV - Epistemics Department replacing Science - time: 14400 #4 hrs + # requirements: # Parkstation-Playtime + # - !type:DepartmentTimeRequirement + # department: Epistemics # DeltaV - Epistemics Department replacing Science + # time: 14400 #4 hrs startingGear: ScientistGear icon: "JobIconScientist" supervisors: job-supervisors-rd diff --git a/Resources/Prototypes/Roles/Jobs/Security/detective.yml b/Resources/Prototypes/Roles/Jobs/Security/detective.yml index feef023b45..a984ddf843 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/detective.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/detective.yml @@ -3,6 +3,7 @@ name: job-name-detective description: job-description-detective playTimeTracker: JobDetective + setPreference: false # Parkstation-Playtime requirements: - !type:DepartmentTimeRequirement department: Security diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml index 7ad80c7741..c5cb79110a 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -4,17 +4,15 @@ description: job-description-hos playTimeTracker: JobHeadOfSecurity requirements: + # Parkstation-Playtime - !type:RoleTimeRequirement role: JobWarden - time: 14400 #DeltaV 4 hrs - # - !type:RoleTimeRequirement # DeltaV - No Security Officer time requirement - REIMPLEMENT WHEN MORE PEOPLE HAVE IT - # role: JobDetective - # time: 14400 #DeltaV 4 hrs - - !type:DepartmentTimeRequirement # DeltaV - Command dept time requirement - department: Command - time: 36000 # 10 hours + time: 14400 # 4 hours + - !type:DepartmentTimeRequirement + department: Security + time: 21600 # 6 hours - !type:OverallPlaytimeRequirement - time: 90000 # DeltaV - 25 hours + time: 93600 # 26 hours - !type:WhitelistRequirement # DeltaV - Whitelist requirement weight: 10 startingGear: HoSGear diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml index 7e7cd67c4a..8fc61fb245 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml @@ -4,12 +4,9 @@ description: job-description-cadet playTimeTracker: JobSecurityCadet requirements: + # Parkstation-Playtime - !type:OverallPlaytimeRequirement - time: 14400 # DeltaV - 4 hours -# - !type:DepartmentTimeRequirement # DeltaV - Removes time limit -# department: Security -# time: 54000 #15 hrs -# inverted: true # stop playing intern if you're good at security! + time: 8000 # 2 hours startingGear: SecurityCadetGear icon: "JobIconSecurityCadet" supervisors: job-supervisors-security diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml index 7866b9dbaa..ef6ced54f2 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml @@ -4,9 +4,12 @@ description: job-description-security playTimeTracker: JobSecurityOfficer requirements: + # Parkstation-Playtime - !type:DepartmentTimeRequirement department: Security - time: 14400 # DeltaV - 4 hours + time: 3600 # 1 hour + - !type:OverallPlaytimeRequirement + time: 14400 # 4 hours startingGear: SecurityOfficerGear icon: "JobIconSecurityOfficer" supervisors: job-supervisors-hos diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml index c351967ad8..fcdc415059 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml @@ -4,11 +4,11 @@ description: job-description-warden playTimeTracker: JobWarden requirements: -# - !type:RoleTimeRequirement # DeltaV - No SecurityOfficer time requirement -# role: JobSecurityOfficer -# time: 36000 #10 hrs - - !type:DepartmentTimeRequirement # DeltaV - Security time requirement + # Parkstation-Playtime + - !type:DepartmentTimeRequirement department: Security + time: 10800 # 3 hours + - !type:OverallPlaytimeRequirement time: 36000 # 10 hours startingGear: WardenGear icon: "JobIconWarden" diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml index 04d1051333..aa3fa9052f 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml @@ -3,6 +3,7 @@ name: job-name-zookeeper description: job-description-zookeeper playTimeTracker: JobZookeeper + setPreference: false # Parkstation-Playtime requirements: - !type:OverallPlaytimeRequirement time: 7200 #DeltaV 2 hours