space-sunrise · VigersRay · Jun 8, 2024 · Jun 5, 2024 · Jun 5, 2024 · Jun 5, 2024
@@ -311,3 +311,10 @@ 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'
+
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 }
@@ -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

@@ -13,6 +13,7 @@
   color: "#9FED58"
   weight: -10
   roles:
+  - IAA # Sunrise-Edit
   - Bartender
   - Borg
   - Botanist
@@ -37,8 +38,8 @@
   description: department-Command-description
   color: "#052EED" # Sunrise-Edit
   roles:
+  - Magistrat # Sunrise-Edit
   - Captain
-  - IAA # Sunrise-Edit
   - CentralCommandOfficial
   - ChiefEngineer
   - ChiefMedicalOfficer

@@ -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
@@ -0,0 +1,13 @@
+- 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
@@ -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
@@ -9,3 +9,15 @@
         - state: idiaa
     - type: PresetIdCard
       job: IAA
+
+- type: entity
+  parent: IDCardStandard
+  id: MagistratIDCard
+  name: Magistrate ID Card
+  components:
+    - type: Sprite
+      layers:
+        - state: silver
+        - state: idmagistrat
+    - type: PresetIdCard
+      job: Magistrat
@@ -0,0 +1,57 @@
+- type: job
+  id: Magistrat
+  name: job-name-magistrat
+  description: job-description-magistrat
+  playTimeTracker: JobMagistrat
+  requirements:
+    - !type:DepartmentTimeRequirement
+      department: Command
+      time: 180000 #50 hrs
+  startingGear: MagistratGear
+  icon: "JobIconMagistrat"
+  supervisors: job-supervisors-service
+  canBeAntag: false
+  setPreference: true
+  access:
+  - Magistrat
+  - Bar
+  - Kitchen
+  - Hydroponics
+  - Janitor
+  - Theatre
+  - Chapel
+  - Lawyer
+  - Brig
+  - Security
+  - Medical
+  - Research
+  - Engineering
+  - Cargo
+  - Salvage
+  - Command
+  extendedAccess:
+  - Hydroponics
+  special:
+  - !type:AddImplantSpecial
+    implants: [ MindShieldImplant ]
+  - !type:AddComponentSpecial
+    components:
+      - type: CommandStaff
+
+- type: startingGear
+  id: MagistratGear
+  equipment:
+    jumpsuit: MagistratUniformSuit
+    back: ClothingBackpackIAAFilled
+    shoes: ClothingShoesBootsLaceup
+    eyes: ClothingEyesGlassesSecurity
+    gloves: ClothingHandsGlovesColorWhite
+    outerClothing: ClothingOuterRobesJudge
+    id: MagistratPDA
+    ears: ClothingHeadsetAltCommand
+    head: ClothingHeadHatPwig
+    pocket1: Flash
+    pocket2: ClothingNeckLawyerbadge
+  innerClothingSkirt: MagistratUniformSuit
+  satchel: ClothingBackpackSatchelIAAFilled
+  duffelbag: ClothingBackpackDuffelIAAFilled
diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/play_time_trackers.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/play_time_trackers.yml
@@ -0,0 +1,2 @@
+- type: playTimeTracker
+  id: JobMagistrat
@@ -4,3 +4,10 @@
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: IAA
+
+- type: statusIcon
+  parent: JobIcon
+  id: JobIconMagistrat
+  icon:
+    sprite: /Textures/Interface/Misc/job_icons.rsi
+    state: Magistrat
@@ -175,6 +175,9 @@
         {
             "name": "HeadRevolutionary"
         },
+		{
+			"name": "Magistrat"
+		},
         {
             "name": "MindShield",
             "delays":

@@ -106,6 +106,9 @@
     {
       "name": "idiaa"
     },
+	{
+		"name": "idmagistrat"
+	},
     {
       "name": "idmedicaldoctor"
     },

@@ -0,0 +1,30 @@
+{
+    "version": 1,
+    "license": "CC-BY-NC-SA 3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x",
+    "size": {
+      "x": 32,
+      "y": 32
+    },
+    "states": [
+      {
+        "name": "icon"
+      },
+      {
+        "name": "equipped-INNERCLOTHING-digi",
+        "directions": 4
+      },
+      {
+        "name": "equipped-INNERCLOTHING",
+        "directions": 4
+      },
+      {
+        "name": "inhand-left",
+        "directions": 4
+      },
+      {
+        "name": "inhand-right",
+        "directions": 4
+      }
+    ]
+  }
@@ -0,0 +1,20 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "taken from the game",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "jobicon"
+    },
+    {
+      "name": "green"
+    },
+	{
+	  "name": "magistrat"
+	}
+  ]
+}
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 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -106,6 +106,9 @@ @@
         {
           "name": "idiaa"
         },
+    	{
+    		"name": "idmagistrat"
+    	},
         {
           "name": "idmedicaldoctor"
         },
@@ Expand Down @@