Station Specific Jobs: Reporter and Psychologist

Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml

@@ -768,4 +768,35 @@
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpsuit/atmos.rsi
 
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitPsychologist
+  name: psychologist suit
+  description: I don't lose things. I place things in locations which later elude me.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/psychologist.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/psychologist.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitReporter
+  name: reporter suit
+  description: A good reporter remains a skeptic all their life.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/reporter.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/reporter.rsi
 
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitJournalist
+  name: journalist suit
+  description: If journalism is good, it is controversial, by nature.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/journalist.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/journalist.rsi

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

@@ -466,4 +466,30 @@
   - type: Sprite
     layers:
       - state: green
-      - state: ertjanitor
+      - state: ertjanitor
+
+# STATION SPECIFIC
+
+- type: entity
+  id: SpawnPointReporter
+  parent: SpawnPointJobBase
+  name: reporter
+  components:
+  - type: SpawnPoint
+    job_id: Reporter
+  - type: Sprite
+    layers:
+      - state: green
+      - state: reporter
+
+- type: entity
+  id: SpawnPointPsychologist
+  parent: SpawnPointJobBase
+  name: psychologist
+  components:
+  - type: SpawnPoint
+    job_id: Psychologist
+  - type: Sprite
+    layers:
+      - state: green
+      - state: psychologist

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

@@ -630,4 +630,34 @@
   description: Red for firepower.
   components:
   - type: PDA
-    id: ERTLeaderIDCard
+    id: ERTLeaderIDCard
+
+- type: entity
+  parent: BasePDA
+  id: PsychologistPDA
+  name: psychologist PDA
+  description: Looks immaculately cleaned.
+  components:
+  - type: PDA
+    id: PsychologistIDCard
+  - type: Appearance
+    visuals:
+      - type: PDAVisualizer
+        state: pda-medical
+  - type: Icon
+    state: pda-medical
+
+- type: entity
+  parent: BasePDA
+  id: ReporterPDA
+  name: reporter PDA
+  description: Smells like freshly printed press.
+  components:
+  - type: PDA
+    id: ReporterIDCard
+  - type: Appearance
+    visuals:
+      - type: PDAVisualizer
+        state: pda-reporter
+  - type: Icon
+    state: pda-reporter

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

@@ -483,3 +483,25 @@
   - type: Sprite
     layers:
     - state: syndie
+
+- type: entity
+  parent: IDCardStandard
+  id: PsychologistIDCard
+  name: psychologist ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: idpsychologist
+  - type: PresetIdCard
+    job: Psychologist
+
+- type: entity
+  parent: IDCardStandard
+  id: ReporterIDCard
+  name: reporter ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: idreporter
+  - type: PresetIdCard
+    job: Reporter

Resources/Prototypes/Maps/bagel.yml

@@ -43,3 +43,4 @@
         MedicalIntern: [ 2, 2 ]
         ServiceWorker: [ 2, 2 ]
         SecurityCadet: [ 2, 2 ]
+        Reporter: [ 1, 1 ]

Resources/Prototypes/Maps/marathon.yml

@@ -44,3 +44,4 @@
         MedicalIntern: [ 2, 2 ]
         ServiceWorker: [ 2, 2 ]
         SecurityCadet: [ 2, 2 ]
+        Psychologist: [ 1, 1 ]

Resources/Prototypes/Roles/Jobs/Civilian/reporter.yml

@@ -0,0 +1,24 @@
+- type: job
+  id: Reporter
+  name: "reporter"
+  startingGear: ReporterGear
+  departments:
+  - Civilian
+  icon: "Reporter"
+  supervisors: "the head of personnel"
+  access:
+  - Service
+  - Maintenance
+
+- type: startingGear
+  id: ReporterGear
+  equipment:
+    head: ClothingHeadHatTophat
+    jumpsuit: ClothingUniformJumpsuitReporter
+    back: ClothingBackpackFilled
+    shoes: ClothingShoesColorWhite
+    id: ReporterPDA
+    ears: ClothingHeadsetService
+  innerclothingskirt: ClothingUniformJumpsuitJournalist
+  satchel: ClothingBackpackSatchelFilled
+  duffelbag: ClothingBackpackDuffelFilled

Resources/Prototypes/Roles/Jobs/Medical/psychologist.yml

@@ -0,0 +1,25 @@
+- type: job
+  id: Psychologist
+  name: "psychologist"
+  startingGear: PsychologistGear
+  departments:
+  - Medical
+  icon: "Psychologist"
+  supervisors: "the chief medical officer"
+  access:
+  - Medical
+  - Maintenance
+  extendedAccess:
+  - Chemistry
+
+- type: startingGear
+  id: PsychologistGear
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitPsychologist
+    back: ClothingBackpackMedicalFilled
+    shoes: ClothingShoesLeather
+    id: PsychologistPDA
+    ears: ClothingHeadsetMedical
+  innerclothingskirt: ClothingUniformJumpsuitPsychologist
+  satchel: ClothingBackpackSatchelMedicalFilled
+  duffelbag: ClothingBackpackDuffelMedicalFilled

Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/78a56e1a22ba1d8d6023ed9bdae55a6de7fe8a39 and modified by emisse",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/78a56e1a22ba1d8d6023ed9bdae55a6de7fe8a39 and modified by emisse",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/78a56e1a22ba1d8d6023ed9bdae55a6de7fe8a39 and modified by emisse",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Interface/Misc/job_icons.rsi/meta.json

@@ -112,6 +112,12 @@
         {
             "name": "Musician"
         },
+        {
+            "name": "Reporter"
+        },
+        {
+            "name": "Psychologist"
+        },
         {
             "name": "MedicalIntern"
         },

Resources/Textures/Markers/jobs.rsi/meta.json

@@ -112,6 +112,9 @@
     {
       "name": "mime"
     },
+    {
+      "name": "reporter"
+    },
     {
       "name": "paramedic"
     },

Resources/Textures/Objects/Devices/pda.rsi/meta.json

@@ -145,6 +145,9 @@
     {
       "name": "pda-musician"
     },
+    {
+      "name": "pda-reporter"
+    },
     {
       "name": "pda-interncadet"
     },

Resources/Textures/Objects/Misc/id_cards.rsi/meta.json

@@ -103,6 +103,12 @@
     {
       "name": "idparamedic"
     },
+    {
+      "name": "idpsychologist"
+    },
+    {
+      "name": "idreporter"
+    },
     {
       "name": "idprisoner"
     },