Add Lost and Found Storage to Cryosleep

Content.Server/Bed/Cryostorage/CryostorageSystem.cs

@@ -2,7 +2,6 @@
 using Content.Server.Chat.Managers;
 using Content.Server.GameTicking;
 using Content.Server.Hands.Systems;
-using Content.Server.Inventory;
 using Content.Server.Popups;
 using Content.Server.Station.Components;
 using Content.Server.Station.Systems;
@@ -13,11 +12,13 @@
 using Content.Shared.Climbing.Systems;
 using Content.Shared.Database;
 using Content.Shared.Hands.Components;
+using Content.Shared.Inventory;
 using Content.Shared.Mind.Components;
-using Robust.Server.Audio;
 using Robust.Server.Containers;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
+using Robust.Shared.Audio;
+using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.Enums;
 using Robust.Shared.Network;
@@ -30,13 +31,13 @@ public sealed class CryostorageSystem : SharedCryostorageSystem
 {
     [Dependency] private readonly IChatManager _chatManager = default!;
     [Dependency] private readonly IPlayerManager _playerManager = default!;
-    [Dependency] private readonly AudioSystem _audio = default!;
     [Dependency] private readonly AccessReaderSystem _accessReader = default!;
+    [Dependency] private readonly InventorySystem _inventory = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly ClimbSystem _climb = default!;
     [Dependency] private readonly ContainerSystem _container = default!;
     [Dependency] private readonly GameTicker _gameTicker = default!;
     [Dependency] private readonly HandsSystem _hands = default!;
-    [Dependency] private readonly ServerInventorySystem _inventory = default!;
     [Dependency] private readonly PopupSystem _popup = default!;
     [Dependency] private readonly StationSystem _station = default!;
     [Dependency] private readonly StationJobsSystem _stationJobs = default!;
@@ -48,8 +49,8 @@ public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<CryostorageComponent, BeforeActivatableUIOpenEvent>(OnBeforeUIOpened);
-        SubscribeLocalEvent<CryostorageComponent, CryostorageRemoveItemBuiMessage>(OnRemoveItemBuiMessage);
+        SubscribeLocalEvent<LostAndFoundComponent, BeforeActivatableUIOpenEvent>(OnBeforeUIOpened);
+        SubscribeLocalEvent<LostAndFoundComponent, CryostorageRemoveItemBuiMessage>(OnRemoveItemBuiMessage);
 
         SubscribeLocalEvent<CryostorageContainedComponent, PlayerSpawnCompleteEvent>(OnPlayerSpawned);
         SubscribeLocalEvent<CryostorageContainedComponent, MindRemovedMessage>(OnMindRemoved);
@@ -64,12 +65,12 @@ public override void Shutdown()
         _playerManager.PlayerStatusChanged -= PlayerStatusChanged;
     }
 
-    private void OnBeforeUIOpened(Entity<CryostorageComponent> ent, ref BeforeActivatableUIOpenEvent args)
+    private void OnBeforeUIOpened(Entity<LostAndFoundComponent> ent, ref BeforeActivatableUIOpenEvent args)
     {
         UpdateCryostorageUIState(ent);
     }
 
-    private void OnRemoveItemBuiMessage(Entity<CryostorageComponent> ent, ref CryostorageRemoveItemBuiMessage args)
+    private void OnRemoveItemBuiMessage(Entity<LostAndFoundComponent> ent, ref CryostorageRemoveItemBuiMessage args)
     {
         var (_, comp) = ent;
         if (args.Session.AttachedEntity is not { } attachedEntity)
@@ -113,7 +114,7 @@ private void OnRemoveItemBuiMessage(Entity<CryostorageComponent> ent, ref Cryost
         UpdateCryostorageUIState(ent);
     }
 
-    private void UpdateCryostorageUIState(Entity<CryostorageComponent> ent)
+    public void UpdateCryostorageUIState(Entity<LostAndFoundComponent> ent)
     {
         var state = new CryostorageBuiState(GetAllContainedData(ent).ToList());
         _ui.TrySetUiState(ent, CryostorageUIKey.Key, state);
@@ -186,7 +187,7 @@ public void HandleEnterCryostorage(Entity<CryostorageContainedComponent> ent, Ne
             }
         }
 
-        _audio.PlayPvs(cryostorageComponent.RemoveSound, ent);
+        _audio.PlayPvs(cryostorageComponent.RemoveSound, cryostorageEnt.Value, AudioParams.Default.WithVolume(6f));
 
         EnsurePausedMap();
         if (PausedMap == null)
@@ -204,12 +205,40 @@ public void HandleEnterCryostorage(Entity<CryostorageContainedComponent> ent, Ne
         }
         comp.AllowReEnteringBody = false;
         _transform.SetParent(ent, PausedMap.Value);
-        cryostorageComponent.StoredPlayers.Add(ent);
-        Dirty(ent, comp);
-        UpdateCryostorageUIState((cryostorageEnt.Value, cryostorageComponent));
+
+        // Try to get the lost and found and add the player to it
+        var query = EntityQueryEnumerator<LostAndFoundComponent>();
+        query.MoveNext(out var storage, out var lostAndFoundComponent);
+
+        if (TryComp<LostAndFoundComponent>(storage, out var lostAndFoundComp))
+        {
+            lostAndFoundComp.StoredPlayers.Add(ent);
+            Dirty(ent, comp);
+            UpdateCryostorageUIState((storage, lostAndFoundComp));
+        }
+        else // If there is no lost and found, just drop the items instead of deleting them
+        {
+            DropItems(ent, cryostorageEnt.Value);
+        }
+
         AdminLog.Add(LogType.Action, LogImpact.High, $"{ToPrettyString(ent):player} was entered into cryostorage inside of {ToPrettyString(cryostorageEnt.Value)}");
     }
 
+    private void DropItems(EntityUid uid, EntityUid cryopod)
+    {
+        if (!_inventory.TryGetSlots(uid, out var slotDefinitions))
+            return;
+
+        foreach (var slot in slotDefinitions)
+        {
+            if (!_inventory.TryGetSlotEntity(uid, slot.Name, out var item))
+                continue;
+
+            _inventory.TryUnequip(uid, slot.Name, true, true);
+            _transform.SetCoordinates(uid, Transform(cryopod).Coordinates);
+        }
+    }
+
     private void HandleCryostorageReconnection(Entity<CryostorageContainedComponent> entity)
     {
         var (uid, comp) = entity;
@@ -235,9 +264,18 @@ private void HandleCryostorageReconnection(Entity<CryostorageContainedComponent>
         }
 
         comp.GracePeriodEndTime = null;
-        cryostorageComponent.StoredPlayers.Remove(uid);
+
+        // Try to get the lost and found and remove the player from it
+        var query = EntityQueryEnumerator<LostAndFoundComponent>();
+        query.MoveNext(out var storage, out var lostAndFoundComponent);
+
+        if (TryComp<LostAndFoundComponent>(storage, out var lostAndFoundComp))
+        {
+            lostAndFoundComp.StoredPlayers.Remove(uid);
+            UpdateCryostorageUIState((storage, lostAndFoundComp));
+        }
+
         AdminLog.Add(LogType.Action, LogImpact.High, $"{ToPrettyString(entity):player} re-entered the game from cryostorage {ToPrettyString(cryostorage)}");
-        UpdateCryostorageUIState((cryostorage, cryostorageComponent));
     }
 
     protected override void OnInsertedContainer(Entity<CryostorageComponent> ent, ref EntInsertedIntoContainerMessage args)
@@ -257,7 +295,7 @@ protected override void OnInsertedContainer(Entity<CryostorageComponent> ent, re
             _chatManager.ChatMessageToOne(ChatChannel.Server, msg, msg, uid, false, actor.PlayerSession.Channel);
     }
 
-    private IEnumerable<CryostorageContainedPlayerData> GetAllContainedData(Entity<CryostorageComponent> ent)
+    private IEnumerable<CryostorageContainedPlayerData> GetAllContainedData(Entity<LostAndFoundComponent> ent)
     {
         foreach (var contained in ent.Comp.StoredPlayers)
         {

Content.Shared/Bed/Cryostorage/CryostorageComponent.cs

@@ -30,85 +30,20 @@ public sealed partial class CryostorageComponent : Component
     public TimeSpan GracePeriod = TimeSpan.FromMinutes(5f);
 
     /// <summary>
-    /// A list of players who have actively entered cryostorage.
+    /// Sound that is played when a player is removed by a cryostorage.
     /// </summary>
     [DataField]
-    [AutoNetworkedField]
-    public List<EntityUid> StoredPlayers = new();
+    public SoundSpecifier? RemoveSound = new SoundPathSpecifier("/Audio/Parkstation/Effects/cryostasis.ogg");
 
     /// <summary>
-    /// Sound that is played when a player is removed by a cryostorage.
+    /// Sound that is played when a player goes inside of the cryostorage pod.
     /// </summary>
     [DataField]
-    public SoundSpecifier? RemoveSound = new SoundPathSpecifier("/Audio/Effects/teleport_departure.ogg");
+    public static SoundSpecifier? EnterSound = new SoundPathSpecifier("/Audio/Parkstation/Effects/cryosleep_open.ogg");
 }
 
 [Serializable, NetSerializable]
 public enum CryostorageVisuals : byte
 {
     Full
 }
-
-[Serializable, NetSerializable]
-public record struct CryostorageContainedPlayerData()
-{
-    /// <summary>
-    /// The player's IC name
-    /// </summary>
-    public string PlayerName = string.Empty;
-
-    /// <summary>
-    /// The player's entity
-    /// </summary>
-    public NetEntity PlayerEnt = NetEntity.Invalid;
-
-    /// <summary>
-    /// A dictionary relating a slot definition name to the name of the item inside of it.
-    /// </summary>
-    public Dictionary<string, string> ItemSlots = new();
-
-    /// <summary>
-    /// A dictionary relating a hand ID to the hand name and the name of the item being held.
-    /// </summary>
-    public Dictionary<string, string> HeldItems = new();
-}
-
-[Serializable, NetSerializable]
-public sealed class CryostorageBuiState : BoundUserInterfaceState
-{
-    public List<CryostorageContainedPlayerData> PlayerData;
-
-    public CryostorageBuiState(List<CryostorageContainedPlayerData> playerData)
-    {
-        PlayerData = playerData;
-    }
-}
-
-[Serializable, NetSerializable]
-public sealed class CryostorageRemoveItemBuiMessage : BoundUserInterfaceMessage
-{
-    public NetEntity StoredEntity;
-
-    public string Key;
-
-    public RemovalType Type;
-
-    public enum RemovalType : byte
-    {
-        Hand,
-        Inventory
-    }
-
-    public CryostorageRemoveItemBuiMessage(NetEntity storedEntity, string key, RemovalType type)
-    {
-        StoredEntity = storedEntity;
-        Key = key;
-        Type = type;
-    }
-}
-
-[Serializable, NetSerializable]
-public enum CryostorageUIKey : byte
-{
-    Key
-}

Content.Shared/Bed/Cryostorage/LostAndFoundComponent.cs

@@ -0,0 +1,85 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Bed.Cryostorage;
+
+/// <summary>
+/// This is used for a container which holds the items lost
+/// when a player enters cryostorage.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[AutoGenerateComponentState]
+public sealed partial class LostAndFoundComponent : Component
+{
+    /// <summary>
+    /// A list of players who have actively entered cryostorage.
+    /// </summary>
+    [DataField]
+    [AutoNetworkedField]
+    public List<EntityUid> StoredPlayers = new();
+
+}
+
+[Serializable, NetSerializable]
+public record struct CryostorageContainedPlayerData()
+{
+    /// <summary>
+    /// The player's IC name
+    /// </summary>
+    public string PlayerName = string.Empty;
+
+    /// <summary>
+    /// The player's entity
+    /// </summary>
+    public NetEntity PlayerEnt = NetEntity.Invalid;
+
+    /// <summary>
+    /// A dictionary relating a slot definition name to the name of the item inside of it.
+    /// </summary>
+    public Dictionary<string, string> ItemSlots = new();
+
+    /// <summary>
+    /// A dictionary relating a hand ID to the hand name and the name of the item being held.
+    /// </summary>
+    public Dictionary<string, string> HeldItems = new();
+}
+
+[Serializable, NetSerializable]
+public sealed class CryostorageBuiState : BoundUserInterfaceState
+{
+    public List<CryostorageContainedPlayerData> PlayerData;
+
+    public CryostorageBuiState(List<CryostorageContainedPlayerData> playerData)
+    {
+        PlayerData = playerData;
+    }
+}
+
+[Serializable, NetSerializable]
+public sealed class CryostorageRemoveItemBuiMessage : BoundUserInterfaceMessage
+{
+    public NetEntity StoredEntity;
+
+    public string Key;
+
+    public RemovalType Type;
+
+    public enum RemovalType : byte
+    {
+        Hand,
+        Inventory
+    }
+
+    public CryostorageRemoveItemBuiMessage(NetEntity storedEntity, string key, RemovalType type)
+    {
+        StoredEntity = storedEntity;
+        Key = key;
+        Type = type;
+    }
+}
+
+[Serializable, NetSerializable]
+public enum CryostorageUIKey : byte
+{
+    Key
+}