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 00000000000..5ac9d98daea Binary files /dev/null and b/Resources/Textures/Interface/Misc/job_icons.rsi/Pilot.png differ 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" },