Fix merge conflicts in branch.

Author: CerberusWolfie

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:

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:
@@ -142411,10 +142411,10 @@ entities:
       parent: 2
 - proto: SpawnPointMagistrate
   entities:
-  - uid: 27523
+  - uid: 27707
     components:
     - type: Transform
-      pos: -2.5,2.5
+      pos: -2.5,-3.5
       parent: 2
 - proto: SpawnPointMailCarrier
   entities:

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 ]