Skip to content

Commit

Permalink
Magistrat (AdventureTimeSS14#161)
Browse files Browse the repository at this point in the history
**Проверки**
<!-- Выполнение всех следующих действий, если это приемлемо для вида
изменений сильно ускорит разбор вашего PR -->
- [x] PR полностью завершён и мне не нужна помощь чтобы его закончить.
- [x] Я внимательно просмотрел все свои изменения и багов в них не
нашёл.
- [x] Я запускал локальный сервер со своими изменениями и всё
протестировал.
- [ ] Я добавил скриншот/видео демонстрации PR в игре, **или** этот PR
этого не требует.

**Изменения**
<!--
Теперь в новую сборку подьехал магистрат, его новые лодауты. В целом,
был перенесен магистрат с прошлой сборки и даже лучше. Были исправлены
небольшиие недочеты. Так же, теперь у нас есть отдельный юрдеп. Кароче,
все круто.

-->

:cl:
- add: Добавлен спавн магистрата, добавлен спавн АВД, добавлены
гарнитуры АВД, Магистрата, юриста, добавлены ключ шифрования юр депа,
добавлена частота юр депа, добавлены доступы АВД и магистрата, добавлена
карта магистрата, добавлено ПДА магистрата, добавлена печать магистрата,
добавлен белый костюм магистрата, добавлены лодауты магистрату,
добавлены стекляянные командные двери магистрату и АВД с соотвествующими
доступами. Вроде все.

---------

Co-authored-by: Darki255 <[email protected]>
  • Loading branch information
Bolper and Darkiich authored Aug 3, 2024
1 parent 6bc3fab commit 7837662
Show file tree
Hide file tree
Showing 93 changed files with 456 additions and 79 deletions.
5 changes: 4 additions & 1 deletion Resources/Locale/ru-RU/ADT/Preferences/loadout-groups.ftl
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
ent-MagistratNeck = Галстуки
ent-MagistratJumpsuit = Костюмы
loadout-group-patholog-head = Патологоанатом, голова
loadout-group-patholog-jumpsuit = Патологоанатом, комбинезон
loadout-group-patholog-outerclothing = Патологоанатом, верхняя одежда
loadout-group-patholog-shoes = Патологоанатом, обувь
loadout-group-patholog-backpack = Патологоанатом, рюкзак
loadout-group-patholog-backpack = Патологоанатом, рюкзак
1 change: 1 addition & 0 deletions Resources/Locale/ru-RU/ADT/headset-component.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ADT-Lawyer-Channel-name = Юридический
1 change: 1 addition & 0 deletions Resources/Locale/ru-RU/ADT/paper/stamp-component.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
stamp-component-stamped-name-magistrat = Магистрат
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/ADT/prototypes/Access/accesses.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
id-card-access-level-iaa = Агент Внутренних Дел
id-card-access-level-magistrate = Магистрат
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
ent-ClothingHeadsetMagistrat = Гарнитура магистрата
.desc = Переговоры особой важности происходят по этой гарнитуре.
ent-ClothingHeadsetLawyer = Гарнитура юриста
.desc = Обычная гарнитура юриста.
ent-ClothingHeadsetIAA = Гарнитура Агента Внутренних Дел
.desc = Переговоры о нарушениях СРП происходят по этой гарнитуре.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-ADTClothingUniformsJumpsuitWhiteDiplomatSuitL = Белый костюм дипломата
.desc = Специально сделанный белый костюм дипломата NanoTrasen.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ent-SpawnPointMagistrat = Точка спавна магистрата
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-ADTEncryptionKeyLawyer = Ключ шифрования юридического отдела.
.desc = Переговоры особой важности происходят по этой частоте.
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
ent-MagistratPDA = КПК Магистрата
.desc = В заметках данного КПК можно найти компромат на каждого из глав.
ent-ADTPathologistPDA = КПК патологоанатома
.desc = От него веет прохладой.
.desc = От него веет прохладой.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-MagistratIDCard = ID Магистрата
.desc = Серебрянная карта с значком Юриста.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ent-RubberStampMagisrat = Печать магистрата
.suffix = DO NOT MAP
.desc = Выглядит угрожающее. От нее веет неоспоримой мощью и величием.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
department-Juridical-description = Следите за соблюдением СРП, правильной трактовкой КЗ, защищайте подсудимых!
department-Juridical = Юридический департамент
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
job-name-magistrat = Магистрат
job-description-magistrat = Самый грозный и богатый на станции.
2 changes: 1 addition & 1 deletion Resources/Locale/ru-RU/job/job-names.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ job-name-centcomoff = представитель Центком
job-name-reporter = репортёр
job-name-musician = музыкант
job-name-librarian = библиотекарь
job-name-lawyer = адвокат
job-name-lawyer = юрист
job-name-mime = мим
job-name-ce = старший инженер
job-name-janitor = уборщик
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
ent-EncryptionKeyIAA = ключ шифрования агента внутренних дел
.desc = Ключ шифрования, используемый самой дотошной персоной.
.suffix = НЕ ТРОГАТЬ, это Корвакс
18 changes: 18 additions & 0 deletions Resources/Prototypes/ADT/Access/juridical.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
- type: accessLevel
id: Lawyer
name: id-card-access-level-lawyer

- type: accessLevel
id: IAA
name: id-card-access-level-iaa

- type: accessLevel
id: Magistrate
name: id-card-access-level-magistrate

- type: accessGroup
id: LawyerDepartament
tags:
- Lawyer
- Magistrate
- IAA
47 changes: 47 additions & 0 deletions Resources/Prototypes/ADT/Entities/Clothing/Ears/headsets.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
- type: entity
parent: ClothingHeadset
id: ClothingHeadsetMagistrat
name: magistrat headset
description: magistrat's headset.
components:
- type: ContainerFill
containers:
key_slots:
- ADTEncryptionKeyLawyer
- EncryptionKeyCommand
- EncryptionKeySecurity
- EncryptionKeyCommon
- EncryptionKeyCentCom
- type: Sprite
sprite: Clothing/Ears/Headsets/servicesecurity.rsi

- type: entity
parent: ClothingHeadset
id: ClothingHeadsetLawyer
name: lawyer headset
description: lawyer's headset.
components:
- type: ContainerFill
containers:
key_slots:
- ADTEncryptionKeyLawyer
- EncryptionKeySecurity
- EncryptionKeyCommon
- type: Sprite
sprite: Clothing/Ears/Headsets/servicesecurity.rsi

- type: entity
parent: ClothingHeadset
id: ClothingHeadsetIAA
name: IAA headset
description: IAA's headset.
components:
- type: ContainerFill
containers:
key_slots:
- ADTEncryptionKeyLawyer
- EncryptionKeyCommand
- EncryptionKeySecurity
- EncryptionKeyCommon
- type: Sprite
sprite: Clothing/Ears/Headsets/servicesecurity.rsi
10 changes: 10 additions & 0 deletions Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
- type: entity
parent: ClothingUniformBase
id: ADTClothingUniformsJumpsuitWhiteDiplomatSuitL
name: white-diplomat-suit-namе
description: white-diplomat-suit-desc
components:
- type: Sprite
sprite: ADT/Clothing/Uniforms/Jumpsuits/white-diplomat-suit.rsi
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpsuits/white-diplomat-suit.rsi
23 changes: 0 additions & 23 deletions Resources/Prototypes/ADT/Entities/Markers/Spawners/job.yml

This file was deleted.

46 changes: 46 additions & 0 deletions Resources/Prototypes/ADT/Entities/Markers/Spawners/jobs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
- type: entity
id: ADTSpawnPointJobBase
parent: MarkerBase
abstract: true
suffix: Job Spawn ADT
components:
- type: SpawnPoint
spawn_type: Job
- type: Sprite
sprite: ADT/Markers/jobs.rsi

- type: entity
id: SpawnPointADTPathologist
parent: ADTSpawnPointJobBase
name: pathologist
components:
- type: SpawnPoint
job_id: ADTPathologist
- type: Sprite
layers:
- state: green
- state: pathologist

- type: entity
id: SpawnPointMagistrat
parent: ADTSpawnPointJobBase
name: magistrat
components:
- type: SpawnPoint
job_id: Magistrat
- type: Sprite
layers:
- state: green
- state: magistrat

- type: entity
id: SpawnPointIAA
parent: ADTSpawnPointJobBase
name: IAA
components:
- type: SpawnPoint
job_id: IAA
- type: Sprite
layers:
- state: green
- state: iaa
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
- type: entity
parent: DoorElectronics
id: DoorElectronicsIAA
suffix: IAA, Locked
components:
- type: AccessReader
access: [["IAA"]]

- type: entity
parent: DoorElectronics
id: DoorElectronicsMagistrate
suffix: Magistrate, Locked
components:
- type: AccessReader
access: [["Magistrate"]]
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
- type: entity
parent: EncryptionKey
id: ADTEncryptionKeyLawyer
name: law department encryption key
description: The encryption key used by the most hated person (after the clown).
components:
- type: EncryptionKey
channels:
- ADTLawyerChannel
defaultChannel: ADTLawyerChannel
- type: Sprite
layers:
- state: crypt_silver
- state: nano_label
11 changes: 11 additions & 0 deletions Resources/Prototypes/ADT/Entities/Objects/Devices/pda.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
- type: entity
parent: BasePDA
id: MagistratPDA
name: magistrat PDA
description: magistrat PDA
components:
- type: Pda
id: MagistratIDCard
state: pda-lawyer
- type: Icon
state: pda-lawyer
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
- type: entity
parent: IDCardStandard
id: MagistratIDCard
name: magistrat ID card
description: magistrat ID card
components:
- type: Sprite
layers:
- state: silver
- state: idlawyer
- type: PresetIdCard
job: Magistrat

- type: entity
parent: IDCardStandard
id: ADTPathologistIDCard
Expand All @@ -9,4 +22,4 @@
- state: default
- state: id-pathologist
- type: PresetIdCard
job: ADTPathologist
job: ADTPathologist
13 changes: 13 additions & 0 deletions Resources/Prototypes/ADT/Entities/Objects/Misc/rubber_stamp.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
- type: entity
name: magistrat's rubber stamp
parent: RubberStampBase
id: RubberStampMagisrat
suffix: DO NOT MAP
components:
- type: Stamp
stampedName: stamp-component-stamped-name-magistrat
stampedColor: "#754d36"
stampState: "paper_stamp-detective"
- type: Sprite
sprite: ADT/Objects/Misc/stampsADT.rsi
state: stamp-magistrat
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
- type: entity
parent: AirlockCommandGlass
id: AirlockMagistrateGlassLocked
suffix: Magistrate, Locked
components:
- type: ContainerFill
containers:
board: [ DoorElectronicsMagistrate ]

- type: entity
parent: AirlockCommandGlass
id: AirlockIAAGlassLocked
suffix: IAA, Locked
components:
- type: ContainerFill
containers:
board: [ DoorElectronicsIAA ]
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
- type: loadout
id: MagistratJumpsuit
equipment: MagistratJumpsuit

- type: startingGear
id: MagistratJumpsuit
equipment:
jumpsuit: ADTClothingUniformsJumpsuitWhiteDiplomatSuitL
25 changes: 24 additions & 1 deletion Resources/Prototypes/ADT/Loadouts/loadout_groups.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,26 @@
- type: loadoutGroup
id: MagistratJumpsuit
name: loadout-group-lawyer-jumpsuit
loadouts:
- MagistratJumpsuit
- LawyerJumpsuit
- LawyerJumpskirt
- LawyerJumpsuitBlue
- LawyerJumpskirtBlue
- LawyerJumpsuitPurple
- LawyerJumpskirtPurple
- LawyerJumpsuitRed
- LawyerJumpskirtRed
- LawyerJumpsuitGood
- LawyerJumpskirtGood

- type: loadoutGroup
id: MagistratNeck
name: loadout-group-lawyer-neck
minLimit: 0
loadouts:
- LawyerNeck

- type: loadoutGroup
id: PathologHead
name: loadout-group-patholog-head
Expand Down Expand Up @@ -37,4 +60,4 @@
name: loadout-group-patholog-shoes
loadouts:
- BlueShoes
- MedicalWinterBoots
- MedicalWinterBoots
15 changes: 14 additions & 1 deletion Resources/Prototypes/ADT/Loadouts/role_loadouts.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
- type: roleLoadout
id: JobMagistrat
groups:
- Inventory # Corvax-Loadouts
- GroupTankHarness
- MagistratNeck
- MagistratJumpsuit
- CommonBackpack
- Glasses
- Survival
- Trinkets
- GroupSpeciesBreathTool

- type: roleLoadout
id: JobADTPathologist
groups:
Expand All @@ -13,4 +26,4 @@
- Glasses
- SurvivalMedical
- Trinkets
- GroupSpeciesBreathToolMedical
- GroupSpeciesBreathToolMedical
Loading

0 comments on commit 7837662

Please sign in to comment.