From bef841021e484dc1241171a3b948b655fd223686 Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Fri, 1 Mar 2024 00:15:10 +0100 Subject: [PATCH] 2 --- .../Locale/ru-RU/corvax/job/job-names.ftl | 8 +++++++ .../Corvax/Roles/Jobs/Medical/brigmedic.yml | 2 ++ .../Corvax/Roles/Jobs/Medical/virologist.yml | 2 ++ .../Corvax/Roles/Jobs/Science/roboticist.yml | 4 +++- .../Corvax/Roles/Jobs/Security/pilot.yml | 2 ++ .../Corvax/Roles/play_time_trackers.yml | 20 +++++++++++++---- .../Prototypes/Corvax/StatusEffects/job.yml | 22 ------------------- 7 files changed, 33 insertions(+), 27 deletions(-) diff --git a/Resources/Locale/ru-RU/corvax/job/job-names.ftl b/Resources/Locale/ru-RU/corvax/job/job-names.ftl index 4521adebbf5..7179ee481f8 100644 --- a/Resources/Locale/ru-RU/corvax/job/job-names.ftl +++ b/Resources/Locale/ru-RU/corvax/job/job-names.ftl @@ -1,2 +1,10 @@ job-name-iaa = агент внутренних дел JobIAA = агент внутренних дел +job-name-brigmedic = бригмедик +JobBrigmedic = бригмедик +job-name-pilot = пилот СБ +JobPilot = пилот СБ +job-name-roboticist = робототехник +JobRoboticist = робототехник +job-name-virologist = вирусолог +JobVirologist = вирусолог diff --git a/Resources/Prototypes/Corvax/Roles/Jobs/Medical/brigmedic.yml b/Resources/Prototypes/Corvax/Roles/Jobs/Medical/brigmedic.yml index c296eba7099..a408cd7a683 100644 --- a/Resources/Prototypes/Corvax/Roles/Jobs/Medical/brigmedic.yml +++ b/Resources/Prototypes/Corvax/Roles/Jobs/Medical/brigmedic.yml @@ -1,8 +1,10 @@ - type: job id: Brigmedic name: job-name-brigmedic + playTimeTracker: JobBrigmedic icon: "JobIconBrigmedic" setPreference: false + overrideConsoleVisibility: true access: - Service - Brig diff --git a/Resources/Prototypes/Corvax/Roles/Jobs/Medical/virologist.yml b/Resources/Prototypes/Corvax/Roles/Jobs/Medical/virologist.yml index ba6699c182c..589bb444407 100644 --- a/Resources/Prototypes/Corvax/Roles/Jobs/Medical/virologist.yml +++ b/Resources/Prototypes/Corvax/Roles/Jobs/Medical/virologist.yml @@ -1,8 +1,10 @@ - type: job id: Virologist name: job-name-virologist + playTimeTracker: JobVirologist icon: "JobIconVirologist" setPreference: false + overrideConsoleVisibility: true access: - Medical - Maintenance diff --git a/Resources/Prototypes/Corvax/Roles/Jobs/Science/roboticist.yml b/Resources/Prototypes/Corvax/Roles/Jobs/Science/roboticist.yml index 24ff802873e..cb7248d4827 100644 --- a/Resources/Prototypes/Corvax/Roles/Jobs/Science/roboticist.yml +++ b/Resources/Prototypes/Corvax/Roles/Jobs/Science/roboticist.yml @@ -1,8 +1,10 @@ - - type: job +- type: job id: Roboticist name: job-name-roboticist + playTimeTracker: JobRoboticist icon: "JobIconRoboticist" setPreference: false + overrideConsoleVisibility: true access: - Research - Maintenance diff --git a/Resources/Prototypes/Corvax/Roles/Jobs/Security/pilot.yml b/Resources/Prototypes/Corvax/Roles/Jobs/Security/pilot.yml index 53e3734469d..9dd6c75d43d 100644 --- a/Resources/Prototypes/Corvax/Roles/Jobs/Security/pilot.yml +++ b/Resources/Prototypes/Corvax/Roles/Jobs/Security/pilot.yml @@ -1,8 +1,10 @@ - type: job id: Pilot name: job-name-pilot + playTimeTracker: JobPilot icon: "JobIconPilot" setPreference: false + overrideConsoleVisibility: true access: - Security - Brig diff --git a/Resources/Prototypes/Corvax/Roles/play_time_trackers.yml b/Resources/Prototypes/Corvax/Roles/play_time_trackers.yml index ad0ed3cd69a..0f968b9208c 100644 --- a/Resources/Prototypes/Corvax/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/Corvax/Roles/play_time_trackers.yml @@ -1,17 +1,29 @@ - type: playTimeTracker id: JobIAA +- type: playTimeTracker + id: JobPilot + +- type: playTimeTracker + id: JobIRoboticist + +- type: playTimeTracker + id: JobBrigmedic + +- type: playTimeTracker + id: JobVirologist + - type: playTimeTracker id: JobEvent1 - + - type: playTimeTracker id: JobEvent2 - + - type: playTimeTracker id: JobEvent3 - + - type: playTimeTracker id: JobEvent4 - + - type: playTimeTracker id: JobEvent5 diff --git a/Resources/Prototypes/Corvax/StatusEffects/job.yml b/Resources/Prototypes/Corvax/StatusEffects/job.yml index b990802d94a..1c8243b4b38 100644 --- a/Resources/Prototypes/Corvax/StatusEffects/job.yml +++ b/Resources/Prototypes/Corvax/StatusEffects/job.yml @@ -11,25 +11,3 @@ icon: sprite: Interface/Misc/job_icons.rsi state: Pilot - -- type: statusIcon - parent: JobIcon - id: JobIconRoboticist - icon: - sprite: Interface/Misc/job_icons.rsi - state: Roboticist - -- type: statusIcon - parent: JobIcon - id: JobIconVirologist - icon: - sprite: Interface/Misc/job_icons.rsi - state: Virologist - -- type: statusIcon - parent: JobIcon - id: JobIconBrigmedic - icon: - sprite: Interface/Misc/job_icons.rsi - state: Brigmedic -