From 07830ff813f5affe2dded9a38b4fa354b8b9aba9 Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Fri, 1 Mar 2024 00:16:12 +0100 Subject: [PATCH 1/4] 1 --- .../Locale/ru-RU/corvax/job/job-names.ftl | 8 +++++++ .../Corvax/Roles/Jobs/Medical/brigmedic.yml | 12 +++++++++++ .../Corvax/Roles/Jobs/Medical/virologist.yml | 10 +++++++++ .../Corvax/Roles/Jobs/Science/roboticist.yml | 10 +++++++++ .../Corvax/Roles/Jobs/Security/pilot.yml | 13 ++++++++++++ .../Corvax/Roles/play_time_trackers.yml | 20 ++++++++++++++---- .../Prototypes/Corvax/StatusEffects/job.yml | 7 ++++++ .../Prototypes/Roles/Jobs/departments.yml | 9 ++++++++ .../Interface/Misc/job_icons.rsi/Pilot.png | Bin 0 -> 149 bytes .../Interface/Misc/job_icons.rsi/meta.json | 3 +++ 10 files changed, 88 insertions(+), 4 deletions(-) create mode 100644 Resources/Prototypes/Corvax/Roles/Jobs/Medical/brigmedic.yml create mode 100644 Resources/Prototypes/Corvax/Roles/Jobs/Medical/virologist.yml create mode 100644 Resources/Prototypes/Corvax/Roles/Jobs/Science/roboticist.yml create mode 100644 Resources/Prototypes/Corvax/Roles/Jobs/Security/pilot.yml create mode 100644 Resources/Textures/Interface/Misc/job_icons.rsi/Pilot.png 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 new file mode 100644 index 00000000000..a408cd7a683 --- /dev/null +++ b/Resources/Prototypes/Corvax/Roles/Jobs/Medical/brigmedic.yml @@ -0,0 +1,12 @@ +- type: job + id: Brigmedic + name: job-name-brigmedic + playTimeTracker: JobBrigmedic + icon: "JobIconBrigmedic" + setPreference: false + overrideConsoleVisibility: true + access: + - Service + - Brig + - Medical + - Maintenance diff --git a/Resources/Prototypes/Corvax/Roles/Jobs/Medical/virologist.yml b/Resources/Prototypes/Corvax/Roles/Jobs/Medical/virologist.yml new file mode 100644 index 00000000000..589bb444407 --- /dev/null +++ b/Resources/Prototypes/Corvax/Roles/Jobs/Medical/virologist.yml @@ -0,0 +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 new file mode 100644 index 00000000000..cb7248d4827 --- /dev/null +++ b/Resources/Prototypes/Corvax/Roles/Jobs/Science/roboticist.yml @@ -0,0 +1,10 @@ +- 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 new file mode 100644 index 00000000000..9dd6c75d43d --- /dev/null +++ b/Resources/Prototypes/Corvax/Roles/Jobs/Security/pilot.yml @@ -0,0 +1,13 @@ +- type: job + id: Pilot + name: job-name-pilot + playTimeTracker: JobPilot + icon: "JobIconPilot" + setPreference: false + overrideConsoleVisibility: true + access: + - Security + - Brig + - Maintenance + - Service + - External 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 b230d2d66c3..1c8243b4b38 100644 --- a/Resources/Prototypes/Corvax/StatusEffects/job.yml +++ b/Resources/Prototypes/Corvax/StatusEffects/job.yml @@ -4,3 +4,10 @@ icon: sprite: Interface/Misc/job_icons.rsi state: IAA + +- type: statusIcon + parent: JobIcon + id: JobIconPilot + icon: + sprite: Interface/Misc/job_icons.rsi + state: Pilot diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index b9d4ff77cdd..cc7bfd5d6b3 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -71,6 +71,10 @@ - MedicalIntern - Psychologist - Paramedic + # Corvax-MRP-start + - Brigmedic + - Virologist + # Corvax-MRP-end - type: department id: Security @@ -82,6 +86,10 @@ - SecurityCadet - SecurityOfficer - Warden + # Corvax-MRP-start + - Brigmedic + - Pilot + # Corvax-MRP-end - type: department id: Science @@ -91,6 +99,7 @@ - ResearchDirector - Scientist - ResearchAssistant + - Roboticist # Corvax-MRP - type: department id: Specific diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Pilot.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Pilot.png new file mode 100644 index 0000000000000000000000000000000000000000..5ac9d98daea5a29e6837de5bfccfe2b7e9467e9f GIT binary patch literal 149 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqoCO|{#S9GGLLkg|>2BR0prE^_ zi(`mHcybCuQyN>_e+4PoD@Fzen;KMXH=J}j^3V9;wB{2FGz@DbkuipG6N{1b r(H7&L9v+3Bt1Ky;DP|FtcKJ*UuUUj{8Mtf$Ie@{_)z4*}Q$iB}`JyXK literal 0 HcmV?d00001 diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json index 49d49e7d161..828548d1333 100644 --- a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json @@ -149,6 +149,9 @@ { "name": "IAA" }, + { + "name": "Pilot" + }, { "name": "Zombie" }, From cf38067a62759a9e5bf65a0c999fd365ec91eb41 Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Fri, 1 Mar 2024 20:17:10 +0100 Subject: [PATCH 2/4] remove pilot --- .../Corvax/Roles/Jobs/Security/pilot.yml | 13 ------------- .../Corvax/Roles/play_time_trackers.yml | 3 --- Resources/Prototypes/Corvax/StatusEffects/job.yml | 7 ------- Resources/Prototypes/Roles/Jobs/departments.yml | 5 +---- .../Interface/Misc/job_icons.rsi/Pilot.png | Bin 149 -> 0 bytes .../Interface/Misc/job_icons.rsi/meta.json | 3 --- 6 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 Resources/Prototypes/Corvax/Roles/Jobs/Security/pilot.yml delete mode 100644 Resources/Textures/Interface/Misc/job_icons.rsi/Pilot.png diff --git a/Resources/Prototypes/Corvax/Roles/Jobs/Security/pilot.yml b/Resources/Prototypes/Corvax/Roles/Jobs/Security/pilot.yml deleted file mode 100644 index 9dd6c75d43d..00000000000 --- a/Resources/Prototypes/Corvax/Roles/Jobs/Security/pilot.yml +++ /dev/null @@ -1,13 +0,0 @@ -- type: job - id: Pilot - name: job-name-pilot - playTimeTracker: JobPilot - icon: "JobIconPilot" - setPreference: false - overrideConsoleVisibility: true - access: - - Security - - Brig - - Maintenance - - Service - - External diff --git a/Resources/Prototypes/Corvax/Roles/play_time_trackers.yml b/Resources/Prototypes/Corvax/Roles/play_time_trackers.yml index 0f968b9208c..0cd655ee7ad 100644 --- a/Resources/Prototypes/Corvax/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/Corvax/Roles/play_time_trackers.yml @@ -1,9 +1,6 @@ - type: playTimeTracker id: JobIAA -- type: playTimeTracker - id: JobPilot - - type: playTimeTracker id: JobIRoboticist diff --git a/Resources/Prototypes/Corvax/StatusEffects/job.yml b/Resources/Prototypes/Corvax/StatusEffects/job.yml index 1c8243b4b38..b230d2d66c3 100644 --- a/Resources/Prototypes/Corvax/StatusEffects/job.yml +++ b/Resources/Prototypes/Corvax/StatusEffects/job.yml @@ -4,10 +4,3 @@ icon: sprite: Interface/Misc/job_icons.rsi state: IAA - -- type: statusIcon - parent: JobIcon - id: JobIconPilot - icon: - sprite: Interface/Misc/job_icons.rsi - state: Pilot diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index cc7bfd5d6b3..c4e38424822 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -86,10 +86,7 @@ - SecurityCadet - SecurityOfficer - Warden - # Corvax-MRP-start - - Brigmedic - - Pilot - # Corvax-MRP-end + - Brigmedic # Corvax-MRP - type: department id: Science diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Pilot.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Pilot.png deleted file mode 100644 index 5ac9d98daea5a29e6837de5bfccfe2b7e9467e9f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 149 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqoCO|{#S9GGLLkg|>2BR0prE^_ zi(`mHcybCuQyN>_e+4PoD@Fzen;KMXH=J}j^3V9;wB{2FGz@DbkuipG6N{1b r(H7&L9v+3Bt1Ky;DP|FtcKJ*UuUUj{8Mtf$Ie@{_)z4*}Q$iB}`JyXK diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json index 828548d1333..49d49e7d161 100644 --- a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json @@ -149,9 +149,6 @@ { "name": "IAA" }, - { - "name": "Pilot" - }, { "name": "Zombie" }, From 3784ca099df9f5cd7cdb7eea2e021f442bf08313 Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Sat, 16 Mar 2024 22:18:58 +0100 Subject: [PATCH 3/4] Update job-names.ftl --- Resources/Locale/ru-RU/corvax/job/job-names.ftl | 2 -- 1 file changed, 2 deletions(-) diff --git a/Resources/Locale/ru-RU/corvax/job/job-names.ftl b/Resources/Locale/ru-RU/corvax/job/job-names.ftl index 7179ee481f8..b8ffb9218ae 100644 --- a/Resources/Locale/ru-RU/corvax/job/job-names.ftl +++ b/Resources/Locale/ru-RU/corvax/job/job-names.ftl @@ -2,8 +2,6 @@ job-name-iaa = агент внутренних дел JobIAA = агент внутренних дел job-name-brigmedic = бригмедик JobBrigmedic = бригмедик -job-name-pilot = пилот СБ -JobPilot = пилот СБ job-name-roboticist = робототехник JobRoboticist = робототехник job-name-virologist = вирусолог From 19a31dad77eb3ca073940d26e2f6a12356ed99e6 Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Mon, 3 Jun 2024 09:46:12 +0200 Subject: [PATCH 4/4] Update play_time_trackers.yml --- Resources/Prototypes/Corvax/Roles/play_time_trackers.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Corvax/Roles/play_time_trackers.yml b/Resources/Prototypes/Corvax/Roles/play_time_trackers.yml index 119d131d2ee..eba37c9448d 100644 --- a/Resources/Prototypes/Corvax/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/Corvax/Roles/play_time_trackers.yml @@ -5,7 +5,7 @@ id: JobPilot - type: playTimeTracker - id: JobIRoboticist + id: JobRoboticist - type: playTimeTracker id: JobBrigmedic @@ -41,4 +41,4 @@ id: JobEvent9 - type: playTimeTracker - id: JobEvent10 \ No newline at end of file + id: JobEvent10