Heads zombies (#504)

* Добавлен тег проверки возможности стать зомби.

* Проставлены теги возможности стать зомби везде, где указано в запросе.

* Поправил код, убрал старые комметарии.

* Косяк нашел)

* Хоп снова может быть нулевым

Content.Server/GameTicking/Rules/ZombieRuleSystem.cs

@@ -19,6 +19,7 @@
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Preferences;
 using Content.Shared.Roles;
+using Content.Shared.Roles.Jobs;
 using Content.Shared.Zombies;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
@@ -45,6 +46,7 @@ public sealed class ZombieRuleSystem : GameRuleSystem<ZombieRuleComponent>
     [Dependency] private readonly ZombieSystem _zombie = default!;
     [Dependency] private readonly SharedMindSystem _mindSystem = default!;
     [Dependency] private readonly SharedRoleSystem _roles = default!;
+    [Dependency] private readonly SharedJobSystem _jobs = default!;
     [Dependency] private readonly StationSystem _station = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
 
@@ -271,6 +273,13 @@ private void InfectInitialPlayers(ZombieRuleComponent component)
         {
             if (player.AttachedEntity == null || !HasComp<HumanoidAppearanceComponent>(player.AttachedEntity) || HasComp<ZombieImmuneComponent>(player.AttachedEntity))
                 continue;
+
+            // Role prevents being a zombie.
+            if (!_jobs.CanBeZombie(player))
+            {
+                continue;
+            }
+
             playerList.Add(player);
 
             var pref = (HumanoidCharacterProfile) _prefs.GetPreferences(player.UserId).SelectedCharacter;

Content.Shared/Roles/JobPrototype.cs

@@ -56,6 +56,9 @@ public sealed class JobPrototype : IPrototype
         [DataField("canBeAntag")]
         public bool CanBeAntag { get; private set; } = true;
 
+        [DataField("canBeZombie")]
+        public bool CanBeZombie { get; private set; } = true;
+
         [DataField("radioBold")]
         public bool RadioIsBold { get; } = false;
 

Content.Shared/Roles/Jobs/SharedJobSystem.cs

@@ -1,4 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Shared.Players;
 using Content.Shared.Players.PlayTimeTracking;
@@ -135,4 +135,15 @@ public bool CanBeAntag(ICommonSession player)
 
         return prototype.CanBeAntag;
     }
+
+    public bool CanBeZombie(ICommonSession player)
+    {
+        if (_playerSystem.ContentData(player) is not { Mind: { } mindId })
+            return false;
+
+        if (!MindTryGetJob(mindId, out _, out var prototype))
+            return true;
+
+        return prototype.CanBeZombie;
+    }
 }

Resources/Prototypes/Roles/Jobs/Command/captain.yml

@@ -14,6 +14,7 @@
   joinNotifyCrew: true
   supervisors: job-supervisors-centcom
   canBeAntag: false
+  canBeZombie: false
   radioBold: true
   accessGroups:
   - AllAccess

Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml

@@ -14,6 +14,7 @@
   icon: "JobIconBrigmedic"
   supervisors: job-supervisors-hos
   canBeAntag: false
+  canBeZombie: false
   access:
   - Medical
   - Security

Resources/Prototypes/Roles/Jobs/Security/detective.yml

@@ -11,6 +11,7 @@
   icon: "JobIconDetective"
   supervisors: job-supervisors-hos
   canBeAntag: false
+  canBeZombie: false
   access:
   - Security
   - Brig

Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml

@@ -13,6 +13,7 @@
   requireAdminNotify: true
   supervisors: job-supervisors-captain
   canBeAntag: false
+  canBeZombie: false
   radioBold: true
   access:
   - HeadOfSecurity

Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml

@@ -10,6 +10,7 @@
   icon: "JobIconSecurityCadet"
   supervisors: job-supervisors-security
   canBeAntag: false
+  canBeZombie: false
   access:
   - Security
   - Brig

Resources/Prototypes/Roles/Jobs/Security/security_officer.yml

@@ -11,6 +11,7 @@
   icon: "JobIconSecurityOfficer"
   supervisors: job-supervisors-hos
   canBeAntag: false
+  canBeZombie: false
   access:
   - Security
   - Brig

Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml

@@ -20,6 +20,7 @@
   icon: "JobIconSeniorOfficer"
   supervisors: job-supervisors-hos
   canBeAntag: false
+  canBeZombie: false
   access:
   - Security
   - Brig

Resources/Prototypes/Roles/Jobs/Security/warden.yml

@@ -11,6 +11,7 @@
   icon: "JobIconWarden"
   supervisors: job-supervisors-hos
   canBeAntag: false
+  canBeZombie: false
   access:
   - Security
   - Armory

Resources/Prototypes/SS220/Roles/Jobs/ghost.yml

@@ -3,4 +3,5 @@
   playTimeTracker: JobGhostRole
   name: Ghost role
   description: Utility job for correct work job ban.
-  canBeAntag: true
+  canBeAntag: true
+  canBeZombie: true