Исправления (#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/en-US/_prototypes/_sunrise/entities/clothing/outerclothing/suits.ftl

@@ -1,26 +0,0 @@
-ent-ClothingOuterAerostaticBomberJacket = aerostatic bomber jacket
-    .desc = A jacket once worn by the revolutionary air brigades during the Antecentennial Revolution. There are quite a few pockets on the inside, mostly for storing notebooks and compasses.
-ent-ClothingOuterDiscoAssBlazer = disco ass blazer
-    .desc = Looks like someone skinned this blazer off some long extinct disco-animal. It has an enigmatic white rectangle on the back and the right sleeve.
-ent-ClothingOuterCoatCEOvercoatWhite = пальто старшего инженера
-    .desc = Пальто Старшего Инженера. Роскошное пальто с позолоченными вставками, делающие вид, что защищает вас от каких-либо угроз.
-ent-ClothingOuterCoatCMOOvercoat = лабораторный халат главного врача
-    .desc = На 99% состоит из Нитрила.
-ent-ClothingOuterCoatCaptainOvercoat = капитанская шинель
-    .desc = Селанная специально под замеры действующего капитана и сделанный лучшими швеями NanoTrasen.
-ent-ClothingOuterEliteCoatHOP = шинель главы персонала
-    .desc = Удобное приталенная шинель тёмно-синего цвета с кожаными ремнями. На плечах видны декоративные погоны.
-ent-ClothingOuterCoatHOSOvercoatBlack = бронированная шинель
-    .desc = Чёрная шинель с красными полосками, серебряными заклепками и золотой бляшкой.
-ent-ClothingOuterCoatIAA = пиджак агента внутренних дел
-    .desc = Чёрный пиджак строгого тона с позолоченным креплением под значок. От него веет запахом чернил для ручек и бюрократией.
-ent-ClothingOuterCoatQM = теплое пальто
-    .desc = Удобное пальто созданное из лёгкой ткани дикого лиаруса, место обитания которого является лавовая планета №468, позволяет придерживаться стиля современных времён.
-ent-ClothingOuterCoatLabResearchDirector = халат научного руководителя
-    .desc = Плотный халат, защищающий своего носителя от струи кислоты и плавленой плазмы. Имеет фиолетовые и голубые ленты на плечах и поясе.
-ent-ClothingOuterCoatHoSOvercoat = бронированная шинель
-    .desc = Довольно старая вещь для этих времён, навевающая старые воспоминания...
-ent-ClothingOuterCoatUSSPOvercoatBlack = бронированная шинель СССП
-    .desc = Старая вещица, прямиком из СССП.
-ent-ClothingOuterAtmosianBomberJacket = куртка-бомбер атмосианина
-    .desc = Плотная, поношенная куртка-бомбер атмосианина.

Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/specific/borg_brains.ftl

@@ -1,4 +0,0 @@
-ent-Boris = robotic brain
-    .desc = { ent-BaseItem.desc }
-ent-Sofia = syndicate robotic brain
-    .desc = { ent-Boris.desc }

Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/specific/borg_modules.ftl

@@ -1,34 +0,0 @@
-ent-BorgCombatModuleERT = Оружейный модуль киборга ОБР
-    .desc = { ent-BaseBorgModuleERT.desc }
-ent-BorgModuleERTNlethal = Нелетальный модуль киборга ОБР
-    .desc = { ent-BaseBorgModuleERT.desc }
-ent-BorgToolModuleERT = Инструментальный модуль киборга ОБР
-    .desc = { ent-BaseBorgModuleERT.desc }
-ent-BorgHeavyModuleSyndicateCombat = Оружейный модуль тяжёлого киборга Синдиката
-    .desc = { ent-BaseBorgModuleSyndicate.desc }
-ent-BorgScoutModuleSyndicateCombat = Защитный модуль киборга диверсанта Синдиката
-    .desc = { ent-BaseBorgModuleSyndicate.desc }
-ent-BorgScoutModuleSyndicateTool = Продвинутый инструментальный модуль киборга диверсанта Синдиката
-    .desc = { ent-BaseBorgModuleSyndicate.desc }
-ent-BaseBorgModuleSecurity = { ent-BaseBorgModule }
-    .desc = { ent-BaseBorgModule.desc }
-ent-BaseBorgModuleERT = { ent-BaseBorgModule }
-    .desc = { ent-BaseBorgModule.desc }
-ent-BorgModuleStun = stuh cyborg module
-    .desc = { ent-BaseBorgModuleSecurity.desc }
-ent-BorgModuleCombat = combat cyborg module
-    .desc = { ent-BaseBorgModuleSecurity.desc }
-ent-BorgModulePeace = peace cyborg module
-    .desc = { ent-BaseBorgModuleSecurity.desc }
-ent-BorgModuleMiningCombat = combat mining cyborg module
-    .desc = { ent-BaseBorgModuleCargo.desc }
-ent-BorgModuleJetpack = jetpack cyborg module
-    .desc = { ent-BaseBorgModuleCargo.desc }
-ent-BorgModuleSyndicateGeneric = cleaning cyborg module
-    .desc = { ent-BaseBorgModuleSyndicate.desc }
-ent-BorgModuleSyndicateMedical = medical syndicate module
-    .desc = { ent-BaseBorgModuleSyndicate.desc }
-ent-BorgModuleSyndicateCombat = combat syndicate cyborg module
-    .desc = { ent-BaseBorgModuleSyndicate.desc }
-ent-BorgModuleStandart = fire extinguisher cyborg module
-    .desc = { ent-BaseBorgModule.desc }

Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/specific/borg_tools.ftl

@@ -1,56 +0,0 @@
-ent-PowerCellRobotTool = robot tool power cell
-    .desc = A small cell that self recharges. Used in robot tools.
-ent-WeaponDisablerBorg = robot disabler
-    .desc = A self-defense weapon that exhausts organic targets, weakening them until they collapse.
-ent-StunbatonBorg = robot stun baton
-    .desc = A stun baton for incapacitating people with. Actively harming with this is considered bad tone.
-ent-HoloprojectorSecurityBorg = holobarrier robot projector
-    .desc = Creates a solid but fragile holographic barrier.
-ent-WeaponLaserBorg = robot laser gun
-    .desc = This laser for security robot.
-ent-FlashBorg = flash robot
-    .desc = An ultrabright flashbulb with a trigger, which causes the victim to be dazed and lose their eyesight for a moment. Useless when burnt out.
-ent-HyposprayBorgStandard = epinephrine robot hypospray
-    .desc = A borg version of hypospray that automatically regenerates epinephrine.
-ent-HyposprayBorgPeace = pax cyborg hypospray
-    .desc = A cyborg version of hypospray that automatically regenerates pax.
-ent-HyposprayBorgMedical = medical robot hypospray
-    .desc = A hypospray that can switch through several reagents.
-ent-WeaponProtoKineticAcceleratorBorg = proto-kinetic robot accelerator
-    .desc = Fires low-damage kinetic bolts at a short range.
-ent-HyposprayBorgSyndi = gorlax robot hypospray
-    .desc = A hypospray that can switch through several reagents.
-ent-HolofanProjectorBorg = holofan robot projector
-    .desc = Stop suicidal passengers from killing everyone during atmos emergencies.
-ent-LightMachineGunBorg = machine gun borg
-    .desc = { ent-BaseItem.desc }
-ent-WeaponLauncherChinaLakeBorg = robot china lake
-    .desc = PLOOP
-ent-FireExtinguisherBorg = fire extinguisher borg
-    .desc = fire extinguisher borg
-ent-SprayBottleSpaceCleanerBorg = space cleaner
-    .desc = BLAM!-brand non-foaming space cleaner!
-ent-CrowbarBorg = borg crowbar
-    .desc = { ent-Crowbar.desc }
-ent-WrenchBorg = borg wrench
-    .desc = { ent-Wrench.desc }
-ent-ScrewdriverBorg = borg screwdriver
-    .desc = { ent-BaseItem.desc }
-ent-WirecutterBorg = borg wirecutter
-    .desc = { ent-BaseItem.desc }
-ent-WelderBorg = borg welder
-    .desc = { ent-Welder.desc }
-ent-WeaponDisablerSMGBorg = станер пулемет киборга
-    .desc = { ent-WeaponDisablerSMG.desc }
-ent-WeaponPulseCarbineBorg = Импульстное оружие Киборга
-    .desc = { ent-BaseWeaponBattery.desc }
-ent-DL6902Borg = DL6902 киборга
-    .desc = Тяжёлый пулемёт Cybersun киборга с расширенным магазином.
-ent-WeaponIAR52Borg = IAR-52 киборга
-    .desc = Высокоскорострельный ПП, оборудован универсальным разъёмом для других типов пистолетных магазинов.
-ent-HyposprayBorgSyndie = Гипоспрей киборга диверсанта
-    .desc = { ent-BaseItem.desc }
-ent-RadioJammerBorg = Глушитель связи диверсанта
-    .desc = { ent-BaseItem.desc }
-ent-HandheldCrewMonitorBorg = handheld robot crew monitor
-    .desc = A hand-held crew monitor that runs off of your own power cells, which displays the status of the crew suit sensors.

Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/specific/chemistry-bottles.ftl

@@ -1,5 +0,0 @@
-ent-AphrodesiacChemistryBottle = aphrodesiac bottle
-    .desc = { ent-BaseChemistryBottleFilled.desc }
-ent-PolytrinicAcidChemistryBottle = { ent-BaseChemistryBottleFilled }
-    .suffix = polytrinic acid
-    .desc = { ent-BaseChemistryBottleFilled.desc }

Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/specific/nanopaste.ftl

@@ -1,9 +0,0 @@
-ent-Nanopaste = нанопаста
-    .suffix = Full
-    .desc = { ent-BaseHealingItem.desc }
-ent-Nanopaste1 = { ent-Nanopaste }
-    .suffix = Single
-    .desc = { ent-Nanopaste.desc }
-ent-Nanopaste10 = { ent-Nanopaste }
-    .suffix = Full
-    .desc = { ent-Nanopaste.desc }

Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/specific/viruses.ftl

@@ -1,2 +0,0 @@
-ent-SyringeRomerolNT = { ent-BaseSyringe }
-    .desc = { ent-BaseSyringe.desc }

Resources/Locale/en-US/_prototypes/entities/objects/misc/dinkystar.ftl

@@ -1,2 +0,0 @@
-ent-Dinkystar = star sticker
-    .desc = A dinky lil star for only the hardest working security officers! It's not even sticky anymore.

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 = БИОКОД