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

Роль - Магистрат #1711

Closed
wants to merge 15 commits into from
Binary file added Resources/Audio/Corvax/Weapons/molotochic.ogg
Binary file not shown.
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/corvax/job/job-names.ftl
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
job-name-iaa = агент внутренних дел
JobIAA = агент внутренних дел
job-name-judge = магистрат
JobJudge = магистрат
1 change: 1 addition & 0 deletions Resources/Locale/ru-RU/corvax/paper/stamp-component.ftl
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
stamp-component-stamped-name-iaa = Агент внутренних дел
stamp-component-stamped-name-psychologist = Психолог
stamp-component-stamped-name-judge = Магистрат
1 change: 1 addition & 0 deletions Resources/Locale/ru-RU/job/job-description.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,4 @@ job-description-security = Ловите преступников и врагов
job-description-serviceworker = Изучите основы барменского искусства, кулинарии, и выращивания растений.
job-description-warden = Патрулируйте отдел безопасности, следите за тем, чтобы никто не воровал из оружейной, и чтобы все заключенные были оформлены и выпущены по окончании срока.
job-description-zookeeper = Устройте веселое шоу с милыми животными и космическими карпами, чтобы все члены экипажа могли ими полюбоваться. Эта должность доступна на станциях Gemini и Avrite.
job-description-judge = Бдите за соблюдением закона, судите клоуна в начале смены и кричите на вашего АВД.
Agoichi marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
ent-ClothingHeadsetIAA = гарнитура АВД
.desc = Гарнитура агента внутренних дел, чтобы услышать последние слова капитана.
ent-ClothingHeadsetJudge = гарнитура магистрата
.desc = Гарнитура магистрата, чтобы услышать как капитан просит засудить ГСБ.
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@ ent-ClothingHeadHatBeretSecurityMedic = берет бригмедика
.desc = Прочный берет с эмблемой медицинской службы.
ent-ClothingHeadCaptainHat = капитанская шляпа
.desc = Особая шляпа, сделанная на заказ для капитана.
ent-ClothingHeadJudge = шляпа магистрата
.desc = Стоп, а это точно шляпа?
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-ClothingUniformMagistrat = накидка магистрата
.desc = Тонкая накидка с значком законного представителя юр департамента, дополнительно защищенным золотой цепью.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-MagistratHammer = молот магистрата
.desc = Молот из дорогой древесины, со встроенным предохранителем во избежание смертей клоунов.
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
ent-IAAPDA = КПК агента внутренних дел
.desc = Корпорация и прибыль - лучшие друзья.
ent-JudgePDA = КПК магистрата
.desc = Для магистратов чтобы садить клоуна с комфортом.
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
ent-IAAIDCard = ID карта агента внутренних дел
.desc = { ent-IDCardStandard.desc }
ent-JudgeIDCard = ID карта магистрата
.desc = { ent-IDCardStandard.desc }
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@ ent-RubberStampIAA = печать агента внутренних дел
ent-RubberStampPsychologist = печать психолога
.desc = { ent-RubberStampMime.desc }
.suffix = НЕ МАППИТЬ
ent-RubberStampJudge = печать магистрата
.desc = { ent-RubberStampMime.desc }
.suffix = НЕ МАППИТЬ
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@ ent-RubberStampIAA = печать агента внутренних дел
ent-RubberStampPsychologist = печать психолога
.desc = { ent-RubberStampMime.desc }
.suffix = НЕ МАППИТЬ
ent-RubberStampJudge = печать магистрата
.desc = { ent-RubberStampMime.desc }
.suffix = НЕ МАППИТЬ
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
job-description-judge = Бдите за соблюдением закона, судите клоуна в начале смены и кричите на вашего АВД.
17 changes: 17 additions & 0 deletions Resources/Prototypes/Corvax/Entities/Clothing/Ears/headsets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,20 @@
- EncryptionKeyIAA
- type: Sprite
sprite: Clothing/Ears/Headsets/servicesecurity.rsi

- type: entity
parent: ClothingHeadset
id: ClothingHeadsetJudge
name: judge headset
description: This is used by justice.
components:
- type: ContainerFill
containers:
key_slots:
- EncryptionKeySecurity
- EncryptionKeyCommon
- EncryptionKeyCommand
- type: Sprite
sprite: Corvax/Clothing/Ears/Headsets/judge.rsi
- type: Clothing
sprite: Corvax/Clothing/Ears/Headsets/judge.rsi
13 changes: 12 additions & 1 deletion Resources/Prototypes/Corvax/Entities/Clothing/Head/hats.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- type: entity
- type: entity
parent: ClothingHeadBase
id: ClothingHeadCapCentcomBlack
name: special operations officer cap
Expand Down Expand Up @@ -85,3 +85,14 @@
sprite: Corvax/Clothing/Head/Hats/caphat.rsi
- type: Clothing
sprite: Corvax/Clothing/Head/Hats/caphat.rsi

- type: entity
parent: ClothingHeadBase
id: ClothingHeadJudge
name: Judge Hat
description: Old-fashioned hat... this is hat, right?
components:
- type: Sprite
sprite: Corvax/Clothing/Head/Hats/magr_hair.rsi
- type: Clothing
sprite: Corvax/Clothing/Head/Hats/magr_hair.rsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@

- type: entity
parent: ClothingOuterStorageBase
id: ClothingUniformMagistrat
name: Magistrat mantle
description: Smells like justice
components:
- type: Sprite
sprite: Corvax/Clothing/OuterClothing/misc/magistrat.rsi
- type: Clothing
sprite: Corvax/Clothing/OuterClothing/misc/magistrat.rsi
- type: StorageFill
11 changes: 11 additions & 0 deletions Resources/Prototypes/Corvax/Entities/Markers/Spawners/jobs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
- type: entity
id: SpawnPointJudge
parent: SpawnPointJobBase
name: judge
components:
- type: SpawnPoint
job_id: Judge
- type: Sprite
layers:
- state: green
- state: judge
20 changes: 20 additions & 0 deletions Resources/Prototypes/Corvax/Entities/Objects/Devices/pda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,23 @@
borderColor: "#6f6192"
- type: Icon
state: pda-lawyer

- type: entity
parent: BasePDA
id: JudgePDA
name: judge PDA
description: For judge to send clown into prison with comfort.
components:
- type: Pda
id: JudgeIDCard
state: pda-judge
penSlot:
startingItem: PenCentcom
priority: -1
whitelist:
tags:
- Write
- type: PdaBorderColor
borderColor: "#40496d"
- type: Icon
state: pda-judge
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,15 @@
- state: idiaa
- type: PresetIdCard
job: IAA

- type: entity
parent: IDCardStandard
id: JudgeIDCard
name: judge ID card
components:
- type: Sprite
layers:
- state: silver
- state: idjudge
- type: PresetIdCard
job: Judge
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,17 @@
- type: Sprite
sprite: Corvax/Objects/Misc/stamps.rsi
state: stamp-psychologist

- type: entity
name: judge rubber stamp
parent: RubberStampBase
id: RubberStampJudge
suffix: DO NOT MAP
components:
- type: Stamp
stampedName: stamp-component-stamped-name-judge
stampedColor: "#33CC33"
stampState: "paper_stamp-ok"
- type: Sprite
sprite: Corvax/Objects/Misc/stamps.rsi
state: stamp-judge
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
- type: entity
name: judge hammer
parent: BaseItem
id: MagistratHammer
description: It has a symbolic of NT
components:
- type: Sprite
sprite: Objects/Weapons/Melee/judge_hammer.rsi
state: icon
- type: MeleeWeapon
soundHit:
path: /Audio/Corvax/Weapons/molotochic.ogg
wideAnimationRotation: 135
damage:
types:
Blunt: 0
- type: StaminaDamageOnHit
damage: 15
- type: Item
size: Small
- type: Clothing
sprite: Objects/Weapons/Melee/judge_hammer.rsi
quickEquip: false
slots:
- Belt
- type: StaticPrice
price: 100
1 change: 1 addition & 0 deletions Resources/Prototypes/Corvax/Maps/astra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
Reporter: [ 1, 1 ]
# command
Captain: [ 1, 1 ]
Judge: [0, 1]
IAA: [ 1, 1 ]
# engineering
ChiefEngineer: [ 1, 1 ]
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Corvax/Maps/avrite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
Janitor: [ 3, 3 ]
Mime: [ 1, 1 ]
Captain: [ 1, 1 ]
Judge: [ 0, 1]
IAA: [ 1, 1 ]
Reporter: [ 2, 2 ]
HeadOfPersonnel: [ 1, 1 ]
Expand Down
3 changes: 2 additions & 1 deletion Resources/Prototypes/Corvax/Maps/delta.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- type: gameMap
- type: gameMap
id: CorvaxDelta
mapName: 'Delta Station'
mapPath: /Maps/corvax_delta.yml
Expand Down Expand Up @@ -27,6 +27,7 @@
Janitor: [ 1, 2 ]
Mime: [ 1, 1 ]
Captain: [ 1, 1 ]
Judge: [ 0, 1]
IAA: [ 1, 1 ]
HeadOfPersonnel: [ 1, 1 ]
ChiefEngineer: [ 1, 1 ]
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Corvax/Maps/gate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
availableJobs:
#service
Captain: [ 1, 1 ]
Judge: [ 0, 1]
IAA: [ 1, 1 ] # Corvax-IAA
HeadOfPersonnel: [ 1, 1 ]
Bartender: [ 2, 2 ]
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Corvax/Maps/outpost.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
availableJobs:
#service
Captain: [ 1, 1 ]
Judge: [ 0, 1]
IAA: [ 1, 1 ] # Corvax-IAA
HeadOfPersonnel: [ 1, 1 ]
Bartender: [ 1, 1 ]
Expand Down
3 changes: 2 additions & 1 deletion Resources/Prototypes/Corvax/Maps/silly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
Janitor: [ 1, 2 ]
Mime: [ 1, 1 ]
Captain: [ 1, 1 ]
Judge: [ 0, 1]
IAA: [ 1, 1 ]
HeadOfPersonnel: [ 1, 1 ]
ChiefEngineer: [ 1, 1 ]
Expand All @@ -53,4 +54,4 @@
SecurityCadet: [ 1, 1 ]
Psychologist: [ 0, 0 ]
Detective: [ 1, 1 ]
Paramedic: [ 1, 1 ]
Paramedic: [ 1, 1 ]
1 change: 1 addition & 0 deletions Resources/Prototypes/Corvax/Maps/spectrum.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
HeadOfSecurity: [ 1, 1 ]
ChiefMedicalOfficer: [ 1, 1 ]
ResearchDirector: [ 1, 1 ]
Judge: [ 0, 1]
CargoTechnician: [ 4, 4 ] #карго
SalvageSpecialist: [ 4, 4 ]
StationEngineer: [ 6, 6 ] #инженерка
Expand Down
48 changes: 48 additions & 0 deletions Resources/Prototypes/Corvax/Roles/Jobs/Command/Judge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
- type: job
id: Judge
name: job-name-judge
description: job-description-judge
playTimeTracker: JobJudge
requirements:
- !type:RoleTimeRequirement
role: JobWarden
time: 72000 #20 hrs

- !type:RoleTimeRequirement
role: JobIAA
time: 72000 #20 hrs
startingGear: JudgeGear
icon: "JobIconJudge"
supervisors: job-supervisors-centcom
canBeAntag: false
access:
- Service
- Brig
- Maintenance
- Command
- External
- Lawyer
- Security
special:
- !type:AddImplantSpecial
implants: [ MindShieldImplant ]

- type: startingGear
id: JudgeGear
equipment:
jumpsuit: ClothingUniformJumpsuitCentcomAgent
back: ClothingBackpackFilled
shoes: ClothingShoesBootsLaceup
eyes: ClothingEyesGlassesSunglasses
head: ClothingHeadJudge
id: JudgePDA
ears: ClothingHeadsetJudge
outerClothing: ClothingUniformMagistrat
pocket1: RubberStampJudge
pocket2: MagistratHammer
# TODO add copy of space law
inhand:
- BriefcaseBrownFilled
innerClothingSkirt: ClothingUniformJumpskirtLawyerBlack
satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled
3 changes: 3 additions & 0 deletions Resources/Prototypes/Corvax/Roles/play_time_trackers.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
- type: playTimeTracker
id: JobIAA

- type: playTimeTracker
id: JobJudge

- type: playTimeTracker
id: JobEvent1

Expand Down
7 changes: 7 additions & 0 deletions Resources/Prototypes/Corvax/StatusEffects/job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,10 @@
icon:
sprite: Interface/Misc/job_icons.rsi
state: IAA

- type: statusIcon
parent: JobIcon
id: JobIconJudge
icon:
sprite: Interface/Misc/job_icons.rsi
state: Judge
Loading
Loading