[FIX] Я не ебу че грабли сделал

# Conflicts:
#	Resources/Prototypes/Catalog/catalog.yml
#	Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
#	Resources/Prototypes/Entities/Mobs/Player/skrell.yml
#	Resources/Prototypes/Species/arachnid.yml
#	Resources/Prototypes/Species/diona.yml
#	Resources/Prototypes/Species/dwarf.yml
#	Resources/Prototypes/Species/reptilian.yml
#	Resources/Prototypes/Species/skeleton.yml
#	Resources/Prototypes/Species/skrell.yml
#	Resources/Prototypes/Species/slime.yml
#	Resources/Prototypes/Species/vox.yml
#	Resources/Prototypes/Voice/speech_emote_sounds.yml

Content.Server/White/Other/OnDeath.cs

@@ -3,6 +3,7 @@ using Content.Server.Ghost.Components;
 using Content.Shared.Ghost;
 using Content.Shared.Humanoid;
 using Content.Shared.Mobs;
+using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Random;
@@ -18,7 +19,7 @@ public sealed class OnDeath : EntitySystem
     public override void Initialize()
     {
         SubscribeLocalEvent<HumanoidAppearanceComponent, MobStateChangedEvent>(HandleDeathEvent);
-        SubscribeLocalEvent<GhostComponent, ComponentInit>(OnGhosted);
+        SubscribeLocalEvent<HumanoidAppearanceComponent, PlayerDetachedEvent>(OnDetach);
     }
 
     private readonly Dictionary<EntityUid, EntityUid> _playingStreams = new();
@@ -89,9 +90,8 @@ public sealed class OnDeath : EntitySystem
     private void PlayDeathSound(EntityUid uid)
         => _audio.PlayEntity(DeathSounds, uid, uid, AudioParams.Default);
 
-    private void OnGhosted(EntityUid uid, GhostComponent component, ComponentInit args)
+    private void OnDetach(EntityUid uid, HumanoidAppearanceComponent component, PlayerDetachedEvent args)
-    {
+        => StopPlayingStream(args.Entity);
-        StopPlayingStream(uid);
+
-    }
 
 }

Content.Shared/Store/ListingPrototype.cs

@@ -86,7 +86,7 @@ public partial class ListingData : IEquatable<ListingData>, ICloneable
     /// <summary>
     /// used internally for tracking how many times an item was purchased.
     /// </summary>
-    public int PurchaseAmount = 0;
+    public int PurchaseAmount;
 
     /// <summary>
     /// Used to delay purchase of some items.

Resources/Prototypes/Catalog/MeatyOrePanel/meatyore_catalog.yml

@@ -1484,14 +1484,14 @@
   id: MeatyBecomeTraitor
   name: Антажка
   description: Выдать себе антажку
-  productEvent: !type:MeatyTraitorRequestActionEvent
-  cost:
-    MeatyOreCoin: 10
   categories:
     - MeatyOreAntag
+  cost:
+    MeatyOreCoin: 10
   conditions:
     - !type:BuyerBlockForAntagCondition
     - !type:BuyerBlockForMindProtected
+  productEvent: !type:MeatyTraitorRequestActionEvent
 
 
 # Special

Resources/Prototypes/Maps/White/wonderbox.yml

@@ -1,52 +0,0 @@
-- type: gameMap
-  id: WonderBox
-  mapName: 'WonderBox Station'
-  mapPath: /Maps/White/WonderBox.yml
-  minPlayers: 50
-  stations:
-    WonderBoxStation:
-      stationProto: StandardNanotrasenStation
-      components:
-        - type: StationNameSetup
-          mapNameTemplate: '{0} WonderBox Station {1}'
-          nameGenerator:
-            !type:NanotrasenNameGenerator
-            prefixCreator: 'TG'
-        - type: StationEmergencyShuttle
-          emergencyShuttlePath: /Maps/Shuttles/emergency_box.yml
-        - type: StationJobs
-          overflowJobs:
-            - Passenger
-          availableJobs:
-            CargoTechnician: [ 6, 6 ]
-            Passenger: [ -1, -1 ]
-            Bartender: [ 2, 2 ]
-            Botanist: [ 6, 6 ]
-            Chef: [ 3, 3 ]
-            Clown: [ 1, 1 ]
-            Janitor: [ 4, 4 ]
-            Mime: [ 1, 1 ]
-            Captain: [ 1, 1 ]
-            HeadOfPersonnel: [ 1, 1 ]
-            ChiefEngineer: [ 1, 1 ]
-            StationEngineer: [ 10, 10 ]
-            ChiefMedicalOfficer: [ 1, 1 ]
-            MedicalDoctor: [ 8, 8 ]
-            Chemist: [ 3, 3 ]
-            ResearchDirector: [ 1, 1 ]
-            Scientist: [ 8, 8 ]
-            HeadOfSecurity: [ 1, 1 ]
-            SecurityOfficer: [ 6, 6 ]
-            Chaplain: [ 1, 1 ]
-            Warden: [ 1, 1 ]
-            Librarian: [ 2, 2 ]
-            Lawyer: [ 2, 2 ]
-            Quartermaster: [ 1, 1 ]
-            SalvageSpecialist: [ 6, 6 ]
-            AtmosphericTechnician: [ 4, 4 ]
-            TechnicalAssistant: [ 4, 4 ]
-            MedicalIntern: [ 3, 3 ]
-            ServiceWorker: [ 3, 3 ]
-            SecurityCadet: [ 6, 6 ]
-            Detective: [ 1, 1 ]
-            ResearchAssistant: [ 3, 3 ]

Resources/Prototypes/Species/arachnid.yml

@@ -1,7 +1,7 @@
 - type: species
   id: Arachnid
   name: species-name-arachnid
-  roundStart: true
+  roundStart: false
   prototype: MobArachnid
   sprites: MobArachnidSprites
   defaultSkinTone: "#385878"
@@ -10,7 +10,8 @@
   skinColoration: Hues
   maleFirstNames: names_arachnid_first
   femaleFirstNames: names_arachnid_first
-  lastNames: names_arachnid_last
+  maleLastNames: names_arachnid_last
+  femaleLastNames: names_arachnid_last
   sexes:
   - Unsexed
 

Resources/Prototypes/Voice/speech_emote_sounds.yml

@@ -76,6 +76,22 @@
       collection: FelinidScreams
     Laugh:
       collection: MaleLaugh
+    Sneeze:
+      collection: MaleSneezes
+    Cough:
+      collection: MaleCoughs
+    Yawn:
+      collection: MaleYawn
+    Snore:
+      collection: Snores
+    Honk:
+      collection: BikeHorn
+    Sigh:
+      collection: MaleSigh
+    Crying:
+      collection: MaleCry
+    Whistle:
+      collection: Whistles
     Hiss:
       collection: FelinidHisses
     Meow:
@@ -96,6 +112,20 @@
       collection: FelinidScreams
     Laugh:
       collection: FemaleLaugh
+    Sneeze:
+      collection: FemaleSneezes
+    Cough:
+      collection: FemaleCoughs
+    Yawn:
+      collection: FemaleYawn
+    Snore:
+      collection: Snores
+    Sigh:
+      collection: FemaleSigh
+    Crying:
+      collection: FemaleCry
+    Whistle:
+      collection: Whistles
     Hiss:
       collection: FelinidHisses
     Meow:

Resources/Prototypes/White/NonPeacefulRound/NonPeacefulRoundItems.yml

@@ -1,5 +1,4 @@
 - type: nonPeacefulRoundEndItems
-  name: nonPeacefulRoundEndItems
   id: nonPeacefulRoundEndRange
   items:
     - WeaponSubMachineGunVector
@@ -24,7 +23,6 @@
     - Stunbaton
 
 - type: nonPeacefulRoundEndItems
-  name: nonPeacefulRoundEndItems
   id: nonPeacefulRoundEndMelee
   items:
     - FireAxeFlaming

Resources/Prototypes/White/Species/felinid.yml

@@ -3,7 +3,6 @@
   name: species-name-felinid
   roundStart: true
   prototype: MobFelinid
-  sprites: MobHumanSprites
   markingLimits: MobFelinidMarkingLimits
   dollPrototype: MobFelinidDummy
   skinColoration: HumanToned