diff --git a/Resources/Locale/ru-RU/ADT/Entities/Objects/Misc/identification_cards.ftl b/Resources/Locale/ru-RU/ADT/Entities/Objects/Misc/identification_cards.ftl index 9c149ba9471..a322bb368c8 100644 --- a/Resources/Locale/ru-RU/ADT/Entities/Objects/Misc/identification_cards.ftl +++ b/Resources/Locale/ru-RU/ADT/Entities/Objects/Misc/identification_cards.ftl @@ -1,2 +1,4 @@ ent-ADTPathologistIDCard = ID карта патологоанатома - .desc = { ent-IDCardStandard.desc } \ No newline at end of file + .desc = { ent-IDCardStandard.desc } +ent-ADTRoboticistIDCard = ID карта робототехника + .desc = { ent-IDCardStandar.desc } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/Job/job-description.ftl b/Resources/Locale/ru-RU/ADT/Job/job-description.ftl index 7b705bba266..1ae1b43ecde 100644 --- a/Resources/Locale/ru-RU/ADT/Job/job-description.ftl +++ b/Resources/Locale/ru-RU/ADT/Job/job-description.ftl @@ -1 +1,2 @@ -job-description-ADTPathologist = Осматривайте тела мёртвого экипажа, выявляйте причины их смерти и не забывайте клонировать трупы. \ No newline at end of file +job-description-ADTPathologist = Осматривайте тела мёртвого экипажа, выявляйте причины их смерти и не забывайте клонировать трупы. +job-description-roboticist = Собирайте боргов, мехов, обслуживайте синтетиков и поражайте (либо пугайте) экипаж своими новейшими разработками. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/Job/job-names.ftl b/Resources/Locale/ru-RU/ADT/Job/job-names.ftl index d829ac1f4cd..1dcc2b99700 100644 --- a/Resources/Locale/ru-RU/ADT/Job/job-names.ftl +++ b/Resources/Locale/ru-RU/ADT/Job/job-names.ftl @@ -1,2 +1,5 @@ job-name-ADTPathologist = Патологоанатом -JobADTPathologist = Патологоанатом \ No newline at end of file +JobADTPathologist = Патологоанатом + +job-name-roboticist = робототехник +JobRoboticist = робототехник \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/preferences/loadout-groups.ftl b/Resources/Locale/ru-RU/ADT/preferences/loadout-groups.ftl new file mode 100644 index 00000000000..e4790b63742 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/preferences/loadout-groups.ftl @@ -0,0 +1,5 @@ +loadout-group-patholog-head = Патологоанатом, голова +loadout-group-patholog-jumpsuit = Патологоанатом, комбинезон +loadout-group-patholog-outerclothing = Патологоанатом, верхняя одежда +loadout-group-patholog-shoes = Патологоанатом, обувь +loadout-group-patholog-backpack = Патологоанатом, рюкзак \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Markers/Spawners/jobs.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Markers/Spawners/jobs.ftl new file mode 100644 index 00000000000..2d81b6b569f --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Markers/Spawners/jobs.ftl @@ -0,0 +1,2 @@ +ent-ADTSpawnPointRoboticist = робототехник + .desc = { ent-SpawnPointJobBase.desc } diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Device/pda.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Device/pda.ftl index e3d91b8b990..49da8e5c5d4 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Device/pda.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Device/pda.ftl @@ -1,2 +1,7 @@ + +ent-ADTRoboticistPDA = КПК робототехника + .desc = Почему это всё ещё не робот?! + ent-ADTPathologistPDA = КПК патологоанатома - .desc = От него веет прохладой. \ No newline at end of file + .desc = От него веет прохладой. + diff --git a/Resources/Prototypes/ADT/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/ADT/Entities/Markers/Spawners/jobs.yml new file mode 100644 index 00000000000..6f7b6391655 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Markers/Spawners/jobs.yml @@ -0,0 +1,13 @@ +# Science + +- type: entity + id: ADTSpawnPointRoboticist + parent: SpawnPointJobBase + name: roboticist + components: + - type: SpawnPoint + job_id: ADTRoboticist + - type: Sprite + layers: + - state: green + - state: scientist diff --git a/Resources/Prototypes/ADT/Entities/Objects/Device/Circuitboards/Machine/fill.txt b/Resources/Prototypes/ADT/Entities/Objects/Devices/Circuitboards/Machine/fill.txt similarity index 100% rename from Resources/Prototypes/ADT/Entities/Objects/Device/Circuitboards/Machine/fill.txt rename to Resources/Prototypes/ADT/Entities/Objects/Devices/Circuitboards/Machine/fill.txt diff --git a/Resources/Prototypes/ADT/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/ADT/Entities/Objects/Devices/pda.yml new file mode 100644 index 00000000000..4b457ff8d33 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Devices/pda.yml @@ -0,0 +1,14 @@ +- type: entity + parent: BasePDA + id: ADTRoboticistPDA + name: roboticist PDA + description: It's covered with an unknown gooey substance. + components: + - type: Pda + id: ADTRoboticistIDCard + state: pda-roboticist + - type: PdaBorderColor + borderColor: "#171716" + accentVColor: "#d90000" + - type: Icon + state: pda-roboticist diff --git a/Resources/Prototypes/ADT/Entities/Objects/Device/translators.yml b/Resources/Prototypes/ADT/Entities/Objects/Devices/translators.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Objects/Device/translators.yml rename to Resources/Prototypes/ADT/Entities/Objects/Devices/translators.yml diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/identification_cards.yml index d35ebc5245a..eef963ebb28 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/identification_cards.yml @@ -1,3 +1,15 @@ +- type: entity + parent: IDCardStandard + id: ADTRoboticistIDCard + name: roboticist ID card + components: + - type: Sprite + layers: + - state: default + - state: idroboticist + - type: PresetIdCard + job: ADTRoboticist + - type: entity parent: IDCardStandard id: ADTPathologistIDCard @@ -9,4 +21,4 @@ - state: default - state: id-pathologist - type: PresetIdCard - job: ADTPathologist \ No newline at end of file + job: ADTPathologist diff --git a/Resources/Prototypes/ADT/Loadouts/Jobs/Science/roboticist.yml b/Resources/Prototypes/ADT/Loadouts/Jobs/Science/roboticist.yml new file mode 100644 index 00000000000..706331458f1 --- /dev/null +++ b/Resources/Prototypes/ADT/Loadouts/Jobs/Science/roboticist.yml @@ -0,0 +1,104 @@ +# Jumpsuit + +- type: loadout + id: ScientistJumpsuit + equipment: ScientistJumpsuit + +- type: startingGear + id: ScientistJumpsuit + equipment: + jumpsuit: ClothingUniformJumpsuitScientist + +- type: loadout + id: ScientistJumpskirt + equipment: ScientistJumpskirt + +- type: startingGear + id: ScientistJumpskirt + equipment: + jumpsuit: ClothingUniformJumpskirtScientist + +- type: loadout + id: RoboticistJumpsuit + equipment: RoboticistJumpsuit + +- type: startingGear + id: RoboticistJumpsuit + equipment: + jumpsuit: ClothingUniformJumpsuitRoboticist + +- type: loadout + id: RoboticistJumpskirt + equipment: RoboticistJumpskirt + +- type: startingGear + id: RoboticistJumpskirt + equipment: + jumpsuit: ClothingUniformJumpskirtRoboticist + +# OuterClothing + +- type: loadout + id: RegularLabCoat + equipment: RegularLabCoat + +- type: startingGear + id: RegularLabCoat + equipment: + outerClothing: ClothingOuterCoatLab + +- type: loadout + id: ScienceLabCoat + equipment: ScienceLabCoat + +- type: startingGear + id: ScienceLabCoat + equipment: + outerClothing: ClothingOuterCoatRnd + +- type: loadout + id: ScienceWintercoat + equipment: ScienceWintercoat + +- type: startingGear + id: ScienceWintercoat + equipment: + outerClothing: ClothingOuterWinterSci + +- type: loadout + id: RoboticistLabCoat + equipment: RoboticistLabCoat + +- type: startingGear + id: RoboticistLabCoat + equipment: + outerClothing: ClothingOuterCoatRobo + +- type: loadout + id: RoboticistWintercoat + equipment: RoboticistWintercoat + +- type: startingGear + id: RoboticistWintercoat + equipment: + outerClothing: ClothingOuterWinterRobo + +# Gloves + +- type: loadout + id: LatexGloves + equipment: LatexGloves + +- type: startingGear + id: LatexGloves + equipment: + gloves: ClothingHandsGlovesLatex + +- type: loadout + id: RobohandsGloves + equipment: RobohandsGloves + +- type: startingGear + id: RobohandsGloves + equipment: + gloves: ClothingHandsGlovesRobohands \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml b/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml index 42082308c62..d6470ffc539 100644 --- a/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml @@ -1,3 +1,36 @@ +#Science + +- type: loadoutGroup + id: RoboticistJumpsuit + name: loadout-group-roboticist-jumpsuit + minLimit: 0 + loadouts: + - ScientistJumpsuit + - ScientistJumpskirt + - RoboticistJumpsuit + - RoboticistJumpskirt + +- type: loadoutGroup + id: RoboticistOuterClothing + name: loadout-group-roboticist-outerclothing + minLimit: 0 + loadouts: + - RegularLabCoat + - ScienceLabCoat + - ScienceWintercoat + - RoboticistWintercoat + +- type: loadoutGroup + id: RobohandsGloves + name: loadout-group-roboticist-gloves + minLimit: 0 + loadouts: + - LatexGloves + - PurpleGloves + - RobohandsGloves + +# Medical + - type: loadoutGroup id: PathologHead name: loadout-group-patholog-head @@ -37,4 +70,4 @@ name: loadout-group-patholog-shoes loadouts: - BlueShoes - - MedicalWinterBoots \ No newline at end of file + - MedicalWinterBoots diff --git a/Resources/Prototypes/ADT/Loadouts/role_loadouts.yml b/Resources/Prototypes/ADT/Loadouts/role_loadouts.yml index abb495f6845..62916711fef 100644 --- a/Resources/Prototypes/ADT/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/ADT/Loadouts/role_loadouts.yml @@ -1,3 +1,20 @@ +- type: roleLoadout + id: JobADTRoboticist + groups: + - Inventory # Corvax-Loadouts + - GroupTankHarness + - ScientistHead + - ScientistNeck + - RoboticistJumpsuit + - ScientistBackpack + - RoboticistOuterClothing + - RobohandsGloves + - ScientistShoes + - Glasses + - Survival + - Trinkets + - GroupSpeciesBreathTool + - type: roleLoadout id: JobADTPathologist groups: @@ -13,4 +30,4 @@ - Glasses - SurvivalMedical - Trinkets - - GroupSpeciesBreathToolMedical \ No newline at end of file + - GroupSpeciesBreathToolMedical diff --git a/Resources/Prototypes/ADT/Roles/Jobs/Science/roboticist.yml b/Resources/Prototypes/ADT/Roles/Jobs/Science/roboticist.yml new file mode 100644 index 00000000000..19d8211f573 --- /dev/null +++ b/Resources/Prototypes/ADT/Roles/Jobs/Science/roboticist.yml @@ -0,0 +1,22 @@ +- type: job + id: ADTRoboticist + name: job-name-roboticist + description: job-description-roboticist + playTimeTracker: JobRoboticist + requirements: + - !type:DepartmentTimeRequirement + department: Science + time: 25200 #7 hrs + startingGear: ADTRoboticistGear + icon: "JobIconRoboticist" + supervisors: job-supervisors-rd + access: + - Research + - Maintenance + +- type: startingGear + id: ADTRoboticistGear + equipment: + ears: ClothingHeadsetRobotics + id: ADTRoboticistPDA + pocket1: BorgTranslatorImplanter diff --git a/Resources/Prototypes/ADT/Roles/play_time_trackers.yml b/Resources/Prototypes/ADT/Roles/play_time_trackers.yml index ed8123ead80..b67b138478c 100644 --- a/Resources/Prototypes/ADT/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/ADT/Roles/play_time_trackers.yml @@ -1,2 +1,5 @@ - type: playTimeTracker - id: JobADTPathologist \ No newline at end of file + id: JobRoboticist + +- type: playTimeTracker + id: JobADTPathologist diff --git a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml index 75cca712214..39872122089 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml @@ -163,6 +163,7 @@ - type: EncryptionKey channels: - Science + - Binary # ADT Tweak Roboticist defaultChannel: Science - type: Sprite layers: diff --git a/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml b/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml index ee30a9cf415..7fa345c8416 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml @@ -208,15 +208,6 @@ equipment: gloves: ClothingHandsGlovesLatex -- type: loadout - id: RobohandsGloves - equipment: RobohandsGloves - -- type: startingGear - id: RobohandsGloves - equipment: - gloves: ClothingHandsGlovesRobohands - # Shoes - type: loadout id: ScienceWinterBoots diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 34208924296..5f91f765086 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -831,8 +831,6 @@ loadouts: - ScientistJumpsuit - ScientistJumpskirt - - RoboticistJumpsuit - - RoboticistJumpskirt - SeniorResearcherJumpsuit - SeniorResearcherJumpskirt @@ -852,8 +850,6 @@ - RegularLabCoat - ScienceLabCoat - ScienceWintercoat - - RoboticistLabCoat - - RoboticistWintercoat - SeniorResearcherLabCoat - type: loadoutGroup @@ -871,7 +867,6 @@ loadouts: - LatexGloves - PurpleGloves - - RobohandsGloves - type: loadoutGroup id: ScientistPDA diff --git a/Resources/Prototypes/Maps/cluster.yml b/Resources/Prototypes/Maps/cluster.yml index 8485b068f8d..9948dfe943a 100644 --- a/Resources/Prototypes/Maps/cluster.yml +++ b/Resources/Prototypes/Maps/cluster.yml @@ -1,4 +1,4 @@ -- type: gameMap +- type: gameMap id: Cluster mapName: 'Cluster' mapPath: /Maps/cluster.yml diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index efc9e003a8a..313089c4826 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -93,6 +93,7 @@ - ResearchDirector - Scientist - ResearchAssistant + - ADTRoboticist # ADT-Roles - type: department id: Specific diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/equipped-INNERCLOTHING.png index af5abf6f0bb..4d5a6f6cb87 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/icon.png index 861539fab81..5a6b5851b74 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/inhand-left.png index bacc6c39de6..3faddf27e2b 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/inhand-right.png index d107c18c8da..193be2fcaa8 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/meta.json index bb0a29fbfcd..e98618842d2 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/meta.json @@ -1,30 +1,30 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Sprite by DreamlyJack, monkey derivative made by brainfood1183 (github)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprite by Prazat (discord: prazat911), monkey derivative made by brainfood1183 (github)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-INNERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-INNERCLOTHING-monkey", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/equipped-INNERCLOTHING.png index f4f4ab93ca6..4d18340f530 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/icon.png index ab39a7e17e4..b887556e93b 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/inhand-left.png index d0bd2174369..3faddf27e2b 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/inhand-right.png index a20d35709d5..193be2fcaa8 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/meta.json index bb0a29fbfcd..e98618842d2 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/meta.json @@ -1,30 +1,30 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Sprite by DreamlyJack, monkey derivative made by brainfood1183 (github)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprite by Prazat (discord: prazat911), monkey derivative made by brainfood1183 (github)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-INNERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-INNERCLOTHING-monkey", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] }