rework grab system and some changes

Content.Server/Kitchen/EntitySystems/KitchenSpikeSystem.cs

@@ -41,7 +41,7 @@ public sealed class KitchenSpikeSystem : SharedKitchenSpikeSystem
         [Dependency] private readonly SharedSuicideSystem _suicide = default!;
         [Dependency] private readonly SharedSkillsSystem _skills = default!;
 
-        private const float ButcherDelayModifierWithoutSkill = 5;
+        private const float ButcherDelayModifierWithoutSkill = 1.8f;
 
         public override void Initialize()
         {

Content.Server/Kitchen/EntitySystems/SharpSystem.cs

@@ -1,4 +1,4 @@
-using Content.Server.Body.Systems;
+using Content.Server.Body.Systems;
 using Content.Server.Kitchen.Components;
 using Content.Server.Nutrition.EntitySystems;
 using Content.Shared.Body.Components;
@@ -36,7 +36,7 @@ public sealed class SharpSystem : EntitySystem
     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
     [Dependency] private readonly SharedSkillsSystem _skills = default!;
 
-    private const float ButcherDelayModifierWithoutSkill = 5;
+    private const float ButcherDelayModifierWithoutSkill = 1.8f;
 
     public override void Initialize()
     {

Content.Server/_Goobstation/Blob/Components/StationBlobConfigComponent.cs

@@ -7,9 +7,9 @@ namespace Content.Server._Goobstation.Blob.Components;
 [RegisterComponent]
 public sealed partial class StationBlobConfigComponent : Component
 {
-    public const int DefaultStageBegin = 30;
-    public const int DefaultStageCritical = 400;
-    public const int DefaultStageEnd = 800;
+    public const int DefaultStageBegin = 40;
+    public const int DefaultStageCritical = 1000;
+    public const int DefaultStageEnd = 1600;
 
     [DataField]
     public int StageBegin { get; set; } = DefaultStageBegin;

Content.Server/_Goobstation/GameTicking/Rules/BlobRuleSystem.cs

@@ -34,7 +34,7 @@ public sealed class BlobRuleSystem : GameRuleSystem<BlobRuleComponent>
     [Dependency] private readonly AlertLevelSystem _alertLevelSystem = default!;
     [Dependency] private readonly IChatManager _chatManager = default!;
 
-    private static readonly SoundPathSpecifier BlobDetectAudio = new ("/Audio/Announcements/outbreak5.ogg");
+    private static readonly SoundPathSpecifier BlobDetectAudio = new ("/Audio/_CorvaxNext/Misc/outbreak5.ogg");
     public override void Initialize()
     {
         base.Initialize();

Content.Server/_Goobstation/GameTicking/Rules/Components/BlobRuleComponent.cs

@@ -9,7 +9,7 @@ namespace Content.Server.GameTicking.Rules.Components;
 public sealed partial class BlobRuleComponent : Component
 {
     [DataField]
-    public SoundSpecifier? AlertAudio = new SoundPathSpecifier("/Audio/Announcements/outbreak5.ogg");
+    public SoundSpecifier? AlertAudio = new SoundPathSpecifier("/Audio/_CorvaxNext/Misc/blob_critical.ogg");
 
     [ViewVariables]
     public List<(EntityUid mindId, MindComponent mind)> Blobs = new(); //BlobRoleComponent

Content.Shared/Movement/Pulling/Components/CanChokeGrabComponent.cs

@@ -0,0 +1,6 @@
+
+using Robust.Shared.GameStates;
+namespace Content.Shared.Movement.Pulling.Components;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class CanChokeGrabComponent : Component { }

Content.Shared/Movement/Pulling/Components/PullerComponent.cs

@@ -73,13 +73,13 @@ public sealed partial class PullerComponent : Component
     public Dictionary<GrabStage, float> EscapeChances = new()
     {
         { GrabStage.No, 1f },
-        { GrabStage.Soft, 0.7f },
-        { GrabStage.Hard, 0.4f },
-        { GrabStage.Suffocate, 0.1f },
+        { GrabStage.Soft, 0.3f },
+        { GrabStage.Hard, 0.2f },
+        { GrabStage.Suffocate, 0.01f },
     };
 
     [DataField]
-    public float SuffocateGrabStaminaDamage = 10f;
+    public float SuffocateGrabStaminaDamage = 30f;
 
     [DataField]
     public float GrabThrowDamageModifier = 2f;
@@ -94,7 +94,7 @@ public sealed partial class PullerComponent : Component
     };
 
     [DataField]
-    public float StaminaDamageOnThrown = 120f;
+    public float StaminaDamageOnThrown = 210f;
 
     [DataField]
     public float GrabThrownSpeed = 7f;
@@ -106,10 +106,10 @@ public sealed partial class PullerComponent : Component
     public float SoftGrabSpeedModifier = 0.9f;
 
     [DataField]
-    public float HardGrabSpeedModifier = 0.7f;
+    public float HardGrabSpeedModifier = 0.5f;
 
     [DataField]
-    public float ChokeGrabSpeedModifier = 0.4f;
+    public float ChokeGrabSpeedModifier = 0.2f;
     // Goobstation end
 }
 

Content.Shared/Movement/Pulling/Systems/PullingSystem.cs

@@ -50,7 +50,6 @@
 using Robust.Shared.Player;
 using Robust.Shared.Random; // Goobstation
 using Robust.Shared.Timing;
-
 namespace Content.Shared.Movement.Pulling.Systems;
 
 /// <summary>
@@ -823,6 +822,8 @@ public bool TryGrab(Entity<PullableComponent?> pullable, Entity<PullerComponent?
         if (!ignoreCombatMode)
             if (!_combatMode.IsInCombatMode(puller))
                 return false;
+            if (!HasComp<CanChokeGrabComponent>(puller))
+                return false;
 
         // It's blocking stage update, maybe better UX?
         if (puller.Comp.GrabStage == GrabStage.Suffocate)

Content.Shared/_CorvaxNext/NextVars.cs

@@ -59,10 +59,10 @@ public sealed class NextVars
         CVarDef.Create("mood.enabled", false, CVar.SERVER);
 
     public static readonly CVarDef<bool> MoodIncreasesSpeed =
-        CVarDef.Create("mood.increases_speed", true, CVar.SERVER);
+        CVarDef.Create("mood.increases_speed", false, CVar.SERVER);
 
     public static readonly CVarDef<bool> MoodDecreasesSpeed =
-        CVarDef.Create("mood.decreases_speed", true, CVar.SERVER);
+        CVarDef.Create("mood.decreases_speed", false, CVar.SERVER);
 
     public static readonly CVarDef<bool> MoodModifiesThresholds =
         CVarDef.Create("mood.modify_thresholds", false, CVar.SERVER);

Resources/Locale/ru-RU/_Goobstation/blob/blob.ftl

@@ -30,6 +30,8 @@ blob-description = Показатели биобезопасности стан
 ghost-role-information-blobbernaut-name = блоббернаут
 ghost-role-information-blobbernaut-description = Вы массивный блоббернаут, защищайте ядро блоба или следуйте его приказам.
 
+ghost-role-information-blobpod-name = блобик
+ghost-role-information-blobpod-description = Вы мерзкая сущность, что зомбирует людей. Служите Блобу!
 ghost-role-information-blob-name = блоб
 ghost-role-information-blob-description = Ты блоб, вы должны захватить эту станцию.
 

Resources/Prototypes/Corvax/Maps/Next/Ishimura.yml

@@ -67,9 +67,9 @@
             Reporter: [ 1, 1 ]
             # silicon
             Borg: [ 2, 3 ]
-        # Goobstation blob-config-start HUGEs
+        # Corvax-next blob-config-start HUGEs
         - type: StationBlobConfig
           stageBegin: 40
-          stageCritical: 450
-          stageTheEnd: 900
-          # Goobstation blob-config-end
+          stageCritical: 700
+          stageTheEnd: 1200
+          # Corvax-next blob-config-end

Resources/Prototypes/Corvax/Maps/Next/amber.yml

@@ -65,9 +65,9 @@
             # silicon
             StationAi: [ 1, 1 ]
             Borg: [ 2, 2 ]
-        # Goobstation blob-config-start SMALL+
+        # Corvax-next blob-config-start SMALL+
         - type: StationBlobConfig
-          stageBegin: 25
-          stageCritical: 350
-          stageTheEnd: 700
-        # Goobstation blob-config-end
+          stageBegin: 40
+          stageCritical: 500
+          stageTheEnd: 900
+        # Corvax-next blob-config-end

Resources/Prototypes/Corvax/Maps/Next/astra.yml

@@ -80,9 +80,9 @@
           - VirusologyAmbusol
           - AstraRepair
           - BluespaceHarvest
-          # Goobstation blob-config-start HUGEs
+          # Corvax-next blob-config-start HUGEs
         - type: StationBlobConfig
           stageBegin: 40
-          stageCritical: 450
-          stageTheEnd: 900
-          # Goobstation blob-config-end
+          stageCritical: 700
+          stageTheEnd: 1200
+          # Corvax-next blob-config-end

Resources/Prototypes/Corvax/Maps/Next/avrite.yml

@@ -68,9 +68,9 @@
           StationAi: [ 1, 1 ]
           Borg: [ 2, 3 ]
 
-        # Goobstation blob-config-start HUGEs
+        # Corvax-next blob-config-start HUGEs
       - type: StationBlobConfig
         stageBegin: 40
-        stageCritical: 450
-        stageTheEnd: 900
-        # Goobstation blob-config-end
+        stageCritical: 700
+        stageTheEnd: 1200
+        # Corvax-next blob-config-end

Resources/Prototypes/Corvax/Maps/Next/awesome.yml

@@ -64,9 +64,9 @@
             # silicon
             StationAi: [ 1, 1 ]
             Borg: [ 2, 2 ]
-        # Goobstation blob-config-start SMALL+
+        # Corvax-next blob-config-start SMALL+
         - type: StationBlobConfig
-          stageBegin: 25
-          stageCritical: 350
-          stageTheEnd: 700
-        # Goobstation blob-config-end
+          stageBegin: 40
+          stageCritical: 500
+          stageTheEnd: 900
+        # Corvax-next blob-config-end

Resources/Prototypes/Corvax/Maps/Next/bagel.yml

@@ -63,9 +63,9 @@
             #silicon
             StationAi: [ 1, 1 ]
             Borg: [ 2, 2 ]
-        # Goobstation blob-config-start HUGEs
+        # Corvax-next blob-config-start HUGEs
         - type: StationBlobConfig
           stageBegin: 40
-          stageCritical: 450
-          stageTheEnd: 900
-        # Goobstation blob-config-end
+          stageCritical: 700
+          stageTheEnd: 1200
+        # Corvax-next blob-config-end

Resources/Prototypes/Corvax/Maps/Next/box.yml

@@ -68,9 +68,9 @@
             # silicon
             StationAi: [ 1, 1 ]
             Borg: [ 2, 3 ]
-        # Goobstation blob-config-start HUGEs
+        # Corvax-next blob-config-start HUGEs
         - type: StationBlobConfig
           stageBegin: 40
-          stageCritical: 450
-          stageTheEnd: 900
-        # Goobstation blob-config-end
+          stageCritical: 700
+          stageTheEnd: 1200
+        # Corvax-next blob-config-end

Resources/Prototypes/Corvax/Maps/Next/cute.yml

@@ -69,9 +69,9 @@
             # silicon
             StationAi: [ 1, 1 ]
             Borg: [ 1, 1 ]
-        # Goobstation blob-config-start SMALL+
+        # Corvax-next blob-config-start SMALL+
         - type: StationBlobConfig
-          stageBegin: 25
-          stageCritical: 350
-          stageTheEnd: 700
-        # Goobstation blob-config-end
+          stageBegin: 40
+          stageCritical: 500
+          stageTheEnd: 900
+        # Corvax-next blob-config-end

Resources/Prototypes/Corvax/Maps/Next/delta.yml

@@ -91,9 +91,9 @@
           - XenobiologyRepair
           - VirusologyAmbusol
           - BluespaceHarvest
-          # Goobstation blob-config-start HUGEs
+          # Corvax-next blob-config-start HUGEs
         - type: StationBlobConfig
           stageBegin: 40
-          stageCritical: 450
-          stageTheEnd: 900
-          # Goobstation blob-config-end
+          stageCritical: 1000
+          stageTheEnd: 1600
+          # Corvax-next blob-config-end

Resources/Prototypes/Corvax/Maps/Next/glacier.yml

@@ -90,9 +90,9 @@
           - Botany
           - Bunker
           - BluespaceHarvest
-          # Goobstation blob-config-start HUGEs
+          # Corvax-next blob-config-start HUGEs
         - type: StationBlobConfig
           stageBegin: 40
-          stageCritical: 450
-          stageTheEnd: 900
-          # Goobstation blob-config-end
+          stageCritical: 700
+          stageTheEnd: 1200
+          # Corvax-next blob-config-end

Resources/Prototypes/Corvax/Maps/Next/marathon.yml

@@ -64,9 +64,9 @@
             # silicon
             StationAi: [ 1, 1 ]
             Borg: [ 2, 2 ]
-        # Goobstation blob-config-start SMALL+
+        # Corvax-next blob-config-start SMALL+
         - type: StationBlobConfig
-          stageBegin: 25
-          stageCritical: 350
-          stageTheEnd: 700
-        # Goobstation blob-config-end
+          stageBegin: 40
+          stageCritical: 500
+          stageTheEnd: 900
+        # Corvax-next blob-config-end

Resources/Prototypes/Corvax/Maps/Next/maus.yml

@@ -69,9 +69,9 @@
             # silicon
             StationAi: [ 1, 1 ]
             Borg: [ 1, 1 ]
-        # Goobstation blob-config-start LOW
+        # Corvax-next blob-config-start LOW
         - type: StationBlobConfig
-          stageBegin: 15
-          stageCritical: 200
-          stageTheEnd: 400
-        # Goobstation blob-config-end
+          stageBegin: 20
+          stageCritical: 300
+          stageTheEnd: 600
+        # Corvax-next blob-config-end

Resources/Prototypes/Corvax/Maps/Next/omega.yml

@@ -63,9 +63,9 @@
             # silicon
             StationAi: [ 1, 1 ]
             Borg: [ 2, 2 ]
-        # Goobstation blob-config-start LOW
+        # Corvax-next blob-config-start LOW
         - type: StationBlobConfig
-          stageBegin: 15
-          stageCritical: 200
-          stageTheEnd: 400
-        # Goobstation blob-config-end
+          stageBegin: 20
+          stageCritical: 300
+          stageTheEnd: 600
+        # Corvax-next blob-config-end

Resources/Prototypes/Corvax/Maps/Next/outpost.yml

@@ -65,9 +65,9 @@
             # silicon
             Borg: [ 1, 1 ]
             StationAi: [ 1, 1 ]
-        # Goobstation blob-config-start SMALL+
+        # Corvax-next blob-config-start SMALL+
         - type: StationBlobConfig
-          stageBegin: 25
-          stageCritical: 350
-          stageTheEnd: 700
-        # Goobstation blob-config-end
+          stageBegin: 40
+          stageCritical: 500
+          stageTheEnd: 900
+        # Corvax-next blob-config-end

Resources/Prototypes/Corvax/Maps/Next/packed.yml

@@ -63,9 +63,9 @@
             # silicon
             StationAi: [ 1, 1 ]
             Borg: [ 1, 1 ]
-        # Goobstation blob-config-start LOW
+        # Corvax-next blob-config-start LOW
         - type: StationBlobConfig
-          stageBegin: 15
-          stageCritical: 200
-          stageTheEnd: 400
-        # Goobstation blob-config-end
+          stageBegin: 20
+          stageCritical: 300
+          stageTheEnd: 600
+        # Corvax-next blob-config-end

Resources/Prototypes/Corvax/Maps/Next/paper.yml

@@ -67,9 +67,9 @@
           #silicon
           StationAi: [ 1, 1 ]
           Borg: [ 3, 3 ]
-        # Goobstation blob-config-start SMALL+
+        # Corvax-next blob-config-start SMALL+
       - type: StationBlobConfig
-        stageBegin: 25
-        stageCritical: 350
-        stageTheEnd: 700
-        # Goobstation blob-config-end
+        stageBegin: 40
+        stageCritical: 500
+        stageTheEnd: 900
+        # Corvax-next blob-config-end

Resources/Prototypes/Corvax/Maps/Next/pearl.yml

@@ -88,9 +88,9 @@
           - Bunker
           - Survive
           - BluespaceHarvest
-        # Goobstation blob-config-start SMALL+
+        # Corvax-next blob-config-start SMALL+
         - type: StationBlobConfig
-          stageBegin: 25
-          stageCritical: 350
-          stageTheEnd: 700
-        # Goobstation blob-config-end
+          stageBegin: 40
+          stageCritical: 500
+          stageTheEnd: 900
+        # Corvax-next blob-config-end