untangle our jobs from wiz den ones (space-wizards#215)

* untangle our jobs from wiz den ones

* fix detective pda

Resources/Credits/GitHub.txt

@@ -1 +1 @@
-20kdc, 4dplanner, aaronmell, Absolute-Potato, Acruid, actioninja, actually-reb, aeosynth, AJCM-git, Alainx277, ALMv1, AlphaQwerty, ancientpower, areitpog, artak10t, as334, asperger-sind, AugustEymann, avghdev, AzzyIsNotHere, BananaFlambe, BasedUser, BGare, bhespiritu, BingoJohnson, bloodrizer, BobdaBiscuit, boiled-water-tsar, Brian-Archambault, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, CakeQ, Capnsockless, Carou02, CatTheSystem, CC-4477, Centronias, chairbender, Charlese2, cheesePizza2, clement-or, clusterfack, clyfordv, Clyybber, ColdAutumnRain, collinlunn, ComicIronic, creadth, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, DamianX, daniel-cr, Decappi, Delete69, DelleVelleD, Dezandor, DmitriyZodiak, DogZeroX, drongood12, DrSmugleaf, DTanxxx, DubiousDoggo, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Ephememory, esguard, exp111, Fiftyllama, FirinMaLazors, Fishfish458, Fogapod, FoLoKe, Fortune117, Fouin, freeman2651, GalacticChimp, gbasood, Git-Nivrak, gituhabu, h3half, halworsen, Hardly3D, harikattar, HoofedEar, hubismal, Hugal31, iczero, ike709, Injazz, InquisitivePenguin, Insineer, j-giebel, Jackw2As, janekvap, Jaskanbe, JasperJRoth, JiimBob, JohnGinnane, johnku1, juliangiebel, JustinTether, JustinTrotter, KaiShibaa, kalanosh, keronshb, kira-er, Kmc2000, komunre, lajolico, Lamrr, lapatison, Leander-0, LetterN, LittleBuilderJane, localcc, lvvova1, lzimann, Macoron, ManelNavola, Markek1, Matz05, MaxNox7, MehimoNemo, MeltedPixel, MemeProof, metalgearsloth, michaelcooke, micheel665, Miniwoffer, Mirino97, mirrorcult, misnor, Mith-randalf, MLGTASTICa, Moneyl, moony, Morb0, N3X15, namespace-Memory, NickPowers43, Nirnael, NIXC, nuke-haus, Nukeuler123, nullarmo, Pangogie, Partmedia, partyaddict, patrikturi, PaulRitter, Peptide90, peptron1, PetMudstone, Phantom-Lily, Pill-U, Pireax, PJB3005, Plasmaguy, plinyvic, pointer-to-null, ProfanedBane, PrPleGoo, psykzz, Putnam3145, Radosvik, Radrark, Rane, RedlineTriad, RednoWCirabrab, Rember, RemieRichards, remove32, RemTim, renodubois, retequizzle, Rich-Dunne, rneuser, Rohesie, rok-povsic, RomanNovo, Saakra, SamV522, SaphireLattice, ScalyChimp, scrato, ScumbagDog, Serkket, SethLafuente, sewerpig, ShadowCommander, shaeone, SignalWalker, Silvertorch5, sirsikes777, Snowni, SoulSloth, Soundwavesghost, Soupstraw, SpaceManiac, SplinterGP, spoogemonster, StanberyTrask, StrawberryMoses, StStevens, SweptWasTaken, Szunti, TaralGit, TemporalOroboros, tentekal, thatrandomcanadianguy, TheCze, TheDarkElites, theOperand, thevinter, TimrodDX, tkdrg, tmtmtl30, Tomeno, Tyler-IN, UKNOWH, UnderscoreX5, UristMcContributor, UristMcDorf, Venomii, Veritius, Visne, volundr-, vulppine, Watermelon914, weaversam8, Willhelm53, wixoaGit, WlarusFromDaSpace, wrexbe, WTCWR68, xRiriq, Ygg01, YotaXP, youarereadingthis, zach-hill, zamp, ZelteHonor, ZeWaka, zionnBE, zlodo, ZNixian, Zth--, Zumorica, Zymem
+20kdc, 4dplanner, aaronmell, Absolute-Potato, Acruid, actioninja, actually-reb, aeosynth, AJCM-git, Alainx277, ALMv1, AlphaQwerty, ancientpower, Andre19926, areitpog, artak10t, as334, asperger-sind, AugustEymann, avghdev, AzzyIsNotHere, BananaFlambe, BasedUser, BGare, bhespiritu, BingoJohnson, bloodrizer, BobdaBiscuit, boiled-water-tsar, Brian-Archambault, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, CakeQ, Capnsockless, Carou02, CatTheSystem, CC-4477, Centronias, chairbender, Charlese2, cheesePizza2, clement-or, clusterfack, clyfordv, Clyybber, ColdAutumnRain, collinlunn, ComicIronic, creadth, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, DamianX, daniel-cr, Decappi, Delete69, DelleVelleD, Dezandor, DmitriyZodiak, DogZeroX, drongood12, DrSmugleaf, DTanxxx, DubiousDoggo, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Ephememory, esguard, exp111, Fiftyllama, FirinMaLazors, Fishfish458, Fogapod, FoLoKe, Fortune117, Fouin, freeman2651, GalacticChimp, gbasood, Git-Nivrak, gituhabu, h3half, halworsen, Hardly3D, harikattar, HoofedEar, hubismal, Hugal31, iczero, ike709, Injazz, InquisitivePenguin, Insineer, j-giebel, Jackw2As, janekvap, Jaskanbe, JasperJRoth, JiimBob, JohnGinnane, johnku1, juliangiebel, JustinTether, JustinTrotter, KaiShibaa, kalanosh, keronshb, kira-er, Kmc2000, komunre, lajolico, Lamrr, lapatison, Leander-0, LetterN, LittleBuilderJane, localcc, lvvova1, lzimann, Macoron, ManelNavola, Markek1, Matz05, MaxNox7, MehimoNemo, MeltedPixel, MemeProof, metalgearsloth, michaelcooke, micheel665, Miniwoffer, Mirino97, mirrorcult, misnor, Mith-randalf, MLGTASTICa, Moneyl, moony, Morb0, N3X15, namespace-Memory, NickPowers43, Nirnael, NIXC, nuke-haus, Nukeuler123, nullarmo, Pangogie, Partmedia, partyaddict, patrikturi, PaulRitter, Peptide90, peptron1, PetMudstone, Phantom-Lily, Pill-U, Pireax, PJB3005, Plasmaguy, plinyvic, pointer-to-null, ProfanedBane, PrPleGoo, psykzz, Putnam3145, Radosvik, Radrark, Rane, RedlineTriad, RednoWCirabrab, Rember, RemieRichards, remove32, RemTim, renodubois, retequizzle, Rich-Dunne, rneuser, Rohesie, rok-povsic, RomanNovo, Saakra, SamV522, SaphireLattice, ScalyChimp, scrato, ScumbagDog, Serkket, SethLafuente, sewerpig, ShadowCommander, shaeone, SignalWalker, Silvertorch5, sirsikes777, Snowni, SoulSloth, Soundwavesghost, Soupstraw, SpaceManiac, SplinterGP, spoogemonster, StanberyTrask, StrawberryMoses, StStevens, SweptWasTaken, Szunti, TaralGit, TemporalOroboros, tentekal, thatrandomcanadianguy, TheCze, TheDarkElites, theOperand, thevinter, TimrodDX, tkdrg, tmtmtl30, Tomeno, Tyler-IN, UKNOWH, UnderscoreX5, UristMcContributor, UristMcDorf, Venomii, Veritius, Visne, volundr-, vulppine, Watermelon914, weaversam8, Willhelm53, wixoaGit, WlarusFromDaSpace, wrexbe, WTCWR68, xRiriq, Ygg01, YotaXP, youarereadingthis, zach-hill, zamp, ZelteHonor, ZeWaka, zionnBE, zlodo, ZNixian, Zth--, Zumorica, Zymem

Resources/Maps/atlas.yml

@@ -16593,7 +16593,7 @@ entities:
       Toggle: []
     type: SignalReceiver
 - uid: 1304
-  type: SpawnPointResearchDirector
+  type: SpawnPointMystagogue
   components:
   - pos: 28.5,-3.5
     parent: 4
@@ -44519,7 +44519,7 @@ entities:
     parent: 4
     type: Transform
 - uid: 4555
-  type: SpawnPointLibrarian
+  type: SpawnPointCataloguer
   components:
   - pos: -23.5,-13.5
     parent: 4
@@ -48256,13 +48256,13 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 4972
-  type: SpawnPointScientist
+  type: SpawnPointEpistemologist
   components:
   - pos: -21.5,-13.5
     parent: 4
     type: Transform
 - uid: 4973
-  type: SpawnPointScientist
+  type: SpawnPointEpistemologist
   components:
   - pos: -20.5,-13.5
     parent: 4
@@ -53260,7 +53260,7 @@ entities:
     parent: 4
     type: Transform
 - uid: 5586
-  type: SpawnPointSalvageSpecialist
+  type: SpawnPointSalvageTechnician
   components:
   - pos: -32.5,0.5
     parent: 4
@@ -53272,7 +53272,7 @@ entities:
     parent: 4
     type: Transform
 - uid: 5588
-  type: SpawnPointSalvageSpecialist
+  type: SpawnPointSalvageTechnician
   components:
   - pos: -32.5,-0.5
     parent: 4
@@ -53290,7 +53290,7 @@ entities:
     parent: 4
     type: Transform
 - uid: 5591
-  type: SpawnPointDetective
+  type: SpawnPointForensicMantis
   components:
   - pos: -24.5,-13.5
     parent: 4

Resources/Maps/lighthouse.yml

@@ -112173,7 +112173,7 @@ entities:
     parent: 100
     type: Transform
 - uid: 12594
-  type: SpawnPointScientist
+  type: SpawnPointEpistemologist
   components:
   - pos: -9.5,-8.5
     parent: 100
@@ -112261,13 +112261,13 @@ entities:
     parent: 100
     type: Transform
 - uid: 12607
-  type: SpawnPointScientist
+  type: SpawnPointEpistemologist
   components:
   - pos: -10.5,-8.5
     parent: 100
     type: Transform
 - uid: 12608
-  type: SpawnPointDetective
+  type: SpawnPointForensicMantis
   components:
   - pos: -10.5,-10.5
     parent: 100
@@ -112341,13 +112341,13 @@ entities:
     parent: 100
     type: Transform
 - uid: 12620
-  type: SpawnPointSalvageSpecialist
+  type: SpawnPointSalvageTechnician
   components:
   - pos: -37.5,-13.5
     parent: 100
     type: Transform
 - uid: 12621
-  type: SpawnPointSalvageSpecialist
+  type: SpawnPointSalvageTechnician
   components:
   - pos: -35.5,-13.5
     parent: 100
@@ -112375,7 +112375,7 @@ entities:
     parent: 100
     type: Transform
 - uid: 12625
-  type: SpawnPointLibrarian
+  type: SpawnPointCataloguer
   components:
   - pos: -8.5,-10.5
     parent: 100
@@ -113386,7 +113386,7 @@ entities:
       id: docking
     type: Fixtures
 - uid: 12740
-  type: SpawnPointResearchDirector
+  type: SpawnPointMystagogue
   components:
   - pos: -11.5,57.5
     parent: 100

Resources/Maps/saltern.yml

@@ -1209,7 +1209,7 @@ entities:
     parent: 852
     type: Transform
 - uid: 137
-  type: SpawnPointSalvageSpecialist
+  type: SpawnPointSalvageTechnician
   components:
   - pos: 27.5,16.5
     parent: 852
@@ -6257,13 +6257,13 @@ entities:
     parent: 852
     type: Transform
 - uid: 723
-  type: SpawnPointScientist
+  type: SpawnPointEpistemologist
   components:
   - pos: -8.5,-19.5
     parent: 852
     type: Transform
 - uid: 724
-  type: SpawnPointScientist
+  type: SpawnPointEpistemologist
   components:
   - pos: -9.5,-19.5
     parent: 852
@@ -17592,7 +17592,7 @@ entities:
     parent: 852
     type: Transform
 - uid: 1086
-  type: SpawnPointResearchDirector
+  type: SpawnPointMystagogue
   components:
   - pos: -5.5,-23.5
     parent: 852
@@ -25770,7 +25770,7 @@ entities:
     parent: 852
     type: Transform
 - uid: 2201
-  type: SpawnPointSalvageSpecialist
+  type: SpawnPointSalvageTechnician
   components:
   - pos: 26.5,16.5
     parent: 852
@@ -45316,7 +45316,7 @@ entities:
     parent: 852
     type: Transform
 - uid: 4868
-  type: SpawnPointScientist
+  type: SpawnPointEpistemologist
   components:
   - pos: -7.5,-19.5
     parent: 852
@@ -62847,7 +62847,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 7167
-  type: SpawnPointLibrarian
+  type: SpawnPointCataloguer
   components:
   - pos: 11.5,-30.5
     parent: 852

Resources/Prototypes/Maps/atlas.yml

@@ -25,18 +25,18 @@
         HeadOfPersonnel: [ 1, 1 ]
         ChiefEngineer: [ 1, 1 ]
         StationEngineer: [ 2, 3 ]
-        Librarian: [ 1, 1 ]
+        Cataloguer: [ 1, 1 ]
         ChiefMedicalOfficer: [ 1, 1 ]
         MedicalDoctor: [ 2, 3 ]
-        ResearchDirector: [ 1, 1 ]
-        Scientist: [ 1, 2 ]
+        Mystagogue: [ 1, 1 ]
+        Epistemologist: [ 1, 2 ]
         HeadOfSecurity: [ 1, 1 ]
         SecurityOfficer: [ 2, 2 ]
         Chaplain: [ 1, 1 ]
         Boxer: [ 1, 2 ]
         Lawyer: [ 1, 1 ]
         Quartermaster: [ 1, 1 ]
-        SalvageSpecialist: [ 2, 2 ]
+        SalvageTechnician: [ 2, 2 ]
         Musician: [ 1, 1 ]
-        Detective: [1, 1]
+        ForensicMantis: [1, 1]
         Cyborg: [1, 1]

Resources/Prototypes/Maps/lighthouse.yml

@@ -21,7 +21,7 @@
         Chef: [ 1, 2 ]
         Clown: [ 1, 1 ]
         Cyborg: [ 2, 2 ]
-        Detective: [ 1, 1 ]
+        ForensicMantis: [ 1, 1 ]
         Janitor: [ 1, 2 ]
         Mime: [ 1, 1 ]
         Captain: [ 1, 1 ]
@@ -33,15 +33,15 @@
         MedicalDoctor: [ 2, 3 ]
         Paramedic: [ 1, 1 ]
         Chemist: [ 1, 2 ]
-        ResearchDirector: [ 1, 1 ]
-        Scientist: [ 3, 3 ]
+        Mystagogue: [ 1, 1 ]
+        Epistemologist: [ 3, 3 ]
         HeadOfSecurity: [ 1, 1 ]
         SecurityOfficer: [ 4, 5 ]
         Chaplain: [ 1, 1 ]
         Warden: [ 1, 1 ]
-        Librarian: [ 1, 1 ]
+        Cataloguer: [ 1, 1 ]
         Lawyer: [ 2, 2 ]
         Quartermaster: [ 1, 2 ]
-        SalvageSpecialist: [ 2, 3 ]
+        SalvageTechnician: [ 2, 3 ]
         Musician: [1, 1]
         AtmosphericTechnician: [ 1, 2 ]

Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/Misc/identification_cards.yml

@@ -12,15 +12,15 @@
 
 - type: entity
   parent: IDCardStandard
-  id: DetectiveIDCard
-  name: detective ID card
+  id: ForensicMantisIDCard
+  name: forensic mantis ID card
   components:
     - type: Sprite
       layers:
         - state: default
         - state: iddetective
     - type: PresetIdCard
-      job: Detective
+      job: ForensicMantis
 
 - type: entity
   parent: IDCardStandard

Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/pda.yml

@@ -31,12 +31,12 @@
 
 - type: entity
   parent: BasePDA
-  id: DetectivePDA
-  name: detective PDA
+  id: ForensicMantisPDA
+  name: forensic mantis PDA
   description: Smells like tobacco, and justice.
   components:
   - type: PDA
-    id: DetectiveIDCard
+    id: ForensicMantisIDCard
   - type: Appearance
     visuals:
       - type: PDAVisualizer

Resources/Prototypes/Nyanotrasen/Markers/Spawners/jobs.yml

@@ -35,12 +35,12 @@
       - state: mailcarrier
 
 - type: entity
-  id: SpawnPointDetective
+  id: SpawnPointForensicMantis
   parent: SpawnPointJobBase
-  name: detective
+  name: forensic mantis
   components:
   - type: SpawnPoint
-    job_id: Detective
+    job_id: ForensicMantis
   - type: Sprite
     layers:
       - state: green
@@ -69,3 +69,51 @@
     layers:
       - state: green
       - state: roboticist
+
+- type: entity
+  id: SpawnPointMystagogue
+  parent: SpawnPointJobBase
+  name: mystagogue
+  components:
+  - type: SpawnPoint
+    job_id: Mystagogue
+  - type: Sprite
+    layers:
+      - state: green
+      - state: rd
+
+- type: entity
+  id: SpawnPointEpistemologist
+  parent: SpawnPointJobBase
+  name: epistemologist
+  components:
+  - type: SpawnPoint
+    job_id: Epistemologist
+  - type: Sprite
+    layers:
+      - state: green
+      - state: scientist
+
+- type: entity
+  id: SpawnPointCataloguer
+  parent: SpawnPointJobBase
+  name: cataloguer
+  components:
+  - type: SpawnPoint
+    job_id: Cataloguer
+  - type: Sprite
+    layers:
+      - state: green
+      - state: librarian
+
+- type: entity
+  id: SpawnPointSalvageTechnician
+  parent: SpawnPointJobBase
+  name: salvagetechnician
+  components:
+  - type: SpawnPoint
+    job_id: SalvageTechnician
+  - type: Sprite
+    layers:
+      - state: green
+      - state: miner

Resources/Prototypes/Nyanotrasen/Roles/Jobs/Engineering/salvage_technician.yml

@@ -0,0 +1,23 @@
+- type: job
+  id: SalvageTechnician
+  name: "salvage technician"
+  icon: "ShaftMiner"
+  startingGear: SalvageTechnicianGear
+  departments:
+  - Engineering
+  supervisors: "the chief engineer"
+  access:
+  - Salvage
+  - Maintenance
+  - External
+
+- type: startingGear
+  id: SalvageTechnicianGear
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitSalvageSpecialist
+    back: ClothingBackpackFilled
+    shoes: ClothingShoesBootsSalvage
+    id: SalvagePDA
+    ears: ClothingHeadsetEngineering
+  satchel: ClothingBackpackSatchelFilled
+  duffelbag: ClothingBackpackDuffelFilled

Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/cataloguer.yml

@@ -0,0 +1,23 @@
+- type: job
+  id: Cataloguer
+  name: "cataloguer"
+  startingGear: CataloguerGear
+  departments:
+  - Epistemics
+  icon: "Librarian"
+  supervisors: "the mystagogue"
+  access:
+  - Research
+
+- type: startingGear
+  id: CataloguerGear
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitColorBrown
+    back: ClothingBackpackBriefcaseFilled
+    shoes: ClothingShoesColorBlack
+    id: LibrarianPDA
+    outerClothing: ClothingOuterRobeBrown
+    head: ClothingHeadHoodBrown
+    ears: ClothingHeadsetScience
+    pocket1: d10Dice
+  innerclothingskirt: ClothingUniformJumpskirtColorBrown