change ERT team

Rxup · Nov 27, 2023 · 87b3649 · 87b3649
1 parent 6ac5e77
commit 87b3649
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/Content.Server/Backmen/SpecForces/SpecForcesSystem.cs b/Content.Server/Backmen/SpecForces/SpecForcesSystem.cs
@@ -193,7 +193,7 @@ private void SpawnGhostRole(SpecForcesType ev, EntityUid shuttle)
             _ => 1
         };
 
-        if (_random.Prob(0.3f))
+        if (countExtra > 2 && _random.Prob(0.3f))
         {
             SpawnEntity(SFOfficer, _random.Pick(spawns));
         }
@@ -202,18 +202,15 @@ private void SpawnGhostRole(SpecForcesType ev, EntityUid shuttle)
         {
             case SpecForcesType.ERT:
                 SpawnEntity(ErtLeader, _random.Pick(spawns));
+                SpawnEntity(ErtEngineer, _random.Pick(spawns));
+
                 while (countExtra > 0)
                 {
                     if (countExtra-- > 0)
                     {
                         SpawnEntity(ErtSecurity, _random.Pick(spawns));
                     }
 
-                    if (countExtra-- > 0)
-                    {
-                        SpawnEntity(ErtEngineer, _random.Pick(spawns));
-                    }
-
                     if (countExtra-- > 0)
                     {
                         SpawnEntity(ErtMedical, _random.Pick(spawns));
@@ -239,7 +236,7 @@ private void SpawnGhostRole(SpecForcesType ev, EntityUid shuttle)
 
                 break;
             case SpecForcesType.DeathSquad:
-                SpawnEntity(countExtra == 0 ? Spestnaz : SpestnazOfficer, _random.Pick(spawns));
+                SpawnEntity(SpestnazOfficer, _random.Pick(spawns));
                 while (countExtra > 0)
                 {
                     if (countExtra-- > 0)