diff --git a/Resources/Prototypes/Roles/Antags/ninja.yml b/Resources/Prototypes/Roles/Antags/ninja.yml index e998d0adc5..1d966c81b2 100644 --- a/Resources/Prototypes/Roles/Antags/ninja.yml +++ b/Resources/Prototypes/Roles/Antags/ninja.yml @@ -6,4 +6,4 @@ objective: roles-antag-space-ninja-objective requirements: - !type:CharacterOverallTimeRequirement # DeltaV - Playtime requirement - min: 72000 # goob mrp - 20 hours - NOBODY IS PLAYING FUCKING 72 HOURS FOR NINJA :sob: + min: 54000 # Goob MRP - 15 hours diff --git a/Resources/Prototypes/Roles/Antags/nukeops.yml b/Resources/Prototypes/Roles/Antags/nukeops.yml index 6d280db346..95f1204c0f 100644 --- a/Resources/Prototypes/Roles/Antags/nukeops.yml +++ b/Resources/Prototypes/Roles/Antags/nukeops.yml @@ -8,7 +8,11 @@ objective: roles-antag-nuclear-operative-objective requirements: - !type:CharacterOverallTimeRequirement - min: 54000 # goob mrp - 15 hours + min: 36000 # Goob MRP - 10 Hours + # Undo Starch's blatant deletion and leave comments for originals. + # - !type:CharacterDepartmentTimeRequirement # DeltaV - Security dept time requirement + # department: Security + # min: 36000 # DeltaV - 10 hours - type: antag id: NukeopsMedic @@ -18,10 +22,10 @@ objective: roles-antag-nuclear-operative-agent-objective requirements: - !type:CharacterOverallTimeRequirement - min: 54000 # goob mrp - 15 hours + min: 54000 # Goob MRP - 15 Hours - !type:CharacterDepartmentTimeRequirement department: Medical - min: 18000 # 5 hours + min: 36000 # Goob MRP - 10 Hours - type: antag id: NukeopsCommander @@ -31,16 +35,16 @@ objective: roles-antag-nuclear-operative-commander-objective requirements: - !type:CharacterOverallTimeRequirement - min: 108000 # goob mrp - 30 hours + min: 108000 # Goob MRP - 30 hours - !type:CharacterDepartmentTimeRequirement # DeltaV - Security dept time requirement department: Security - min: 10800 # goob mrp - 3 hours + min: 18000 # Goob MRP - 5 Hours - !type:CharacterDepartmentTimeRequirement # DeltaV - Command dept time requirement department: Command - min: 10800 # goob mrp - 3 hours + min: 18000 # Goob MRP - 5 Hours + # - !type:CharacterWhitelistRequirement # Undo Starch's blatant deletion instead of commenting out. + - # needing whitelist to be nukie commander was fucking stupid im glad i dont play delta - #Lone Operative Gear - type: startingGear id: SyndicateLoneOperativeGearFull diff --git a/Resources/Prototypes/Roles/Antags/revolutionary.yml b/Resources/Prototypes/Roles/Antags/revolutionary.yml index 16873181a9..7cbcb96c10 100644 --- a/Resources/Prototypes/Roles/Antags/revolutionary.yml +++ b/Resources/Prototypes/Roles/Antags/revolutionary.yml @@ -6,7 +6,10 @@ objective: roles-antag-rev-head-objective requirements: - !type:CharacterOverallTimeRequirement # DeltaV - Playtime requirement - min: 72000 # goob mrp - 20 hours + min: 54000 # Goob MRP - 15 Hours + - !type:CharacterDepartmentTimeRequirement # DeltaV - Command dept time requirement + department: Command + min: 18000 # Goob MRP - 5 Hours - type: antag id: Rev diff --git a/Resources/Prototypes/Roles/Antags/zombie.yml b/Resources/Prototypes/Roles/Antags/zombie.yml index b3a19a4620..77ed7f6785 100644 --- a/Resources/Prototypes/Roles/Antags/zombie.yml +++ b/Resources/Prototypes/Roles/Antags/zombie.yml @@ -6,7 +6,7 @@ objective: roles-antag-initial-infected-objective requirements: - !type:CharacterOverallTimeRequirement # DeltaV - Playtime requirement - min: 18000 # goob mrp - 5 hours + min: 18000 # Goob MRP - 5 Hours - type: antag id: Zombie diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index f782d3b286..4cc60c7be8 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -16,9 +16,9 @@ min: 7200 # 2 hours - !type:CharacterDepartmentTimeRequirement department: Logistics # DeltaV - Logistics Department replacing Cargo - min: 21600 #goob mrp 6 hours + min: 36000 # Goob MRP - 10 Hours - !type:CharacterOverallTimeRequirement - min: 72000 #goob mrp 20 hrs + min: 108000 # Goob MRP - 30 Hours weight: 10 startingGear: QuartermasterGear icon: "JobIconQuarterMaster" diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml index e7b9dc717f..8f9ee4183b 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml @@ -7,7 +7,7 @@ requirements: - !type:CharacterDepartmentTimeRequirement department: Logistics # DeltaV - Logistics Department replacing Cargo - min: 10800 #goob mrp 3 hrs + min: 21600 # Goob MRP - 6 Hours # - !type:OverallPlaytimeRequirement #DeltaV # time: 36000 #10 hrs icon: "JobIconShaftMiner" diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml index f5ea4af827..2f91e6c60a 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml @@ -6,7 +6,7 @@ requirements: - !type:CharacterDepartmentTimeRequirement department: Epistemics # Chaplain is now one of the station's "Crew-Aligned Wizards" - min: 7200 # 2 hours + min: 14400 # Goob MRP - 4 Hours - !type:CharacterLogicOrRequirement requirements: - !type:CharacterSpeciesRequirement diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml index 81b69a5d08..09b0df9a5c 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml @@ -6,24 +6,25 @@ requirements: - !type:CharacterDepartmentTimeRequirement department: Logistics # DeltaV - Logistics Department replacing Cargo - min: 10800 # goob mrp - 3 hours + min: 18000 # Goob MRP - 5 Hours - !type:CharacterDepartmentTimeRequirement department: Engineering - min: 10800 # goob mrp - 3 hours + min: 18000 # Goob MRP - 5 Hours - !type:CharacterDepartmentTimeRequirement department: Medical - min: 10800 # goob mrp - 3 hours + min: 18000 # Goob MRP - 5 Hours - !type:CharacterDepartmentTimeRequirement department: Security - min: 10800 # goob mrp - 3 hours + min: 18000 # Goob MRP - 5 Hours - !type:CharacterDepartmentTimeRequirement # DeltaV - Epistemics dept time requirement department: Epistemics # DeltaV - Epistemics Department replacing Science - min: 10800 # goob mrp - 3 hours + min: 18000 # Goob MRP - 5 Hours - !type:CharacterDepartmentTimeRequirement department: Command - min: 54000 # 15 hours + min: 72000 # Goob MRP - 20 Hours - !type:CharacterOverallTimeRequirement # DeltaV - Playtime requirement - min: 54000 # 15 hours + min: 108000 # Goob MRP - 30 Hours + # - !type:CharacterWhitelistRequirement # Undo Starch's blatant delete instead of commenting weight: 20 startingGear: CaptainGear icon: JobIconCaptain diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml index d08ed9f344..56067d0139 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -7,18 +7,18 @@ requirements: - !type:CharacterPlaytimeRequirement tracker: JobChef - min: 3600 # goob mrp - 1 hour + min: 7200 # Goob MRP - 2 Hours - !type:CharacterPlaytimeRequirement tracker: JobBartender - min: 3600 # goob mrp - 1 hour + min: 7200 # Goob MRP - 2 Hours - !type:CharacterPlaytimeRequirement tracker: JobJanitor - min: 3600 # goob mrp - 1 hour + min: 7200 # Goob MRP - 2 Hours - !type:CharacterDepartmentTimeRequirement # DeltaV - Civilian dept time requirement department: Civilian - min: 36000 # 10 hours + min: 36000 # Goob MRP - 10 Hours - !type:CharacterOverallTimeRequirement # DeltaV - Playtime requirement - min: 36000 # 10 hours + min: 72000 # Goob MRP - 20 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 e8881db5d0..a3bba1547a 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml @@ -7,7 +7,7 @@ requirements: - !type:CharacterDepartmentTimeRequirement department: Engineering - min: 18000 # DeltaV - 5 hours + min: 36000 # DeltaV - 10 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 ac141779ad..d3c8b74a7f 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml @@ -6,13 +6,13 @@ requirements: - !type:CharacterPlaytimeRequirement tracker: JobAtmosphericTechnician - min: 10800 # goob mrp - 3 hours + min: 36000 # DeltaV - 10 hours # - !type:RoleTimeRequirement # DeltaV - No Station Engineer time requirement # role: JobStationEngineer # time: 21600 #6 hrs - !type:CharacterDepartmentTimeRequirement department: Engineering - min: 54000 # goob mrp - 15 hours - i would've set this to 10 but there are too many fucking CEs that have no idea how engi works + min: 72000 # Goob MRP - 20 Hours # - !type:OverallPlaytimeRequirement # time: 72000 # DeltaV - 20 hours weight: 10 diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml index 92f49d76e3..352a4988ca 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml @@ -12,7 +12,7 @@ min: 21600 #6 hrs - !type:CharacterDepartmentTimeRequirement department: Engineering - min: 108000 # 30 hrs + min: 108000 # Goob MRP - 30 Hours startingGear: SeniorEngineerGear icon: "JobIconSeniorEngineer" supervisors: job-supervisors-ce diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml index 796ea51bba..58bd66cd95 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml @@ -7,7 +7,7 @@ requirements: - !type:CharacterDepartmentTimeRequirement department: Engineering - min: 7200 #2 hrs + min: 14400 # Goob MRP - 4 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 b5d333c763..4abda51eda 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml @@ -6,7 +6,7 @@ antagAdvantage: 3 # DeltaV - Reduced TC: External Access + Engineering requirements: - !type:CharacterOverallTimeRequirement # DeltaV - to prevent griefers from taking the role. - min: 3600 # 1 hours + min: 7200 # Goob MRP - 2 Hours (Prevent Raiders and ensure gameplay.) # - !type:DepartmentTimeRequirement # DeltaV - Removes time limit # department: Engineering # time: 54000 #15 hrs diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml index 781472adff..b2e1fe794f 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml @@ -6,7 +6,7 @@ requirements: - !type:CharacterDepartmentTimeRequirement department: Medical - min: 14400 # goob mrp - 4 hours + min: 21600 # Goob MRP - 6 Hours startingGear: ChemistGear icon: "JobIconChemist" supervisors: job-supervisors-cmo diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml index 16548fc9e9..0753a4ef3d 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml @@ -15,9 +15,9 @@ # time: 21600 #6 hrs - !type:CharacterDepartmentTimeRequirement department: Medical - min: 36000 # goob mrp - 10 hours + min: 54000 # Goob MRP - 15 Hours (Should know Surgery now.) - !type:CharacterOverallTimeRequirement - min: 36000 # goob mrp - 10 hours + min: 72000 # DeltaV - 20 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 8ea6add7ff..68fe0a7d23 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml @@ -6,7 +6,7 @@ requirements: - !type:CharacterDepartmentTimeRequirement department: Medical - min: 7200 #2 hrs + min: 18000 # Goob MRP - 5 Hours startingGear: DoctorGear icon: "JobIconMedicalDoctor" supervisors: job-supervisors-cmo diff --git a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml index a281f27fa2..9d3440ee67 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml @@ -10,7 +10,7 @@ # time: 14400 #4 hrs - !type:CharacterDepartmentTimeRequirement # DeltaV - Medical dept time requirement department: Medical - min: 14400 # goob mrp - 4 hours + min: 18000 # Goob MRP - 5 Hours (Matches Medical Doctor) # - !type:OverallPlaytimeRequirement # DeltaV - No playtime requirement # time: 54000 # 15 hrs startingGear: ParamedicGear diff --git a/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml b/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml index 17fdd5615f..118fb0f2db 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml @@ -12,7 +12,7 @@ min: 21600 #6 hrs - !type:CharacterDepartmentTimeRequirement department: Medical - min: 108000 # 30 hrs + min: 108000 # Goob MRP - 30 Hours startingGear: SeniorPhysicianGear icon: "JobIconSeniorPhysician" supervisors: job-supervisors-cmo diff --git a/Resources/Prototypes/Roles/Jobs/Science/borg.yml b/Resources/Prototypes/Roles/Jobs/Science/borg.yml index 967bdb9939..e447416c15 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/borg.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/borg.yml @@ -23,7 +23,7 @@ playTimeTracker: JobBorg requirements: - !type:CharacterOverallTimeRequirement - min: 108000 #30 hrs - still making this 30 hours instead of something reasonable, silicon laws are really fucky - not for the new goober.. + min: 108000 # Goob MRP - 30 Hours canBeAntag: false icon: JobIconBorg supervisors: job-supervisors-rd diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index bc9074022a..72e3d0a349 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -7,9 +7,15 @@ requirements: - !type:CharacterDepartmentTimeRequirement department: Epistemics # DeltaV - Epistemics Department replacing Science - min: 3600 # goob mrp - 10 hours + min: 54000 # DeltaV - 15 hours + - !type:CharacterPlaytimeRequirement + tracker: JobForensicMantis + min: 18000 # 5 hours + - !type:CharacterPlaytimeRequirement + tracker: JobLibrarian + min: 18000 # 5 hours - !type:CharacterOverallTimeRequirement - min: 3600 # goob mrp - 10 hours + min: 90000 # Goob MRP - 25 hours - !type:CharacterLogicOrRequirement requirements: - !type:CharacterSpeciesRequirement diff --git a/Resources/Prototypes/Roles/Jobs/Science/roboticist.yml b/Resources/Prototypes/Roles/Jobs/Science/roboticist.yml index 17e5b469b6..8b7611e7a4 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/roboticist.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/roboticist.yml @@ -6,7 +6,7 @@ requirements: - !type:CharacterDepartmentTimeRequirement department: Epistemics - min: 7200 # 2 hours - same as scientist + min: 14400 # 4 hours - same as scientist startingGear: RoboticistGear icon: "JobIconRoboticist" supervisors: job-supervisors-rd diff --git a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml index a6a97f5e00..49d8c110cb 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml @@ -6,7 +6,7 @@ requirements: - !type:CharacterDepartmentTimeRequirement department: Epistemics # DeltaV - Epistemics Department replacing Science - min: 7200 # 2 hours + min: 14400 # 4 hours - same as scientist startingGear: ScientistGear icon: "JobIconScientist" supervisors: job-supervisors-rd diff --git a/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml b/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml index e96ce687b9..c93fff6628 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml @@ -6,7 +6,7 @@ requirements: - !type:CharacterDepartmentTimeRequirement department: Epistemics # DeltaV - Epistemics Department replacing Science - min: 108000 #30 hrs + min: 108000 # Goob MRP - 30 Hours startingGear: SeniorResearcherGear icon: "JobIconSeniorResearcher" supervisors: job-supervisors-rd diff --git a/Resources/Prototypes/Roles/Jobs/Security/detective.yml b/Resources/Prototypes/Roles/Jobs/Security/detective.yml index 6aec655afc..04dc55bc1f 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/detective.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/detective.yml @@ -6,7 +6,7 @@ requirements: - !type:CharacterDepartmentTimeRequirement department: Security - min: 18000 # goob mrp - 50 hours + min: 36000 # DeltaV - 10 hours startingGear: DetectiveGear icon: "JobIconDetective" supervisors: job-supervisors-hos diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml index 06b235350f..056c49c287 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -6,18 +6,18 @@ requirements: - !type:CharacterPlaytimeRequirement tracker: JobWarden - min: 10800 #goob mrp 3 hrs + min: 18000 # Goob MRP - 5 Hours # - !type:RoleTimeRequirement # DeltaV - No Security Officer time requirement - REIMPLEMENT WHEN MORE PEOPLE HAVE IT # role: JobDetective # time: 14400 #DeltaV 4 hrs - - !type:CharacterDepartmentTimeRequirement # goob mrp - Command dept time requirement + - !type:CharacterDepartmentTimeRequirement # Goob MRP - Command Dept Time Requirement department: Command - min: 7200 # 2 hours - - !type:CharacterDepartmentTimeRequirement # goob mrp - sec dept time requirement + min: 18000 # Goob MRP - 5 Hours + - !type:CharacterDepartmentTimeRequirement # Goob MRP - Command Dept Time Requirement department: Security min: 36000 # 10 hours - !type:CharacterOverallTimeRequirement - min: 72000 # goob mrp - 20 hours + min: 90000 # DeltaV - 25 hours weight: 10 startingGear: HoSGear icon: "JobIconHeadOfSecurity" diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml index d813762a15..adb7e1b263 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml @@ -6,10 +6,11 @@ requirements: - !type:CharacterPlaytimeRequirement # DeltaV - JobSecurityOfficer time requirement. Make them experienced in proper officer work. tracker: JobSecurityOfficer - min: 28800 # goob mrp - 8 hrs + min: 43200 # DeltaV - 12 hrs - !type:CharacterPlaytimeRequirement # DeltaV - JobDetective time requirement. Give them an understanding of basic forensics. tracker: JobDetective min: 14400 # DeltaV - 4 hours + # - !type:CharacterWhitelistRequirement # Undo Starch's blatant deletion instead of comment startingGear: WardenGear icon: "JobIconWarden" supervisors: job-supervisors-hos diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml index 075f27c9f9..b946f635d6 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml @@ -5,7 +5,7 @@ playTimeTracker: JobBoxer requirements: - !type:CharacterOverallTimeRequirement - min: 3600 #goob mrp 1 hours + min: 3600 # Goob MRP - 1 Hour startingGear: BoxerGear icon: "JobIconBoxer" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml index 35fa2b3ff0..72c01e9260 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml @@ -5,10 +5,10 @@ playTimeTracker: JobPsychologist requirements: - !type:CharacterOverallTimeRequirement - min: 7200 #goob mrp 2 hours + min: 18000 # Goob MRP - 5 Hours - !type:CharacterDepartmentTimeRequirement department: Medical - min: 3600 #goob mrp 1 hrs + min: 7200 # Goob MRP - 2 Hours startingGear: PsychologistGear icon: "JobIconPsychologist" supervisors: job-supervisors-cmo