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

Переработка ролей Центрального Коммандования #53

Closed
wants to merge 12 commits into from
Closed

Переработка ролей Центрального Коммандования #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 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
0d7b37e
Merge branch 'space-sunrise:master' into master
Rinary1 Jun 7, 2024
9d02db2
Merge branch 'space-sunrise:master' into master
Rinary1 Jun 7, 2024
72adbb1
Merge branch 'space-sunrise:master' into master
Rinary1 Jun 8, 2024
55d6113
Merge branch 'space-sunrise:master' into master
Rinary1 Jun 8, 2024
6599e9e
Merge branch 'space-sunrise:master' into master
Rinary1 Jun 9, 2024
a2b8c1e
No Operator, but Officer
Rinary1 Jun 9, 2024
7ea1481
No Centcom Official, but Centcom Field Officer
Rinary1 Jun 11, 2024
d4c0469
Merge branch 'space-sunrise:master' into Centcom-Rework
Rinary1 Jun 11, 2024
3065118
Merge branch 'space-sunrise:master' into Centcom-Rework
Rinary1 Jun 12, 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
3 changes: 2 additions & 1 deletion Resources/Locale/ru-RU/_sunrise/job/job-desc.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
job-description-magistrat = Вы само правосудие станции, ваша задача судить всех крупных нарушителей порядка.
job-description-centcomop = Не одобряйте эвакуацию. Не одобряйте ОБР. Делите зарплату экипажа станций на 0.
job-description-centcomof = Не одобряйте эвакуацию. Не одобряйте ОБР. Делите зарплату экипажа станций на 0.
job-description-centcomfo = Коммандование станции возамнило себя главными? Прилетите на станцию и используя дубинку объясните им как не надо.
3 changes: 2 additions & 1 deletion Resources/Locale/ru-RU/_sunrise/job/job-names.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
job-name-magistrat = магистрат
job-name-centcomop = оператор Центком
job-name-centcomof = офицер ЦентКом
job-name-centcomfo = полевой офицер ЦентКом

JobCentCommOfficial = представитель Центком
JobMagistrat = магистрат
12 changes: 6 additions & 6 deletions .../Jobs/CentralCommand/centcom_official.yml → .../CentralCommand/centcom_field_officer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
- type: job
id: CentCommOfficial
name: job-name-centcomoff
description: job-description-centcomoff
playTimeTracker: JobCentCommOfficial
id: CentCommFieldOfficer
name: job-name-centcomfo
description: job-description-centcomfo
playTimeTracker: JobCentCommFieldOfficer
requirements:
- !type:DepartmentTimeRequirement
department: Command
time: 180000 #50 hrs
weight: 30
setPreference: true
startingGear: CentCommOfficialGear
startingGear: CentCommFieldOfficerGear
icon: "JobIconNanotrasen"
supervisors: job-supervisors-centcom
radioBold: true
Expand All @@ -23,7 +23,7 @@
- Vox

- type: startingGear
id: CentCommOfficialGear
id: CentCommFieldOfficerGear
equipment:
jumpsuit: ClothingUniformJumpsuitCentcomOfficial
shoes: ClothingShoesBootsCombatFilled
Expand Down
12 changes: 6 additions & 6 deletions .../Jobs/CentralCommand/centcom_operator.yml → ...s/Jobs/CentralCommand/centcom_officer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
- type: job
id: CentCommOperator
name: job-name-centcomop
description: job-description-centcomop
playTimeTracker: JobCentCommOperator
id: CentComOfficer
name: job-name-centcomof
description: job-description-centcomof
playTimeTracker: JobCentComOfficer
requirements:
- !type:DepartmentTimeRequirement
department: Command
time: 180000 #50 hrs
weight: 30
setPreference: true
startingGear: CentCommOperatorGear
startingGear: CentComOfficerGear
icon: "JobIconNanotrasen"
supervisors: job-supervisors-centcom
radioBold: true
Expand All @@ -23,7 +23,7 @@
- Vox

- type: startingGear
id: CentCommOperatorGear
id: CentCommOfficerGear
equipment:
jumpsuit: ClothingUniformJumpsuitCentcomAdmiral
shoes: ClothingShoesBootsJack
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@
weight: 120
roles:
- CentCommOfficial
- CentCommOperator
- CentComOfficer
primary: false
2 changes: 1 addition & 1 deletion Resources/Prototypes/_Sunrise/Roles/play_time_trackers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
id: JobBrigmedic

- type: playTimeTracker
id: JobCentCommOperator
id: JobCentComOfficer

- type: playTimeTracker
id: JobCentCommOfficial