remove dignitary, rename roles, remove other some roles as asked

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

@@ -1,14 +1,14 @@
-job-name-warden = Warden
-job-name-security = Security Officer
-job-name-cadet = Security Cadet
-job-name-hos = Head of Security
+job-name-warden = Sheriff
+job-name-security = Police Deputy
+job-name-cadet = Police Cadet
+job-name-hos = Marshall
 job-name-detective = Detective
 job-name-brigmedic = Corpsman
 job-name-borg = Cyborg
 job-name-senior-researcher = Psycom
 job-name-senior-engineer = Senior Engineer
 job-name-senior-physician = Senior Physician
-job-name-senior-officer = Senior Officer
+job-name-senior-officer = Police Officer
 job-name-scientist = Researcher
 job-name-research-assistant = Research Assistant
 job-name-rd = Research Director
@@ -20,10 +20,10 @@ job-name-paramedic = Paramedic
 job-name-cmo = Chief Medical Officer
 job-name-chemist = Chemist
 job-name-technical-assistant = Technical Assistant
-job-name-engineer = Station Engineer
+job-name-engineer = Maintenance Tech
 job-name-atmostech = Atmospheric Technician
 job-name-hop = Head of Personnel
-job-name-captain = Captain
+job-name-captain = District Executive
 job-name-ntrep = Corporate Liaison
 job-name-serviceworker = Service Worker
 job-name-centcomoff = CentComm Official
@@ -36,23 +36,23 @@ job-name-librarian = Cataloguer
 # job-name-lawyer = Lawyer
 job-name-mime = Mime
 job-name-ce = Chief Engineer
-job-name-janitor = Janitor
+job-name-janitor = Custodian
 job-name-chaplain = Chaplain
 job-name-botanist = Botanist
 job-name-bartender = Bartender
-job-name-passenger = Passenger
+job-name-passenger = Pedestrian
 job-name-salvagespec = Salvage Specialist
 job-name-station-ai = Station AI
 job-name-qm = Logistics Officer
 job-name-cargotech = Cargo Technician
 job-name-chef = Chef
-job-name-clown = Clown
+job-name-clown = Performer
 job-name-ertleader = ERT Leader
 job-name-ertchaplain = ERT Chaplain
 job-name-ertengineer = ERT Engineer
 job-name-ertsecurity = ERT Security
 job-name-ertmedic = ERT Medic
-job-name-ertjanitor = ERT Janitor
+job-name-ertjanitor = ERT Cleaner
 job-name-boxer = Boxer
 job-name-zookeeper = Zookeeper
 job-name-visitor = Visitor
@@ -79,34 +79,34 @@ JobBartender = Bartender
 JobBorg = Borg
 JobBotanist = Botanist
 JobBoxer = Boxer
-JobCaptain = Captain
+JobCaptain = District Executive
 JobCargoTechnician = Cargo Technician
 JobCentralCommandOfficial = Central Command Official
 JobChaplain = Chaplain
 JobChef = Chef
 JobChemist = Chemist
 JobChiefEngineer = Chief Engineer
 JobChiefMedicalOfficer = Chief Medical Officer
-JobClown = Clown
+JobClown = Performer
 JobDetective = Detective
 JobBrigmedic = Corpsman
 JobERTChaplain = ERT Chaplain
 JobERTEngineer = ERT Engineer
-JobERTJanitor = ERT Janitor
+JobERTJanitor = ERT Cleaner
 JobERTLeader = ERT Leader
 JobERTMedical = ERT Medical
 JobERTSecurity = ERT Security
 JobHeadOfPersonnel = Head of Personnel
-JobHeadOfSecurity = Head of Security
-JobJanitor = Janitor
+JobHeadOfSecurity = Marshall
+JobJanitor = Custodian
 JobLawyer = Lawyer
 JobLibrarian = Librarian
 JobMedicalDoctor = Medical doctor
 JobMedicalIntern = Medical intern
 JobMime = Mime
 JobMusician = Musician
 JobParamedic = Paramedic
-JobPassenger = Passenger
+JobPassenger = Pedestrian
 JobPsychologist = Psychologist
 JobQuartermaster = Logistics Officer
 JobReporter = Reporter
@@ -115,16 +115,16 @@ JobResearchDirector = Research Director
 JobRoboticist = Biologist
 JobSalvageSpecialist = Salvage Specialist
 JobScientist = Researcher
-JobSecurityCadet = Security Cadet
-JobSecurityOfficer = Security Officer
+JobSecurityCadet = Police Cadet
+JobSecurityOfficer = Police Deputy
 JobSeniorEngineer = Senior Engineer
-JobSeniorOfficer = Senior Officer
+JobSeniorOfficer = Police Officer
 JobSeniorPhysician = Senior Physician
 JobSeniorResearcher = Psycom
 JobServiceWorker = Service Worker
 JobStationAi = Station AI
-JobStationEngineer = Station Engineer
+JobStationEngineer = Maintenance Tech
 JobTechnicalAssistant = Technical Assistant
 JobVisitor = Visitor
-JobWarden = Warden
+JobWarden = Sheriff
 JobZookeeper = Zookeeper

Resources/Prototypes/Loadouts/Generic/species.yml

@@ -67,11 +67,10 @@
         departments:
           - Engineering
           - Command
-          - Dignitary
           - Security
       - !type:CharacterJobRequirement
         jobs:
           - Paramedic
           - SalvageSpecialist
   items:
-    - ClothingNeckMantleMag
+    - ClothingNeckMantleMag

Resources/Prototypes/Roles/Jobs/departments.yml

@@ -28,9 +28,7 @@
   - Passenger
   - Reporter
   - Visitor
-  - Zookeeper
   - ServiceWorker
-  - MartialArtist
   - Prisoner
   - Gladiator
 
@@ -79,18 +77,6 @@
   primary: false
   weight: 100
 
-- type: department
-  id: Dignitary
-  name: department-Dignitary
-  description: department-Dignitary-description
-  color: "#33FE6D"
-  roles:
-  - BlueshieldOfficer
-  - NanotrasenRepresentative
-  - Magistrate
-  primary: false
-  weight: 101
-
 - type: department
   id: Engineering
   name: department-Engineering
@@ -132,7 +118,6 @@
   - Detective
   - Warden
   - PrisonGuard
-  - Brigmedic
 
 - type: department
   id: Research
@@ -167,10 +152,7 @@
   roles:
   - Boxer
   - Reporter
-  - Zookeeper
   - Psychologist
-  - MartialArtist
   - Gladiator
   - Prisoner
-  - Brigmedic
   primary: false

Resources/Prototypes/Traits/physical.yml

@@ -532,7 +532,6 @@
           departments:
           - Security
           - Command
-          - Dignitary
     - !type:CharacterTraitRequirement
       inverted: true
       traits:
@@ -674,7 +673,6 @@
       departments:
         - Security
         - Command
-        - Dignitary
     - !type:CharacterTraitRequirement
       traits:
         - CyberEyes
@@ -757,7 +755,6 @@
       departments:
         - Security
         - Command
-        - Dignitary
     - !type:CharacterTraitRequirement
       traits:
         - CyberEyes
@@ -1000,7 +997,6 @@
       departments:
         - Security
         - Command
-        - Dignitary
     - !type:CharacterSpeciesRequirement
       species:
         - IPC
@@ -1092,7 +1088,6 @@
       departments:
         - Security
         - Command
-        - Dignitary
     - !type:CharacterSpeciesRequirement
       species:
         - IPC