-
Notifications
You must be signed in to change notification settings - Fork 47
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
**Проверки** <!-- Выполнение всех следующих действий, если это приемлемо для вида изменений сильно ускорит разбор вашего PR --> - [x] PR полностью завершён и мне не нужна помощь чтобы его закончить. - [x] Я внимательно просмотрел все свои изменения и багов в них не нашёл. - [x] Я запускал локальный сервер со своими изменениями и всё протестировал. - [ ] Я добавил скриншот/видео демонстрации PR в игре, **или** этот PR этого не требует. **Изменения** <!-- Теперь в новую сборку подьехал магистрат, его новые лодауты. В целом, был перенесен магистрат с прошлой сборки и даже лучше. Были исправлены небольшиие недочеты. Так же, теперь у нас есть отдельный юрдеп. Кароче, все круто. --> :cl: - add: Добавлен спавн магистрата, добавлен спавн АВД, добавлены гарнитуры АВД, Магистрата, юриста, добавлены ключ шифрования юр депа, добавлена частота юр депа, добавлены доступы АВД и магистрата, добавлена карта магистрата, добавлено ПДА магистрата, добавлена печать магистрата, добавлен белый костюм магистрата, добавлены лодауты магистрату, добавлены стекляянные командные двери магистрату и АВД с соотвествующими доступами. Вроде все. --------- Co-authored-by: Darki255 <[email protected]>
- Loading branch information
Showing
93 changed files
with
456 additions
and
79 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 = Патологоанатом, рюкзак | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
ADT-Lawyer-Channel-name = Юридический |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
stamp-component-stamped-name-magistrat = Магистрат |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
id-card-access-level-iaa = Агент Внутренних Дел | ||
id-card-access-level-magistrate = Магистрат |
6 changes: 6 additions & 0 deletions
6
Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Ears/headsets.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
ent-ClothingHeadsetMagistrat = Гарнитура магистрата | ||
.desc = Переговоры особой важности происходят по этой гарнитуре. | ||
ent-ClothingHeadsetLawyer = Гарнитура юриста | ||
.desc = Обычная гарнитура юриста. | ||
ent-ClothingHeadsetIAA = Гарнитура Агента Внутренних Дел | ||
.desc = Переговоры о нарушениях СРП происходят по этой гарнитуре. |
2 changes: 2 additions & 0 deletions
2
Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
ent-ADTClothingUniformsJumpsuitWhiteDiplomatSuitL = Белый костюм дипломата | ||
.desc = Специально сделанный белый костюм дипломата NanoTrasen. |
1 change: 1 addition & 0 deletions
1
Resources/Locale/ru-RU/ADT/prototypes/Entities/Markers/Spawners/jobs.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
ent-SpawnPointMagistrat = Точка спавна магистрата |
2 changes: 2 additions & 0 deletions
2
Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Device/encryption_keys.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
ent-ADTEncryptionKeyLawyer = Ключ шифрования юридического отдела. | ||
.desc = Переговоры особой важности происходят по этой частоте. |
5 changes: 4 additions & 1 deletion
5
Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Device/pda.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,5 @@ | ||
ent-MagistratPDA = КПК Магистрата | ||
.desc = В заметках данного КПК можно найти компромат на каждого из глав. | ||
ent-ADTPathologistPDA = КПК патологоанатома | ||
.desc = От него веет прохладой. | ||
.desc = От него веет прохладой. | ||
2 changes: 2 additions & 0 deletions
2
Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/identification_cards.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
ent-MagistratIDCard = ID Магистрата | ||
.desc = Серебрянная карта с значком Юриста. |
3 changes: 3 additions & 0 deletions
3
Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/rubber_stamp.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
ent-RubberStampMagisrat = Печать магистрата | ||
.suffix = DO NOT MAP | ||
.desc = Выглядит угрожающее. От нее веет неоспоримой мощью и величием. |
2 changes: 2 additions & 0 deletions
2
Resources/Locale/ru-RU/ADT/prototypes/Entities/Roles/Jobs/departments.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
department-Juridical-description = Следите за соблюдением СРП, правильной трактовкой КЗ, защищайте подсудимых! | ||
department-Juridical = Юридический департамент |
2 changes: 2 additions & 0 deletions
2
Resources/Locale/ru-RU/ADT/prototypes/Entities/Roles/Jobs/jobs.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
job-name-magistrat = Магистрат | ||
job-description-magistrat = Самый грозный и богатый на станции. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 0 additions & 2 deletions
2
Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/ears/headsets.ftl
This file was deleted.
Oops, something went wrong.
1 change: 1 addition & 0 deletions
1
...urces/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/devices/encryption_keys.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,3 @@ | ||
ent-EncryptionKeyIAA = ключ шифрования агента внутренних дел | ||
.desc = Ключ шифрования, используемый самой дотошной персоной. | ||
.suffix = НЕ ТРОГАТЬ, это Корвакс |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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
47
Resources/Prototypes/ADT/Entities/Clothing/Ears/headsets.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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
10
Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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
23
Resources/Prototypes/ADT/Entities/Markers/Spawners/job.yml
This file was deleted.
Oops, something went wrong.
46 changes: 46 additions & 0 deletions
46
Resources/Prototypes/ADT/Entities/Markers/Spawners/jobs.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
File renamed without changes.
15 changes: 15 additions & 0 deletions
15
Resources/Prototypes/ADT/Entities/Objects/Devices/Electronics/door_access.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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"]] |
14 changes: 14 additions & 0 deletions
14
Resources/Prototypes/ADT/Entities/Objects/Devices/encryption_keys.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 13 additions & 0 deletions
13
Resources/Prototypes/ADT/Entities/Objects/Misc/rubber_stamp.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
17 changes: 17 additions & 0 deletions
17
Resources/Prototypes/ADT/Entities/Structures/Doors/Airlock/access.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 ] |
8 changes: 8 additions & 0 deletions
8
Resources/Prototypes/ADT/Loadouts/Jobs/Juridical/magistrat.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.