Магистрат и юридический департамент (#44)

* Vulpkanin Lang Fix * Blueshield * Revert "Blueshield" This reverts commit f4b7491. * Magistrat Job * Magistrat Icons, IAA Icons Change * Changelog * Law department, Some Fixes, Add Magistrate, Lawyer to all Maps * )) * Magistrat Loadout * Lawyer, Remove Comments from Maps, Adds More Lawyers(from 1 to 3, copyed from comments) * Law department in Sunrise Maps
space-sunrise · Jun 8, 2024 · e7b1402 · e7b1402
1 parent d7b054c
commit e7b1402
Show file tree

Hide file tree

Showing 54 changed files with 266 additions and 41 deletions.
diff --git a/Resources/Changelog/ChangelogSunrise.yml b/Resources/Changelog/ChangelogSunrise.yml
@@ -311,6 +311,12 @@ Entries:
     type: Add
   id: 27
   time: '2024-06-07T17:08:00.724523+00:00'
+- author: Rinary
+  changes:
+  - message: "\u0431\u044B\u043B\u0430\u0020\ \u0434\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430\u0020\ \u0440\u043E\u043B\u044C\u000D\u000A\ \u043C\u0430\u0433\u0438\u0441\u0442\u0440\u0430\u0442\u0430."
+    type: Add
+  id: 27
+  time: '2024-06-08T00:34:38.724523+00:00'
 - author: Babaev
   changes:
   - message: "\u041D\u043E\u0432\u044B\u0435 \u0441\u043F\u0440\u0430\u0439\u0442\u044B\

diff --git a/Resources/Locale/ru-RU/_sunrise/job/department-desc.ftl b/Resources/Locale/ru-RU/_sunrise/job/department-desc.ftl
@@ -0,0 +1 @@
+department-Law-description = Защищяйте, судите или накажите преступников.
diff --git a/Resources/Locale/ru-RU/_sunrise/job/department.ftl b/Resources/Locale/ru-RU/_sunrise/job/department.ftl
@@ -0,0 +1 @@
+department-Law = Юридический отдел
diff --git a/Resources/Locale/ru-RU/_sunrise/job/job-desc.ftl b/Resources/Locale/ru-RU/_sunrise/job/job-desc.ftl
@@ -0,0 +1 @@
+job-description-magistrat = Вы само правосудие станции, ваша задача судить всех крупных нарушителей порядка.
diff --git a/Resources/Locale/ru-RU/_sunrise/job/job-names.ftl b/Resources/Locale/ru-RU/_sunrise/job/job-names.ftl
@@ -0,0 +1 @@
+job-name-magistrat = Магистрат
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/markers/spawners/jobs.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/markers/spawners/jobs.ftl
@@ -0,0 +1,2 @@
+ent-SpawnPointMagistrat = Магистрат
+    .desc = { ent-SpawnPointJobBase.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/devices/pda.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/devices/pda.ftl
@@ -0,0 +1,2 @@
+ent-MagistratPDA = КПК Магистрата
+    .desc = { ent-CaptainPDA.desc }
diff --git a/...s/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/misc/identification_cards.ftl b/...s/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/misc/identification_cards.ftl
@@ -0,0 +1,2 @@
+ent-MagistratIDCard = ID карта Магистрата
+    .desc = { ent-IDCardStandard.desc }
diff --git a/Resources/Prototypes/Access/command.yml b/Resources/Prototypes/Access/command.yml
@@ -9,6 +9,10 @@
 - type: accessLevel
   id: HeadOfPersonnel
   name: id-card-access-level-head-of-personnel
+
+- type: accessLevel
+  id: Magistrat
+  name: id-card-access-level-magistrat
 
 - type: accessGroup
   id: Command

diff --git a/Resources/Prototypes/Maps/bagel.yml b/Resources/Prototypes/Maps/bagel.yml
@@ -49,7 +49,6 @@
             SecurityOfficer: [ 4, 4 ]
             Detective: [ 1, 1 ]
             SecurityCadet: [ 4, 4 ]
-            #Lawyer: [ 2, 2 ]
             #supply
             Quartermaster: [ 1, 1 ]
             SalvageSpecialist: [ 3, 3 ]
@@ -60,5 +59,7 @@
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
             Reporter: [ 2, 2 ]
-            # Sunrise-Roles
+            # Sunrise-Law
             IAA: [ 1, 1 ]
+            Lawyer: [ 2, 2 ]
+            Magistrate: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/box.yml b/Resources/Prototypes/Maps/box.yml
@@ -49,7 +49,6 @@
             SecurityOfficer: [ 5, 5 ]
             Detective: [ 1, 1 ]
             SecurityCadet: [ 4, 4 ]
-            #Lawyer: [ 2, 2 ]
             #supply
             Quartermaster: [ 1, 1 ]
             SalvageSpecialist: [ 3, 3 ]
@@ -59,6 +58,7 @@
             Clown: [ 1, 1 ]
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
-            # Sunrise-Roles
+            # Sunrise-Law
             IAA: [ 1, 1 ]
-
+            Lawyer: [ 2, 2 ]
+            Magistrate: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/cluster.yml b/Resources/Prototypes/Maps/cluster.yml
@@ -26,7 +26,6 @@
             Janitor: [ 1, 1 ]
             Chaplain: [ 1, 1 ]
             Librarian: [ 1, 1 ]
-            #Lawyer: [ 1, 1 ]
             ServiceWorker: [ 1, 1 ]
             #engineering
             ChiefEngineer: [ 1, 1 ]
@@ -58,6 +57,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
@@ -49,7 +49,6 @@
             HeadOfSecurity: [ 1, 1 ]
             SecurityOfficer: [ 4, 4 ]
             Warden: [ 1, 1 ]
-            #Lawyer: [ 1, 1 ]
             SecurityCadet: [ 1, 1 ]
             Detective: [ 1, 1 ]
             #supply
@@ -63,5 +62,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
@@ -51,7 +51,6 @@
             HeadOfSecurity: [ 1, 1 ]
             SecurityOfficer: [ 3, 3 ]
             Warden: [ 1, 1 ]
-            #Lawyer: [ 1, 1 ]
             SecurityCadet: [ 3, 3 ]
             Detective: [ 1, 1 ]
             #supply
@@ -64,5 +63,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
@@ -50,7 +50,6 @@
             SecurityOfficer: [ 8, 8 ]
             Detective: [ 1, 1 ]
             SecurityCadet: [ 4, 4 ]
-            #Lawyer: [ 2, 2 ]
             #supply
             Quartermaster: [ 1, 1 ]
             SalvageSpecialist: [ 3, 3 ]
@@ -60,5 +59,7 @@
             Clown: [ 1, 1 ]
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
-            # Sunrise-Roles
+            # Sunrise-Law
             IAA: [ 1, 1 ]
+            Lawyer: [ 2, 2 ]
+            Magistrate: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/marathon.yml b/Resources/Prototypes/Maps/marathon.yml
@@ -50,7 +50,6 @@
             SecurityOfficer: [ 4, 4 ]
             Detective: [ 1, 1 ]
             SecurityCadet: [ 4, 4 ]
-            #Lawyer: [ 2, 2 ]
             #supply
             Quartermaster: [ 1, 1 ]
             SalvageSpecialist: [ 3, 3 ]
@@ -60,5 +59,7 @@
             Clown: [ 1, 1 ]
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
-            # Sunrise-Roles
+            # Sunrise-Law
             IAA: [ 1, 1 ]
+            Lawyer: [ 2, 2 ]
+            Magistrate: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/meta.yml b/Resources/Prototypes/Maps/meta.yml
@@ -48,7 +48,6 @@
             SecurityOfficer: [ 5, 7 ]
             Detective: [ 1, 1 ]
             SecurityCadet: [ 3, 6 ]
-            #Lawyer: [ 2, 2 ]
             #supply
             Quartermaster: [ 1, 1 ]
             SalvageSpecialist: [ 3, 3 ]
@@ -58,5 +57,7 @@
             Clown: [ 1, 1 ]
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
-            # Sunrise-Roles
+            # Sunrise-Law
             IAA: [ 1, 1 ]
+            Lawyer: [ 2, 2 ]
+            Magistrate: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/oasis.yml b/Resources/Prototypes/Maps/oasis.yml
@@ -51,7 +51,6 @@
             SecurityOfficer: [ 8, 8 ]
             Detective: [ 1, 1 ]
             SecurityCadet: [ 4, 4 ]
-            # Lawyer: [ 3, 3 ]
             #supply
             Quartermaster: [ 1, 1 ]
             SalvageSpecialist: [ 3, 3 ]
@@ -61,5 +60,7 @@
             Clown: [ 1, 1 ]
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
-            # Sunrise-Roles
+            # Sunrise-Law
             IAA: [ 1, 1 ]
+            Lawyer: [ 3, 3 ]
+            Magistrate: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/omega.yml b/Resources/Prototypes/Maps/omega.yml
@@ -47,7 +47,6 @@
             SecurityOfficer: [ 4, 4 ]
             Detective: [ 1, 1 ]
             SecurityCadet: [ 2, 2 ]
-            #Lawyer: [ 1, 1 ]
             #supply
             Quartermaster: [ 1, 1 ]
             SalvageSpecialist: [ 2, 2 ]
@@ -58,5 +57,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
@@ -25,7 +25,6 @@
             Janitor: [ 3, 3 ]
             Chaplain: [ 2, 2 ]
             Librarian: [ 2, 2 ]
-            #Lawyer: [ 2, 2 ]
             ServiceWorker: [ 3, 4 ]
             #engineering
             ChiefEngineer: [ 1, 1 ]
@@ -61,6 +60,7 @@
             Musician: [ 2, 2 ]
             Boxer: [ 1, 1 ]
             Reporter: [ 1, 1 ]
-            # Sunrise-Roles
+            # Sunrise-Law
             IAA: [ 1, 1 ]
-
+            Lawyer: [ 2, 2 ]
+            Magistrate: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/packed.yml b/Resources/Prototypes/Maps/packed.yml
@@ -46,7 +46,6 @@
             SecurityOfficer: [ 4, 4 ]
             Detective: [ 1, 1 ]
             SecurityCadet: [ 2, 2 ]
-            #Lawyer: [ 1, 1 ]
             #supply
             Quartermaster: [ 1, 1 ]
             SalvageSpecialist: [ 2, 2 ]
@@ -57,5 +56,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
@@ -49,7 +49,6 @@
             Warden: [ 1, 1 ]
             SecurityOfficer: [ 6, 6 ]
             SecurityCadet: [ 3, 3 ]
-            #Lawyer: [ 1, 2 ]
             #supply
             Quartermaster: [ 1, 1 ]
             SalvageSpecialist: [ 2, 2 ]
@@ -60,5 +59,7 @@
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
             Borg: [ 2, 2 ]
-            # Sunrise-Roles
+            # Sunrise-Law
             IAA: [ 1, 1 ]
+            Lawyer: [ 1, 2 ]
+            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
@@ -38,7 +38,6 @@
   color: "#052EED" # Sunrise-Edit
   roles:
   - Captain
-  - IAA # Sunrise-Edit
   - CentralCommandOfficial
   - ChiefEngineer
   - ChiefMedicalOfficer

diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -41,3 +41,14 @@
       sprite: _Sunrise/Clothing/Uniforms/Jumpsuit/centcom_admiral.rsi
     - type: Clothing
       sprite: _Sunrise/Clothing/Uniforms/Jumpsuit/centcom_admiral.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: MagistratUniformSuit
+  name: Костюм магистрата
+  description: Увольте пару срочников!
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Clothing/Uniforms/jumpsuit/magistratebel.rsi
+  - type: Clothing
+    sprite: _Sunrise/Clothing/Uniforms/jumpsuit/magistratebel.rsi
diff --git a/Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/jobs.yml
@@ -1,4 +1,16 @@
 - type: entity
+  id: SpawnPointMagistrat
+  parent: SpawnPointJobBase
+  name: Magistrat
+  components:
+  - type: SpawnPoint
+    job_id: Magistrat
+  - type: Sprite
+    sprite: _Sunrise/Markers/jobs.rsi
+    layers:
+      - state: green
+      - state: magistrat
+      - state: jobicon
   id: SpawnPointBrigmedic
   parent: SpawnPointJobBase
   name: brigmedic
@@ -8,4 +20,4 @@
   - type: Sprite
     layers:
       - state: green
-      - state: brigmedic
+      - state: brigmedic
diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/pda.yml
@@ -11,3 +11,22 @@
       borderColor: "#6f6192"
     - type: Icon
       state: pda-lawyer
+
+- type: entity
+  parent: CaptainPDA
+  id: MagistratPDA
+  name: magistrat PDA
+  components:
+  - type: Pda
+    id: MagistratIDCard
+    state: pda-captain
+    penSlot:
+      startingItem: Pen
+      priority: -1
+      whitelist:
+        tags:
+        - Write
+  - type: PdaBorderColor
+    borderColor: "#7C5D00"
+  - type: Icon
+    state: pda-captain
diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/identification_cards.yml
@@ -12,6 +12,15 @@
 
 - type: entity
   parent: IDCardStandard
+  id: MagistratIDCard
+  name: Magistrate ID Card
+  components:
+    - type: Sprite
+      layers:
+        - state: silver
+        - state: idmagistrat
+    - type: PresetIdCard
+      job: Magistrat
   id: BrigmedicIDCard
   name: brigmedic ID card
   components:
@@ -20,4 +29,4 @@
     - state: default
     - state: idbrigmedic
   - type: PresetIdCard
-    job: Brigmedic
+    job: Brigmedic
diff --git a/Resources/Prototypes/_Sunrise/Loadouts/role_loadouts.yml b/Resources/Prototypes/_Sunrise/Loadouts/role_loadouts.yml
@@ -10,6 +10,9 @@
   - Socks
 
 - type: roleLoadout
+  id: JobMagistrat
+  groups:
+  - CommonBackpack
   id: JobBrigmedic
   groups:
   - BrigmedicJumpsuit
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		department-Law-description = Защищяйте, судите или накажите преступников.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		department-Law = Юридический отдел
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		job-description-magistrat = Вы само правосудие станции, ваша задача судить всех крупных нарушителей порядка.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ent-SpawnPointMagistrat = Магистрат
		.desc = { ent-SpawnPointJobBase.desc }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ent-MagistratPDA = КПК Магистрата
		.desc = { ent-CaptainPDA.desc }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ent-MagistratIDCard = ID карта Магистрата
		.desc = { ent-IDCardStandard.desc }