diff --git a/Resources/Locale/en-US/_Goobstation/prototypes/access/accesses.ftl b/Resources/Locale/en-US/_Goobstation/prototypes/access/accesses.ftl
index 131d1eef770..e11ee5caeaf 100644
--- a/Resources/Locale/en-US/_Goobstation/prototypes/access/accesses.ftl
+++ b/Resources/Locale/en-US/_Goobstation/prototypes/access/accesses.ftl
@@ -1,2 +1,3 @@
 id-card-access-level-ntr = Nanotrasen Representative
 id-card-access-level-bso = Blueshield Officer
+id-card-access-level-mag = Magistrate
diff --git a/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl b/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl
index 3ebfe8bf1b1..1ea79f2c16d 100644
--- a/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl
+++ b/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl
@@ -1,6 +1,6 @@
 id-card-access-level-orders = Orders
 id-card-access-level-mantis = Mantis
-id-card-access-level-chief-justice = Chief Justice
+id-card-access-level-cj = Chief Justice
 id-card-access-level-prosecutor = Prosecutor
 id-card-access-level-justice = Justice
 id-card-access-level-corpsman = Corpsman
diff --git a/Resources/Locale/en-US/job/department-desc.ftl b/Resources/Locale/en-US/job/department-desc.ftl
index 0243d61942f..f9670d4b6b3 100644
--- a/Resources/Locale/en-US/job/department-desc.ftl
+++ b/Resources/Locale/en-US/job/department-desc.ftl
@@ -7,3 +7,4 @@ department-Security-description = Keep the peace around the station.
 department-Science-description = Research artifacts and anomalies to invent new equipment for the station
 department-Silicon-description = Obey your laws and serve the crew.
 department-Specific-description = Jobs that not all stations have.
+department-Dignitary-description = Assist Heads of Staff and Captain, follow your directives.
diff --git a/Resources/Locale/en-US/job/department.ftl b/Resources/Locale/en-US/job/department.ftl
index 2295a9ba9d3..784e8f8e87b 100644
--- a/Resources/Locale/en-US/job/department.ftl
+++ b/Resources/Locale/en-US/job/department.ftl
@@ -7,3 +7,4 @@ department-Security = Security
 department-Science = Science
 department-Silicon = Silicons
 department-Specific = Station specific
+department-Dignitary = Dignitary
diff --git a/Resources/Locale/en-US/loadouts/categories.ftl b/Resources/Locale/en-US/loadouts/categories.ftl
index 0e4cf112521..78caa4aa485 100644
--- a/Resources/Locale/en-US/loadouts/categories.ftl
+++ b/Resources/Locale/en-US/loadouts/categories.ftl
@@ -20,6 +20,7 @@ loadout-category-JobsCommandHeadOfPersonnel = Head of Personnel
 loadout-category-JobsCommandAdminAssistant = Administrative Assistant
 loadout-category-JobsCommandBlueshieldOfficer = Blueshield Officer
 loadout-category-JobsCommandNanorep = Nanotrasen Representative
+loadout-category-JobsCommandMagistrate = Magistrate
 
 # Engineering
 loadout-category-JobsEngineering = Engineering
diff --git a/Resources/Locale/en-US/loadouts/itemgroups.ftl b/Resources/Locale/en-US/loadouts/itemgroups.ftl
index 4c42edc72c0..c49f2e14042 100644
--- a/Resources/Locale/en-US/loadouts/itemgroups.ftl
+++ b/Resources/Locale/en-US/loadouts/itemgroups.ftl
@@ -82,6 +82,21 @@ character-item-group-LoadoutHeadOfPersonnelOuter = Head of Personnel Outerwear
 character-item-group-LoadoutHeadOfPersonnelShoes = Head of Personnel Shoes
 character-item-group-LoadoutHeadOfPersonnelUniforms = Head of Personnel Uniforms
 
+# Dignitary - BlueshieldOfficer
+character-item-group-LoadoutBlueshieldOfficerBackpacks = Blueshield Officer Backpacks
+character-item-group-LoadoutBlueshieldOfficerVests = Blueshield Officer Vests
+character-item-group-LoadoutBlueshieldOfficerUniforms = Blueshield Officer Uniforms
+
+# Dignitary - Magistrate
+character-item-group-LoadoutMagistrateHead = Magistrate Headgear
+character-item-group-LoadoutMagistrateNeck = Magistrate Neckwear
+character-item-group-LoadoutMagistrateOuter = Magistrate Outerwear
+character-item-group-LoadoutMagistrateUniforms = Magistrate Uniforms
+
+# Dignitary - Nanotrasen Representative
+character-item-group-LoadoutNanorepBackpacks = Nanotrasen Representative Backpacks
+character-tiem-group-LoadoutNanorepUniforms = Nanotrasen Representative Uniforms
+
 # Engineering
 character-item-group-LoadoutEngineeringBackpacks = Engineering Backpacks
 character-item-group-LoadoutEngineeringBelt = Engineering Belt
diff --git a/Resources/Locale/en-US/paper/stamp-component.ftl b/Resources/Locale/en-US/paper/stamp-component.ftl
index c3e38245ca8..797a0fff55b 100644
--- a/Resources/Locale/en-US/paper/stamp-component.ftl
+++ b/Resources/Locale/en-US/paper/stamp-component.ftl
@@ -17,3 +17,4 @@ stamp-component-stamped-name-trader = Trader
 stamp-component-stamped-name-syndicate = Syndicate
 stamp-component-stamped-name-ce = Chief Engineer
 stamp-component-stamped-name-nanorep = Nanotrasen Representative
+stamp-component-stamped-name-magistrate = Magistrate
diff --git a/Resources/Maps/arena.yml b/Resources/Maps/arena.yml
index d409d1add8a..aa61c9bb3af 100644
--- a/Resources/Maps/arena.yml
+++ b/Resources/Maps/arena.yml
@@ -151146,6 +151146,13 @@ entities:
     - type: Transform
       pos: -31.5,17.5
       parent: 6747
+- proto: SpawnPointMagistrate
+  entities:
+  - uid: 27823
+    components:
+    - type: Transform
+      pos: -23.5,-51.5
+      parent: 6747
 - proto: SpawnPointMailCarrier
   entities:
   - uid: 27031
diff --git a/Resources/Maps/asterisk.yml b/Resources/Maps/asterisk.yml
index 0bd34d57884..41fc0f2e73d 100644
--- a/Resources/Maps/asterisk.yml
+++ b/Resources/Maps/asterisk.yml
@@ -57641,6 +57641,13 @@ entities:
     - type: Transform
       pos: -12.5,14.5
       parent: 2
+- proto: SpawnPointMagistrate
+  entities:
+  - uid: 11187
+    components:
+    - type: Transform
+      pos: 46.5,-9.5
+      parent: 2
 - proto: SpawnPointMailCarrier
   entities:
   - uid: 9983
diff --git a/Resources/Maps/core.yml b/Resources/Maps/core.yml
index 40ab7beceed..9685efd2e13 100644
--- a/Resources/Maps/core.yml
+++ b/Resources/Maps/core.yml
@@ -121830,6 +121830,13 @@ entities:
     - type: Transform
       pos: -18.5,-9.5
       parent: 2
+- proto: SpawnPointMagistrate
+  entities:
+  - uid: 22545
+    components:
+    - type: Transform
+      pos: 45.5,-36.5
+      parent: 2
 - proto: SpawnPointMedicalDoctor
   entities:
   - uid: 6720
diff --git a/Resources/Maps/edge.yml b/Resources/Maps/edge.yml
index b50006a7cb9..f19c2065af2 100644
--- a/Resources/Maps/edge.yml
+++ b/Resources/Maps/edge.yml
@@ -91074,6 +91074,13 @@ entities:
     - type: Transform
       pos: -20.5,20.5
       parent: 2
+- proto: SpawnPointMagistrate
+  entities:
+  - uid: 17481
+    components:
+    - type: Transform
+      pos: -8.5,35.5
+      parent: 2
 - proto: SpawnPointMailCarrier
   entities:
   - uid: 13998
diff --git a/Resources/Maps/europa.yml b/Resources/Maps/europa.yml
index 165934fe330..0d54891dc6a 100644
--- a/Resources/Maps/europa.yml
+++ b/Resources/Maps/europa.yml
@@ -65764,7 +65764,7 @@ entities:
       pos: -11.5,11.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -26472.29
+      secondsUntilStateChange: -26515.367
       state: Opening
     - type: Occluder
       enabled: True
@@ -78679,6 +78679,13 @@ entities:
     - type: Transform
       pos: -28.5,-0.5
       parent: 1
+- proto: SpawnPointMagistrate
+  entities:
+  - uid: 16620
+    components:
+    - type: Transform
+      pos: -8.5,6.5
+      parent: 1
 - proto: SpawnPointMailCarrier
   entities:
   - uid: 1223
diff --git a/Resources/Maps/gaxstation.yml b/Resources/Maps/gaxstation.yml
index aee3e3d9d2d..f502c4b698d 100644
--- a/Resources/Maps/gaxstation.yml
+++ b/Resources/Maps/gaxstation.yml
@@ -113824,6 +113824,13 @@ entities:
     - type: Transform
       pos: 17.5,58.5
       parent: 2
+- proto: SpawnPointMagistrate
+  entities:
+  - uid: 20871
+    components:
+    - type: Transform
+      pos: 71.5,26.5
+      parent: 2
 - proto: SpawnPointMailCarrier
   entities:
   - uid: 20865
@@ -134443,7 +134450,7 @@ entities:
       lastSignals:
         DoorStatus: True
     - type: Door
-      secondsUntilStateChange: -120432.64
+      secondsUntilStateChange: -120542.65
       state: Opening
   - uid: 18112
     components:
diff --git a/Resources/Maps/glacier.yml b/Resources/Maps/glacier.yml
index d1ed95ead20..c0fcbe15321 100644
--- a/Resources/Maps/glacier.yml
+++ b/Resources/Maps/glacier.yml
@@ -45936,6 +45936,18 @@ entities:
     - type: Transform
       pos: 36.74322,44.429073
       parent: 2
+- proto: ClothingOuterWinterCentcom
+  entities:
+  - uid: 17499
+    components:
+    - type: Transform
+      pos: 32.888283,41.295105
+      parent: 2
+  - uid: 17500
+    components:
+    - type: Transform
+      pos: 36.825783,45.31073
+      parent: 2
 - proto: ClothingOuterWinterChem
   entities:
   - uid: 6216
@@ -96430,6 +96442,13 @@ entities:
     - type: Transform
       pos: -57.5,2.5
       parent: 2
+- proto: SpawnPointMagistrate
+  entities:
+  - uid: 17498
+    components:
+    - type: Transform
+      pos: 32.5,41.5
+      parent: 2
 - proto: SpawnPointMailCarrier
   entities:
   - uid: 13932
diff --git a/Resources/Maps/hammurabi.yml b/Resources/Maps/hammurabi.yml
index c5e3cb0e876..09f874f94b9 100644
--- a/Resources/Maps/hammurabi.yml
+++ b/Resources/Maps/hammurabi.yml
@@ -236485,6 +236485,13 @@ entities:
     - type: Transform
       pos: -64.5,3.5
       parent: 1
+- proto: SpawnPointMagistrate
+  entities:
+  - uid: 42454
+    components:
+    - type: Transform
+      pos: -97.5,1.5
+      parent: 1
 - proto: SpawnPointMailCarrier
   entities:
   - uid: 17152
diff --git a/Resources/Maps/hive.yml b/Resources/Maps/hive.yml
index 60982472322..ef0019b3454 100644
--- a/Resources/Maps/hive.yml
+++ b/Resources/Maps/hive.yml
@@ -149517,6 +149517,13 @@ entities:
     - type: Transform
       pos: -53.5,-24.5
       parent: 1
+- proto: SpawnPointMagistrate
+  entities:
+  - uid: 27791
+    components:
+    - type: Transform
+      pos: 105.5,6.5
+      parent: 1
 - proto: SpawnPointMailCarrier
   entities:
   - uid: 7387
diff --git a/Resources/Maps/lighthouse.yml b/Resources/Maps/lighthouse.yml
index 94c30dfd8ad..9921bbb9f6d 100644
--- a/Resources/Maps/lighthouse.yml
+++ b/Resources/Maps/lighthouse.yml
@@ -110260,6 +110260,13 @@ entities:
     - type: Transform
       pos: 18.5,-9.5
       parent: 100
+- proto: SpawnPointMagistrate
+  entities:
+  - uid: 20900
+    components:
+    - type: Transform
+      pos: -8.5,58.5
+      parent: 100
 - proto: SpawnPointMailCarrier
   entities:
   - uid: 16733
diff --git a/Resources/Maps/meta.yml b/Resources/Maps/meta.yml
index 445bb4f7dd6..ddbd71d9b11 100644
--- a/Resources/Maps/meta.yml
+++ b/Resources/Maps/meta.yml
@@ -10339,7 +10339,7 @@ entities:
       pos: -53.5,-12.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -12845.943
+      secondsUntilStateChange: -12876.496
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -75704,7 +75704,7 @@ entities:
       pos: -3.5,-52.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -40871.477
+      secondsUntilStateChange: -40902.03
       state: Closing
   - uid: 11944
     components:
@@ -142409,6 +142409,13 @@ entities:
     - type: Transform
       pos: -25.5,-16.5
       parent: 2
+- proto: SpawnPointMagistrate
+  entities:
+  - uid: 27707
+    components:
+    - type: Transform
+      pos: -2.5,-3.5
+      parent: 2
 - proto: SpawnPointMailCarrier
   entities:
   - uid: 21681
diff --git a/Resources/Maps/pebble.yml b/Resources/Maps/pebble.yml
index 81b007c7e9b..9b7c428b513 100644
--- a/Resources/Maps/pebble.yml
+++ b/Resources/Maps/pebble.yml
@@ -59195,6 +59195,13 @@ entities:
     - type: Transform
       pos: -29.5,-4.5
       parent: 2
+- proto: SpawnPointMagistrate
+  entities:
+  - uid: 10228
+    components:
+    - type: Transform
+      pos: -0.5,-24.5
+      parent: 2
 - proto: SpawnPointMailCarrier
   entities:
   - uid: 8928
diff --git a/Resources/Maps/radstation.yml b/Resources/Maps/radstation.yml
index b8eb6b1bcc5..f350c67478e 100644
--- a/Resources/Maps/radstation.yml
+++ b/Resources/Maps/radstation.yml
@@ -15129,7 +15129,7 @@ entities:
       pos: 34.5,-35.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -55516.35
+      secondsUntilStateChange: -55586.55
       state: Opening
   - uid: 383
     components:
@@ -131127,6 +131127,13 @@ entities:
     - type: Transform
       pos: 43.5,-0.5
       parent: 2
+- proto: SpawnPointMagistrate
+  entities:
+  - uid: 22317
+    components:
+    - type: Transform
+      pos: 5.5,53.5
+      parent: 2
 - proto: SpawnPointMailCarrier
   entities:
   - uid: 18892
@@ -157775,7 +157782,7 @@ entities:
       links:
       - 19976
     - type: Door
-      secondsUntilStateChange: -191808.66
+      secondsUntilStateChange: -191878.86
       state: Opening
   - uid: 23356
     components:
diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml
index e90783df4fc..e2f8a808534 100644
--- a/Resources/Maps/saltern.yml
+++ b/Resources/Maps/saltern.yml
@@ -4332,7 +4332,7 @@ entities:
       pos: 3.5,22.5
       parent: 31
     - type: Door
-      secondsUntilStateChange: -32552.574
+      secondsUntilStateChange: -32634.607
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -66886,6 +66886,13 @@ entities:
     - type: Transform
       pos: 12.5,-29.5
       parent: 31
+- proto: SpawnPointMagistrate
+  entities:
+  - uid: 11411
+    components:
+    - type: Transform
+      pos: -1.5,23.5
+      parent: 31
 - proto: SpawnPointMailCarrier
   entities:
   - uid: 11397
diff --git a/Resources/Maps/shoukou.yml b/Resources/Maps/shoukou.yml
index 9988eefc92c..4cbe47174af 100644
--- a/Resources/Maps/shoukou.yml
+++ b/Resources/Maps/shoukou.yml
@@ -36708,7 +36708,7 @@ entities:
       pos: -36.5,-22.5
       parent: 34
     - type: Door
-      secondsUntilStateChange: -67318.92
+      secondsUntilStateChange: -67401.266
       state: Closing
   - uid: 1274
     components:
@@ -72765,6 +72765,13 @@ entities:
     - type: Transform
       pos: -7.5,-17.5
       parent: 34
+- proto: SpawnPointMagistrate
+  entities:
+  - uid: 13762
+    components:
+    - type: Transform
+      pos: 52.5,-36.5
+      parent: 34
 - proto: SpawnPointMailCarrier
   entities:
   - uid: 857
diff --git a/Resources/Maps/submarine.yml b/Resources/Maps/submarine.yml
index 3f1bc9eb174..0890fe73aa5 100644
--- a/Resources/Maps/submarine.yml
+++ b/Resources/Maps/submarine.yml
@@ -209675,6 +209675,13 @@ entities:
     - type: Transform
       pos: 9.5,-27.5
       parent: 2
+- proto: SpawnPointMagistrate
+  entities:
+  - uid: 39307
+    components:
+    - type: Transform
+      pos: 14.5,49.5
+      parent: 2
 - proto: SpawnPointMailCarrier
   entities:
   - uid: 983
diff --git a/Resources/Maps/tortuga.yml b/Resources/Maps/tortuga.yml
index 1359965938b..f9f702c820c 100644
--- a/Resources/Maps/tortuga.yml
+++ b/Resources/Maps/tortuga.yml
@@ -167883,6 +167883,13 @@ entities:
     - type: Transform
       pos: 44.5,14.5
       parent: 33
+- proto: SpawnPointMagistrate
+  entities:
+  - uid: 27376
+    components:
+    - type: Transform
+      pos: -68.5,22.5
+      parent: 33
 - proto: SpawnPointMailCarrier
   entities:
   - uid: 3585
diff --git a/Resources/Prototypes/Access/misc.yml b/Resources/Prototypes/Access/misc.yml
index c2984168f85..a9e3aa0cd8a 100644
--- a/Resources/Prototypes/Access/misc.yml
+++ b/Resources/Prototypes/Access/misc.yml
@@ -48,5 +48,6 @@
   - ChiefJustice # DeltaV - Add Chief Justice access
   - Prosecutor # DeltaV - Add Prosecutor access
   - Corpsman # DeltaV - Add Corpsman access
-  - BlueshieldOfficer
-  - NanotrasenRepresentative
+  - BlueshieldOfficer # Goobstation - Add BSO Access
+  - NanotrasenRepresentative # Goobstation - Add NTR Access
+  - Magistrate # Goobstation - Add Magistrate Access
diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/magistrate.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/magistrate.yml
new file mode 100644
index 00000000000..918963673f7
--- /dev/null
+++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/magistrate.yml
@@ -0,0 +1,35 @@
+- type: characterItemGroup
+  id: LoadoutMagistrateHead
+  maxItems: 1
+  items:
+    - type: loadout
+      id: LoadoutClothingHeadChiefJustice
+
+- type: characterItemGroup
+  id: LoadoutMagistrateNeck
+  maxItems: 1
+  items:
+    - type: loadout
+      id: LoadoutClothingNeckChiefJustice
+
+- type: characterItemGroup
+  id: LoadoutMagistrateOuter
+  maxItems: 1
+  items:
+    - type: loadout
+      id: LoadoutClothingOuterChiefJustice
+
+- type: characterItemGroup
+  id: LoadoutMagistrateUniforms
+  maxItems: 1
+  items:
+    - type: loadout
+      id: LoadoutClothingUniformJumpsuitMagistrate
+    - type: loadout
+      id: LoadoutClothingUniformJumpskirtMagistrate
+    - type: loadout
+      id: LoadoutClothingUniformJumpsuitChiefJustice
+    - type: loadout
+      id: LoadoutClothingUniformJumpsuitChiefJusticeFormal
+    - type: loadout
+      id: LoadoutClothingUniformJumpsuitChiefJusticeWhite
diff --git a/Resources/Prototypes/Loadouts/Categories/categories.yml b/Resources/Prototypes/Loadouts/Categories/categories.yml
index d9a9dc56b57..af4b7ab2117 100644
--- a/Resources/Prototypes/Loadouts/Categories/categories.yml
+++ b/Resources/Prototypes/Loadouts/Categories/categories.yml
@@ -54,6 +54,7 @@
     - JobsCommandAdminAssistant
     - JobsCommandBlueshieldOfficer
     - JobsCommandNanorep
+    - JobsCommandMagistrate
 
 - type: loadoutCategory
   id: JobsCommandAUncategorized
@@ -73,6 +74,9 @@
 - type: loadoutCategory
   id: JobsCommandNanorep
 
+- type: loadoutCategory
+  id: JobsCommandMagistrate
+
 # Engineering
 - type: loadoutCategory
   id: JobsEngineering
diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/magistrate.yml b/Resources/Prototypes/Loadouts/Jobs/Command/magistrate.yml
new file mode 100644
index 00000000000..bd36d9e2167
--- /dev/null
+++ b/Resources/Prototypes/Loadouts/Jobs/Command/magistrate.yml
@@ -0,0 +1,141 @@
+# Uncategorized
+# Backpacks
+
+# Belt
+
+# Ears
+
+# Equipment
+
+# Eyes
+
+# Gloves
+
+# Head
+- type: loadout
+  id: LoadoutClothingHeadChiefJustice
+  category: JobsCommandMagistrate
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutMagistrateHead
+    - !type:CharacterJobRequirement
+      jobs:
+        - ChiefJustice
+        - Magistrate
+  items:
+    - ClothingHeadHatCJToque
+
+# Id
+
+# Neck
+- type: loadout
+  id: LoadoutClothingNeckChiefJustice
+  category: JobsCommandMagistrate
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutMagistrateNeck
+    - !type:CharacterJobRequirement
+      jobs:
+        - ChiefJustice
+        - Magistrate
+  items:
+    - ClothingNeckCloakCJ
+
+# Mask
+
+# Outer
+- type: loadout
+  id: LoadoutClothingOuterChiefJustice
+  category: JobsCommandMagistrate
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutMagistrateOuter
+    - !type:CharacterJobRequirement
+      jobs:
+        - ChiefJustice
+        - Magistrate
+  items:
+    - ClothingOuterChiefJustice
+
+# Shoes
+
+# Uniforms
+- type: loadout
+  id: LoadoutClothingUniformJumpskirtMagistrate
+  category: JobsCommandMagistrate
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutMagistrateUniforms
+    - !type:CharacterJobRequirement
+      jobs:
+        - ChiefJustice
+        - Magistrate
+  items:
+    - ClothingUniformJumpskirtChiefJustice
+
+- type: loadout
+  id: LoadoutClothingUniformJumpsuitMagistrate
+  category: JobsCommandMagistrate
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutMagistrateUniforms
+    - !type:CharacterJobRequirement
+      jobs:
+        - Magistrate
+  items:
+    - ClothingUniformJumpsuitMagistrate
+
+- type: loadout
+  id: LoadoutClothingUniformJumpsuitChiefJustice
+  category: JobsCommandMagistrate
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutMagistrateUniforms
+    - !type:CharacterJobRequirement
+      jobs:
+        - ChiefJustice
+        - Magistrate
+  items:
+    - ClothingUniformJumpsuitChiefJustice
+
+- type: loadout
+  id: LoadoutClothingUniformJumpsuitChiefJusticeFormal
+  category: JobsCommandMagistrate
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutMagistrateUniforms
+    - !type:CharacterJobRequirement
+      jobs:
+        - ChiefJustice
+        - Magistrate
+  items:
+    - ClothingUniformJumpsuitChiefJusticeFormal
+
+- type: loadout
+  id: LoadoutClothingUniformJumpsuitChiefJusticeWhite
+  category: JobsCommandMagistrate
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutMagistrateUniforms
+    - !type:CharacterJobRequirement
+      jobs:
+        - ChiefJustice
+        - Magistrate
+  items:
+    - ClothingUniformJumpsuitChiefJusticeWhite
diff --git a/Resources/Prototypes/Maps/arena.yml b/Resources/Prototypes/Maps/arena.yml
index 0d1ad7edffe..d1e02b8456e 100644
--- a/Resources/Prototypes/Maps/arena.yml
+++ b/Resources/Prototypes/Maps/arena.yml
@@ -26,6 +26,7 @@
             Captain: [ 1, 1 ]
             BlueshieldOfficer: [ 1, 1]
             NanotrasenRepresentative: [ 1, 1 ]
+            Magistrate: [ 1, 1 ]
             AdministrativeAssistant: [ 1, 1 ]
           #engineering
             AtmosphericTechnician: [ 1, 2 ]
diff --git a/Resources/Prototypes/Maps/asterisk.yml b/Resources/Prototypes/Maps/asterisk.yml
index 294ac7b8064..b43202acf72 100644
--- a/Resources/Prototypes/Maps/asterisk.yml
+++ b/Resources/Prototypes/Maps/asterisk.yml
@@ -26,6 +26,7 @@
             Captain: [ 1, 1 ]
             BlueshieldOfficer: [ 1, 1]
             NanotrasenRepresentative: [ 1, 1 ]
+            Magistrate: [ 1, 1 ]
             AdministrativeAssistant: [ 1, 1 ]
             HeadOfPersonnel: [ 1, 1 ]
             Bartender: [ 1, 2 ]
diff --git a/Resources/Prototypes/Maps/core.yml b/Resources/Prototypes/Maps/core.yml
index 89d8b097af6..e5b4640911c 100644
--- a/Resources/Prototypes/Maps/core.yml
+++ b/Resources/Prototypes/Maps/core.yml
@@ -27,6 +27,7 @@
             Captain: [ 1, 1 ]
             BlueshieldOfficer: [ 1, 1]
             NanotrasenRepresentative: [ 1, 1 ]
+            Magistrate: [ 1, 1 ]
             AdministrativeAssistant: [ 1, 1 ]
             HeadOfPersonnel: [ 1, 1 ]
             ServiceWorker: [ 3, 6 ]
diff --git a/Resources/Prototypes/Maps/edge.yml b/Resources/Prototypes/Maps/edge.yml
index 3acfaaefdc9..bb27ee6ebb5 100644
--- a/Resources/Prototypes/Maps/edge.yml
+++ b/Resources/Prototypes/Maps/edge.yml
@@ -23,6 +23,7 @@
             Captain: [ 1, 1 ]
             BlueshieldOfficer: [ 1, 1]
             NanotrasenRepresentative: [ 1, 1 ]
+            Magistrate: [ 1, 1 ]
             AdministrativeAssistant: [ 1, 1 ]
             HeadOfPersonnel: [ 1, 1 ]
             Bartender: [ 1, 2 ]
diff --git a/Resources/Prototypes/Maps/europa.yml b/Resources/Prototypes/Maps/europa.yml
index 18d54babe94..a3397c29c09 100644
--- a/Resources/Prototypes/Maps/europa.yml
+++ b/Resources/Prototypes/Maps/europa.yml
@@ -21,6 +21,7 @@
             Captain: [ 1, 1 ]
             BlueshieldOfficer: [ 1, 1]
             NanotrasenRepresentative: [ 1, 1 ]
+            Magistrate: [ 1, 1 ]
             AdministrativeAssistant: [ 1, 1 ]
             HeadOfPersonnel: [ 1, 1 ]
             Bartender: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/gaxstation.yml b/Resources/Prototypes/Maps/gaxstation.yml
index ca6088c7d1c..a1901d5fe46 100644
--- a/Resources/Prototypes/Maps/gaxstation.yml
+++ b/Resources/Prototypes/Maps/gaxstation.yml
@@ -22,6 +22,7 @@
             Captain: [ 1, 1 ]
             NanotrasenRepresentative: [ 1, 1 ]
             BlueshieldOfficer: [ 1, 1 ]
+            Magistrate: [ 1, 1 ]
             HeadOfPersonnel: [ 1, 1 ]
             AdministrativeAssistant: [ 1, 1 ]
             Bartender: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/glacier.yml b/Resources/Prototypes/Maps/glacier.yml
index 0b146b1ae0f..8eef819c824 100644
--- a/Resources/Prototypes/Maps/glacier.yml
+++ b/Resources/Prototypes/Maps/glacier.yml
@@ -25,6 +25,7 @@
           Captain: [ 1, 1 ]
           BlueshieldOfficer: [ 1, 1]
           NanotrasenRepresentative: [ 1, 1 ]
+          Magistrate: [ 1, 1 ]
           AdministrativeAssistant: [ 1, 1 ]
         #service
           HeadOfPersonnel: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/hammurabi.yml b/Resources/Prototypes/Maps/hammurabi.yml
index e36cca1314e..0d117d37f27 100644
--- a/Resources/Prototypes/Maps/hammurabi.yml
+++ b/Resources/Prototypes/Maps/hammurabi.yml
@@ -25,6 +25,7 @@
             Captain: [ 1, 1 ]
             BlueshieldOfficer: [ 1, 1]
             NanotrasenRepresentative: [ 1, 1 ]
+            Magistrate: [ 1, 1 ]
             AdministrativeAssistant: [ 1, 1 ]
           #engineering
             AtmosphericTechnician: [ 2, 3 ]
diff --git a/Resources/Prototypes/Maps/hive.yml b/Resources/Prototypes/Maps/hive.yml
index 30dfcd4edbe..52353877a07 100644
--- a/Resources/Prototypes/Maps/hive.yml
+++ b/Resources/Prototypes/Maps/hive.yml
@@ -26,6 +26,7 @@
             Captain: [ 1, 1 ]
             BlueshieldOfficer: [ 1, 1]
             NanotrasenRepresentative: [ 1, 1 ]
+            Magistrate: [ 1, 1 ]
             AdministrativeAssistant: [ 1, 1 ]
           #engineering
             AtmosphericTechnician: [ 1, 2 ]
diff --git a/Resources/Prototypes/Maps/lighthouse.yml b/Resources/Prototypes/Maps/lighthouse.yml
index 34fa636e2c4..036d1fa7d77 100644
--- a/Resources/Prototypes/Maps/lighthouse.yml
+++ b/Resources/Prototypes/Maps/lighthouse.yml
@@ -23,6 +23,7 @@
           Captain: [ 1, 1 ]
           BlueshieldOfficer: [ 1, 1]
           NanotrasenRepresentative: [ 1, 1 ]
+          Magistrate: [ 1, 1 ]
           AdministrativeAssistant: [ 1, 1 ]
           HeadOfPersonnel: [ 1, 1 ]
           Bartender: [ 1, 2 ]
diff --git a/Resources/Prototypes/Maps/meta.yml b/Resources/Prototypes/Maps/meta.yml
index 4362375c753..2365ba1fc41 100644
--- a/Resources/Prototypes/Maps/meta.yml
+++ b/Resources/Prototypes/Maps/meta.yml
@@ -21,6 +21,7 @@
             Captain: [ 1, 1 ]
             BlueshieldOfficer: [ 1, 1]
             NanotrasenRepresentative: [ 1, 1 ]
+            Magistrate: [ 1, 1 ]
             AdministrativeAssistant: [ 1, 1 ]
             HeadOfPersonnel: [ 1, 1 ]
             Bartender: [ 2, 2 ]
diff --git a/Resources/Prototypes/Maps/pebble.yml b/Resources/Prototypes/Maps/pebble.yml
index fdf6a0d3b26..1659dfc7610 100644
--- a/Resources/Prototypes/Maps/pebble.yml
+++ b/Resources/Prototypes/Maps/pebble.yml
@@ -21,6 +21,7 @@
             Captain: [ 1, 1 ]
             BlueshieldOfficer: [ 1, 1]
             NanotrasenRepresentative: [ 1, 1 ]
+            Magistrate: [ 1, 1 ]
             AdministrativeAssistant: [ 1, 1 ]
             HeadOfPersonnel: [ 1, 1 ]
             Bartender: [ 1, 2 ]
diff --git a/Resources/Prototypes/Maps/radstation.yml b/Resources/Prototypes/Maps/radstation.yml
index c05f16796b3..5bc4f4709b6 100644
--- a/Resources/Prototypes/Maps/radstation.yml
+++ b/Resources/Prototypes/Maps/radstation.yml
@@ -22,6 +22,7 @@
             Captain: [ 1, 1 ]
             BlueshieldOfficer: [ 1, 1]
             NanotrasenRepresentative: [ 1, 1 ]
+            Magistrate: [ 1, 1 ]
             AdministrativeAssistant: [ 1, 1 ]
             HeadOfPersonnel: [ 1, 1 ]
             Bartender: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/saltern.yml b/Resources/Prototypes/Maps/saltern.yml
index 4d416df87ba..73072bce836 100644
--- a/Resources/Prototypes/Maps/saltern.yml
+++ b/Resources/Prototypes/Maps/saltern.yml
@@ -24,6 +24,7 @@
             Captain: [ 1, 1 ]
             BlueshieldOfficer: [ 1, 1]
             NanotrasenRepresentative: [ 1, 1 ]
+            Magistrate: [ 1, 1 ]
             AdministrativeAssistant: [ 1, 1 ]
             HeadOfPersonnel: [ 1, 1 ]
             Bartender: [ 1, 2 ]
diff --git a/Resources/Prototypes/Maps/shoukou.yml b/Resources/Prototypes/Maps/shoukou.yml
index 18aae21c379..743234b6533 100644
--- a/Resources/Prototypes/Maps/shoukou.yml
+++ b/Resources/Prototypes/Maps/shoukou.yml
@@ -35,6 +35,7 @@
             Captain: [ 1, 1 ]
             BlueshieldOfficer: [ 1, 1]
             NanotrasenRepresentative: [ 1, 1 ]
+            Magistrate: [ 1, 1 ]
             AdministrativeAssistant: [ 1, 1 ]
             HeadOfPersonnel: [ 1, 1 ]
           #Engineering
diff --git a/Resources/Prototypes/Maps/submarine.yml b/Resources/Prototypes/Maps/submarine.yml
index 5ff22608182..656c7a3e7b7 100644
--- a/Resources/Prototypes/Maps/submarine.yml
+++ b/Resources/Prototypes/Maps/submarine.yml
@@ -25,6 +25,7 @@
             Captain: [ 1, 1 ]
             BlueshieldOfficer: [ 1, 1]
             NanotrasenRepresentative: [ 1, 1 ]
+            Magistrate: [ 1, 1 ]
             AdministrativeAssistant: [ 1, 1 ]
           #engineering
             AtmosphericTechnician: [ 2, 4 ]
diff --git a/Resources/Prototypes/Maps/tortuga.yml b/Resources/Prototypes/Maps/tortuga.yml
index 1108593bb30..933f7747a78 100644
--- a/Resources/Prototypes/Maps/tortuga.yml
+++ b/Resources/Prototypes/Maps/tortuga.yml
@@ -25,6 +25,7 @@
             Captain: [ 1, 1 ]
             BlueshieldOfficer: [ 1, 1]
             NanotrasenRepresentative: [ 1, 1 ]
+            Magistrate: [ 1, 1 ]
             AdministrativeAssistant: [ 1, 1 ]
           #engineering
             AtmosphericTechnician: [ 2, 3 ]
diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml
index 06963eb8988..8fc4cfb986b 100644
--- a/Resources/Prototypes/Roles/Jobs/departments.yml
+++ b/Resources/Prototypes/Roles/Jobs/departments.yml
@@ -58,10 +58,19 @@
   - ERTEngineer
   - DeathSquad
   - AdministrativeAssistant # Delta V - Administrative Assistant, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Command/admin_assistant.yml
+  primary: false
+  weight: 100
+
+- type: department
+  id: Dignitary
+  description: department-Dignitary-description
+  color: "#33FE6D"
+  roles:
   - BlueshieldOfficer # Goobstation
   - NanotrasenRepresentative # Goobstation
+  - Magistrate # Goobstation
   primary: false
-  weight: 100
+  weight: 101
 
 - type: department
   id: Engineering
diff --git a/Resources/Prototypes/_Goobstation/Access/centcomm.yml b/Resources/Prototypes/_Goobstation/Access/centcomm.yml
index bd8ee7102ec..c2f20bceacf 100644
--- a/Resources/Prototypes/_Goobstation/Access/centcomm.yml
+++ b/Resources/Prototypes/_Goobstation/Access/centcomm.yml
@@ -5,3 +5,7 @@
 - type: accessLevel
   id: BlueshieldOfficer
   name: id-card-access-level-bso
+
+- type: accessLevel
+  id: Magistrate
+  name: id-card-access-level-mag
diff --git a/Resources/Prototypes/_Goobstation/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/_Goobstation/Catalog/Fills/Lockers/heads.yml
index 45e4e5262a2..8be2864619f 100644
--- a/Resources/Prototypes/_Goobstation/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/_Goobstation/Catalog/Fills/Lockers/heads.yml
@@ -29,3 +29,16 @@
     - id: WeaponLeverChester
     - id: WeaponEnergyRevolver
     - id: BlueshieldAmmunitionBoxFilled
+
+- type: entity
+  id: LockerMagistrateFilled
+  suffix: Filled
+  parent: LockerMagistrate
+  components:
+  - type: StorageFill
+    contents:
+    - id: BoxFolderCentCom
+    - id: WeaponDisabler
+    - id: BriefcaseBrownFilled
+    - id: RubberStampMagistrate
+    - id: ClothingHeadHatPwig
diff --git a/Resources/Prototypes/_Goobstation/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/_Goobstation/Entities/Clothing/Ears/headsets.yml
new file mode 100644
index 00000000000..99ba0a12653
--- /dev/null
+++ b/Resources/Prototypes/_Goobstation/Entities/Clothing/Ears/headsets.yml
@@ -0,0 +1,20 @@
+- type: entity
+  parent: ClothingHeadset
+  id: ClothingHeadsetMagistrate
+  name: magistrate's headset
+  description: The headset used by the magistrate.
+  components:
+  - type: ContainerFill
+    containers:
+      key_slots:
+      - EncryptionKeyCommand
+      - EncryptionKeyCentCom
+      - EncryptionKeyJustice
+      - EncryptionKeyPrison
+      - EncryptionKeySecurity
+      - EncryptionKeyCommon
+  - type: Sprite
+    sprite: DeltaV/Clothing/Ears/Headsets/justice.rsi
+    state: icon_alt
+  - type: Clothing
+    sprite: DeltaV/Clothing/Ears/Headsets/justice.rsi
diff --git a/Resources/Prototypes/_Goobstation/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_Goobstation/Entities/Clothing/Uniforms/jumpsuits.yml
index 13185f9b389..7c8ec011131 100644
--- a/Resources/Prototypes/_Goobstation/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/_Goobstation/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -24,3 +24,14 @@
     sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/nanotrasen_representative.rsi
   - type: Clothing
     sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/nanotrasen_representative.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitMagistrate
+  name: magistrate robes
+  description: The robes worn by officials.
+  components:
+  - type: Sprite
+    sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/magistrate.rsi
+  - type: Clothing
+    sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/magistrate.rsi
diff --git a/Resources/Prototypes/_Goobstation/Entities/Marker/unique.yml b/Resources/Prototypes/_Goobstation/Entities/Marker/unique.yml
index 4400a7b872a..dc9c6637304 100644
--- a/Resources/Prototypes/_Goobstation/Entities/Marker/unique.yml
+++ b/Resources/Prototypes/_Goobstation/Entities/Marker/unique.yml
@@ -24,4 +24,18 @@
       - sprite: _Goobstation/Structures/Storage/closet.rsi
         state: ntr
   - type: UniqueEntityMarker
-    markerName: NanorepLocker
\ No newline at end of file
+    markerName: NanorepLocker
+
+- type: entity
+  name: magistrate locker unique marker
+  id: UniqueMarkerMagistrateLocker
+  parent: MarkerBase
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    layers:
+      - state: red
+      - sprite: _Goobstation/Structures/Storage/closet.rsi
+        state: mag
+  - type: UniqueEntityMarker
+    markerName: MagistrateLocker
diff --git a/Resources/Prototypes/_Goobstation/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/_Goobstation/Entities/Markers/Spawners/jobs.yml
index 9bf7854bf7d..afe4800c9f5 100644
--- a/Resources/Prototypes/_Goobstation/Entities/Markers/Spawners/jobs.yml
+++ b/Resources/Prototypes/_Goobstation/Entities/Markers/Spawners/jobs.yml
@@ -23,3 +23,15 @@
     layers:
       - state: green
       - state: centcom
+
+- type: entity
+  id: SpawnPointMagistrate
+  parent: SpawnPointJobBase
+  name: magistrate
+  components:
+  - type: SpawnPoint
+    job_id: Magistrate
+  - type: Sprite
+    layers:
+      - state: green
+      - state: centcom
diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Devices/Electronics/door_access.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Devices/Electronics/door_access.yml
index c49a3f34bc4..1e9b3f4d4e7 100644
--- a/Resources/Prototypes/_Goobstation/Entities/Objects/Devices/Electronics/door_access.yml
+++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Devices/Electronics/door_access.yml
@@ -21,3 +21,11 @@
   components:
   - type: AccessReader
     access: [["BlueshieldOfficer"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsMAG
+  suffix: Magistrate, Locked
+  components:
+  - type: AccessReader
+    access: [["Magistrate"]]
diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Devices/unique_teleporters.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Devices/unique_teleporters.yml
index e4bb5b8d48d..15adb7be458 100644
--- a/Resources/Prototypes/_Goobstation/Entities/Objects/Devices/unique_teleporters.yml
+++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Devices/unique_teleporters.yml
@@ -22,7 +22,7 @@
   - type: Sprite
     state: bso
   - type: SpawnItemsOnUse
-    items: 
+    items:
     - id: UniqueLockerBlueshieldOfficerFilled
 
 - type: entity
@@ -46,7 +46,7 @@
   - type: Sprite
     state: ntr
   - type: SpawnItemsOnUse
-    items: 
+    items:
     - id: UniqueLockerNanorepFilled
 
 - type: entity
@@ -60,3 +60,27 @@
   - type: UniqueEntityMarker
     markerName: NanorepLocker
     stationOnly: false
+
+- type: entity
+  parent: BaseLockerTeleporter
+  id: MagistrateLockerTeleporter
+  name: magistrate locker teleporter
+  description: Device that allows you to request delivery of magistrate locker.
+  components:
+  - type: Sprite
+    state: mag
+  - type: SpawnItemsOnUse
+    items:
+    - id: UniqueLockerMagistrateFilled
+
+- type: entity
+  parent: MagistrateLockerTeleporter
+  id: UniqueMagistrateLockerTeleporter
+  suffix: Unique
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: UniqueEntityChecker
+    markerName: MagistrateLocker
+  - type: UniqueEntityMarker
+    markerName: MagistrateLocker
+    stationOnly: false
diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Misc/rubber_stamps.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Misc/rubber_stamps.yml
index fb4d12bb33e..f21d039b394 100644
--- a/Resources/Prototypes/_Goobstation/Entities/Objects/Misc/rubber_stamps.yml
+++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Misc/rubber_stamps.yml
@@ -9,4 +9,17 @@
     stampState: "paper_stamp-nanorep"
   - type: Sprite
     sprite: _Goobstation/Objects/Misc/stamps.rsi
-    state: stamp-nanorep
\ No newline at end of file
+    state: stamp-nanorep
+
+- type: entity
+  name: magistrate rubber stamp
+  parent: RubberStampBase
+  id: RubberStampMagistrate
+  components:
+  - type: Stamp
+    stampedName: stamp-component-stamped-name-magistrate
+    stampedColor: "#76a5b4"
+    stampState: "paper_stamp-magistrate"
+  - type: Sprite
+    sprite: _Goobstation/Objects/Misc/stamps.rsi
+    state: stamp-magistrate
diff --git a/Resources/Prototypes/_Goobstation/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/_Goobstation/Entities/Structures/Doors/Airlocks/access.yml
index 01df42e7f2c..e44c9fb990d 100644
--- a/Resources/Prototypes/_Goobstation/Entities/Structures/Doors/Airlocks/access.yml
+++ b/Resources/Prototypes/_Goobstation/Entities/Structures/Doors/Airlocks/access.yml
@@ -77,3 +77,23 @@
   - type: ContainerFill
     containers:
       board: [ DoorElectronicsNTR ]
+
+# MAG locked
+
+- type: entity
+  parent: AirlockCentralCommand
+  id: AirlockMagistrateCommandLocked
+  suffix: Magistrate, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsMAG ]
+
+- type: entity
+  parent: AirlockCentralCommandGlass
+  id: AirlockMagistrateCommandGlassLocked
+  suffix: Magistrate, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsMAG ]
diff --git a/Resources/Prototypes/_Goobstation/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/_Goobstation/Entities/Structures/Storage/Closets/Lockers/lockers.yml
index 4cbb6f375c0..b4556c8f347 100644
--- a/Resources/Prototypes/_Goobstation/Entities/Structures/Storage/Closets/Lockers/lockers.yml
+++ b/Resources/Prototypes/_Goobstation/Entities/Structures/Storage/Closets/Lockers/lockers.yml
@@ -27,3 +27,18 @@
     stateBaseClosed: ntr
     stateDoorOpen: ntr_open
     stateDoorClosed: ntr_door
+
+- type: entity
+  id: LockerMagistrate
+  name: magistrate locker
+  parent: LockerBaseSecure
+  components:
+  - type: Appearance
+  - type: Sprite
+    sprite: _Goobstation/Structures/Storage/closet.rsi
+  - type: AccessReader
+    access: [["Magistrate"]]
+  - type: EntityStorageVisuals
+    stateBaseClosed: mag
+    stateDoorOpen: bso_open # Sue me
+    stateDoorClosed: mag_door
diff --git a/Resources/Prototypes/_Goobstation/Entities/Unique/lockers.yml b/Resources/Prototypes/_Goobstation/Entities/Unique/lockers.yml
index 8a2ab206f30..8b8199f9ec7 100644
--- a/Resources/Prototypes/_Goobstation/Entities/Unique/lockers.yml
+++ b/Resources/Prototypes/_Goobstation/Entities/Unique/lockers.yml
@@ -5,7 +5,7 @@
   components:
   - type: ConditionalSpawner
     prototypes:
-    - UniqueMarkerNanorepLocker 
+    - UniqueMarkerNanorepLocker
 
 - type: entity
   id: UniqueLockerBlueshieldOfficerFilled
@@ -15,3 +15,12 @@
   - type: ConditionalSpawner
     prototypes:
     - UniqueMarkerBlueshieldLocker
+
+- type: entity
+  id: UniqueLockerMagistrateFilled
+  suffix: MAP THIS, Unique, Filled
+  parent: LockerMagistrateFilled
+  components:
+  - type: ConditionalSpawner
+    prototypes:
+    - UniqueMarkerMagistrateLocker
diff --git a/Resources/Prototypes/_Goobstation/Roles/Jobs/Command/magistrate.yml b/Resources/Prototypes/_Goobstation/Roles/Jobs/Command/magistrate.yml
new file mode 100644
index 00000000000..1e97aee0d32
--- /dev/null
+++ b/Resources/Prototypes/_Goobstation/Roles/Jobs/Command/magistrate.yml
@@ -0,0 +1,46 @@
+- type: job
+  id: Magistrate
+  name: Magistrate
+  description: "Ensure Space Law is being followed, Uphold Justice and Legality, Hold Hearings and Trials, Follow SOP, Ensure Command is Following Space Law."
+  playTimeTracker: JobMagistrate
+  requirements:
+    - !type:CharacterDepartmentTimeRequirement
+      department: Command
+      min: 54000 # 15 hours
+    - !type:CharacterDepartmentTimeRequirement
+      department: Security
+      min: 54000 # 15 hours
+  weight: 20
+  startingGear: MagistrateGear
+  icon: "JobIconMagistrate"
+  requireAdminNotify: true
+  joinNotifyCrew: true
+  supervisors: job-supervisors-centcom
+  canBeAntag: false
+  access:
+  - Security
+  - Brig
+  - External
+  - Cryogenics
+  - Maintenance
+  - Detective
+  - Corpsman
+  - Command
+  - CentralCommand
+  - Magistrate
+  special:
+  - !type:AddImplantSpecial
+    implants: [ MindShieldImplant ]
+  - !type:AddComponentSpecial
+    components:
+      - type: CommandStaff
+
+- type: startingGear
+  id: MagistrateGear
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitMagistrate
+    shoes: ClothingShoesLeather
+    gloves: ClothingHandsGlovesColorWhite
+    id: CentcomPDA
+    ears: ClothingHeadsetMagistrate
+    pocket1: UniqueMagistrateLockerTeleporter
diff --git a/Resources/Prototypes/_Goobstation/Roles/play_time_trackers.yml b/Resources/Prototypes/_Goobstation/Roles/play_time_trackers.yml
index fbaf30463be..7faee3d9999 100644
--- a/Resources/Prototypes/_Goobstation/Roles/play_time_trackers.yml
+++ b/Resources/Prototypes/_Goobstation/Roles/play_time_trackers.yml
@@ -3,3 +3,6 @@
 
 - type: playTimeTracker
   id: JobNanotrasenRepresentative
+
+- type: playTimeTracker
+  id: JobMagistrate
diff --git a/Resources/Prototypes/_Goobstation/StatusEffects/job.yml b/Resources/Prototypes/_Goobstation/StatusEffects/job.yml
index 22ed9aeda4c..fbfadfe32af 100644
--- a/Resources/Prototypes/_Goobstation/StatusEffects/job.yml
+++ b/Resources/Prototypes/_Goobstation/StatusEffects/job.yml
@@ -11,3 +11,10 @@
   icon:
     sprite: /Textures/_Goobstation/Interface/Misc/job_icons.rsi
     state: blueshield
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconMagistrate
+  icon:
+    sprite: /Textures/_Goobstation/Interface/Misc/job_icons.rsi
+    state: magistrate
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
index 8807254a3d2..7dde264d713 100644
--- a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. paper_stamp-syndicate by Veritius. paper_receipt, paper_receipt_horizontal by eoineoineoin. pen_centcom is a resprited version of pen_cap by PuroSlavKing (Github). Luxury pen is drawn by Ubaser. Lawyer and psychologist paper stamp resprited by Guess-My-Name. paper_stamp-signature by Mnemotechnician.",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. paper_stamp-syndicate by Veritius. paper_receipt, paper_receipt_horizontal by eoineoineoin. pen_centcom is a resprited version of pen_cap by PuroSlavKing (Github). Luxury pen is drawn by Ubaser. Lawyer and psychologist paper stamp resprited by Guess-My-Name. paper_stamp-signature by Mnemotechnician. paper_stamp-magistrate by CerberusWolfie",
   "size": {
     "x": 32,
     "y": 32
@@ -239,6 +239,9 @@
     {
       "name": "paper_stamp-nanorep"
     },
+    {
+      "name": "paper_stamp-magistrate"
+    },
     {
       "name": "paper_stamp-rd"
     },
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-magistrate.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-magistrate.png
new file mode 100644
index 00000000000..bdaa688372b
Binary files /dev/null and b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-magistrate.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/magistrate.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/magistrate.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..8e2b28207b7
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/magistrate.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/magistrate.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/magistrate.rsi/icon.png
new file mode 100644
index 00000000000..327ad37558b
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/magistrate.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/magistrate.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/magistrate.rsi/inhand-left.png
new file mode 100644
index 00000000000..1f3da9492f2
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/magistrate.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/magistrate.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/magistrate.rsi/inhand-right.png
new file mode 100644
index 00000000000..981c5ec9b5f
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/magistrate.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/magistrate.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/magistrate.rsi/meta.json
new file mode 100644
index 00000000000..66fe2f9230f
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/magistrate.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from paradise @ https://github.com/ParadiseSS13/Paradise/commit/14a7b74c2aad4002bf575687ed01321c8d66e5ff",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/_Goobstation/Interface/Misc/job_icons.rsi/magistrate.png b/Resources/Textures/_Goobstation/Interface/Misc/job_icons.rsi/magistrate.png
new file mode 100644
index 00000000000..60ff394c1f1
Binary files /dev/null and b/Resources/Textures/_Goobstation/Interface/Misc/job_icons.rsi/magistrate.png differ
diff --git a/Resources/Textures/_Goobstation/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/_Goobstation/Interface/Misc/job_icons.rsi/meta.json
index 1c7da3045b0..6e3863d054a 100644
--- a/Resources/Textures/_Goobstation/Interface/Misc/job_icons.rsi/meta.json
+++ b/Resources/Textures/_Goobstation/Interface/Misc/job_icons.rsi/meta.json
@@ -12,6 +12,9 @@
       },
       {
         "name": "blueshield"
+      },
+      {
+        "name": "magistrate"
       }
   ]
 }
diff --git a/Resources/Textures/_Goobstation/Objects/Devices/unique_teleporters.rsi/mag.png b/Resources/Textures/_Goobstation/Objects/Devices/unique_teleporters.rsi/mag.png
new file mode 100644
index 00000000000..c36a855df96
Binary files /dev/null and b/Resources/Textures/_Goobstation/Objects/Devices/unique_teleporters.rsi/mag.png differ
diff --git a/Resources/Textures/_Goobstation/Objects/Devices/unique_teleporters.rsi/meta.json b/Resources/Textures/_Goobstation/Objects/Devices/unique_teleporters.rsi/meta.json
index 1701d119ac5..6c03554278c 100644
--- a/Resources/Textures/_Goobstation/Objects/Devices/unique_teleporters.rsi/meta.json
+++ b/Resources/Textures/_Goobstation/Objects/Devices/unique_teleporters.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Made by Renee - https://discord.com/channels/1202734573247795300/1288192265319223387/1288254493020131368",
+  "copyright": "Made by Renee - https://discord.com/channels/1202734573247795300/1288192265319223387/1288254493020131368. Mag resprite by CerberusWolfie",
   "size": {
     "x": 32,
     "y": 32
@@ -15,6 +15,9 @@
     },
     {
       "name": "bso"
+    },
+    {
+      "name": "mag"
     }
   ]
 }
diff --git a/Resources/Textures/_Goobstation/Objects/Misc/stamps.rsi/meta.json b/Resources/Textures/_Goobstation/Objects/Misc/stamps.rsi/meta.json
index cf9e466a53d..b2b1dcf57c8 100644
--- a/Resources/Textures/_Goobstation/Objects/Misc/stamps.rsi/meta.json
+++ b/Resources/Textures/_Goobstation/Objects/Misc/stamps.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/fb1012102257b7b0a08d861fd2b8ba963c416e93. Resprited centcom sprite by BombasterDS",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/fb1012102257b7b0a08d861fd2b8ba963c416e93. Resprited centcom sprite by BombasterDS (NanoTrasen Rep). Repsprited from NTR by CerberusWolfie (Magistrate)",
     "size": {
         "x": 32,
         "y": 32
@@ -9,6 +9,9 @@
     "states": [
         {
             "name": "stamp-nanorep"
+        },
+        {
+            "name": "stamp-magistrate"
         }
     ]
 }
diff --git a/Resources/Textures/_Goobstation/Objects/Misc/stamps.rsi/stamp-magistrate.png b/Resources/Textures/_Goobstation/Objects/Misc/stamps.rsi/stamp-magistrate.png
new file mode 100644
index 00000000000..501963b0fe0
Binary files /dev/null and b/Resources/Textures/_Goobstation/Objects/Misc/stamps.rsi/stamp-magistrate.png differ
diff --git a/Resources/Textures/_Goobstation/Structures/Storage/closet.rsi/mag.png b/Resources/Textures/_Goobstation/Structures/Storage/closet.rsi/mag.png
new file mode 100644
index 00000000000..4fabadb1c98
Binary files /dev/null and b/Resources/Textures/_Goobstation/Structures/Storage/closet.rsi/mag.png differ
diff --git a/Resources/Textures/_Goobstation/Structures/Storage/closet.rsi/mag_door.png b/Resources/Textures/_Goobstation/Structures/Storage/closet.rsi/mag_door.png
new file mode 100644
index 00000000000..bb09ddfde3d
Binary files /dev/null and b/Resources/Textures/_Goobstation/Structures/Storage/closet.rsi/mag_door.png differ
diff --git a/Resources/Textures/_Goobstation/Structures/Storage/closet.rsi/meta.json b/Resources/Textures/_Goobstation/Structures/Storage/closet.rsi/meta.json
index 79b82e65e63..a149cb6a917 100644
--- a/Resources/Textures/_Goobstation/Structures/Storage/closet.rsi/meta.json
+++ b/Resources/Textures/_Goobstation/Structures/Storage/closet.rsi/meta.json
@@ -4,7 +4,7 @@
     "x": 32,
     "y": 32
   },
-  "copyright": "Made by Icepick - https://discord.com/channels/1202734573247795300/1236697829171527841/1282401830181277789",
+  "copyright": "Made by Icepick - https://discord.com/channels/1202734573247795300/1236697829171527841/1282401830181277789. Mag and Mag_Open resprited from BSO by CerberusWolfie",
   "license": "CC-BY-SA-3.0",
   "states": [
     {
@@ -15,6 +15,12 @@
     },
     {
       "name": "bso_open"
+    },
+    {
+      "name": "mag"
+    },
+    {
+      "name": "mag_door"
     },
 	{
       "name": "ntr"