фикс революции

space-sunrise · Dec 16, 2024 · 540f264 · 540f264
1 parent e938379
commit 540f264
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs b/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs
@@ -136,6 +136,7 @@ private void OnPostFlash(EntityUid uid, HeadRevolutionaryComponent comp, ref Aft
 
         if (HasComp<RevolutionaryComponent>(ev.Target) ||
             HasComp<MindShieldComponent>(ev.Target) ||
+            HasComp<CommandStaffComponent>(ev.Target) ||
             !HasComp<HumanoidAppearanceComponent>(ev.Target) &&
             !alwaysConvertible ||
             !_mobState.IsAlive(ev.Target) ||

diff --git a/Resources/Changelog/ChangelogSunrise.yml b/Resources/Changelog/ChangelogSunrise.yml
@@ -8182,3 +8182,19 @@
     type: Fix
   id: 573
   time: '2024-12-15T20:26:00.755934+00:00'
+- author: VigersRay
+  changes:
+  - message: "\u041A\u043E\u043C\u043C\u0430\u043D\u0434\u043D\u044B\u0439 \u0441\u043E\
+      \u0441\u0442\u0430\u0432 \u043D\u0435 \u043C\u043E\u0436\u0435\u0442 \u0441\u0442\
+      \u0430\u0442\u044C \u0433\u043B\u0430\u0432\u0430\u043C\u0438 \u0440\u0435\u0432\
+      \u043E\u043B\u044E\u0446\u0438\u0438."
+    type: Fix
+  - message: "\u041A\u043E\u043C\u043C\u0430\u043D\u0434\u043D\u044B\u0439 \u0441\u043E\
+      \u0441\u0442\u0430\u0432 \u043D\u0435\u043B\u044C\u0437\u044F \u043A\u043E\u043D\
+      \u0432\u0435\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0432 \u0440\
+      \u0435\u0432\u043E\u043B\u044E\u0446\u0438\u043E\u043D\u0435\u0440\u0430 \u0434\
+      \u0430\u0436\u0435 \u0431\u0435\u0437 \u0438\u043C\u043F\u043B\u0430\u043D\u0442\
+      \u0430 \u0449\u0438\u0442\u0430 \u0440\u0430\u0437\u0443\u043C\u0430."
+    type: Fix
+  id: 574
+  time: '2024-12-16T15:37:28.339501+00:00'
diff --git a/Resources/Prototypes/GameRules/roundstart.yml b/Resources/Prototypes/GameRules/roundstart.yml
@@ -235,8 +235,6 @@
     definitions:
     - prefRoles: [ HeadRev ]
       max: 3
-      pickCommandStaff: true # Sunrise-Edit
-      maxCommandStaff: 3 # Sunrise-Edit
       playerRatio: 15
       briefing:
         text: head-rev-role-greeting