From bf0a124b051aa0f1fbe471fe95542209c71a4a98 Mon Sep 17 00:00:00 2001
From: Remuchi <72476615+Remuchi@users.noreply.github.com>
Date: Sat, 20 Apr 2024 20:41:39 +0700
Subject: [PATCH] [Fix] Hotfixes 2 (#287)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: Скоупидия и Вандербокс снова работают

* fix: главы станции снова не могут быть главами революции

* а что так можно было
---
 .../GameTicking/Rules/RevolutionaryRuleSystem.cs           | 4 ++--
 Resources/Locale/ru-RU/locales-new/autotranslate-18.ftl    | 2 --
 Resources/Maps/White/Scoupidia.yml                         | 7 -------
 Resources/Maps/White/WonderBox.yml                         | 7 -------
 Resources/migration.yml                                    | 3 ++-
 5 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs b/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs
index 8de729af89..69d0396e3a 100644
--- a/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs
@@ -176,7 +176,7 @@ public sealed class RevolutionaryRuleSystem : GameRuleSystem<RevolutionaryRuleCo
         var query = QueryActiveRules();
         while (query.MoveNext(out _, out _, out var comp, out _))
         {
-            var eligiblePlayers = _antagSelection.GetEligiblePlayers(ev.Players, comp.HeadRevPrototypeId);
+            var eligiblePlayers = _antagSelection.GetEligiblePlayers(ev.Players, comp.HeadRevPrototypeId, customExcludeCondition: HasComp<CommandStaffComponent>);
 
             if (eligiblePlayers.Count == 0)
                 continue;
@@ -408,7 +408,7 @@ public sealed class RevolutionaryRuleSystem : GameRuleSystem<RevolutionaryRuleCo
         // revs lost and heads died
         "rev-stalemate"
     ];
-    
+
     public void TransferRole(EntityUid transferFrom, EntityUid transferTo)
     {
         if (HasComp<CommandStaffComponent>(transferFrom))
diff --git a/Resources/Locale/ru-RU/locales-new/autotranslate-18.ftl b/Resources/Locale/ru-RU/locales-new/autotranslate-18.ftl
index 9bf92a68e6..18df623929 100644
--- a/Resources/Locale/ru-RU/locales-new/autotranslate-18.ftl
+++ b/Resources/Locale/ru-RU/locales-new/autotranslate-18.ftl
@@ -12,8 +12,6 @@ ent-FoodShakerPepper = перечница
    .desc = Часто используется для придания вкуса еде или заставляет людей чихать.
 ent-Vape = вейп
    .desc = Как сигара, но для крепких подростков. (ВНИМАНИЕ: наливайте в вейп только воду)
-ent-NewsReadCartridge = Новостной картридж
-   .desc = Программа для чтения новостей
 ent-DoorRemoteAll = супер дверной пульт
    .desc = ""
 ent-EncryptionKey = ключ шифрования
diff --git a/Resources/Maps/White/Scoupidia.yml b/Resources/Maps/White/Scoupidia.yml
index 8066f44775..907bc5968b 100644
--- a/Resources/Maps/White/Scoupidia.yml
+++ b/Resources/Maps/White/Scoupidia.yml
@@ -147339,13 +147339,6 @@ entities:
     - type: Transform
       pos: 104.674225,53.53794
       parent: 2
-- proto: NewsReadCartridge
-  entities:
-  - uid: 16473
-    components:
-    - type: Transform
-      pos: 36.526398,55.051796
-      parent: 2
 - proto: NitrogenCanister
   entities:
   - uid: 16474
diff --git a/Resources/Maps/White/WonderBox.yml b/Resources/Maps/White/WonderBox.yml
index c2d7161207..bfa06d6b1d 100644
--- a/Resources/Maps/White/WonderBox.yml
+++ b/Resources/Maps/White/WonderBox.yml
@@ -124843,13 +124843,6 @@ entities:
     - type: Transform
       pos: 4.6548524,-9.473162
       parent: 2
-- proto: NewsReadCartridge
-  entities:
-  - uid: 11237
-    components:
-    - type: Transform
-      pos: -60.486717,8.594372
-      parent: 2
 - proto: NitrogenCanister
   entities:
   - uid: 16232
diff --git a/Resources/migration.yml b/Resources/migration.yml
index 8acbd5bd95..42dacbf48b 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -254,4 +254,5 @@ BodyBag_Container: BodyBag
 BodyBag_Folded: BodyBagFolded
 
 # 2024-04-14
-BookSpaceLaws: null
\ No newline at end of file
+BookSpaceLaws: null
+NewsReadCartridge: null
\ No newline at end of file