Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Magistrat #161

Merged
merged 21 commits into from
Aug 3, 2024
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
3ee3549
Добавление магистрата: печать магистрата
Bolper Jul 31, 2024
2759738
Добавление магистрата: гарнитура магистрата, гарнитура юриста, гарнит…
Bolper Jul 31, 2024
fbfcd82
Добавление магистрата: Доступы: магистрат, АВД. КПК магистрата. airlo…
Bolper Jul 31, 2024
dcc6bbb
Перенос магистрата:Белый костюм дипломата
Bolper Jul 31, 2024
d38f318
Добавление магистрата: добавлено стартовое снаряжение, спавн поинты М…
Bolper Jul 31, 2024
3e513aa
Добавление магистрата. Чуток подправил спавн АВД
Bolper Jul 31, 2024
1fa20bb
Добавление магистрата: лодауты для магистрата
Bolper Aug 1, 2024
49017fe
Добавление магистрата: небольшие правки: дали доступ кэпу. Теперь в к…
Bolper Aug 1, 2024
cd7d985
Добавление Магистрата. исправлена опечатка. Теперь точно у кэпа есть …
Bolper Aug 1, 2024
bf8d499
Добавление магистрата: fix: YAML Linter.
Bolper Aug 1, 2024
1a108fa
Добавление магистрата. Удаление пустой FTLки
Bolper Aug 1, 2024
fd3c1c6
Добавление магистрата: fix: код ревью поделали
Bolper Aug 1, 2024
5c514ae
Merge branch 'magistrat' of https://github.com/Bolper/Bolper_Space_St…
Bolper Aug 1, 2024
6cc6cbc
test fix
Bolper Aug 1, 2024
e6f5374
Мяу~ Убираем лишнию хуйню, которую я же сам и добавил. Добавление маг…
Bolper Aug 1, 2024
0d27017
Добавление магистата. Fix
Bolper Aug 1, 2024
71ef668
Merge branch 'master' into magistrat
Darkiich Aug 1, 2024
ee62d64
Добавление магистрата. fix Resources\Prototypes\ADT\Entities\Objects\…
Bolper Aug 3, 2024
7baf95f
Добавление магистрата: fix:
Bolper Aug 3, 2024
e21b06f
Добавление магистрата. fix:
Bolper Aug 3, 2024
de6d78b
Добавление магистрата. fix:
Bolper Aug 3, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/ADT/loadout.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-MagistratNeck = Галстуки
ent-MagistratJumpsuit = Костюмы
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
@@ -0,0 +1,2 @@
ent-MagistratPDA = КПК Магистрата
.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 = Самый грозный и богатый на станции.
1 change: 1 addition & 0 deletions Resources/Locale/ru-RU/ADT/prototypes/radio_channels.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ADT-Lawyer-Channel-name = Юридический
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
Original file line number Diff line number Diff line change
@@ -1,2 +0,0 @@
ent-ClothingHeadsetIAA = гарнитура АВД
.desc = Гарнитура агента внутренних дел, чтобы услышать последние слова капитана.
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/LawDepartament.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
34 changes: 34 additions & 0 deletions Resources/Prototypes/ADT/Entities/Markers/Spawners/jobs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
- type: entity
id: ADTSpawnPointJobBase
parent: MarkerBase
abstract: true
suffix: Job Spawn
components:
- type: SpawnPoint
spawn_type: Job
- type: Sprite
sprite: ADT/Markers/jobs.rsi

- 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
@@ -0,0 +1,12 @@
- 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
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
22 changes: 22 additions & 0 deletions Resources/Prototypes/ADT/Loadouts/Jobs/loadout_groups.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
- 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
12 changes: 12 additions & 0 deletions Resources/Prototypes/ADT/Loadouts/Jobs/role_loadouts.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
- type: roleLoadout
id: JobMagistrat
groups:
- Inventory # Corvax-Loadouts
- GroupTankHarness
- MagistratNeck
- MagistratJumpsuit
- CommonBackpack
- Glasses
- Survival
- Trinkets
- GroupSpeciesBreathTool
55 changes: 55 additions & 0 deletions Resources/Prototypes/ADT/Roles/Jobs/LawDepartament/Magistrat.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
- type: job
id: Magistrat
name: job-name-magistrat
description: job-description-magistrat
playTimeTracker: JobMagistrat
requirements:
- !type:DepartmentTimeRequirement
department: Security
time: 600000
# - !type:DepartmentTimeRequirement
# department: Sponsor
# time: 10
startingGear: MagistratGear
icon: "JobIconMagistrat"
requireAdminNotify: true
joinNotifyCrew: true
supervisors: job-supervisors-captain
canBeAntag: false
access:
- Command
- Brig
- Maintenance
- Service
- Security
- Magistrate
- Lawyer
- IAA
special:
- !type:AddImplantSpecial
implants: [ MindShieldImplant ]

- type: startingGear
id: MagistratGear
equipment:
# jumpsuit: ADTClothingUniformsJumpsuitWhiteDiplomatSuitL
# back: ClothingBackpackIAAFilled
shoes: ClothingShoesBootsLaceup
#mask: Ну что за косипор оставляет пустуе значения?
#outerClothing: ClothingOuterRobesJudge
eyes: ClothingEyesGlassesSunglasses
#head: ClothingHeadHatPwig
id: MagistratPDA
#gloves:
ears: ClothingHeadsetMagistrat
#belt:
neck: ClothingNeckLawyerbadge
pocket2: RubberStampMagisrat
# pocket1: ADTtelescopicBaton
# underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear
# socks: ClothingUnderwearSocksNormal
# underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear
# underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear
# innerClothingSkirt: ADTClothingUniformsJumpsuitWhiteDiplomatSuitL
# satchel: ClothingBackpackSatchelIAAFilled
# duffelbag: ClothingBackpackDuffelIAAFilled
8 changes: 8 additions & 0 deletions Resources/Prototypes/ADT/Roles/Jobs/departments.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
- type: department
id: Juridical
description: department-Juridical-description
color: "#777777"
roles:
- Magistrat
- IAA
- Lawyer
2 changes: 2 additions & 0 deletions Resources/Prototypes/ADT/Roles/Jobs/play_time_trackers.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- type: playTimeTracker
id: JobMagistrat
6 changes: 6 additions & 0 deletions Resources/Prototypes/ADT/StatusIcon/job.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
- type: statusIcon
parent: JobIcon
id: JobIconMagistrat
icon:
sprite: /Textures/ADT/Interface/Misc/job_icons.rsi
state: Magistrat
7 changes: 7 additions & 0 deletions Resources/Prototypes/ADT/radio_channels.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
- type: radioChannel
id: ADTLawyerChannel
name: ADT-Lawyer-Channel-name
keycode: 'ю'
frequency: 1305
color: "#c6d2f5"
longRange: false
2 changes: 2 additions & 0 deletions Resources/Prototypes/Access/misc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,5 @@
- Chapel
- Hydroponics
- Atmospherics
- IAA
- Magistrate
Loading
Loading