diff --git a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml
index 07f495c5f3..1243f0af34 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml
@@ -406,6 +406,18 @@
       - state: green
       - state: security_officer
 
+- type: entity
+  id: SpawnPointDetective
+  parent: SpawnPointJobBase
+  name: detective
+  components:
+  - type: SpawnPoint
+    job_id: Detective
+  - type: Sprite
+    layers:
+      - state: green
+      - state: detective
+
 # SPECIAL
 # ERT
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index 734fa7a6ea..6b249d4eb3 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -661,3 +661,18 @@
         state: pda-reporter
   - type: Icon
     state: pda-reporter
+
+- type: entity
+  parent: BasePDA
+  id: DetectivePDA
+  name: detective PDA
+  description: Smells like rain... pouring down the rooftops...
+  components:
+  - type: PDA
+    id: DetectiveIDCard
+  - type: Appearance
+    visuals:
+      - type: PDAVisualizer
+        state: pda-detective
+  - type: Icon
+    state: pda-detective
diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
index 7daebaa837..b9d9264862 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
@@ -508,3 +508,14 @@
     - state: idreporter
   - type: PresetIdCard
     job: Reporter
+
+- type: entity
+  parent: IDCardStandard
+  id: DetectiveIDCard
+  name: detective ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: iddetective
+  - type: PresetIdCard
+    job: Detective
diff --git a/Resources/Prototypes/Maps/atlas.yml b/Resources/Prototypes/Maps/atlas.yml
index ead61e8bea..89d365bc9a 100644
--- a/Resources/Prototypes/Maps/atlas.yml
+++ b/Resources/Prototypes/Maps/atlas.yml
@@ -44,3 +44,4 @@
         MedicalIntern: [ 1, 1 ]
         ServiceWorker: [ 1, 1 ]
         SecurityCadet: [ 1, 1 ]
+        Detective: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/bagel.yml b/Resources/Prototypes/Maps/bagel.yml
index 7acd299262..a2561307b5 100644
--- a/Resources/Prototypes/Maps/bagel.yml
+++ b/Resources/Prototypes/Maps/bagel.yml
@@ -44,3 +44,4 @@
         ServiceWorker: [ 2, 2 ]
         SecurityCadet: [ 2, 2 ]
         Reporter: [ 1, 1 ]
+        Detective: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/barratry.yml b/Resources/Prototypes/Maps/barratry.yml
index 2e54c5251f..680f91ea53 100644
--- a/Resources/Prototypes/Maps/barratry.yml
+++ b/Resources/Prototypes/Maps/barratry.yml
@@ -43,3 +43,4 @@
         MedicalIntern: [ 1, 2 ]
         ServiceWorker: [ 1, 2 ]
         SecurityCadet: [ 1, 2 ]
+        Detective: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/delta.yml b/Resources/Prototypes/Maps/delta.yml
index 683e210579..229519c9bd 100644
--- a/Resources/Prototypes/Maps/delta.yml
+++ b/Resources/Prototypes/Maps/delta.yml
@@ -42,4 +42,5 @@
         TechnicalAssistant: [ 1, 2 ]
         MedicalIntern: [ 1, 2 ]
         ServiceWorker: [ 1, 2 ]
-        SecurityCadet: [ 1, 2 ]
\ No newline at end of file
+        SecurityCadet: [ 1, 2 ]
+        Detective: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/lighthouse.yml b/Resources/Prototypes/Maps/lighthouse.yml
index 364fa3068f..3643216ead 100644
--- a/Resources/Prototypes/Maps/lighthouse.yml
+++ b/Resources/Prototypes/Maps/lighthouse.yml
@@ -44,3 +44,4 @@
         MedicalIntern: [ 2, 2 ]
         ServiceWorker: [ 2, 2 ]
         SecurityCadet: [ 2, 2 ]
+        Detective: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/marathon.yml b/Resources/Prototypes/Maps/marathon.yml
index 295f157bff..f88fd0edee 100644
--- a/Resources/Prototypes/Maps/marathon.yml
+++ b/Resources/Prototypes/Maps/marathon.yml
@@ -45,3 +45,4 @@
         ServiceWorker: [ 2, 2 ]
         SecurityCadet: [ 2, 2 ]
         Psychologist: [ 1, 1 ]
+        Detective: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/nss_pillar.yml b/Resources/Prototypes/Maps/nss_pillar.yml
index 5366b05d71..0e3e709099 100644
--- a/Resources/Prototypes/Maps/nss_pillar.yml
+++ b/Resources/Prototypes/Maps/nss_pillar.yml
@@ -42,4 +42,5 @@
         Lawyer: [ 1, 2 ]
         Quartermaster: [ 1, 1 ]
         CargoTechnician: [ 4, 6 ]
-        SalvageSpecialist: [ 4, 6 ]
\ No newline at end of file
+        SalvageSpecialist: [ 4, 6 ]
+        Detective: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/saltern.yml b/Resources/Prototypes/Maps/saltern.yml
index a7ee797fdf..24fa15c1d8 100644
--- a/Resources/Prototypes/Maps/saltern.yml
+++ b/Resources/Prototypes/Maps/saltern.yml
@@ -44,3 +44,4 @@
         MedicalIntern: [ 2, 2 ]
         ServiceWorker: [ 2, 2 ]
         SecurityCadet: [ 2, 2 ]
+        Detective: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/splitstation.yml b/Resources/Prototypes/Maps/splitstation.yml
index 71a07eff8c..28ad56e5d7 100644
--- a/Resources/Prototypes/Maps/splitstation.yml
+++ b/Resources/Prototypes/Maps/splitstation.yml
@@ -43,3 +43,4 @@
         Quartermaster: [ 1, 1 ]
         CargoTechnician: [ 3, 6 ]
         SalvageSpecialist: [ 4, 6 ]
+        Detective: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/waystation.yml b/Resources/Prototypes/Maps/waystation.yml
index b0601bd74c..ba11fb29ef 100644
--- a/Resources/Prototypes/Maps/waystation.yml
+++ b/Resources/Prototypes/Maps/waystation.yml
@@ -44,3 +44,4 @@
         MedicalIntern: [ 1, 1 ]
         ServiceWorker: [ 1, 1 ]
         SecurityCadet: [ 1, 1 ]
+        Detective: [ 1, 1 ]
diff --git a/Resources/Prototypes/Roles/Jobs/Security/detective.yml b/Resources/Prototypes/Roles/Jobs/Security/detective.yml
new file mode 100644
index 0000000000..c0f0ae532d
--- /dev/null
+++ b/Resources/Prototypes/Roles/Jobs/Security/detective.yml
@@ -0,0 +1,32 @@
+- type: job
+  id: Detective
+  name: job-name-detective
+  startingGear: DetectiveGear
+  departments:
+  - Security
+  icon: "Detective"
+  supervisors: job-supervisors-hos
+  canBeAntag: false
+  access:
+  - Security
+  - Brig
+  - Maintenance
+  - Service
+
+- type: startingGear
+  id: DetectiveGear
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitDetective
+    back: ClothingBackpackSecurityFilled
+    shoes: ClothingShoesBootsJack
+    eyes: ClothingEyesGlassesSunglasses
+    head: ClothingHeadHatFedoraBrown
+    outerClothing: ClothingOuterVestDetective
+    id: DetectivePDA
+    ears: ClothingHeadsetSecurity
+    pocket1: ForensicPad
+    pocket2: ForensicScanner
+    belt: ClothingBeltHolster
+  innerclothingskirt: ClothingUniformJumpskirtDetective
+  satchel: ClothingBackpackSatchelSecurityFilled
+  duffelbag: ClothingBackpackDuffelSecurityFilled
\ No newline at end of file