Merge branch 'sec-rework' of https://github.com/AdventureTimeSS14/spa…

…ce_station_ADT into sec-rework
AdventureTimeSS14 · Sep 6, 2024 · e672657 · e672657
2 parents 1f956b8 + ac7e380
commit e672657
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 9 deletions.
diff --git a/Resources/Locale/ru-RU/ADT/Job/job-names.ftl b/Resources/Locale/ru-RU/ADT/Job/job-names.ftl
@@ -27,5 +27,5 @@ job-name-ADTSpaceSecPilot = пилот SPACE SEC
 job-name-ADTSpaceSecCommander = командир SPACE SEC
 job-name-ADTSpaceSecService = сотрудник SPACE SEC
 
-job-name-ADTSecBorg = Офицер Синего Щита
+job-name-ADTSecBorg = Киборг службы безопасности
 JobADTSecBorg = Киборг службы безопасности
diff --git a/Resources/Locale/ru-RU/ADT/Objects/Specific/Robotics/borg_parts.ftl b/Resources/Locale/ru-RU/ADT/Objects/Specific/Robotics/borg_parts.ftl
@@ -1,12 +1,6 @@
 ent-ADTLeftArmBorgSecurity = левая рука киборга-офицера
-    .desc = { ent-BaseBorgArmLeft.desc }
 ent-ADTRightArmBorgSecurity = правая рука киборга-офицера
-    .desc = { ent-BaseBorgArmRight.desc }
 ent-ADTLeftLegBorgSecurity = левая нога киборга-офицера
-    .desc = { ent-BaseBorgLegLeft.desc }
 ent-ADTRightLegBorgSecurity = правая нога киборга-офицера
-    .desc = { ent-BaseBorgLegRight.desc }
 ent-ADTHeadBorgSecurity = голова киборга-офицера
-    .desc = { ent-BaseBorgHead.desc }
 ent-ADTTorsoBorgSecurity = туловище киборга-офицера
-    .desc = { ent-BaseBorgTorso.desc }
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Silicons/borg_chassis.yml b/Resources/Prototypes/ADT/Entities/Mobs/Silicons/borg_chassis.yml
@@ -52,7 +52,8 @@
     - Binary
     - Common
     - Science
-
+  - type: TTS
+    voice: sentrybot
 - type: entity
   id: ADTPlayerSecBorgGeneric
   parent: ADTBorgChassisSec

diff --git a/Resources/migration.yml b/Resources/migration.yml
@@ -472,5 +472,5 @@ ClothingOuterArmorHeavyGreen: null
 
 #2024-09-06
 
-RiotBulletShield:
+RiotBulletShield: null
 #ADT end