саммери

Rxup · Feb 18, 2024 · 54723cb · 54723cb
1 parent 6cdc0e4
commit 54723cb
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 9 deletions.
diff --git a/Content.Server/Backmen/SpecForces/SpecForcesSystem.cs b/Content.Server/Backmen/SpecForces/SpecForcesSystem.cs
@@ -194,7 +194,7 @@ private void SpawnGhostRole(SpecForcesType ev, EntityUid shuttle)
                 SpawnEntity(ErtLeader, _random.Pick(spawns));
                 SpawnEntity(ErtEngineer, _random.Pick(spawns));
 
-                while (countExtra > 0)
+                while (countExtra > 3)
                 {
                     if (countExtra-- > 0)
                     {
@@ -227,7 +227,9 @@ private void SpawnGhostRole(SpecForcesType ev, EntityUid shuttle)
                 break;
             case SpecForcesType.ERTAlpha:
                 SpawnEntity(ErtAplhaLeader, _random.Pick(spawns));
-                while (countExtra > 0)
+                SpawnEntity(ErtAplhaOperative, _random.Pick(spawns));
+                SpawnEntity(ErtAplhaOperative, _random.Pick(spawns));
+                while (countExtra > 5)
                 {
                     if (countExtra-- > 0)
                     {
@@ -238,6 +240,8 @@ private void SpawnGhostRole(SpecForcesType ev, EntityUid shuttle)
                 break;
             case SpecForcesType.ERTEpsilon:
                 SpawnEntity(ErtEpsilonLeader, _random.Pick(spawns));
+                SpawnEntity(ErtEpsilonSecurity, _random.Pick(spawns));
+                SpawnEntity(ErtEpsilonEngineer, _random.Pick(spawns));
 
                 while (countExtra > 0)
                 {
@@ -265,9 +269,11 @@ private void SpawnGhostRole(SpecForcesType ev, EntityUid shuttle)
                 break;
             case SpecForcesType.DeathSquad:
                 SpawnEntity(SpestnazOfficer, _random.Pick(spawns));
+                SpawnEntity(Spestnaz, _random.Pick(spawns));
+                SpawnEntity(Spestnaz, _random.Pick(spawns));
                 while (countExtra > 0)
                 {
-                    if (countExtra-- > 0)
+                    if (countExtra-- > 5)
                     {
                         SpawnEntity(Spestnaz, _random.Pick(spawns));
                     }
@@ -403,11 +409,11 @@ private void OnCleanup(RoundRestartCleanupEvent ev)
     [ValidatePrototypeId<EntityPrototype>] private const string ErtAplhaOperative = "SpawnMobHumanERTOperativeAlpha1";
 
     private const string ErtEpsilonShuttlePath = "Maps/Backmen/Grids/NT-DF-Kolibri-011.yml";
-    [ValidatePrototypeId<EntityPrototype>] private const string ErtEpsilonLeader = "ReinforcementRadioMTFLeaderEgg";
-    [ValidatePrototypeId<EntityPrototype>] private const string ErtEpsilonSecurity = "ReinforcementRadioMTFSecurityEgg";
-    [ValidatePrototypeId<EntityPrototype>] private const string ErtEpsilonEngineer = "ReinforcementRadioMTFEngineerEgg";
-    [ValidatePrototypeId<EntityPrototype>] private const string ErtEpsilonJunitor = "ReinforcementRadioMTFJunitorEgg";
-    [ValidatePrototypeId<EntityPrototype>] private const string ErtEpsilonMedical = "ReinforcementRadioMTFMedicalEgg";
+    [ValidatePrototypeId<EntityPrototype>] private const string ErtEpsilonLeader = "SpawnMobHumanERTLeaderEpsilon";
+    [ValidatePrototypeId<EntityPrototype>] private const string ErtEpsilonSecurity = "SpawnMobHumanERTSecurityEpsilon";
+    [ValidatePrototypeId<EntityPrototype>] private const string ErtEpsilonEngineer = "SpawnMobHumanERTEngineerEpsilon";
+    [ValidatePrototypeId<EntityPrototype>] private const string ErtEpsilonJunitor = "SpawnMobHumanERTJanitorEpsilon";
+    [ValidatePrototypeId<EntityPrototype>] private const string ErtEpsilonMedical = "SpawnMobHumanERTMedicalEpsilon";
 
     private const string RxbzzShuttlePath = "Maps/Backmen/Grids/NT-CC-SRV-013.yml";
     [ValidatePrototypeId<EntityPrototype>] private const string RxbzzLeader = "MobHumanRXBZZLeader";

diff --git a/Resources/Locale/ru-RU/backmen/SpecForces.ftl b/Resources/Locale/ru-RU/backmen/SpecForces.ftl
@@ -6,6 +6,6 @@ spec-forces-system-RXBZZ-title = Sierra-6
 spec-forces-system-RXBZZ-annonce = ВНИМАНИЕ! Мы получили запрос на РХБЗЗ! Запрос одобрен! Отряд будет подготовлен и отправлен в кратчайшие сроки!
 spec-forces-system-ERT = Был вызван ОБР Theta 9 в { $time } ({ $who })!
 spec-forces-system-ERTAlpha = Был вызван СОБР Alpha 1 в { $time } ({ $who })!
-spec-forces-system-ERTERTEpsilon = Был вызван ОБР Epsilon 11 в { $time } ({ $who })!
+spec-forces-system-ERTEpsilon = Был вызван ОБР Epsilon 11 в { $time } ({ $who })!
 spec-forces-system-RXBZZ = Был вызван РХБЗЗ в { $time } ({ $who })!
 spec-forces-system-DeathSquad = Был вызван спецназ в { $time } ({ $who })!
diff --git a/Resources/Prototypes/Backmen/Adminbuse/centFifa.yml b/Resources/Prototypes/Backmen/Adminbuse/centFifa.yml
@@ -693,6 +693,9 @@
   - type: Speech
     speechSounds: Metrocop
     soundCooldownTime: 0.1
+  - type: AutoImplant
+    implants:
+    - MindShieldImplant
   - type: TriggerOnMobstateChange
     mobState:
     - Critical
@@ -2051,6 +2054,7 @@
     sprite: Markers/jobs.rsi
     state: centcom
   - type: GhostRole
+    whitelistRequired: true
     allowMovement: true
     allowSpeech: true
     makeSentient: true

diff --git a/Resources/Prototypes/Backmen/Entities/Markers/Spawners/specforce.yml b/Resources/Prototypes/Backmen/Entities/Markers/Spawners/specforce.yml
@@ -136,3 +136,53 @@
   components:
     - type: GhostRoleMobSpawner
       prototype: MobHumanSpecialReAgent
+
+- type: entity
+  id: SpawnMobHumanERTLeaderEpsilon
+  parent: SpawnSpecforce
+  noSpawn: true
+  name: ОБР Лидер
+  suffix: спавнер спецсил
+  components:
+    - type: GhostRoleMobSpawner
+      prototype: MobHumanERTLeaderReadyV3
+
+- type: entity
+  id: SpawnMobHumanERTSecurityEpsilon
+  parent: SpawnSpecforce
+  noSpawn: true
+  name: ОБР Охрана
+  suffix: спавнер спецсил
+  components:
+    - type: GhostRoleMobSpawner
+      prototype: MobHumanERTSecurityReadyV3
+
+- type: entity
+  id: SpawnMobHumanERTEngineerEpsilon
+  parent: SpawnSpecforce
+  noSpawn: true
+  name: ОБР Инж
+  suffix: спавнер спецсил
+  components:
+    - type: GhostRoleMobSpawner
+      prototype: MobHumanERTEngineerReadyV3
+
+- type: entity
+  id: SpawnMobHumanERTJanitorEpsilon
+  parent: SpawnSpecforce
+  noSpawn: true
+  name: ОБР Уборщик
+  suffix: спавнер спецсил
+  components:
+    - type: GhostRoleMobSpawner
+      prototype: MobHumanERTJunitorEggV3
+
+- type: entity
+  id: SpawnMobHumanERTMedicalEpsilon
+  parent: SpawnSpecforce
+  noSpawn: true
+  name: ОБР Медик
+  suffix: спавнер спецсил
+  components:
+    - type: GhostRoleMobSpawner
+      prototype: MobHumanERTMedicalReadyV3