))

space-sunrise · Jun 8, 2024 · f1aa6fa · f1aa6fa
1 parent c95268d
commit f1aa6fa
Show file tree

Hide file tree

Showing 18 changed files with 52 additions and 21 deletions.
diff --git a/Resources/Prototypes/Maps/bagel.yml b/Resources/Prototypes/Maps/bagel.yml
@@ -60,5 +60,7 @@
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
             Reporter: [ 2, 2 ]
-            # Sunrise-Roles
+            # Sunrise-Law
             IAA: [ 1, 1 ]
+            Lawyer: [ 1, 1 ]
+            Magistrate: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/box.yml b/Resources/Prototypes/Maps/box.yml
@@ -59,6 +59,7 @@
             Clown: [ 1, 1 ]
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
-            # Sunrise-Roles
+            # Sunrise-Law
             IAA: [ 1, 1 ]
-
+            Lawyer: [ 1, 1 ]
+            Magistrate: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/cluster.yml b/Resources/Prototypes/Maps/cluster.yml
@@ -58,6 +58,7 @@
             Clown: [ 1, 1 ]
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
-            # Sunrise-Roles
+            # Sunrise-Law
             IAA: [ 1, 1 ]
-
+            Lawyer: [ 1, 1 ]
+            Magistrate: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/core.yml b/Resources/Prototypes/Maps/core.yml
@@ -63,5 +63,7 @@
             Musician: [ 1, 1 ]
             Boxer: [ 2, 2 ]
             Reporter: [ 2, 2 ]
-            # Sunrise-Roles
+            # Sunrise-Law
             IAA: [ 1, 1 ]
+            Lawyer: [ 1, 1 ]
+            Magistrate: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/europa.yml b/Resources/Prototypes/Maps/europa.yml
@@ -64,5 +64,7 @@
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
             Reporter: [ 1, 1 ]
-            # Sunrise-Roles
+            # Sunrise-Law
             IAA: [ 1, 1 ]
+            Lawyer: [ 1, 1 ]
+            Magistrate: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/fland.yml b/Resources/Prototypes/Maps/fland.yml
@@ -60,5 +60,7 @@
             Clown: [ 1, 1 ]
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
-            # Sunrise-Roles
+            # Sunrise-Law
             IAA: [ 1, 1 ]
+            Lawyer: [ 1, 1 ]
+            Magistrate: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/marathon.yml b/Resources/Prototypes/Maps/marathon.yml
@@ -60,5 +60,7 @@
             Clown: [ 1, 1 ]
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
-            # Sunrise-Roles
+            # Sunrise-Law
             IAA: [ 1, 1 ]
+            Lawyer: [ 1, 1 ]
+            Magistrate: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/meta.yml b/Resources/Prototypes/Maps/meta.yml
@@ -58,5 +58,7 @@
             Clown: [ 1, 1 ]
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
-            # Sunrise-Roles
+            # Sunrise-Law
             IAA: [ 1, 1 ]
+            Lawyer: [ 1, 1 ]
+            Magistrate: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/oasis.yml b/Resources/Prototypes/Maps/oasis.yml
@@ -61,5 +61,7 @@
             Clown: [ 1, 1 ]
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
-            # Sunrise-Roles
+            # Sunrise-Law
             IAA: [ 1, 1 ]
+            Lawyer: [ 1, 1 ]
+            Magistrate: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/omega.yml b/Resources/Prototypes/Maps/omega.yml
@@ -58,5 +58,7 @@
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
             Borg: [ 2, 2 ]
-            # Sunrise-Roles
+            # Sunrise-Law
             IAA: [ 1, 1 ]
+            Lawyer: [ 1, 1 ]
+            Magistrate: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/origin.yml b/Resources/Prototypes/Maps/origin.yml
@@ -61,6 +61,7 @@
             Musician: [ 2, 2 ]
             Boxer: [ 1, 1 ]
             Reporter: [ 1, 1 ]
-            # Sunrise-Roles
+            # Sunrise-Law
             IAA: [ 1, 1 ]
-
+            Lawyer: [ 1, 1 ]
+            Magistrate: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/packed.yml b/Resources/Prototypes/Maps/packed.yml
@@ -57,5 +57,7 @@
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
             Borg: [ 1 , 1 ]
-            # Sunrise-Roles
+            # Sunrise-Law
             IAA: [ 1, 1 ]
+            Lawyer: [ 1, 1 ]
+            Magistrate: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/train.yml b/Resources/Prototypes/Maps/train.yml
@@ -60,5 +60,7 @@
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
             Borg: [ 2, 2 ]
-            # Sunrise-Roles
+            # Sunrise-Law
             IAA: [ 1, 1 ]
+            Lawyer: [ 1, 1 ]
+            Magistrate: [ 1, 1 ]
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
@@ -7,7 +7,6 @@
     - !type:OverallPlaytimeRequirement
       time: 36000 # 10 hrs
   startingGear: LawyerGear
-  setPreference: false # Replaced on the IAA
   icon: "JobIconLawyer"
   supervisors: job-supervisors-hop
   access:

diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml
@@ -13,7 +13,6 @@
   color: "#9FED58"
   weight: -10
   roles:
-  - IAA # Sunrise-Edit
   - Bartender
   - Borg
   - Botanist
@@ -38,7 +37,6 @@
   description: department-Command-description
   color: "#052EED" # Sunrise-Edit
   roles:
-  - Magistrat # Sunrise-Edit
   - Captain
   - CentralCommandOfficial
   - ChiefEngineer

diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml
@@ -0,0 +1,10 @@
+- type: department
+  id: Law
+  description: department-Law-description
+  color: "#FF5297"
+  weight: -10
+  roles:
+  - Magistrat
+  - IAA
+  - Lawyer
+
diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/play_time_trackers.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/play_time_trackers.yml
diff --git a/Resources/Prototypes/_Sunrise/Roles/play_time_trackers.yml b/Resources/Prototypes/_Sunrise/Roles/play_time_trackers.yml
@@ -1,2 +1,5 @@
 - type: playTimeTracker
   id: JobIAA
+
+- type: playTimeTracker
+  id: JobMagistrat