Порция фиксов

AdventureTimeSS14 · Sep 8, 2024 · 7c144fd · 7c144fd
1 parent 3baf963
commit 7c144fd
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 17 deletions.
diff --git a/Resources/Locale/ru-RU/ADT/Job/job-names.ftl b/Resources/Locale/ru-RU/ADT/Job/job-names.ftl
@@ -26,3 +26,6 @@ job-name-ADTSpaceSecOfficer = офицер SPACE SEC
 job-name-ADTSpaceSecPilot = пилот SPACE SEC
 job-name-ADTSpaceSecCommander = командир SPACE SEC
 job-name-ADTSpaceSecService = сотрудник SPACE SEC
+
+job-name-station-ai = ИИ Станции
+JobStationAi = ИИ Станции
diff --git a/Resources/Prototypes/ADT/Economy/salary.yml b/Resources/Prototypes/ADT/Economy/salary.yml
@@ -47,3 +47,7 @@
     Scientist: 300
     ResearchAssistant: 200
     Brigmedic: 400
+    ADTSeniorEngineer: 450
+    ADTSeniorPhysician: 450
+    ADTSeniorResearcher: 450
+    ADTSeniorOfficer: 450
diff --git a/Resources/Prototypes/ADT/Loadouts/role_loadouts.yml b/Resources/Prototypes/ADT/Loadouts/role_loadouts.yml
@@ -69,7 +69,6 @@
   - MedicalGloves
   - MedicalBackpack
   - MedicalDoctorOuterClothing
-  - MedicalDoctorJumpsuit
   - Trinkets
   - SurvivalMedical
   - GroupSpeciesBreathToolMedical

diff --git a/Resources/Prototypes/ADT/Traits/speech.yml b/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
 
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -150,6 +150,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: FootstepModifier
     footstepSoundCollection:

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/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