diff --git a/Resources/Locale/ru-RU/_sunrise/job/job-desc.ftl b/Resources/Locale/ru-RU/_sunrise/job/job-desc.ftl index e1ea8d27a59..bbb5ea40d49 100644 --- a/Resources/Locale/ru-RU/_sunrise/job/job-desc.ftl +++ b/Resources/Locale/ru-RU/_sunrise/job/job-desc.ftl @@ -6,3 +6,4 @@ job-description-senior-researcher = Обучайте новых ученых о job-description-senior-physician = Обучайте новых медиков основам ухода за ранеными, химии, диагностике больных и избавлению от мертвых. job-description-senior-officer = Обучите новых кадетов основам обыска, проведения арестов, времени пребывания в тюрьме и правильной стрельбе из огнестрельного оружия. job-description-blueshield = Ваша главная задача - защита глав. Помните, вы не офицер службы безопасности. +job-description-roboticist = Занимайтесь созданием киборгов, мехов и чините их. diff --git a/Resources/Locale/ru-RU/_sunrise/job/job-names.ftl b/Resources/Locale/ru-RU/_sunrise/job/job-names.ftl index 581a8c63b43..2ce0ccae711 100644 --- a/Resources/Locale/ru-RU/_sunrise/job/job-names.ftl +++ b/Resources/Locale/ru-RU/_sunrise/job/job-names.ftl @@ -6,6 +6,7 @@ job-name-senior-engineer = ведущий инженер job-name-senior-researcher = ведущий учёный job-name-senior-physician = ведущий врач job-name-senior-officer = инструктор СБ +job-name-roboticist = робототехник # Перевод трекеров времени JobCentCommOfficial = представитель Центком @@ -14,3 +15,4 @@ JobSeniorEngineer = ведущий инженер JobSeniorOfficer = инструктор СБ JobSeniorPhysician = ведущий врач JobSeniorResearcher = ведущий учёный +JobRoboticist = робототехник diff --git a/Resources/Locale/ru-RU/_sunrise/preferences/loadout-groups.ftl b/Resources/Locale/ru-RU/_sunrise/preferences/loadout-groups.ftl index b2ffeb5036c..1f5e1834e51 100644 --- a/Resources/Locale/ru-RU/_sunrise/preferences/loadout-groups.ftl +++ b/Resources/Locale/ru-RU/_sunrise/preferences/loadout-groups.ftl @@ -15,3 +15,6 @@ loadout-group-senior-researcher-jumpsuit = Униформа ведущего у loadout-group-senior-physician-jumpsuit = Униформа ведущего врача loadout-group-senior-engineer-jumpsuit = Униформа ведущего инженера loadout-group-chief-engineer-backpack = Старший инженер, рюкзак +loadout-group-roboticist-head = Робототехник, головной убор +loadout-group-roboticist-jumpsuit = Робототехник, комбинезон +loadout-group-roboticist-outerclothing = Робототехник, верхняя одежда diff --git a/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml b/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml index 9900c0eb197..9ded3965d9b 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml @@ -1,23 +1,3 @@ -# Head - -- type: loadout - id: RoboticistCap - equipment: RoboticistCap - -- type: startingGear - id: RoboticistCap - equipment: - head: ClothingHeadHatCorpsoft - -- type: loadout - id: SkullBandana - equipment: SkullBandana - -- type: startingGear - id: SkullBandana - equipment: - head: ClothingHeadBandSkull - # Neck - type: loadout @@ -162,14 +142,15 @@ equipment: gloves: ClothingHandsGlovesLatex -- type: loadout - id: RobohandsGloves - equipment: RobohandsGloves - -- type: startingGear - id: RobohandsGloves - equipment: - gloves: ClothingHandsGlovesRobohands +# Sunrise-Edit: Только для робототехника +#- type: loadout +# id: RobohandsGloves +# equipment: RobohandsGloves +# +#- type: startingGear +# id: RobohandsGloves +# equipment: +# gloves: ClothingHandsGlovesRobohands # Shoes - type: loadout diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index f1c6e0096ce..b8180a52429 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -749,15 +749,6 @@ - BrownShoes - ScienceWinterBoots -- type: loadoutGroup - id: ScientistHead - name: loadout-group-scientist-head - minLimit: 0 - loadouts: -# - RoboticistCap Sunrise-Edit: только для роли робототеха - - SkullBandana -# - ScientificBeret Sunrise-Edit: только для роли ведущего ученого - - type: loadoutGroup id: ScientistNeck name: loadout-group-scientist-neck @@ -808,7 +799,6 @@ loadouts: - LatexGloves - PurpleGloves - - RobohandsGloves - type: loadoutGroup id: ResearchAssistantJumpsuit diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index 7a2b90cbb83..f64f4bf759c 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -363,7 +363,6 @@ - type: roleLoadout id: JobScientist groups: - - ScientistHead - ScientistNeck - ScientistJumpsuit - ScientistBackpack diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index 8c8c39f8129..ecaff642798 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -95,6 +95,7 @@ - SeniorResearcher # Sunrise-Senior - Scientist - ResearchAssistant + - Roboticist # Sunrise-Edit - type: department id: Specific diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/identification_cards.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/identification_cards.yml index 4316e9e930b..2d0f8e55d81 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/identification_cards.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/identification_cards.yml @@ -13,3 +13,15 @@ heldPrefix: silver - type: PresetIdCard job: BlueShield + +- type: entity + parent: IDCardStandard + id: RoboticistIDCard + name: ID карта робототехника + components: + - type: Sprite + layers: + - state: default + - state: idroboticist + - type: PresetIdCard + job: Roboticist diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/pda.yml index bd91f83230d..3e8839ff1b9 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/pda.yml @@ -35,7 +35,7 @@ parent: BasePDA id: BlueShieldPDA name: КПК офицера «синий щит» - description: Охуенный стиль. + description: КПК для геев. components: - type: Sprite sprite: _Sunrise/Objects/pda.rsi @@ -54,4 +54,25 @@ state: pda-blueshield - type: Icon sprite: _Sunrise/Objects/pda.rsi - state: pda-blueshield \ No newline at end of file + state: pda-blueshield + +- type: entity + parent: BasePDA + id: RoboticistPDA + name: КПК робототехника + description: Он покрыт чем-то липким. + components: + - type: Pda + id: RoboticistIDCard + state: pda-roboticist + - type: PdaBorderColor + borderColor: "#d7d7d0" + accentVColor: "#8900c9" + - type: Icon + state: pda-roboticist + - type: HealthAnalyzer + scanningEndSound: + path: "/Audio/Items/Medical/healthscanner.ogg" + damageContainers: + - Synth + - Silicon diff --git a/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Science/roboticist.yml b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Science/roboticist.yml new file mode 100644 index 00000000000..3720cbdd175 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Science/roboticist.yml @@ -0,0 +1,19 @@ +# Head + +- type: loadout + id: RoboticistCap + equipment: RoboticistCap + +- type: startingGear + id: RoboticistCap + equipment: + head: ClothingHeadHatCorpsoft + +- type: loadout + id: SkullBandana + equipment: SkullBandana + +- type: startingGear + id: SkullBandana + equipment: + head: ClothingHeadBandSkull diff --git a/Resources/Prototypes/_Sunrise/Loadouts/loadout_groups.yml b/Resources/Prototypes/_Sunrise/Loadouts/loadout_groups.yml index 07afd119ca0..2822357270e 100644 --- a/Resources/Prototypes/_Sunrise/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/_Sunrise/Loadouts/loadout_groups.yml @@ -192,3 +192,26 @@ loadouts: - JumpsuitSeniorEngineer - JumpskirtSeniorEngineer + +- type: loadoutGroup + id: RoboticistJumpsuit + name: loadout-group-roboticist-jumpsuit + loadouts: + - RoboticistJumpsuit + - RoboticistJumpskirt + +- type: loadoutGroup + id: RoboticistOuterClothing + name: loadout-group-roboticist-outerclothing + minLimit: 0 + loadouts: + - RoboticistLabCoat + - RoboticistWintercoat + +- type: loadoutGroup + id: RoboticistHead + name: loadout-group-roboticist-head + minLimit: 0 + loadouts: + - RoboticistCap + - SkullBandana diff --git a/Resources/Prototypes/_Sunrise/Loadouts/role_loadouts.yml b/Resources/Prototypes/_Sunrise/Loadouts/role_loadouts.yml index 34c0bde0793..e0f4ed010fa 100644 --- a/Resources/Prototypes/_Sunrise/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/_Sunrise/Loadouts/role_loadouts.yml @@ -123,3 +123,18 @@ - Bra - Pants - Socks + +- type: roleLoadout + id: JobRoboticist + groups: + - RoboticistHead + - ScientistNeck + - RoboticistJumpsuit + - RoboticistOuterClothing + - ScientistBackpack + - ScientistShoes + - Survival + - Trinkets + - Bra + - Pants + - Socks diff --git a/Resources/Prototypes/_Sunrise/Maps/box.yml b/Resources/Prototypes/_Sunrise/Maps/box.yml index e933cf2e9c6..7125e94c7ef 100644 --- a/Resources/Prototypes/_Sunrise/Maps/box.yml +++ b/Resources/Prototypes/_Sunrise/Maps/box.yml @@ -58,10 +58,11 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] - # Sunrise-Roles - Brigmedic: [ 1, 1 ] + # Sunrise-Blueshield BlueShield: [ 1, 1 ] - # law + # Sunrise-Security + Brigmedic: [ 1, 1 ] + # Sunrise-Law IAA: [ 1, 1 ] Lawyer: [ 2, 2 ] Magistrat: [ 1, 1 ] @@ -70,3 +71,5 @@ SeniorPhysician: [ 1, 1 ] SeniorResearcher: [ 1, 1 ] SeniorOfficer: [ 1, 1 ] + # Sunrise-Science + Roboticist: [ 2, 2 ] diff --git a/Resources/Prototypes/_Sunrise/Maps/cluster.yml b/Resources/Prototypes/_Sunrise/Maps/cluster.yml index 11408756e05..3037db06f07 100644 --- a/Resources/Prototypes/_Sunrise/Maps/cluster.yml +++ b/Resources/Prototypes/_Sunrise/Maps/cluster.yml @@ -57,11 +57,14 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] - # Sunrise-Roles - Brigmedic: [ 1, 1 ] + # Sunrise-Blueshield BlueShield: [ 1, 1 ] - # law + # Sunrise-Security + Brigmedic: [ 1, 1 ] + # Sunrise-Law IAA: [ 1, 1 ] Lawyer: [ 1, 1 ] Magistrat: [ 1, 1 ] + # Sunrise-Science + Roboticist: [ 1, 1 ] diff --git a/Resources/Prototypes/_Sunrise/Maps/delta.yml b/Resources/Prototypes/_Sunrise/Maps/delta.yml index 3fc2d03e4be..45c8a2c1121 100644 --- a/Resources/Prototypes/_Sunrise/Maps/delta.yml +++ b/Resources/Prototypes/_Sunrise/Maps/delta.yml @@ -52,16 +52,18 @@ Psychologist: [ 1, 1 ] Detective: [ 1, 1 ] Paramedic: [ 2, 2 ] - # law + # Sunrise-Law IAA: [ 1, 1 ] Lawyer: [ 2, 2 ] Magistrat: [ 1, 1 ] - # blueshield + # Sunrise-Blueshield BlueShield: [ 1, 1 ] - # security + # Sunrise-Security Brigmedic: [ 1, 1 ] # Sunrise-Senior SeniorEngineer: [ 1, 1 ] SeniorPhysician: [ 1, 1 ] SeniorResearcher: [ 1, 1 ] SeniorOfficer: [ 1, 1 ] + # Sunrise-Science + Roboticist: [ 2, 2 ] diff --git a/Resources/Prototypes/_Sunrise/Maps/fland.yml b/Resources/Prototypes/_Sunrise/Maps/fland.yml index b97ecfdafde..899a2570c1f 100644 --- a/Resources/Prototypes/_Sunrise/Maps/fland.yml +++ b/Resources/Prototypes/_Sunrise/Maps/fland.yml @@ -59,10 +59,11 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] - # Sunrise-Roles - Brigmedic: [ 1, 1 ] + # Sunrise-BlueShield BlueShield: [ 1, 1 ] - # law + # Sunrise-Security + Brigmedic: [ 1, 1 ] + # Sunrise-Law IAA: [ 1, 1 ] Lawyer: [ 2, 2 ] Magistrat: [ 1, 1 ] @@ -71,3 +72,5 @@ SeniorPhysician: [ 1, 1 ] SeniorResearcher: [ 1, 1 ] SeniorOfficer: [ 1, 1 ] + # Sunrise-Science + Roboticist: [ 2, 2 ] diff --git a/Resources/Prototypes/_Sunrise/Maps/marathon.yml b/Resources/Prototypes/_Sunrise/Maps/marathon.yml index aaeb991c7dc..c39dbdcc654 100644 --- a/Resources/Prototypes/_Sunrise/Maps/marathon.yml +++ b/Resources/Prototypes/_Sunrise/Maps/marathon.yml @@ -58,10 +58,11 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] - # Sunrise-Roles + # Sunrise-Security Brigmedic: [ 1, 1 ] + # Sunrise-BlueShield BlueShield: [ 1, 1 ] - # law + # Sunrise-Law IAA: [ 1, 1 ] Lawyer: [ 2, 2 ] Magistrat: [ 1, 1 ] @@ -70,3 +71,5 @@ SeniorPhysician: [ 1, 1 ] SeniorResearcher: [ 1, 1 ] SeniorOfficer: [ 1, 1 ] + # Sunrise-Science + Roboticist: [ 2, 2 ] diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/Science/roboticist.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/Science/roboticist.yml new file mode 100644 index 00000000000..3d5ef0e07df --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Roles/Jobs/Science/roboticist.yml @@ -0,0 +1,30 @@ +- type: job + id: Roboticist + name: job-name-roboticist + description: job-description-roboticist + playTimeTracker: JobRoboticist + requirements: + - !type:DepartmentTimeRequirement + department: Science + time: 14400 # 4 hrs + - !type:DepartmentTimeRequirement + department: Engineering + time: 14400 # 4 hrs + startingGear: RoboticistGear + icon: JobIconRoboticist + supervisors: job-supervisors-rd + access: + - Research + - Maintenance + - Engineering + +- type: startingGear + id: RoboticistGear + equipment: + outerClothing: ClothingOuterCoatRobo + id: RoboticistPDA + gloves: ClothingHandsGlovesRobohands + belt: ClothingBeltUtilityEngineering + ears: ClothingHeadsetRobotics + pocket1: Nanopaste + pocket2: Nanopaste diff --git a/Resources/Prototypes/_Sunrise/Roles/play_time_trackers.yml b/Resources/Prototypes/_Sunrise/Roles/play_time_trackers.yml index 869cdbc4f21..f4772272fa0 100644 --- a/Resources/Prototypes/_Sunrise/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/_Sunrise/Roles/play_time_trackers.yml @@ -27,3 +27,6 @@ - type: playTimeTracker id: JobSeniorResearcher + +- type: playTimeTracker + id: JobRoboticist