SerbiaStrong-220 · DexlerXD · Sep 19, 2024 · Sep 18, 2024 · Sep 18, 2024 · Sep 18, 2024
diff --git a/Resources/Locale/ru-RU/ss220/prototypes/access/access.ftl b/Resources/Locale/ru-RU/ss220/prototypes/access/access.ftl
@@ -8,3 +8,5 @@ id-card-access-level-ussp = СССП
 id-card-access-level-ussp-command = СССП Командный
 id-card-access-level-ussp-medical = СССП Медицинский
 id-card-access-level-ussp-Engineering = СССП Инженерный
+
+id-card-access-level-magistrate = Магистрат
diff --git a/Resources/Locale/ru-RU/ss220/prototypes/entities/misc/identification_cards.ftl b/Resources/Locale/ru-RU/ss220/prototypes/entities/misc/identification_cards.ftl
@@ -0,0 +1,2 @@
+ent-MagistrateIDCard = ID карта магистрата
+    .desc = { ent-IDCardStandard.desc }
diff --git a/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/devices/electronics/door_access.ftl b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/devices/electronics/door_access.ftl
@@ -13,3 +13,7 @@ ent-DoorElectronicsUsspMedical = { ent-DoorElectronicsUssp }
 ent-DoorElectronicsUsspEngineering = { ent-DoorElectronicsUssp }
     .suffix = СССП, Закрыт, Инженерный
     .desc = { ent-DoorElectronics.desc }
+
+ent-DoorElectronicsMagistrate = { ent-DoorElectronics }
+    .suffix = Магистрат, Закрыт
+    .desc = { ent-DoorElectronics.desc }
diff --git a/Resources/Locale/ru-RU/ss220/prototypes/entities/structures/doors/airlocks/access.ftl b/Resources/Locale/ru-RU/ss220/prototypes/entities/structures/doors/airlocks/access.ftl
@@ -0,0 +1,7 @@
+ent-AirlockMagistrateGlassLocked = { ent-AirlockSecurityGlass }
+    .suffix = Магистрат, Закрыт
+    .desc = { ent-AirlockSecurityGlass.desc }
+
+ent-AirlockMagistrateLocked = { ent-AirlockServiceLocked }
+    .suffix = Магистрат, Закрыт
+    .desc = { ent-AirlockServiceLocked.desc }
diff --git a/Resources/Locale/ru-RU/ss220/storage/lockers.ftl b/Resources/Locale/ru-RU/ss220/storage/lockers.ftl
@@ -23,4 +23,10 @@ ent-LockerMime = шкаф мима
     .desc = Самое тихое место на станции.
 ent-LockerMimeFilled = { ent-LockerMime }
     .suffix = Заполненный
-    .desc = { ent-LockerMime.desc }
+    .desc = { ent-LockerMime.desc }
+
+ent-LockerMagistrate = шкаф Магистрата
+    .desc = { ent-LockerBaseSecure.desc }
+ent-LockerMagistrateFilled = { ent-LockerMagistrate }
+    .suffix = Заполненный
+    .desc = { ent-LockerBaseSecure.desc }
diff --git a/Resources/Prototypes/Access/misc.yml b/Resources/Prototypes/Access/misc.yml
@@ -34,3 +34,4 @@
   - Chapel
   - Hydroponics
   - Atmospherics
+  - Magistrate #SS220-Magistrate Foundation
diff --git a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml
@@ -49,6 +49,7 @@
       - Security
       - Service
       - Theatre
+      - Magistrate #SS220-Magistrate Foundation
       privilegedIdSlot:
         name: id-card-console-privileged-id
         ejectSound: /Audio/Machines/id_swipe.ogg
@@ -117,6 +118,7 @@
     - Security
     - Service
     - Theatre
+    - Magistrate #SS220-Magistrate Foundation
     - CentralCommand
     - NuclearOperative
     - SyndicateAgent

diff --git a/Resources/Prototypes/SS220/Access/internal-affairs.yml b/Resources/Prototypes/SS220/Access/internal-affairs.yml
@@ -0,0 +1,4 @@
+- type: accessLevel
+  id: Magistrate
+  name: id-card-access-level-magistrate
+  canBeSwitchableInReader: false
diff --git a/Resources/Prototypes/SS220/Catalog/Fills/Lockers/Internal-affairs.yml b/Resources/Prototypes/SS220/Catalog/Fills/Lockers/Internal-affairs.yml
@@ -0,0 +1,23 @@
+# Magistrate
+- type: entityTable
+  id: LockerFillMagistrate
+  table: !type:AllSelector
+    children:
+#    - id: ClothingHeadsetLawyer До появления ДВД
+#    - id: DoorRemoteLawyer До появления ДВД
+    - id: ClothingOuterRobesJudge
+    - id: ClothingHeadHatPwig
+    - id: WeaponDisabler
+    - id: ClothingWristWatchGold
+    - id: ClothingEyesGlassesCommand
+    - id: Telescopichka
+
+- type: entity
+  id: LockerMagistrateFilled
+  suffix: Filled
+  parent: LockerMagistrate
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: LockerFillMagistrate
diff --git a/Resources/Prototypes/SS220/Entities/Debugging/access_configurator_debug.yml b/Resources/Prototypes/SS220/Entities/Debugging/access_configurator_debug.yml
@@ -47,6 +47,7 @@
       - Service
       - SyndicateAgent
       - Theatre
+      - Magistrate
       #New centcomm accesses begin
       - CentralCommand
       - CentralCommandCBURN

diff --git a/Resources/Prototypes/SS220/Entities/Debugging/id_card_debug.yml b/Resources/Prototypes/SS220/Entities/Debugging/id_card_debug.yml
@@ -48,6 +48,7 @@
       - Service
       - SyndicateAgent
       - Theatre
+      - Magistrate
       #New centcomm accesses begin
       - CentralCommand
       - CentralCommandCBURN

diff --git a/Resources/Prototypes/SS220/Entities/Objects/Devices/Electronics/door_access.yml b/Resources/Prototypes/SS220/Entities/Objects/Devices/Electronics/door_access.yml
@@ -40,3 +40,11 @@
   components:
   - type: AccessReader
     access: [["UsspEngineering"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsMagistrate
+  suffix: Magistrate, Locked
+  components:
+  - type: AccessReader
+    access: [["Magistrate"]]
diff --git a/Resources/Prototypes/SS220/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/SS220/Entities/Objects/Devices/pda.yml
@@ -53,4 +53,34 @@
       map: [ "enum.PdaVisualLayers.IdLight" ]
       visible: false #SS220 PDA-Resprite-End
   - type: Icon
-    state: pda-seniorservice
+    state: pda-seniorservice
+
+- type: entity
+  parent: BasePDA
+  id: MagistratePDA
+  name: magistrate PDA
+  description: ###
+  components:
+  - type: Pda
+    id: MagistrateIDCard
+    state: pda-magistrate
+    - type: PdaBorderColor
+      borderColor: "#414452"
+      accentVColor: "#731611"
+      accentHColor: "#dfac5c"
+  - type: Sprite
+    sprite: Objects/Devices/pda.rsi
+    layers:
+    - map: [ "enum.PdaVisualLayers.Base" ]
+    - state: "screen-nt"
+      shader: "unshaded"
+    - state: "light_overlay"
+      map: [ "enum.PdaVisualLayers.Flashlight" ]
+      shader: "unshaded"
+      visible: false
+    - state: "id_overlay"
+      map: [ "enum.PdaVisualLayers.IdLight" ]
+      visible: false
+  - type: Icon
+    sprite: Objects/Devices/pda.rsi
+    state: pda-magistrate
diff --git a/Resources/Prototypes/SS220/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/SS220/Entities/Objects/Misc/identification_cards.yml
@@ -123,3 +123,16 @@
       groups:
       - AllAccess # SS220 Fast fix access
       - CentralCommand
+
+- type: entity
+  parent: IDCardStandard
+  id: MagistrateIDCard
+  name: magistrate ID card
+  components:
+    - type: Sprite
+      layers:
+        - state: silver
+        - state: idmagistrate
+    - type: PresetIdCard
+      job: Magistrate
+
diff --git a/Resources/Prototypes/SS220/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/SS220/Entities/Structures/Doors/Airlocks/access.yml
@@ -19,3 +19,25 @@
   - type: ContainerFill
     containers:
       board: [ DoorElectronicsExternal ]
+
+- type: entity
+  parent: AirlockCommandGlass
+  id: AirlockMagistrateGlassLocked
+  suffix: Magistrate, Locked
+  components:
+  - type: Sprite
+    sprite: SS220/Structures/Doors/Airlocks/Glass/magistrate.rsi
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsMagistrate ]
+
+- type: entity
+  parent: Airlock
+  id: AirlockMagistrateLocked
+  suffix: Magistrate, Locked
+  components:
+  - type: Sprite
+    sprite: SS220/Structures/Doors/Airlocks/Glass/magistrate.rsi
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsMagistrate ]
diff --git a/Resources/Prototypes/SS220/Entities/Structures/Storage/Lockers/closet.yml b/Resources/Prototypes/SS220/Entities/Structures/Storage/Lockers/closet.yml
@@ -119,3 +119,16 @@
   - type: EntityStorageVisuals
     stateDoorOpen: generic_open
     stateDoorClosed: generic_red_door
+
+- type: entity
+  id: LockerMagistrate
+  parent: LockerBase
+  name: magistrate locker
+  components:
+  - type: Appearance
+  - type: EntityStorageVisuals
+    stateBaseClosed: nt
+    stateDoorOpen: medsteel_open
+    stateDoorClosed: magistrate_door
+  - type: AccessReader
+    access: [ [ "Magistrate" ] ]
diff --git a/Resources/Prototypes/SS220/Entities/markers/Spawners/jobs.yml b/Resources/Prototypes/SS220/Entities/markers/Spawners/jobs.yml
@@ -0,0 +1,11 @@
+- type: entity
+  id: SpawnPointMagistrate
+  parent: SpawnPointJobBase
+  name: magistrate
+  components:
+  - type: SpawnPoint
+    job_id: Magistrate
+  - type: Sprite
+    layers:
+      - state: green
+      - state: lawyer
diff --git a/Resources/Prototypes/SS220/Roles/Jobs/Internal Affairs/magistrate.yml b/Resources/Prototypes/SS220/Roles/Jobs/Internal Affairs/magistrate.yml
@@ -0,0 +1,51 @@
+- type: job
+  id: Magistrate
+  name: job-name-magistrate #todo добавить при добавлении ДВД
+  description: job-description-magistrate #todo добавить при добавлении ДВД
+  playTimeTracker: JobMagistrate
+  requirements:
+    - !type:DepartmentTimeRequirement
+      department: Command
+      time: 288000 # SS220-RoleTime 2
+    - !type:DepartmentTimeRequirement #todo поменять при добавлении ДВД
+      department: InternalAffairs
+      time: 288000 # SS220-RoleTime 2
+    - !type:AgeRequirement
+      requiredAge: 32
+    - !type:SpeciesRequirement #SS220-jobbans begin
+      inverted: true
+      species:
+      - Felinid #SS220-jobbans end
+  weight: 20
+  startingGear: MagistrateGear
+  icon: "JobIconMagistrate"
+  requireAdminNotify: true
+  joinNotifyCrew: true
+  supervisors: job-supervisors-centcom
+  canBeAntag: false
+  radioBold: true
+  access:
+  - Command
+  - Lawyer
+  - Magistrate
+  - Service
+  - Brig
+  - Maintenance
+  - External
+  special:
+  - !type:AddImplantSpecial
+    implants: [ MindShieldImplant ]
+  - !type:AddComponentSpecial
+    components:
+      - type: CommandStaff
+
+- type: startingGear
+  id: MagistrateGear
+  equipment:
+    shoes: ClothingShoesBootsLaceup
+    eyes: ClothingEyesGlassesCommand
+    id: MagistratePDA
+    ears: ClothingHeadsetIAA
+  storage:
+    back:
+    - Flash
diff --git a/Resources/Prototypes/SS220/Roles/play_time_trackers.yml b/Resources/Prototypes/SS220/Roles/play_time_trackers.yml
@@ -13,6 +13,9 @@
 - type: playTimeTracker
   id: EventRole
 
+- type: playTimeTracker
+  id: JobMagistrate
+
 - type: playTimeTracker
   id: JobSeniorEngineer
 

diff --git a/Resources/Prototypes/SS220/StatusIcons/job.yml b/Resources/Prototypes/SS220/StatusIcons/job.yml
@@ -0,0 +1,7 @@
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconMagistrate
+  icon:
+    sprite: /Textures/SS220/Interface/Misc/job_icons.rsi
+    state: magistrate
+  jobName: job-name-magistrate
diff --git a/Resources/Textures/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/Objects/Devices/pda.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt",
-  "copyright": "Sprited by Kit0vras (Github) for SS220, pda-ce_dark sprited by nightmare_stalker (Discord) for SS220",
+  "copyright": "Sprited by Kit0vras (Github) for SS220, pda-ce_dark sprited by nightmare_stalker (Discord) for SS220, pda-magistrate sprited by Estkemran (Github) for SS220",
   "size": {
     "x": 32,
     "y": 32
@@ -119,6 +119,9 @@
     {
       "name": "pda-library"
     },
+    {
+      "name": "pda-magistrate"
+    },
     {
       "name": "pda-medical"
     },

diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-magistrate.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-magistrate.png
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idmagistrate.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idmagistrate.png
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt",
-  "copyright": "Made by Kit0vras (Github) for SS220",
+  "copyright": "Made by Kit0vras (Github) for SS220, idmagistrate state sprited by Estkemran (Github) for SS220",
   "size": {
     "x": 32,
     "y": 32
@@ -109,6 +109,9 @@
     {
       "name": "idiaa"
     },
+    {
+      "name": "idmagistrate"
+    },
     {
       "name": "idmedicaldoctor"
     },

diff --git a/Resources/Textures/SS220/Interface/Misc/job_icons.rsi/magistrate.png b/Resources/Textures/SS220/Interface/Misc/job_icons.rsi/magistrate.png
diff --git a/Resources/Textures/SS220/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/SS220/Interface/Misc/job_icons.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt",
-    "copyright": "SecurityPilot Made by Surani, mindslave Made by ell_good (Discord) For SS220",
+    "copyright": "SecurityPilot Made by Surani, mindslave Made by ell_good (Discord) For SS220, magistrate sprited by Estkemran (GIthub) for SS220",
 
     "size": {
         "x": 8,
@@ -11,6 +11,9 @@
         {
           "name": "SecurityPilot"
         },
+        {
+          "name": "magistrate"
+        },
         {
           "name": "master"
         },

diff --git a/...rces/Textures/SS220/Structures/Doors/Airlocks/Glass/magistrate.rsi/assembly.png b/...rces/Textures/SS220/Structures/Doors/Airlocks/Glass/magistrate.rsi/assembly.png
diff --git a/...ures/SS220/Structures/Doors/Airlocks/Glass/magistrate.rsi/bolted_open_unlit.png b/...ures/SS220/Structures/Doors/Airlocks/Glass/magistrate.rsi/bolted_open_unlit.png
diff --git a/.../Textures/SS220/Structures/Doors/Airlocks/Glass/magistrate.rsi/bolted_unlit.png b/.../Textures/SS220/Structures/Doors/Airlocks/Glass/magistrate.rsi/bolted_unlit.png
diff --git a/Resources/Textures/SS220/Structures/Doors/Airlocks/Glass/magistrate.rsi/closed.png b/Resources/Textures/SS220/Structures/Doors/Airlocks/Glass/magistrate.rsi/closed.png
diff --git a/.../Textures/SS220/Structures/Doors/Airlocks/Glass/magistrate.rsi/closed_unlit.png b/.../Textures/SS220/Structures/Doors/Airlocks/Glass/magistrate.rsi/closed_unlit.png
diff --git a/...urces/Textures/SS220/Structures/Doors/Airlocks/Glass/magistrate.rsi/closing.png b/...urces/Textures/SS220/Structures/Doors/Airlocks/Glass/magistrate.rsi/closing.png
diff --git a/...Textures/SS220/Structures/Doors/Airlocks/Glass/magistrate.rsi/closing_unlit.png b/...Textures/SS220/Structures/Doors/Airlocks/Glass/magistrate.rsi/closing_unlit.png
diff --git a/...es/Textures/SS220/Structures/Doors/Airlocks/Glass/magistrate.rsi/deny_unlit.png b/...es/Textures/SS220/Structures/Doors/Airlocks/Glass/magistrate.rsi/deny_unlit.png
diff --git a/...s/SS220/Structures/Doors/Airlocks/Glass/magistrate.rsi/emergency_open_unlit.png b/...s/SS220/Structures/Doors/Airlocks/Glass/magistrate.rsi/emergency_open_unlit.png
diff --git a/...xtures/SS220/Structures/Doors/Airlocks/Glass/magistrate.rsi/emergency_unlit.png b/...xtures/SS220/Structures/Doors/Airlocks/Glass/magistrate.rsi/emergency_unlit.png
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ent-MagistrateIDCard = ID карта магистрата
		.desc = { ent-IDCardStandard.desc }