Лодаут, исправление замечания

AdventureTimeSS14 · Jul 31, 2024 · 66eca0b · 66eca0b
1 parent 33dc906
commit 66eca0b
Show file tree

Hide file tree

Showing 39 changed files with 142 additions and 331 deletions.
diff --git a/Resources/Locale/ru-RU/ADT/Entities/Markers/Spawners/jobs.ftl b/Resources/Locale/ru-RU/ADT/Entities/Markers/Spawners/jobs.ftl
@@ -0,0 +1,2 @@
+ent-ADTSpawnPointRoboticist = робототехник
+    .desc = { ent-SpawnPointJobBase.desc }
diff --git a/Resources/Locale/ru-RU/ADT/Entities/Objects/Device/pda.ftl b/Resources/Locale/ru-RU/ADT/Entities/Objects/Device/pda.ftl
@@ -0,0 +1,2 @@
+ent-ADTRoboticistPDA = КПК робототехника
+    .desc = Почему это всё ещё не робот?!
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
@@ -0,0 +1,2 @@
+ent-ADTRoboticistIDCard = ID карта робототехника
+    .desc = { ent-IDCardStandard.desc }
diff --git a/Resources/Locale/ru-RU/ADT/preferences/loadout-groups.ftl b/Resources/Locale/ru-RU/ADT/preferences/loadout-groups.ftl
@@ -0,0 +1,20 @@
+# Errors
+
+# Miscellaneous
+
+# Command
+
+# Civilian
+
+# Cargo
+
+# Engineering
+
+# Science
+loadout-group-roboticist-id = Робототехник, ID
+loadout-group-roboticist-implanters = Робототехник, имплантер
+# Security
+
+# Medical
+
+# Wildcards
diff --git a/Resources/Locale/ru-RU/job/job-description.ftl b/Resources/Locale/ru-RU/job/job-description.ftl
@@ -46,3 +46,6 @@ job-description-serviceworker = Изучите основы барменског
 job-description-visitor = Наслаждайтесь своим визитом на станцию.
 job-description-warden = Патрулируйте отдел безопасности, следите за тем, чтобы никто не воровал из оружейной, и чтобы все заключённые были оформлены и выпущены по окончании срока.
 job-description-zookeeper = Устройте весёлое шоу с милыми животными и космическими карпами, чтобы все члены экипажа могли ими полюбоваться. Эта должность доступна на станциях Gemini и Avrite.
+
+#ADT_Jobs
+job-description-roboticist = Собирайте боргов, мехов, обслуживайте синтетиков и поражайте (либо пугайте) экипаж своими новейшими разработками.
diff --git a/Resources/Locale/ru-RU/job/job-names.ftl b/Resources/Locale/ru-RU/job/job-names.ftl
@@ -95,3 +95,8 @@ JobWarden = смотритель
 JobVisitor = посетитель
 JobBoxer = боксёр
 JobZookeeper = зоотехник
+
+#ADT Jobs
+job-name-roboticist = робототехник
+# Role timers
+JobRoboticist = робототехник
diff --git a/Resources/Prototypes/ADT/Loadouts/Jobs/Science/roboticist.yml b/Resources/Prototypes/ADT/Loadouts/Jobs/Science/roboticist.yml
@@ -1,250 +1,20 @@
-# # Senior Time
-# - type: loadoutEffectGroup
-#   id: SeniorResearcher
-#   effects:
-#   - !type:JobRequirementLoadoutEffect
-#     requirement:
-#       !type:DepartmentTimeRequirement
-#       department: Science
-#       time: 216000 #60 hrs
-
-# # Head
-
-# - type: loadout
-#   id: ScientificBeret
-#   equipment: ScientificBeret
-#   effects:
-#   - !type:GroupLoadoutEffect
-#     proto: SeniorResearcher
-
-# - type: startingGear
-#   id: ScientificBeret
-#   equipment:
-#     head: ClothingHeadHatBeretRND
-
-# - 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
-#   id: ScientistTie
-#   equipment: ScientistTie
-
-# - type: startingGear
-#   id: ScientistTie
-#   equipment:
-#     neck: ClothingNeckTieSci
-
-# # 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
-
-# - type: loadout
-#   id: SeniorResearcherJumpsuit
-#   equipment: SeniorResearcherJumpsuit
-#   effects:
-#   - !type:GroupLoadoutEffect
-#     proto: SeniorResearcher
-
-# - type: startingGear
-#   id: SeniorResearcherJumpsuit
-#   equipment:
-#     jumpsuit: ClothingUniformJumpsuitSeniorResearcher
-
-# - type: loadout
-#   id: SeniorResearcherJumpskirt
-#   equipment: SeniorResearcherJumpskirt
-#   effects:
-#   - !type:GroupLoadoutEffect
-#     proto: SeniorResearcher
-
-# - type: startingGear
-#   id: SeniorResearcherJumpskirt
-#   equipment:
-#     jumpsuit: ClothingUniformJumpskirtSeniorResearcher
-
-# # Back
-# - type: loadout
-#   id: ScientistBackpack
-#   equipment: ScientistBackpack
-
-# - type: startingGear
-#   id: ScientistBackpack
-#   equipment:
-#     back: ClothingBackpackScience
-
-# - type: loadout
-#   id: ScientistSatchel
-#   equipment: ScientistSatchel
-
-# - type: startingGear
-#   id: ScientistSatchel
-#   equipment:
-#     back: ClothingBackpackSatchelScience
-
-# - type: loadout
-#   id: ScientistDuffel
-#   equipment: ScientistDuffel
-
-# - type: startingGear
-#   id: ScientistDuffel
-#   equipment:
-#     back: ClothingBackpackDuffelScience
-
-# # 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
-
-# - type: loadout
-#   id: SeniorResearcherLabCoat
-#   equipment: SeniorResearcherLabCoat
-#   effects:
-#   - !type:GroupLoadoutEffect
-#     proto: SeniorResearcher
-
-# - type: startingGear
-#   id: SeniorResearcherLabCoat
-#   equipment:
-#     outerClothing: ClothingOuterCoatLabSeniorResearcher
-
-# # 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
-
-# # Shoes
-# - type: loadout
-#   id: ScienceWinterBoots
-#   equipment: ScienceWinterBoots
-
-# - type: startingGear
-#   id: ScienceWinterBoots
-#   equipment:
-#     shoes: ClothingShoesBootsWinterSci
-
-# # ID
-# - type: loadout
-#   id: ScientistPDA
-#   equipment: ScientistPDA
-
-# - type: startingGear
-#   id: ScientistPDA
-#   equipment:
-#     id: SciencePDA
-
-# - type: loadout
-#   id: SeniorResearcherPDA
-#   equipment: SeniorResearcherPDA
-#   effects:
-#   - !type:GroupLoadoutEffect
-#     proto: SeniorResearcher
-
-# - type: startingGear
-#   id: SeniorResearcherPDA
-#   equipment:
-#     id: SeniorResearcherPDA
+# ID
+- type: loadout
+  id: ADTRoboticistPDA
+  equipment: ADTRoboticistPDA
+
+- type: startingGear
+  id: ADTRoboticistPDA
+  equipment:
+    id: ADTRoboticistPDA
+
+# Implanters
+- type: loadout
+  id: BorgTranslatorImplanter
+  equipment: BorgTranslatorImplanter
+
+- type: startingGear
+  id: BorgTranslatorImplanter
+  storage:
+    back:
+    - BorgTranslatorImplanter
diff --git a/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml b/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml
@@ -0,0 +1,17 @@
+#Science
+
+- type: loadoutGroup
+  id: ADTRobotocistPDA
+  name: loadout-group-roboticist-id
+  loadouts:
+  - ScientistPDA
+  - SeniorResearcherPDA
+  - ADTRoboticistPDA
+
+- type: loadoutGroup
+  id: ADTRobotocistImplanters
+  name: loadout-group-roboticist-implanters
+  minLimit: 0
+  maxLimit: 1
+  loadouts:
+  - BorgTranslatorImplanter
diff --git a/Resources/Prototypes/ADT/Loadouts/role_loadouts.yml b/Resources/Prototypes/ADT/Loadouts/role_loadouts.yml
@@ -1,10 +1,18 @@
 - type: roleLoadout
-  id: JobRoboticist
+  id: JobADTRoboticist
   groups:
   - Inventory # Corvax-Loadouts
-  - LawyerNeck
-  - LawyerJumpsuit
-  - CommonBackpack
+  - GroupTankHarness
+  - ScientistHead
+  - ScientistNeck
+  - ScientistJumpsuit
+  - ScientistBackpack
+  - ScientistOuterClothing
+  - ScientistGloves
+  - ScientistShoes
+  - ADTRobotocistPDA
+  - ADTRobotocistImplanters
+  - Glasses
   - Survival
   - Trinkets
   - GroupSpeciesBreathTool
diff --git a/Resources/Prototypes/ADT/Roles/Jobs/Science/roboticist.yml b/Resources/Prototypes/ADT/Roles/Jobs/Science/roboticist.yml
@@ -18,4 +18,4 @@
   id: ADTRoboticistGear
   equipment:
     ears: ClothingHeadsetRobotics
-    id: ADTRoboticistPDA
+    # id: ADTRoboticistPDA
diff --git a/Resources/Prototypes/ADT/Roles/play_time_trackers.yml b/Resources/Prototypes/ADT/Roles/play_time_trackers.yml
@@ -1,2 +1,2 @@
-# - type: playTimeTracker
-#   id: JobRoboticist
+- type: playTimeTracker
+  id: JobRoboticist
diff --git a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml
@@ -163,7 +163,7 @@
   - type: EncryptionKey
     channels:
     - Science
-    - Binary
+    - Binary # ADT Tweak Roboticist
     defaultChannel: Science
   - type: Sprite
     layers:

diff --git a/Resources/Prototypes/Maps/atlas.yml b/Resources/Prototypes/Maps/atlas.yml
@@ -40,7 +40,6 @@
             Scientist: [ 2, 2 ]
             ResearchAssistant: [ 1, 3 ]
             Borg: [ 2, 2 ]
-            ADTRoboticist: [ 1, 1 ] #ADT
             #security
             HeadOfSecurity: [ 1, 1 ]
             Warden: [ 1, 1 ]

diff --git a/Resources/Prototypes/Maps/bagel.yml b/Resources/Prototypes/Maps/bagel.yml
@@ -44,7 +44,6 @@
             Scientist: [ 5, 5 ]
             ResearchAssistant: [ 4, 4 ]
             Borg: [ 2, 2 ]
-            ADTRoboticist: [ 1, 1 ] #ADT
             #security
             HeadOfSecurity: [ 1, 1 ]
             Warden: [ 1, 1 ]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ent-ADTSpawnPointRoboticist = робототехник
		.desc = { ent-SpawnPointJobBase.desc }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ent-ADTRoboticistPDA = КПК робототехника
		.desc = Почему это всё ещё не робот?!
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ent-ADTRoboticistIDCard = ID карта робототехника
		.desc = { ent-IDCardStandard.desc }