Фикс фелинидов

Content.Server/_Sunrise/Felinid/FelinidSystem.cs

@@ -53,11 +53,13 @@ private void AddInsertAltVerb(EntityUid uid, FelinidContainerComponent component
     private void OnMeleeHit(EntityUid uid, FelinidComponent component, MeleeHitEvent args)
     {
         if (!args.IsHit ||
-            !args.HitEntities.Any())
+            !args.HitEntities.Any() ||
+            args.User == uid)
         {
             return;
         }
 
+        args.HitSoundOverride = component.DamageSound;
         args.BonusDamage = component.DamageBonus;
         _damageableSystem.TryChangeDamage(uid, component.FelinidDamage);
     }

Content.Shared/_Sunrise/Felinid/FelinidComponent.cs

@@ -1,4 +1,5 @@
 using Content.Shared.Damage;
+using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 
 namespace Content.Shared._Sunrise.Felinid;
@@ -18,9 +19,6 @@ public sealed partial class FelinidComponent : Component
     [DataField("felinidDamage")]
     public DamageSpecifier FelinidDamage = new();
 
-    [DataField]
-    public TimeSpan PopupCooldown = TimeSpan.FromSeconds(3.0);
-
-    [DataField]
-    public TimeSpan? NextPopupTime;
+    [DataField("damageSound")]
+    public SoundSpecifier DamageSound = new SoundPathSpecifier("/Audio/Effects/hit_kick.ogg");
 }

Content.Shared/_Sunrise/Felinid/SharedFelinidSystem.cs

@@ -1,15 +1,9 @@
-using Content.Shared.IdentityManagement;
 using Content.Shared.Item;
-using Content.Shared.Popups;
-using Robust.Shared.Timing;
 
 namespace Content.Shared._Sunrise.Felinid;
 
 public sealed class SharedFelinidSystem : EntitySystem
 {
-    [Dependency] private readonly SharedPopupSystem _popup = default!;
-    [Dependency] private readonly IGameTiming _timing = default!;
-
     public override void Initialize()
     {
         base.Initialize();
@@ -22,17 +16,6 @@ private void OnPickupAttempt(EntityUid uid, FelinidComponent component, PickupAt
         if (!HasComp<FelinidComponent>(args.Item))
             return;
 
-        ShowPopup((uid, component), args.Item, "Коллапс неизбежен");
         args.Cancel();
     }
-
-    private void ShowPopup(Entity<FelinidComponent> user, EntityUid target, string reason)
-    {
-        if (!(_timing.CurTime > user.Comp.NextPopupTime))
-            return;
-
-        var targetName = Identity.Entity(target, EntityManager);
-        _popup.PopupCursor(Loc.GetString(reason, ("entity", targetName)), user);
-        user.Comp.NextPopupTime = _timing.CurTime + user.Comp.PopupCooldown;
-    }
 }

Resources/Prototypes/Entities/Mobs/Species/human.yml

@@ -28,10 +28,10 @@
           32:
             sprite: Mobs/Species/Human/displacement.rsi
             state: jumpsuit-female
-  # Sunrise edit ;3
+  # Sunrise-Start
   - type: FootprintEmitter
   - type: Carriable
-  # Sunrise edit end 0_0
+  # Sunrise-End
 
 
 - type: entity

Resources/Prototypes/_Sunrise/Entities/Mobs/Species/felinid.yml

@@ -1,7 +1,7 @@
 - type: entity
   save: false
   name: Urist McFelinid
-  parent: BaseMobHuman
+  parent: BaseMobSpeciesOrganic
   id: MobFelinidBase
   abstract: true
   components:
@@ -12,8 +12,28 @@
     allowedEmotes: ['Mew', 'Meow', 'Hisses', 'Purr']
   - type: Sprite
     scale: 0.72, 0.72
+  - type: Icon
+    sprite: Mobs/Species/Human/parts.rsi
+    state: full
+  - type: Thirst
+  - type: Hunger
+  - type: Butcherable
+    butcheringType: Spike
+    spawned:
+    - id: FoodMeatHuman
+      amount: 2
   - type: HumanoidAppearance
     species: Felinid
+    hideLayersOnEquip:
+    - Hair
+    - Snout
+  - type: Inventory
+    femaleDisplacements:
+      jumpsuit:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Human/displacement.rsi
+            state: jumpsuit-female
   - type: Fixtures
     fixtures:
       fix1:
@@ -74,14 +94,15 @@
       types:
         Slash: 3
   - type: DamageOnHighSpeedImpact
-    minimumSpeed: 10
+    minimumSpeed: 5
     damage:
       types:
-        Blunt: 300
+        Blunt: 10
     soundHit:
       path: /Audio/Effects/hit_kick.ogg
   - type: Stamina
     critThreshold: 50
+  - type: FootprintEmitter
   - type: Vocal
     sounds:
       Male: MaleFelinid
@@ -118,7 +139,6 @@
   - type: MovementSpeedModifier
     baseWalkSpeed: 2.0
     baseSprintSpeed: 4.0
-  - type: VentCrawler
   - type: Item
     size: Large
     shape:
@@ -130,6 +150,7 @@
     felinidDamage:
       types:
         Blunt: 5
+    damageSound: /Audio/Effects/hit_kick.ogg
 #  - type: DamagedByFlashing
 #    flashDamage:
 #      types: