Исправления (#488)

* init

* fix en us

* translate Labels

* last fix

.github/config.yml

@@ -1,9 +1,9 @@
 Project-Condor:
-  org: space-wizards
+  org: space-sunrise
   project: 2
   inbox: Inbox
   labels:
-    "W: In Progress": "In Progress"
+    "W: In Progress": "В Прогрессе"
     "W: Discussion": "Design and Discussion"
     "W: Backlog": "Backlog"
-    "W: Next": "Next"
+    "W: Next": "Следующее"

.github/labeler.yml

@@ -1,22 +1,22 @@
-"Changes: Sprites":
+"Изменения: Спрайты":
 - changed-files:
   - any-glob-to-any-file: '**/*.rsi/*.png'
 
-"Changes: Map":
+"Изменения: Карты":
 - changed-files:
   - any-glob-to-any-file:
     - 'Resources/Maps/**/*.yml'
     - 'Resources/Prototypes/Maps/**/*.yml'
 
-"Changes: UI":
+"Изменения: Интерфейс":
 - changed-files:
   - any-glob-to-any-file: '**/*.xaml*'
 
-"Changes: Shaders":
+"Изменения: Шейдеры":
 - changed-files:
   - any-glob-to-any-file: '**/*.swsl'
 
-"No C#":
+"Нет C#":
 - changed-files:
   # Equiv to any-glob-to-all as long as this has one matcher. If ALL changed files are not C# files, then apply label.
   - all-globs-to-all-files: "!**/*.cs"

.github/workflows/labeler-needsreview.yml

@@ -10,7 +10,7 @@ jobs:
     steps:
     - uses: actions-ecosystem/action-add-labels@v1
       with:
-        labels: "Status: Needs Review"
+        labels: "Статус: Требует Рассмотрения"
     - uses: actions-ecosystem/action-remove-labels@v1
       with:
-        labels: "Status: Awaiting Changes"
+        labels: "Статус: Ожидает Изменения"

.github/workflows/labeler-untriaged.yml

@@ -11,4 +11,4 @@ jobs:
     - uses: actions-ecosystem/action-add-labels@v1
       if: join(github.event.issue.labels) == ''
       with:
-        labels: "Status: Untriaged"
+        labels: "Статус: Несортированный"

Content.Server/Mech/Equipment/EntitySystems/MechGunSystem.cs

@@ -15,28 +15,16 @@ public sealed class MechGunSystem : EntitySystem
     public override void Initialize()
     {
         base.Initialize();
-        SubscribeLocalEvent<MechEquipmentComponent, GunShotEvent>(MechGunShot);
-        SubscribeLocalEvent<MechEquipmentComponent, OnEmptyGunShotEvent>(MechEmptyGunShot);
+        SubscribeLocalEvent<MechEquipmentComponent, GunShotEvent>((id,cmp,_)=> TryChargeGunBattery(id, cmp));
+        SubscribeLocalEvent<MechEquipmentComponent, OnEmptyGunShotEvent>((id, cmp, _) => TryChargeGunBattery(id, cmp));
     }
 
-    private void MechGunShot(EntityUid uid, MechEquipmentComponent component, ref GunShotEvent args)
+    private void TryChargeGunBattery(EntityUid uid, MechEquipmentComponent component)
     {
-        if (!component.EquipmentOwner.HasValue
-            || !HasComp<MechComponent>(component.EquipmentOwner.Value)
-            || !TryComp<BatteryComponent>(uid, out var battery))
-            return;
-
-        ChargeGunBattery(uid, battery);
-    }
-
-    private void MechEmptyGunShot(EntityUid uid, MechEquipmentComponent component, ref OnEmptyGunShotEvent args)
-    {
-        if (!component.EquipmentOwner.HasValue
-            || !HasComp<MechComponent>(component.EquipmentOwner.Value)
-            || !TryComp<BatteryComponent>(uid, out var battery))
-            return;
-
-        ChargeGunBattery(uid, battery);
+        if (component.EquipmentOwner.HasValue
+            && HasComp<MechComponent>(component.EquipmentOwner.Value)
+            && TryComp<BatteryComponent>(uid, out var battery))
+            ChargeGunBattery(uid, battery);
     }
 
     private void ChargeGunBattery(EntityUid uid, BatteryComponent component)

Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/biocode/biocode.ftl

@@ -28,12 +28,6 @@ ent-WeaponPistolViperBiocode = { ent-WeaponPistolViper }
 ent-WeaponRifleM90GrenadeLauncherBiocode = { ent-WeaponRifleM90GrenadeLauncher }
     .desc = { ent-WeaponRifleM90GrenadeLauncher.desc }
     .suffix = БИОКОД
-ent-EnergySwordDoubleBiocode = { ent-EnergySwordDouble }
-    .desc = { ent-EnergySwordDouble.desc }
-    .suffix = БИОКОД
-ent-EnergySwordBiocode = { ent-EnergySword }
-    .desc = { ent-EnergySword.desc }
-    .suffix = БИОКОД
 ent-WeaponSIAR52Biocode = { ent-WeaponSIAR52 }
     .desc = { ent-WeaponSIAR52.desc }
     .suffix = БИОКОД