finally done with this fucking pr

Resources/Locale/en-US/job/job-description.ftl

@@ -47,8 +47,24 @@ job-description-warden = Keep the prison running, delegate work to the other hea
 job-description-zookeeper = Put on a joyful display of cute animals and space carps for all the crew to see. Currently available on Gemini Station.
 
 #PS14
-job-description-atmospec = Optimize the station's atmospherics setup, and synthesize rare gases to use or sell.
+job-description-atmospec = Operate the prison's atmospherics setup, fix the prisoners atmospheric 'mistakes'.
+job-description-cco = Manage solitary and distribute equipment from the armory. Deal with unruly officers.
+job-description-hom = Coordinate your department, allocate resources to projects, take the blame when the lights go off.
+job-description-infirmary-doctor = Patch up the wounded & scold the undeserving.
+job-description-inspector = Perform cell inspections, ensure that the guilty party is found, and get yelled at by the welfare officer.
+job-description-sp-cargotech = Export the prisoners' produce and turn it into sweet, liquid cash.
+job-description-sp-chaplain = Give the prisoners something to believe in, like a father figure... or a cult.
+job-description-sp-chemist = Create medicine for the infirmary to function.
+job-description-sp-clown = Who hires a prison clown! like seriously what kind of job is that?
+job-description-sp-psychologist = Give counselling to those who need it, or prescribe drugs to those who don't.
+job-description-sp-qm = Control imports and manage your department. Help prisoners - or guards - make a bar.
+job-description-sp-reporter = Broadcast all the prison's most heinous acts for the world to see.
 job-description-gardener = Grow food for the chef, drugs for 'medbay', and other plants to keep yourself entertained.
-job-description-maintengineer = Keep the station's main engine & solars active, optimize the power network, and make emergency repairs using your hardsuit in spaced areas.
+job-description-maintenance-worker = fix lights, mop floors, beg the engineers for proper training.
+job-description-maintengineer = Keep the prison's main engine & solars active, make emergency repairs using your hardsuit in spaced areas, Train the wannabes.
+job-description-md = Manage the infirmary and keep everyone alive.
 job-description-prisonchef = Keep other inmates fed with a variety of food items, butcher dead animals to ensure ammonia doesn't leak, and help keep the bar lively.
-job-description-prisoner = Serve your sentence, work service jobs or plan an escape.
+job-description-prison-officer = Follow orders, deal with troublemakers and keep prisoners working.
+job-description-rookie-officer = Learn the art of keeping prisoners in line. Don’t abuse your power!
+job-description-prisoner = Serve your sentence, work service jobs or plan an escape.
+job-description-wo = Handle prisoner compaints, maintain law and order, hold security accountable.

Resources/Locale/en-US/job/job-names.ftl

@@ -48,6 +48,12 @@ job-name-visitor = Visitor
 
 #PS14
 job-name-sp-warden = Warden
+job-name-wo = Welfare Officer
+job-name-sp-cargotech = Cargo Technician
+job-name-sp-chaplain = Chaplain
+job-name-sp-clown = Clown
+job-name-sp-qm = Quartermaster
+job-name-sp-reporter = Reporter
 job-name-atmospec = Atmospheric Specialist
 job-name-sp-chemist = Chemist
 job-name-sp-psychologist = Psychologist
@@ -61,7 +67,7 @@ job-name-maintengineer = Maintenance Engineer
 job-name-md = Medical Director
 job-name-prisonchef = Prison Chef
 job-name-prison-officer = Prison Officer
-job-name-probationary-officer = Probationary Officer
+job-name-rookie-officer = Rookie Officer
 job-name-prisoner = Prisoner
 
 # Role timers - Make these alphabetical or I cut you
@@ -116,14 +122,20 @@ JobZookeeper = Zookeeper
 
 #PS14
 JobSPWarden = Warden
+JobWelfareOfficer = Welfare Officer
+JobSPCargoTechnician = Cargo Technician
+JobSPChaplain = Chaplain
+JobSPClown = Clown
+JobSPQuartermaster = Quartermaster
+JobSPReporter = Reporter
 JobAtmosphericSpecialist = Atmospheric Specialist
 JobChiefCustodialOfficer = Chief Custodial Officer
 JobGardener = Gardener
 JobHeadOfMaintenance = Head Of Maintenance
 JobInspector = Inspector
 JobPrisonChef = Prison Chef
 JobPrisonOfficer = Prison Officer
-JobProbationaryOfficer = Probationary Officer
+JobRookieOfficer = Rookie Officer
 JobPrisoner = Prisoner
 JobMaintenanceEngineer = Maintenance Engineer
 JobMaintenanceWorker = Maintenance Worker

Resources/Locale/en-US/job/job-supervisors.ftl

@@ -15,4 +15,9 @@ job-supervisors-hire = whoever hires you
 job-supervisors-everyone = absolutely everyone
 
 #SP14
+job-supervisors-cco = the chief custodial officer
+job-supervisors-guards = prison officers, the warden, and the chief custodial officer
+job-supervisors-hom = the head of maintenance
+job-supervisors-md = the medical director
 job-supervisors-warden = the warden
+job-supervisors-wo = the welfare officer

Resources/Prototypes/Loadouts/Jobs/Civilian/librarian.yml

@@ -0,0 +1,36 @@
+# Jumpsuit
+- type: loadout
+  id: LibrarianJumpsuit
+  equipment: LibrarianJumpsuit
+
+- type: startingGear
+  id: LibrarianJumpsuit
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitLibrarian
+
+- type: loadout
+  id: LibrarianJumpskirt
+  equipment: LibrarianJumpskirt
+
+- type: startingGear
+  id: LibrarianJumpskirt
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtLibrarian
+
+- type: loadout
+  id: CuratorJumpsuit
+  equipment: CuratorJumpsuit
+
+- type: startingGear
+  id: CuratorJumpsuit
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitCurator
+
+- type: loadout
+  id: CuratorJumpskirt
+  equipment: CuratorJumpskirt
+
+- type: startingGear
+  id: CuratorJumpskirt
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtCurator

Resources/Prototypes/Loadouts/role_loadouts.yml

@@ -1,3 +1,32 @@
+# SP14 Command
+- type: roleLoadout
+  id: JobSPWarden
+  groups:
+  - HeadofSecurityHead
+  - HeadofSecurityNeck
+  - HeadofSecurityJumpsuit
+  - SecurityBackpack
+  - SecurityBelt
+  - HeadofSecurityOuterClothing
+  - SecurityShoes
+  - SurvivalSecurity
+  - Trinkets
+  - GroupSpeciesBreathToolSecurity
+
+- type: roleLoadout
+  id: JobWelfareOfficer
+  groups:
+  - GroupTankHarness
+  - HoPHead
+  - HoPNeck
+  - HoPJumpsuit
+  - HoPBackpack
+  - HoPOuterClothing
+  - Glasses
+  - Survival
+  - Trinkets
+  - GroupSpeciesBreathTool
+
 # Command
 - type: roleLoadout
   id: JobCaptain
@@ -25,6 +54,46 @@
   - Trinkets
   - GroupSpeciesBreathTool
 
+# SP14 Civilian
+- type: roleLoadout
+  id: JobSPChaplain
+  groups:
+  - GroupTankHarness
+  - ChaplainHead
+  - ChaplainMask
+  - ChaplainNeck
+  - ChaplainJumpsuit
+  - CommonBackpack
+  - ChaplainOuterClothing
+  - Glasses
+  - Survival
+  - Trinkets
+  - GroupSpeciesBreathTool
+
+- type: roleLoadout
+  id: JobSPClown
+  groups:
+  - GroupTankHarness
+  - ClownHead
+  - ClownJumpsuit
+  - ClownBackpack
+  - ClownOuterClothing
+  - ClownShoes
+  - Glasses
+  - SurvivalClown
+  - Trinkets
+
+- type: roleLoadout
+  id: JobSPReporter
+  groups:
+  - GroupTankHarness
+  - ReporterJumpsuit
+  - CommonBackpack
+  - Glasses
+  - Survival
+  - Trinkets
+  - GroupSpeciesBreathTool
+
 # Civilian
 - type: roleLoadout
   id: JobPassenger
@@ -181,6 +250,37 @@
   - Instruments
   - GroupSpeciesBreathTool
 
+# SP Cargo
+
+- type: roleLoadout
+  id: JobSPQuartermaster
+  groups:
+  - GroupTankHarness
+  - QuartermasterHead
+  - QuartermasterNeck
+  - QuartermasterJumpsuit
+  - CargoTechnicianBackpack
+  - QuartermasterOuterClothing
+  - QuartermasterShoes
+  - Glasses
+  - Survival
+  - Trinkets
+  - GroupSpeciesBreathTool
+
+- type: roleLoadout
+  id: JobSPCargoTechnician
+  groups:
+  - GroupTankHarness
+  - CargoTechnicianHead
+  - CargoTechnicianJumpsuit
+  - CargoTechnicianBackpack
+  - CargoTechnicianOuterClothing
+  - CargoTechnicianShoes
+  - Glasses
+  - Survival
+  - Trinkets
+  - GroupSpeciesBreathTool
+
 # Cargo
 - type: roleLoadout
   id: JobQuartermaster
@@ -461,28 +561,14 @@
   - GroupSpeciesBreathToolSecurity
 
 - type: roleLoadout
-  id: JobProbationaryOfficer
+  id: JobRookieOfficer
   groups:
   - SecurityCadetJumpsuit
   - SecurityBackpack
   - SurvivalSecurity
   - Trinkets
   - GroupSpeciesBreathToolSecurity
 
-- type: roleLoadout
-  id: JobSPWarden
-  groups:
-  - HeadofSecurityHead
-  - HeadofSecurityNeck
-  - HeadofSecurityJumpsuit
-  - SecurityBackpack
-  - SecurityBelt
-  - HeadofSecurityOuterClothing
-  - SecurityShoes
-  - SurvivalSecurity
-  - Trinkets
-  - GroupSpeciesBreathToolSecurity
-
 # Security
 
 - type: roleLoadout

Resources/Prototypes/Roles/Jobs/Inmate/librarian.yml → Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml

@@ -1,8 +1,8 @@
 - type: job
-  id: Librarian
-  name: job-name-librarian
-  description: job-description-librarian
-  playTimeTracker: JobLibrarian
+  id: PrisonLibrarian
+  name: job-name-prison-librarian
+  description: job-description-prison-librarian
+  playTimeTracker: JobPrisonLibrarian
   startingGear: LibrarianGear
   icon: "JobIconLibrarian"
   supervisors: job-supervisors-hop

Resources/Prototypes/Roles/Jobs/Guards/chief-custodial-officer.yml

@@ -15,11 +15,11 @@
       time: 108000 # 30 hrs
     - !type:OverallPlaytimeRequirement
       time: 144000 #40 hrs
-  weight: 30
+  weight: 35
   startingGear: HoSGear
   icon: "JobIconHeadOfSecurity"
   requireAdminNotify: true
-  supervisors: job-supervisors-captain
+  supervisors: job-supervisors-warden
   canBeAntag: false
   access:
   - HeadOfSecurity

Resources/Prototypes/Roles/Jobs/Guards/inspector.yml

@@ -10,7 +10,7 @@
     time: 54000 # 15 hours
   startingGear: DetectiveGear
   icon: "JobIconDetective"
-  supervisors: job-supervisors-hos
+  supervisors: job-supervisors-cco
   canBeAntag: false
   access:
   - Security

Resources/Prototypes/Roles/Jobs/Guards/prison_officer.yml

@@ -10,7 +10,7 @@
       time: 36000 #10 hrs
   startingGear: SecurityOfficerGear
   icon: "JobIconSecurityOfficer"
-  supervisors: job-supervisors-hos
+  supervisors: job-supervisors-cco
   canBeAntag: false
   access:
   - Security

Resources/Prototypes/Roles/Jobs/Guards/probationary_officer.yml → Resources/Prototypes/Roles/Jobs/Guards/rookie_officer.yml

@@ -1,18 +1,18 @@
 - type: job
-  id: ProbationaryOfficer
-  name: job-name-probationary-officer
-  description: job-description-probationary-officer
-  playTimeTracker: JobProbationaryOfficer
+  id: RookieOfficer
+  name: job-name-rookie-officer
+  description: job-description-rookie-officer
+  playTimeTracker: JobRookieOfficer
   requirements:
     - !type:OverallPlaytimeRequirement
       time: 18000 #5 hrs
     - !type:DepartmentTimeRequirement
       department: Security
-      time: 54000 #15 hrs
+      time: 36000 #10 hrs
       inverted: true # stop playing intern if you're good at security!
   startingGear: SecurityCadetGear
   icon: "JobIconSecurityCadet"
-  supervisors: job-supervisors-security
+  supervisors: job-supervisors-guards
   canBeAntag: false
   access:
   - Security

Resources/Prototypes/Roles/Jobs/Infirmary/infirmary_doctor.yml

@@ -9,7 +9,7 @@
       time: 14400 #4 hrs
   startingGear: DoctorGear
   icon: "JobIconMedicalDoctor"
-  supervisors: job-supervisors-cmo
+  supervisors: job-supervisors-md
   access:
   - Medical
   - Maintenance

Resources/Prototypes/Roles/Jobs/Inmate/gardener.yml

@@ -5,7 +5,7 @@
   playTimeTracker: JobGardener
   startingGear: BotanistGear
   icon: "JobIconGardener"
-  supervisors: job-supervisors-hop
+  supervisors: job-supervisors-wo
   access:
   - Service
   - Maintenance

Resources/Prototypes/Roles/Jobs/Inmate/prison_chef.yml

@@ -9,7 +9,7 @@
       time: 1800
   startingGear: ChefGear
   icon: "JobIconPrisonChef"
-  supervisors: job-supervisors-hop
+  supervisors: job-supervisors-wo
   access:
   - Service
   - Maintenance

Resources/Prototypes/Roles/Jobs/Maintenance/atmospheric_specialist.yml

@@ -10,7 +10,7 @@
       time: 54000 # 15 hrs
   startingGear: AtmosphericTechnicianGear
   icon: "JobIconAtmosphericSpecialist"
-  supervisors: job-supervisors-ce
+  supervisors: job-supervisors-hom
   access:
   - Maintenance
   - Engineering

Resources/Prototypes/Roles/Jobs/Maintenance/head_of_maintenance.yml

@@ -1,7 +1,7 @@
 - type: job
   id: HeadOfMaintenance
   name: job-name-hom
-  description: job-description-ce
+  description: job-description-hom
   playTimeTracker: JobHeadOfMaintenance
   requirements:
     - !type:RoleTimeRequirement

Resources/Prototypes/Roles/Jobs/Maintenance/maintenance_engineer.yml

@@ -10,7 +10,7 @@
       time: 14400 #4 hrs
   startingGear: StationEngineerGear
   icon: "JobIconMaintenanceEngineer"
-  supervisors: job-supervisors-ce
+  supervisors: job-supervisors-hom
   access:
   - Maintenance
   - Engineering