space-syndicate · Krosus777 · Dec 3, 2024 · Dec 3, 2024 · Dec 21, 2024 · Dec 21, 2024
diff --git a/Resources/Audio/_CorvaxNext/Weapons/knock.ogg b/Resources/Audio/_CorvaxNext/Weapons/knock.ogg
diff --git a/Resources/Locale/ru-RU/_corvaxnext/entities/clothing/clothing/uniforms/jumpsuits.ftl b/Resources/Locale/ru-RU/_corvaxnext/entities/clothing/clothing/uniforms/jumpsuits.ftl
@@ -0,0 +1,8 @@
+ent-ClothingOuterRobesMantleMagistrat = мантия
+    .desc = мантия магистрата.
+ent-ClothingOuterRobesMantleMagistrat2 = мантия
+    .desc = мантия магистрата
+ent-ClothingOuterRobesMantleMagistrat3 = мантия
+    .desc = мантия магистрата
+ent-ClothingOuterRobesMantleMagistrat4 = мантия
+    .desc = мантия магистрата
diff --git a/Resources/Locale/ru-RU/_corvaxnext/headset-component.ftl b/Resources/Locale/ru-RU/_corvaxnext/headset-component.ftl
@@ -0,0 +1 @@
+chat-radio-legal = Юридический
diff --git a/Resources/Locale/ru-RU/_corvaxnext/job/department-desc.ftl b/Resources/Locale/ru-RU/_corvaxnext/job/department-desc.ftl
@@ -0,0 +1 @@
+Legal-description = Контролируйте соблюдение закона
diff --git a/Resources/Locale/ru-RU/_corvaxnext/job/department.ftl b/Resources/Locale/ru-RU/_corvaxnext/job/department.ftl
@@ -0,0 +1 @@
+department-Legal = Юридический отдел
diff --git a/Resources/Locale/ru-RU/_corvaxnext/job/job-description.ftl b/Resources/Locale/ru-RU/_corvaxnext/job/job-description.ftl
@@ -1 +1,2 @@
 job-description-surgeon = Мастерски пихайте скальпель куда поглубже приходящим бедолагам... Спасая жизни, конечно!
+job-description-magistrat = Вершите правосудие на станции!
diff --git a/Resources/Locale/ru-RU/_corvaxnext/job/job-names.ftl b/Resources/Locale/ru-RU/_corvaxnext/job/job-names.ftl
@@ -1,2 +1,4 @@
 job-name-surgeon = хирург
 JobSurgeon = хирург
+JobMagistrat = магистрат
+job-name-magistrat = магистрат
diff --git a/Resources/Locale/ru-RU/_corvaxnext/preferences/loadout-groups.ftl b/Resources/Locale/ru-RU/_corvaxnext/preferences/loadout-groups.ftl
@@ -8,3 +8,8 @@ loadout-group-brigmedic-outerclothing = Бригмедик, рюкзак
 loadout-group-surgeon-head = Хирург, голова
 loadout-group-surgeon-jumpsuit = Хирург, комбинезон
 loadout-group-surgeon-scalpel = Хирург, скальпель
+
+# Magistrat
+
+loadout-group-magistrat-jumpsuit = Мантия
+loadout-group-magistrat-hat = Парик
diff --git a/Resources/Locale/ru-RU/_corvaxnext/prototypes/entities/clothing/ears/headsets.ftl b/Resources/Locale/ru-RU/_corvaxnext/prototypes/entities/clothing/ears/headsets.ftl
@@ -0,0 +1,3 @@
+
+ent-ClothingHeadsetMagistrat = гарнитура магистрата
+    .desc = Гарнитура, которая помогает вершить закон.
diff --git a/Resources/Locale/ru-RU/_corvaxnext/prototypes/entities/fills/items/briefcase.ftl b/Resources/Locale/ru-RU/_corvaxnext/prototypes/entities/fills/items/briefcase.ftl
@@ -0,0 +1,3 @@
+ent-BriefcaseMagistratFilled = коричневый чемодан
+    .suffix = магистрат
+    .desc = { ent-BriefcaseBrown.desc }
diff --git a/Resources/Locale/ru-RU/_corvaxnext/prototypes/entities/markers/spawners/job.ftl b/Resources/Locale/ru-RU/_corvaxnext/prototypes/entities/markers/spawners/job.ftl
@@ -0,0 +1,2 @@
+ent-SpawnPointMagistrat = Магистрат
+    .desc = { ent-SpawnPointJobBase.desc }
diff --git a/...es/Locale/ru-RU/_corvaxnext/prototypes/entities/objects/devices/electronics/computers.ftl b/...es/Locale/ru-RU/_corvaxnext/prototypes/entities/objects/devices/electronics/computers.ftl
@@ -0,0 +1,2 @@
+ent-ComputerCriminalRecordsMagistrat = портативная консоль криминальных записей
+    .desc = Специальная разработка для магистрата
diff --git a/...ces/Locale/ru-RU/_corvaxnext/prototypes/entities/objects/devices/electronics/triggers.ftl b/...ces/Locale/ru-RU/_corvaxnext/prototypes/entities/objects/devices/electronics/triggers.ftl
@@ -0,0 +1,2 @@
+ent-ScreenTimerMagistr = настольный таймер
+    .desc = Настраиваемый таймер
diff --git a/Resources/Locale/ru-RU/_corvaxnext/prototypes/entities/objects/devices/pda.ftl b/Resources/Locale/ru-RU/_corvaxnext/prototypes/entities/objects/devices/pda.ftl
@@ -1,2 +1,4 @@
 ent-SurgeonPDA = КПК хирурга
     .desc = { ent-MedicalPDA.desc }
+ent-MagistratPDA = КПК магистрата
+    .desc = { ent-LawyerPDA }
diff --git a/Resources/Locale/ru-RU/_corvaxnext/prototypes/entities/objects/misc/gavel_block.ftl b/Resources/Locale/ru-RU/_corvaxnext/prototypes/entities/objects/misc/gavel_block.ftl
@@ -0,0 +1,3 @@
+ent-GavelBlock = подставка для молортока
+    .desc = Стучать сюда
+
diff --git a/Resources/Locale/ru-RU/_corvaxnext/prototypes/entities/objects/misc/identification_cards.ftl b/Resources/Locale/ru-RU/_corvaxnext/prototypes/entities/objects/misc/identification_cards.ftl
@@ -1,2 +1,4 @@
 ent-SurgeonIDCard = ID карта хирурга
     .desc = { ent-IDCardStandard.desc }
+ent-MagistratIDCard = ID карта магистрата
+    .desc = { ent-IDCardStandard.desc }
diff --git a/Resources/Locale/ru-RU/_corvaxnext/prototypes/entities/objects/misc/rubber_stamp.ftl b/Resources/Locale/ru-RU/_corvaxnext/prototypes/entities/objects/misc/rubber_stamp.ftl
@@ -0,0 +1,3 @@
+ent-RubberStampMagistrat = печать магистрата
+    .suffix = НЕ МАППИТЬ
+    .desc = { ent-RubberStampBase.desc }
diff --git a/Resources/Locale/ru-RU/_corvaxnext/prototypes/entities/objects/weapons/meele/hammer.ftl b/Resources/Locale/ru-RU/_corvaxnext/prototypes/entities/objects/weapons/meele/hammer.ftl
@@ -0,0 +1,2 @@
+ent-MagistrHammer = молоток судьи
+    .desc = Вынеси им приговор!
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/entities/clothing/head/hats.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/entities/clothing/head/hats.ftl
@@ -6,3 +6,5 @@ ent-ClothingHeadHatCapcapWhite = белая фуражка капитана
    .desc = Стильная белая фуражка капитана.
 ent-ClothingHeadHatCapcapSheriff = фуражка шерифа
    .desc = Стильная фуражка шерифа.
+ent-ClothingHeadHatPwig2 = парик
+    .desc = Пышный парик
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/objectives/thief.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/objectives/thief.ftl
@@ -1,2 +1,4 @@
 ent-ClothingNeckSecBadgeStealCollectionObjective = { ent-BaseThiefStealCollectionObjective }
     .desc = { ent-BaseThiefStealCollectionObjective.desc }
+ent-MagistrHammerStealObjective = { ent-BaseThiefStealCollectionObjective }
+    .desc = { ent-BaseThiefStealCollectionObjective.desc }
@@ -23,3 +23,17 @@
     layers:
     - state: green
     - state: surgeon # Corvax-Next-surgeon
+
+- type: entity
+  id: SpawnPointMagistrat
+  parent: SpawnPointJobBase
+  name: magistrat
+  components:
+  # Corvax-Next-magistrat-start
+  - type: SpawnPoint
+    job_id: Magistrat
+  # Corvax-Next-magistrat-end
+  - type: Sprite
+    layers:
+    - state: green
+    - state: magistrat # Corvax-Next-magistrat
@@ -9,6 +9,7 @@
       - Common
       - Command
       - Security
+      - Legal #CorvaxNext-Magitrat
       defaultChannel: Command
     - type: Sprite
       layers:

@@ -23,6 +23,7 @@
     CaptainJetpackStealObjective: 0.5
     HandTeleporterStealObjective: 0.5
     EnergyShotgunStealObjective: 0.5
+    MagistrHammerStealObjective: 1 #CorvaxNext-Magstrat
 
 - type: weightedRandom
   id: TraitorObjectiveGroupKill
@@ -87,6 +88,7 @@
     BibleStealObjective: 1
     ClothingNeckGoldmedalStealObjective: 1              #other
     ClothingNeckClownmedalStealObjective: 0.5
+    MagistrHammerStealObjective: 1 #CorvaxNext-Magistrat
 
 - type: weightedRandom
   id: ThiefObjectiveGroupStructure

@@ -0,0 +1,17 @@
+- type: entity
+  id: BriefcaseMagistratFilled
+  name: briefcase brown
+  parent: BriefcaseBrown
+  suffix: Magistrat
+  components:
+    - type: StorageFill
+      contents:
+        - id: RubberStampMagistrat
+        - id: MagistrHammer
+        - id: ComputerCriminalRecordsMagistrat
+        - id: BoxSurvival
+        - id: GavelBlock
+        - id: ScreenTimerMagistr
+        - id: RubberStampApproved
+        - id: RubberStampDenied
+        - id: BoxFolderCentCom
@@ -0,0 +1,12 @@
+- type: entity
+  parent: ClothingHeadset
+  id: ClothingHeadsetMagistrat
+  name: headset magistrat
+  description: A headset for internal affairs agent to hear the captain's last words.
+  components:
+  - type: ContainerFill
+    containers:
+      key_slots:
+      - EncryptionKeyIAA
+  - type: Sprite
+    sprite: Clothing/Ears/Headsets/servicesecurity.rsi
@@ -47,3 +47,14 @@
   - type: Tag
     tags:
     - HamsterWearable
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatPwig2
+  name: pwig magistrat
+  description: To be honest, those look ridiculous.
+  components:
+  - type: Sprite
+    sprite: _CorvaxNext/Clothing/Head/Hats/true_wig.rsi
+  - type: Clothing
+    sprite: _CorvaxNext/Clothing/Head/Hats/true_wig.rsi
@@ -8,3 +8,48 @@
     sprite: _CorvaxNext/Clothing/Uniforms/Jumpskirt/white_captain.rsi
   - type: Clothing
     sprite: _CorvaxNext/Clothing/Uniforms/Jumpskirt/white_captain.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingOuterRobesMantleMagistrat
+  name: judge magistrat
+  description: This robe commands authority.
+  components:
+  - type: Sprite
+    sprite: _CorvaxNext/Clothing/Uniforms/Jumpsuit/judge.rsi
+  - type: Clothing
+    sprite: _CorvaxNext/Clothing/Uniforms/Jumpsuit/judge.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingOuterRobesMantleMagistrat2
+  name: judge magistrat
+  description: This robe commands authority.
+  components:
+  - type: Sprite
+    sprite: _CorvaxNext/Clothing/Uniforms/Jumpsuit/mantle.rsi
+  - type: Clothing
+    sprite: _CorvaxNext/Clothing/Uniforms/Jumpsuit/mantle.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingOuterRobesMantleMagistrat3
+  name: judge magistrat
+  description: This robe commands authority.
+  components:
+  - type: Sprite
+    sprite: _CorvaxNext/Clothing/Uniforms/Jumpsuit/magistrat_mantle.rsi
+  - type: Clothing
+    sprite: _CorvaxNext/Clothing/Uniforms/Jumpsuit/magistrat_mantle.rsi
+
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingOuterRobesMantleMagistrat4
+  name: judge magistrat
+  description: This robe commands authority.
+  components:
+  - type: Sprite
+    sprite: _CorvaxNext/Clothing/Uniforms/Jumpsuit/magistrat.rsi
+  - type: Clothing
+    sprite: _CorvaxNext/Clothing/Uniforms/Jumpsuit/magistrat.rsi
@@ -0,0 +1,87 @@
+- type: entity
+  parent: [ BaseHandheldComputer, PowerCellSlotSmallItem ]
+  id: ComputerCriminalRecordsMagistrat
+  name: partable computer criminal records magistrat
+  description: This can be used to check criminal records. Only security can modify them.
+  components:
+  - type: CriminalRecordsConsole
+  - type: UserInterface
+    interfaces:
+      enum.CriminalRecordsConsoleKey.Key:
+        type: CriminalRecordsConsoleBoundUserInterface
+  - type: ActivatableUI
+    key: enum.CriminalRecordsConsoleKey.Key
+  - type: Sprite
+    sprite: Objects/Misc/qm_clipboard.rsi
+    layers:
+    - map: ["computerLayerBody"]
+      state: qm_clipboard
+    - map: ["computerLayerKeyboard"]
+      state: qm_clipboard
+    - map: ["computerLayerScreen"]
+      state: qm_clipboard
+    - map: ["computerLayerKeys"]
+      state: qm_clipboard
+  - type: PointLight
+    radius: 1.5
+    energy: 1.6
+    color: "#1f8c28"
+  - type: Computer
+    board: CriminalRecordsComputerCircuitboard
+  - type: AccessReader
+    access: [["Lawyer"]]
+  - type: GuideHelp
+    guides:
+    - CriminalRecords
+  - type: ActivatableUIRequiresPowerCell
+  - type: Appearance
+
+- type: entity
+  id: ComputerCriminalRecordsMagistratEmpty
+  parent: ComputerCriminalRecordsMagistrat
+  suffix: Empty
+  components:
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default
+
+
+
+- type: entity
+  id: ScreenTimerMagistr
+  parent: [BaseHandheldComputer, PowerCellSlotSmallItem ]
+  name: timer magistrat
+  description: It's a timer for sending timed signals to things, with a built-in screen.
+  components:
+  - type: SignalTimer
+    canEditLabel: true
+  - type: TextScreenVisuals
+    color: Gold
+    textOffset: 0,0
+    timerOffset: 0,0
+    rowOffset: 5
+    textLength: 5
+    rows: 1
+  - type: Sprite
+    drawdepth: WallMountedItems
+    sprite: _CorvaxNext/Objects/Devices/magistr_timer.rsi
+    state: signalscreen
+  - type: ActivatableUI
+    key: enum.SignalTimerUiKey.Key
+  - type: UserInterface
+    interfaces:
+      enum.SignalTimerUiKey.Key:
+        type: SignalTimerBoundUserInterface
+  - type: Clickable
+  - type: InteractionOutline
+  - type: Appearance
+  - type: DeviceLinkSource
+    ports:
+      - Start
+      - Timer
+  - type: DeviceLinkSink
+    ports:
+      - Trigger
+  - type: Item
+    size: Normal
@@ -1,3 +1,25 @@
+- type: entity
+  parent: BaseSecurityPDA
+  id: MagistratPDA
+  name: magistrat PDA
+  description: Corporation and profit are best friends.
+  components:
+    - type: Sprite
+      sprite: _CorvaxNext/Objects/Devices/pda.rsi
+      state: pda-judge
+    - type: Pda
+      id: MagistratIDCard
+      state: pda-judge
+      penSlot:
+        startingItem: PenCentcom
+        whitelist:
+          tags:
+          - Write
+    - type: PdaBorderColor
+      borderColor: "#6f6192"
+    - type: Icon
+      state: pda-judge
+
 - type: entity
   parent: BaseMedicalPDA
   id: SurgeonPDA
@@ -15,3 +37,4 @@
   - type: GuideHelp
     guides:
     - Medical Doctor
+
@@ -0,0 +1,16 @@
+- type: entity
+  parent: BaseItem
+  id: GavelBlock
+  name: gavel block
+  description: Hammer here
+  components:
+  - type: Sprite
+    sprite: _CorvaxNext/Objects/Misc/gavelblock.rsi/
+    state: icon
+  - type: Physics
+    bodyType: Dynamic
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: Metallic
+  - type: Item
+    size: Tiny
@@ -1,5 +1,16 @@
 - type: entity
   parent: IDCardStandard
+  id: MagistratIDCard
+  name: ID card magistrat
+  components:
+    - type: Sprite
+      sprite: _CorvaxNext/Objects/Misc/id_cards.rsi
+      layers:
+        - state: silver
+        - state: idjudge
+    - type: PresetIdCard
+
+- type: entity
   id: SurgeonIDCard
   name: surgeon ID card
   components:

@@ -0,0 +1,13 @@
+- type: entity
+  name: rubber stamp magistrat
+  parent: RubberStampBase
+  id: RubberStampMagistrat
+  suffix: DO NOT MAP
+  components:
+    - type: Stamp
+      stampedName: Магистрат
+      stampedColor: "#817066"
+      stampState: "paper_stamp-centcom"
+    - type: Sprite
+      sprite: Objects/Misc/stamps.rsi
+      state: stamp-centcom
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Legal-description = Контролируйте соблюдение закона
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		department-Legal = Юридический отдел
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		job-description-surgeon = Мастерски пихайте скальпель куда поглубже приходящим бедолагам... Спасая жизни, конечно!
		job-description-magistrat = Вершите правосудие на станции!
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@

		ent-ClothingHeadsetMagistrat = гарнитура магистрата
		.desc = Гарнитура, которая помогает вершить закон.
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-ComputerCriminalRecordsMagistrat = портативная консоль криминальных записей
		.desc = Специальная разработка для магистрата
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ent-ScreenTimerMagistr = настольный таймер
		.desc = Настраиваемый таймер
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		ent-GavelBlock = подставка для молортока
		.desc = Стучать сюда
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ent-MagistrHammer = молоток судьи
		.desc = Вынеси им приговор!