Eshe fixes (#388)

* fix: antags must be alive

* fix: fix flare gun

* fix: fix rd suit size

* remove govnovoz

Content.Server/Audio/ContentAudioSystem.cs

@@ -14,7 +14,7 @@ namespace Content.Server.Audio;
 public sealed class ContentAudioSystem : SharedContentAudioSystem
 {
     [ValidatePrototypeId<SoundCollectionPrototype>]
-    private const string LobbyMusicCollection = "LobbyMusic";
+    private const string LobbyMusicCollection = "LobbyMusicWhite";
 
     [Dependency] private readonly AudioSystem _serverAudio = default!;
     [Dependency] private readonly IRobustRandom _robustRandom = default!;

Content.Server/Ghost/GhostSystem.cs

@@ -38,6 +38,7 @@ using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Systems;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.Manager.Exceptions;
 using Robust.Shared.Timing;
 using InvisibilityComponent = Content.Shared._White.Administration.InvisibilityComponent;
 
@@ -455,8 +456,10 @@ namespace Content.Server.Ghost
             {
                 var entity = mindContainer.Owner;
 
-                if (!(HasComp<HumanoidAppearanceComponent>(entity) || HasComp<GhostComponent>(entity)) ||
+                if (!(HasComp<HumanoidAppearanceComponent>(entity) || HasComp<GhostComponent>(entity)))
-                    HasComp<GlobalAntagonistComponent>(entity))
+                    continue;
+
+                if (HasComp<GlobalAntagonistComponent>(entity))
                     continue;
 
                 var playerDepartmentId = _prototypeManager.Index<DepartmentPrototype>("Specific").ID;
@@ -503,9 +506,12 @@ namespace Content.Server.Ghost
             foreach (var antagonist in EntityQuery<GlobalAntagonistComponent>())
             {
                 var entity = antagonist.Owner;
+
+                if (!_mobState.IsAlive(entity))
+                    continue;
+
                 var prototype =
-                    _prototypeManager.Index<AntagonistPrototype>(antagonist.AntagonistPrototype ??
+                    _prototypeManager.Index<AntagonistPrototype>(antagonist.AntagonistPrototype ?? "globalAntagonistUnknown");
-                                                                 "globalAntagonistUnknown");
 
                 var warp = new GhostWarpGlobalAntagonist(
                     GetNetEntity(entity),

Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml

@@ -421,7 +421,7 @@
     sprintModifier: 0.8
   - type: HeldSpeedModifier
   - type: Item
-    size: Normal
+    size: Huge
   - type: Tag
     tags:
     - WhitelistChameleon

Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml

@@ -12,6 +12,9 @@
   - type: Item
     size: Small
     sprite: Objects/Weapons/Guns/Shotguns/flaregun.rsi
+    shape:
+    - 0,0,1,0
+    - 0,1,0,1
   - type: Gun
     fireRate: 8
     selectedMode: SemiAuto
@@ -37,3 +40,12 @@
     slots:
     - Belt
     - suitStorage
+  - type: EmitSoundOnPickup
+    sound:
+      collection: PistolsPickUp
+  - type: EmitSoundOnDrop
+    sound:
+      collection: PistolsDrop
+  - type: EmitSoundOnLand
+    sound:
+      collection: PistolsDrop

Resources/Prototypes/SoundCollections/lobby.yml

@@ -1,28 +1,38 @@
+# Хз куда это
+#- /Audio/Lobby/itachi.ogg
+#- /Audio/Lobby/bobby.ogg
+
 - type: soundCollection
-  id: LobbyMusic
+  id: LobbyMusicMeme
   files:
-    - /Audio/Lobby/thunderdome.ogg
-    - /Audio/Lobby/singuloose.ogg
-    - /Audio/Lobby/title2.ogg
-    - /Audio/Lobby/title3.ogg
-    - /Audio/Lobby/lasers_rip_apart_the_bulkhead.ogg
-    - /Audio/Lobby/every_light_is_blinking_at_once.ogg
-    - /Audio/Lobby/atomicamnesiammx.ogg
-    - /Audio/Lobby/itachi.ogg
    - /Audio/Lobby/govnovoz.ogg
    - /Audio/Lobby/govnovoz2.ogg
    - /Audio/Lobby/govnovoz3.ogg
    - /Audio/Lobby/govnovoz4.ogg
-    - /Audio/Lobby/spaceoddity.ogg
-  #  - /Audio/Lobby/absconditus.ogg
-  #  - /Audio/Lobby/space_asshole.ogg
-  #  - /Audio/Lobby/endless_space.ogg
-  #  - /Audio/Lobby/comet_haley.ogg
-  #  - /Audio/Lobby/mod.flip-flap.ogg
-  #  - /Audio/Lobby/Spac_Stac.ogg
-  #  - /Audio/Lobby/pwmur.ogg
 
 - type: soundCollection
-  id: LobbyMusicOld
+  id: LobbyMusicSongs
   files:
-    - /Audio/Lobby/bobby.ogg
+  - /Audio/Lobby/spaceoddity.ogg
+  - /Audio/Lobby/space_asshole.ogg
+
+- type: soundCollection
+  id: LobbyMusicWhite
+  files:
+    - /Audio/Lobby/thunderdome.ogg
+    - /Audio/Lobby/singuloose.ogg
+    - /Audio/Lobby/lasers_rip_apart_the_bulkhead.ogg
+    - /Audio/Lobby/every_light_is_blinking_at_once.ogg
+    - /Audio/Lobby/atomicamnesiammx.ogg
+    - /Audio/Lobby/Spac_Stac.ogg
+    - /Audio/Lobby/comet_haley.ogg
+
+- type: soundCollection
+  id: LobbyMusicSS13
+  files:
+    - /Audio/Lobby/title2.ogg
+    - /Audio/Lobby/title3.ogg
+    - /Audio/Lobby/absconditus.ogg
+    - /Audio/Lobby/endless_space.ogg
+    - /Audio/Lobby/mod.flip-flap.ogg
+    - /Audio/Lobby/pwmur.ogg