Фиксики

Resources/Locale/ru-RU/ADT/Job/job-names.ftl

@@ -1,6 +1,7 @@
 job-name-ADTPathologist = Патологоанатом
 JobADTPathologist = Патологоанатом
 
+job-name-roboticist = Робототехник
 JobRoboticist = Робототехник
 
 job-name-magistrat = Магистрат
@@ -27,5 +28,9 @@ job-name-ADTSpaceSecPilot = пилот SPACE SEC
 job-name-ADTSpaceSecCommander = командир SPACE SEC
 job-name-ADTSpaceSecService = сотрудник SPACE SEC
 
+
+job-name-station-ai = ИИ Станции
+JobStationAi = ИИ Станции
+
 job-name-ADTSecBorg = Киборг службы безопасности
 JobADTSecBorg = Киборг службы безопасности

Resources/Locale/ru-RU/job/job-names.ftl

@@ -52,7 +52,6 @@ job-name-visitor = Посетитель
 job-name-geneticist = генетик
 job-name-no-id = нет ID
 job-name-prisoner = заключённый
-job-name-roboticist = робототехник
 job-name-syndicate = синдикат
 job-name-unknown = неизвестно
 job-name-virologist = вирусолог

Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/satchel.yml

@@ -38,7 +38,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: SpeedLoaderMagnum
       - id: SpeedLoaderMagnum
       - id: SmokeGrenade
       - id: SmokeGrenade

Resources/Prototypes/ADT/Economy/salary.yml

@@ -47,3 +47,7 @@
     Scientist: 300
     ResearchAssistant: 200
     Brigmedic: 400
+    ADTSeniorEngineer: 450
+    ADTSeniorPhysician: 450
+    ADTSeniorResearcher: 450
+    ADTSeniorOfficer: 450

Resources/Prototypes/ADT/Entities/Mobs/Cyborgs/borg_chassis.yml

@@ -24,6 +24,11 @@
       - ADTBorgModuleSecurity
     hasMindState: sec_e
     noMindState: sec_e_r
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default
+        startingItem: PowerCellMedium
   - type: BorgTransponder
     sprite:
       sprite: ADT/Mobs/Cyborg/chassis.rsi

Resources/Prototypes/ADT/Loadouts/role_loadouts.yml

@@ -69,7 +69,6 @@
   - MedicalGloves
   - MedicalBackpack
   - MedicalDoctorOuterClothing
-  - MedicalDoctorJumpsuit
   - Trinkets
   - SurvivalMedical
   - GroupSpeciesBreathToolMedical

Resources/Prototypes/ADT/Roles/Jobs/Command/blueshieldofficer.yml

@@ -13,6 +13,8 @@
     - !type:RoleTimeRequirement
       role: JobChiefMedicalOfficer
       time: 18000 #5 hrs
+    - !type:AgeRequirement
+      requiredAge: 21
   weight: 15
   startingGear: ADTBlueShieldOfficerGear
   icon: "JobIconADTBlueShieldOfficer"

Resources/Prototypes/ADT/Roles/Jobs/Security/senior_officer.yml

@@ -38,4 +38,5 @@
     id: SeniorOfficerPDA
     ears: ClothingHeadsetSecurity
     pocket1: WeaponRevolverDeckard
+    pocket2: SpeedLoaderMagnum
     # neck: ADTClothingNeckSecBadge # TODO: Вернуть жетоны СБ

Resources/Prototypes/ADT/Traits/speech.yml

@@ -7,12 +7,13 @@
   components:
     - type: MothAccent
 
-- type: trait
-  id: ADTDeutscAccent 
-  name: trait-deutsch-name
-  description: trait-deutsch-desc
-  category: SpeechTraits
-  cost: 1
-  components:
-    - type: DeutschAccent
+# Визарды добавили свой немецкий язык
+# - type: trait
+#   id: ADTDeutscAccent 
+#   name: trait-deutsch-name
+#   description: trait-deutsch-desc
+#   category: SpeechTraits
+#   cost: 1
+#   components:
+#     - type: DeutschAccent
 

Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml

@@ -158,6 +158,17 @@
   - type: Vocal
     sounds:
       Unsexed: UnisexSilicon
+# Start ADT Tweak
+  - type: LanguageSpeaker
+    speaks:
+    - GalacticCommon
+    - BorgTalk
+    - RobotTalk
+    understands:
+    - GalacticCommon
+    - BorgTalk
+    - RobotTalk
+# End ADT Tweak
   - type: UnblockableSpeech
   - type: Construction
     graph: Cyborg

Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml

@@ -224,8 +224,11 @@
           bounds: "-0.15,-0.3,0.15,0.3"
         hard: false
         mask:
-        - Impassable
-        - BulletImpassable
+# Start ADT Tweak
+        # - Impassable
+        # - BulletImpassable
+        - Opaque # ADT add
+# End ADT Tweak
       fly-by: *flybyfixture
   - type: Ammo
   - type: StaminaDamageOnCollide
@@ -264,8 +267,11 @@
           bounds: "-0.15,-0.3,0.15,0.3"
         hard: false
         mask:
-        - Impassable
-        - BulletImpassable
+# Start ADT Tweak
+        # - Impassable
+        # - BulletImpassable
+        - Opaque # ADT add
+# End ADT Tweak
       fly-by: *flybyfixture
   - type: Ammo
   - type: StaminaDamageOnCollide
@@ -934,8 +940,11 @@
           bounds: "-0.15,-0.3,0.15,0.3"
         hard: false
         mask:
-        - Impassable
-        - BulletImpassable
+# Start ADT Tweak
+        # - Impassable
+        # - BulletImpassable
+        - Opaque # ADT add
+# End ADT Tweak
       fly-by: *flybyfixture
   - type: Ammo
   - type: StaminaDamageOnCollide
@@ -1010,8 +1019,11 @@
           bounds: "-0.15,-0.3,0.15,0.3"
         hard: false
         mask:
-        - Impassable
-        - BulletImpassable
+# Start ADT Tweak
+        # - Impassable
+        # - BulletImpassable
+        - Opaque # ADT add
+# End ADT Tweak
       fly-by: *flybyfixture
   - type: Ammo
   - type: Projectile