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.

Sign up for GitHub

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

Магистрат и юридический департамент #44

Merged
merged 16 commits into from
Jun 8, 2024
Merged

Магистрат и юридический департамент #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
07448d0
Vulpkanin Lang Fix
Rinary1 Jun 5, 2024
9dd0ca9
Merge branch 'space-sunrise:master' into Vulpkanin
Rinary1 Jun 5, 2024
1557f5d
Merge branch 'space-sunrise:master' into Vulpkanin
Rinary1 Jun 5, 2024
f4b7491
Blueshield
Rinary1 Jun 5, 2024
525782a
Revert "Blueshield"
Rinary1 Jun 5, 2024
227fcad
Magistrat Job
Rinary1 Jun 7, 2024
d1f6a98
Merge branch 'space-sunrise:master' into Roles
Rinary1 Jun 7, 2024
afcd9b1
Magistrat Icons, IAA Icons Change
Rinary1 Jun 7, 2024
3e73dd1
Changelog
Rinary1 Jun 7, 2024
c95268d
Law department, Some Fixes, Add Magistrate, Lawyer to all Maps
Rinary1 Jun 8, 2024
f1aa6fa
))
Rinary1 Jun 8, 2024
922dcb3
Magistrat Loadout
Rinary1 Jun 8, 2024
a5e41d8
Lawyer, Remove Comments from Maps, Adds More Lawyers(from 1 to 3, cop…
Rinary1 Jun 8, 2024
1126452
Merge branch 'master' into Roles
Rinary1 Jun 8, 2024
d3e64bc
Law department in Sunrise Maps
Rinary1 Jun 8, 2024
766c1c9
Merge branch 'Roles' of https://github.com/Rinary1/space-sunrise into…
Rinary1 Jun 8, 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
6 changes: 6 additions & 0 deletions Resources/Changelog/ChangelogSunrise.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,12 @@ Entries:
type: Add
id: 27
time: '2024-06-07T17:08:00.724523+00:00'
- author: Rinary
changes:
- message: "\u0431\u044B\u043B\u0430\u0020\ \u0434\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430\u0020\ \u0440\u043E\u043B\u044C\u000D\u000A\ \u043C\u0430\u0433\u0438\u0441\u0442\u0440\u0430\u0442\u0430."
type: Add
id: 27
time: '2024-06-08T00:34:38.724523+00:00'
- author: Babaev
changes:
- message: "\u041D\u043E\u0432\u044B\u0435 \u0441\u043F\u0440\u0430\u0439\u0442\u044B\
Expand Down
1 change: 1 addition & 0 deletions Resources/Locale/ru-RU/_sunrise/job/department-desc.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
department-Law-description = Защищяйте, судите или накажите преступников.
1 change: 1 addition & 0 deletions Resources/Locale/ru-RU/_sunrise/job/department.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
department-Law = Юридический отдел
1 change: 1 addition & 0 deletions Resources/Locale/ru-RU/_sunrise/job/job-desc.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
job-description-magistrat = Вы само правосудие станции, ваша задача судить всех крупных нарушителей порядка.
1 change: 1 addition & 0 deletions Resources/Locale/ru-RU/_sunrise/job/job-names.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
job-name-magistrat = Магистрат
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/markers/spawners/jobs.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-SpawnPointMagistrat = Магистрат
.desc = { ent-SpawnPointJobBase.desc }
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/devices/pda.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-MagistratPDA = КПК Магистрата
.desc = { ent-CaptainPDA.desc }
2 changes: 2 additions & 0 deletions ...s/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/misc/identification_cards.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-MagistratIDCard = ID карта Магистрата
.desc = { ent-IDCardStandard.desc }
4 changes: 4 additions & 0 deletions Resources/Prototypes/Access/command.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
- type: accessLevel
id: HeadOfPersonnel
name: id-card-access-level-head-of-personnel

- type: accessLevel
id: Magistrat
name: id-card-access-level-magistrat

- type: accessGroup
id: Command
Expand Down
5 changes: 3 additions & 2 deletions Resources/Prototypes/Maps/bagel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
SecurityOfficer: [ 4, 4 ]
Detective: [ 1, 1 ]
SecurityCadet: [ 4, 4 ]
#Lawyer: [ 2, 2 ]
#supply
Quartermaster: [ 1, 1 ]
SalvageSpecialist: [ 3, 3 ]
Expand All @@ -60,5 +59,7 @@
Mime: [ 1, 1 ]
Musician: [ 1, 1 ]
Reporter: [ 2, 2 ]
# Sunrise-Roles
# Sunrise-Law
IAA: [ 1, 1 ]
Lawyer: [ 2, 2 ]
Magistrate: [ 1, 1 ]
6 changes: 3 additions & 3 deletions Resources/Prototypes/Maps/box.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
SecurityOfficer: [ 5, 5 ]
Detective: [ 1, 1 ]
SecurityCadet: [ 4, 4 ]
#Lawyer: [ 2, 2 ]
#supply
Quartermaster: [ 1, 1 ]
SalvageSpecialist: [ 3, 3 ]
Expand All @@ -59,6 +58,7 @@
Clown: [ 1, 1 ]
Mime: [ 1, 1 ]
Musician: [ 1, 1 ]
# Sunrise-Roles
# Sunrise-Law
IAA: [ 1, 1 ]

Lawyer: [ 2, 2 ]
Magistrate: [ 1, 1 ]
6 changes: 3 additions & 3 deletions Resources/Prototypes/Maps/cluster.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
Janitor: [ 1, 1 ]
Chaplain: [ 1, 1 ]
Librarian: [ 1, 1 ]
#Lawyer: [ 1, 1 ]
ServiceWorker: [ 1, 1 ]
#engineering
ChiefEngineer: [ 1, 1 ]
Expand Down Expand Up @@ -58,6 +57,7 @@
Clown: [ 1, 1 ]
Mime: [ 1, 1 ]
Musician: [ 1, 1 ]
# Sunrise-Roles
# Sunrise-Law
IAA: [ 1, 1 ]

Lawyer: [ 1, 1 ]
Magistrate: [ 1, 1 ]
5 changes: 3 additions & 2 deletions Resources/Prototypes/Maps/core.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
HeadOfSecurity: [ 1, 1 ]
SecurityOfficer: [ 4, 4 ]
Warden: [ 1, 1 ]
#Lawyer: [ 1, 1 ]
SecurityCadet: [ 1, 1 ]
Detective: [ 1, 1 ]
#supply
Expand All @@ -63,5 +62,7 @@
Musician: [ 1, 1 ]
Boxer: [ 2, 2 ]
Reporter: [ 2, 2 ]
# Sunrise-Roles
# Sunrise-Law
IAA: [ 1, 1 ]
Lawyer: [ 1, 1 ]
Magistrate: [ 1, 1 ]
5 changes: 3 additions & 2 deletions Resources/Prototypes/Maps/europa.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
HeadOfSecurity: [ 1, 1 ]
SecurityOfficer: [ 3, 3 ]
Warden: [ 1, 1 ]
#Lawyer: [ 1, 1 ]
SecurityCadet: [ 3, 3 ]
Detective: [ 1, 1 ]
#supply
Expand All @@ -64,5 +63,7 @@
Mime: [ 1, 1 ]
Musician: [ 1, 1 ]
Reporter: [ 1, 1 ]
# Sunrise-Roles
# Sunrise-Law
IAA: [ 1, 1 ]
Lawyer: [ 1, 1 ]
Magistrate: [ 1, 1 ]
5 changes: 3 additions & 2 deletions Resources/Prototypes/Maps/fland.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
SecurityOfficer: [ 8, 8 ]
Detective: [ 1, 1 ]
SecurityCadet: [ 4, 4 ]
#Lawyer: [ 2, 2 ]
#supply
Quartermaster: [ 1, 1 ]
SalvageSpecialist: [ 3, 3 ]
Expand All @@ -60,5 +59,7 @@
Clown: [ 1, 1 ]
Mime: [ 1, 1 ]
Musician: [ 1, 1 ]
# Sunrise-Roles
# Sunrise-Law
IAA: [ 1, 1 ]
Lawyer: [ 2, 2 ]
Magistrate: [ 1, 1 ]
5 changes: 3 additions & 2 deletions Resources/Prototypes/Maps/marathon.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
SecurityOfficer: [ 4, 4 ]
Detective: [ 1, 1 ]
SecurityCadet: [ 4, 4 ]
#Lawyer: [ 2, 2 ]
#supply
Quartermaster: [ 1, 1 ]
SalvageSpecialist: [ 3, 3 ]
Expand All @@ -60,5 +59,7 @@
Clown: [ 1, 1 ]
Mime: [ 1, 1 ]
Musician: [ 1, 1 ]
# Sunrise-Roles
# Sunrise-Law
IAA: [ 1, 1 ]
Lawyer: [ 2, 2 ]
Magistrate: [ 1, 1 ]
5 changes: 3 additions & 2 deletions Resources/Prototypes/Maps/meta.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
SecurityOfficer: [ 5, 7 ]
Detective: [ 1, 1 ]
SecurityCadet: [ 3, 6 ]
#Lawyer: [ 2, 2 ]
#supply
Quartermaster: [ 1, 1 ]
SalvageSpecialist: [ 3, 3 ]
Expand All @@ -58,5 +57,7 @@
Clown: [ 1, 1 ]
Mime: [ 1, 1 ]
Musician: [ 1, 1 ]
# Sunrise-Roles
# Sunrise-Law
IAA: [ 1, 1 ]
Lawyer: [ 2, 2 ]
Magistrate: [ 1, 1 ]
5 changes: 3 additions & 2 deletions Resources/Prototypes/Maps/oasis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
SecurityOfficer: [ 8, 8 ]
Detective: [ 1, 1 ]
SecurityCadet: [ 4, 4 ]
# Lawyer: [ 3, 3 ]
#supply
Quartermaster: [ 1, 1 ]
SalvageSpecialist: [ 3, 3 ]
Expand All @@ -61,5 +60,7 @@
Clown: [ 1, 1 ]
Mime: [ 1, 1 ]
Musician: [ 1, 1 ]
# Sunrise-Roles
# Sunrise-Law
IAA: [ 1, 1 ]
Lawyer: [ 3, 3 ]
Magistrate: [ 1, 1 ]
5 changes: 3 additions & 2 deletions Resources/Prototypes/Maps/omega.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
SecurityOfficer: [ 4, 4 ]
Detective: [ 1, 1 ]
SecurityCadet: [ 2, 2 ]
#Lawyer: [ 1, 1 ]
#supply
Quartermaster: [ 1, 1 ]
SalvageSpecialist: [ 2, 2 ]
Expand All @@ -58,5 +57,7 @@
Mime: [ 1, 1 ]
Musician: [ 1, 1 ]
Borg: [ 2, 2 ]
# Sunrise-Roles
# Sunrise-Law
IAA: [ 1, 1 ]
Lawyer: [ 1, 1 ]
Magistrate: [ 1, 1 ]
6 changes: 3 additions & 3 deletions Resources/Prototypes/Maps/origin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
Janitor: [ 3, 3 ]
Chaplain: [ 2, 2 ]
Librarian: [ 2, 2 ]
#Lawyer: [ 2, 2 ]
ServiceWorker: [ 3, 4 ]
#engineering
ChiefEngineer: [ 1, 1 ]
Expand Down Expand Up @@ -61,6 +60,7 @@
Musician: [ 2, 2 ]
Boxer: [ 1, 1 ]
Reporter: [ 1, 1 ]
# Sunrise-Roles
# Sunrise-Law
IAA: [ 1, 1 ]

Lawyer: [ 2, 2 ]
Magistrate: [ 1, 1 ]
5 changes: 3 additions & 2 deletions Resources/Prototypes/Maps/packed.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
SecurityOfficer: [ 4, 4 ]
Detective: [ 1, 1 ]
SecurityCadet: [ 2, 2 ]
#Lawyer: [ 1, 1 ]
#supply
Quartermaster: [ 1, 1 ]
SalvageSpecialist: [ 2, 2 ]
Expand All @@ -57,5 +56,7 @@
Mime: [ 1, 1 ]
Musician: [ 1, 1 ]
Borg: [ 1 , 1 ]
# Sunrise-Roles
# Sunrise-Law
IAA: [ 1, 1 ]
Lawyer: [ 1, 1 ]
Magistrate: [ 1, 1 ]
5 changes: 3 additions & 2 deletions Resources/Prototypes/Maps/train.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
Warden: [ 1, 1 ]
SecurityOfficer: [ 6, 6 ]
SecurityCadet: [ 3, 3 ]
#Lawyer: [ 1, 2 ]
#supply
Quartermaster: [ 1, 1 ]
SalvageSpecialist: [ 2, 2 ]
Expand All @@ -60,5 +59,7 @@
Mime: [ 1, 1 ]
Musician: [ 1, 1 ]
Borg: [ 2, 2 ]
# Sunrise-Roles
# Sunrise-Law
IAA: [ 1, 1 ]
Lawyer: [ 1, 2 ]
Magistrate: [ 1, 1 ]
1 change: 0 additions & 1 deletion Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
- !type:OverallPlaytimeRequirement
time: 36000 # 10 hrs
startingGear: LawyerGear
setPreference: false # Replaced on the IAA
icon: "JobIconLawyer"
supervisors: job-supervisors-hop
access:
Expand Down
1 change: 0 additions & 1 deletion Resources/Prototypes/Roles/Jobs/departments.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
color: "#052EED" # Sunrise-Edit
roles:
- Captain
- IAA # Sunrise-Edit
- CentralCommandOfficial
- ChiefEngineer
- ChiefMedicalOfficer
Expand Down
11 changes: 11 additions & 0 deletions Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/jumpsuits.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,14 @@
sprite: _Sunrise/Clothing/Uniforms/Jumpsuit/centcom_admiral.rsi
- type: Clothing
sprite: _Sunrise/Clothing/Uniforms/Jumpsuit/centcom_admiral.rsi

- type: entity
parent: ClothingUniformBase
id: MagistratUniformSuit
name: Костюм магистрата
description: Увольте пару срочников!
components:
- type: Sprite
sprite: _Sunrise/Clothing/Uniforms/jumpsuit/magistratebel.rsi
- type: Clothing
sprite: _Sunrise/Clothing/Uniforms/jumpsuit/magistratebel.rsi
14 changes: 13 additions & 1 deletion Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/jobs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,16 @@
- type: entity
id: SpawnPointMagistrat
parent: SpawnPointJobBase
name: Magistrat
components:
- type: SpawnPoint
job_id: Magistrat
- type: Sprite
sprite: _Sunrise/Markers/jobs.rsi
layers:
- state: green
- state: magistrat
- state: jobicon
id: SpawnPointBrigmedic
parent: SpawnPointJobBase
name: brigmedic
Expand All @@ -8,4 +20,4 @@
- type: Sprite
layers:
- state: green
- state: brigmedic
- state: brigmedic
19 changes: 19 additions & 0 deletions Resources/Prototypes/_Sunrise/Entities/Objects/Devices/pda.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,22 @@
borderColor: "#6f6192"
- type: Icon
state: pda-lawyer

- type: entity
parent: CaptainPDA
id: MagistratPDA
name: magistrat PDA
components:
- type: Pda
id: MagistratIDCard
state: pda-captain
penSlot:
startingItem: Pen
priority: -1
whitelist:
tags:
- Write
- type: PdaBorderColor
borderColor: "#7C5D00"
- type: Icon
state: pda-captain
11 changes: 10 additions & 1 deletion Resources/Prototypes/_Sunrise/Entities/Objects/Misc/identification_cards.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,15 @@

- type: entity
parent: IDCardStandard
id: MagistratIDCard
name: Magistrate ID Card
components:
- type: Sprite
layers:
- state: silver
- state: idmagistrat
- type: PresetIdCard
job: Magistrat
id: BrigmedicIDCard
name: brigmedic ID card
components:
Expand All @@ -20,4 +29,4 @@
- state: default
- state: idbrigmedic
- type: PresetIdCard
job: Brigmedic
job: Brigmedic
3 changes: 3 additions & 0 deletions Resources/Prototypes/_Sunrise/Loadouts/role_loadouts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
- Socks

- type: roleLoadout
id: JobMagistrat
groups:
- CommonBackpack
id: JobBrigmedic
groups:
- BrigmedicJumpsuit
Expand Down
Loading
Loading