Bugfix + Carcat nerf (#1761)

* fix #1758

* nerf carcat

* fix #1747

Content.Shared/Nutrition/Components/EdibleComponent.cs

@@ -1,4 +1,5 @@
-using Content.Shared.Body.Components;
+using Content.Shared._CP14.Cooking;
+using Content.Shared.Body.Components;
 using Content.Shared.FixedPoint;
 using Content.Shared.Nutrition.EntitySystems;
 using Content.Shared.Nutrition.Prototypes;
@@ -11,7 +12,7 @@ namespace Content.Shared.Nutrition.Components;
 /// This is used on an entity with a solution container to flag a specific solution as being able to have its
 /// reagents consumed directly.
 /// </summary>
-[RegisterComponent, NetworkedComponent, Access(typeof(IngestionSystem))]
+[RegisterComponent, NetworkedComponent, Access(typeof(IngestionSystem), typeof(CP14SharedCookingSystem))]
 public sealed partial class EdibleComponent : Component
 {
     /// <summary>

Content.Shared/Nutrition/Components/FoodComponent.cs

@@ -1,4 +1,3 @@
-using Content.Shared._CP14.Cooking;
 using Content.Shared.Body.Components;
 using Content.Shared.FixedPoint;
 using Content.Shared.Nutrition.EntitySystems;
@@ -7,7 +6,7 @@ using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Nutrition.Components;
 [Obsolete("Migration to Content.Shared.Nutrition.Components.EdibleComponent is required")]
-[RegisterComponent, Access(typeof(FoodSystem), typeof(FoodSequenceSystem), typeof(CP14SharedCookingSystem))]
+[RegisterComponent, Access(typeof(FoodSystem), typeof(FoodSequenceSystem))]
 public sealed partial class FoodComponent : Component
 {
     [DataField]

Content.Shared/_CP14/Cooking/CP14SharedCookingSystem.cs

@@ -119,7 +119,7 @@ public abstract partial class CP14SharedCookingSystem : EntitySystem
         if (source.Comp.FoodData is null)
             return false;
 
-        if (!TryComp<FoodComponent>(target, out var holderFoodComp))
+        if (!TryComp<EdibleComponent>(target, out var holderFoodComp))
             return false;
 
         if (!_solution.TryGetSolution(source.Owner, source.Comp.SolutionId, out var cookerSoln, out var cookerSolution))
@@ -287,7 +287,7 @@ public abstract partial class CP14SharedCookingSystem : EntitySystem
         //Process entities
         foreach (var contained in container.ContainedEntities)
         {
-            if (TryComp<FoodComponent>(contained, out var food))
+            if (TryComp<EdibleComponent>(contained, out var food))
             {
                 //Merge trash
                 newData.Trash.AddRange(food.Trash);

Resources/Prototypes/_CP14/Entities/Actions/Spells/Athletic/second_wind.yml

@@ -24,12 +24,8 @@
         damage:
           types:
             Blunt: 20
-      - !type:GenericStatusEffect
-        key: Stun
-        time: 6
-        type: Remove
-      - !type:GenericStatusEffect
-        key: KnockedDown
+      - !type:ModifyStatusEffect
+        effectProto: StatusEffectStunned
         time: 6
         type: Remove
   - type: Action

Resources/Prototypes/_CP14/Entities/Mobs/Species/carcat.yml

@@ -87,10 +87,6 @@
     footstepSoundCollection: null # Silent footstep
   - type: CP14AuraImprint
     imprintColor: "#9e7e5d"
-  - type: CP14SkillStorage #Innate athletic
-    freeLearnedSkills:
-    - AthleticT1
-    - AthleticT2
   - type: Inventory
     templateId: CP14Carcat # Cant wear shoes
     speciesId: carcat

Resources/ServerInfo/_CP14/Guidebook_EN/SpeciesTabs/Carcat.xml

@@ -13,7 +13,6 @@
   - Wearing shoes? Not for them. Where have you seen shoes that will fit over clawed paws?
   - Soft paws - soft pads ensure a completely silent footstep.
   - Night vision - nature has given carcats excellent night vision - they see in the dark almost as well as they do in daylight. Combined with their silent walk, this makes them ideal hunters.
-  - Carkats initially have basic and advanced athletic.
 
   ## Cultural Features
   - Ancestral nation: the Carkats do not worship gods - they honor the spirits of their ancestors, believing them to be the guardians of boundaries and law.

Resources/ServerInfo/_CP14/Guidebook_RU/SpeciesTabs/Carcat.xml

@@ -13,7 +13,6 @@
   - Ношение обуви? Не для них. Где вы видели ботинки, которые налезут на лапы с когтями?
   - Мягкие лапы - мягкие подушечки обеспечивают абсолютно бесшумную поступь.
   - Ночное зрение - природа наградила каркатов отличным ночным зрением — они видят в темноте почти так же хорошо, как при свете дня. Вкупе с бесшумной ходьбой, это делает их идеальными охотниками.
-  - Каркаты имеют базовую и продвинутую атлетику с начала раунда.
 
   ## Культурные особенности
   - Народ предков: каркаты не поклоняются богам — они чтят духов своих предков, считая их хранителями границ и закона.