Merge branch 'master' into STC_Mindshield

Author: SemperVictor

Content.Client/_NF/CryoSleep/CryoSleepEui.cs

@@ -10,6 +10,7 @@
 using Content.Shared._NF.Shipyard.Components;
 using Content.Shared.Access.Components;
 using Content.Shared.Eui;
+using Content.Shared.FixedPoint;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Inventory;
 using Content.Shared.PDA;
@@ -84,7 +85,7 @@ public override void HandleMessage(EuiMessageBase msg)
                 slotsComp);
             //Uplink
             string? uplinkWarningLoc = warningMsg.FoundUplink.HasValue
-                ? GetUplinkWarningLocMessage(warningMsg.FoundUplink.Value, slotsComp)
+                ? GetUplinkWarningLocMessage(warningMsg.FoundUplink.Value, slotsComp, warningMsg.UplinkBalance)
                 : null;
             //Items
             string? itemWarningLoc = GetImportantItemWarningLocMessage(warningMsg.ImportantItems, slotsComp);
@@ -108,17 +109,23 @@ public override void HandleMessage(EuiMessageBase msg)
 
     private string GetStorageName(CryoSleepWarningMessage.NetworkedWarningItem item, InventorySlotsComponent inventoryComp)
     {
-        if (item.SlotId == null)
+        if (item.Container is not null)
         {
             return Identity.Name(_entityManager.GetEntity(item.Container!.Value), _entityManager);
         }
-        else
+        else if (item.SlotId is not null)
         {
             //Lowercase this just to make the name not look weird in the popup
             var returnVal = inventoryComp.SlotData[item.SlotId].SlotDisplayName;
             //I can't execute without assigning it first
             return returnVal.ToLower();
         }
+        else if (item.HandId is not null)
+            //Hand IDs are not human readable, with no reliable way to get a human readable name. This is a bit hardcodey, but it should work in 95% of situations
+            //If someone has a way to convert to a human name, go for it
+            return Loc.GetString("accept-cryo-window-prompt-hand-slot-name");
+
+        return "ERROR";
     }
 
     //All of these message get methods were moved to be separate to make the code less rigid, and easier to read.
@@ -211,20 +218,20 @@ private string GetStorageName(CryoSleepWarningMessage.NetworkedWarningItem item,
     //Grab any needed uplink warnings.
     //Returns null if no warning is needed
     private string? GetUplinkWarningLocMessage(CryoSleepWarningMessage.NetworkedWarningItem foundUplink,
-        InventorySlotsComponent slotsComp)
+        InventorySlotsComponent slotsComp,
+        FixedPoint2 balance)
     {
         var localUplink = _entityManager.GetEntity(foundUplink.Item);
         if (!_entityManager.TryGetComponent<StoreComponent>(localUplink, out var store))
             return null;
         var currencyProtoId = store.Balance.Keys.First();
-        var amount = store.Balance[currencyProtoId];
-        if (amount == 0
+        if (balance.Equals(0)
             || !_prototypeManager.TryIndex(currencyProtoId, out var currencyProto))
             return null;
         return Loc.GetString("accept-cryo-window-prompt-uplink-warning",
             ("uplink", Identity.Name(_entityManager.GetEntity(foundUplink.Item), _entityManager)),
             ("storage", GetStorageName(foundUplink, slotsComp)),
-            ("amount", amount),
+            ("amount", balance),
             ("currency",  Loc.GetString(currencyProto.DisplayName)));
     }
 

Content.Server/Botany/Systems/PlantHolderSystem.cs

@@ -322,6 +322,7 @@ private void OnInteractUsing(Entity<PlantHolderComponent> entity, ref InteractUs
             {
                 healthOverride = component.Health;
             }
+            component.Seed.Unique = false;
             var packetSeed = component.Seed;
             var seed = _botany.SpawnSeedPacket(packetSeed, Transform(args.User).Coordinates, args.User, healthOverride);
             _randomHelper.RandomOffset(seed, 0.25f);

Content.Server/_NF/CryoSleep/CryoSleepSystem.cs

@@ -1,9 +1,11 @@
 using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 using System.Numerics;
 using Content.Server._NF.Shipyard.Systems;
 using Content.Server.DoAfter;
 using Content.Server.EUI;
 using Content.Server.Ghost;
+using Content.Server.Hands.Systems;
 using Content.Server.Interaction;
 using Content.Server.Mind;
 using Content.Server.Popups;
@@ -17,6 +19,7 @@
 using Content.Shared.DoAfter;
 using Content.Shared.DragDrop;
 using Content.Shared.Examine;
+using Content.Shared.FixedPoint;
 using Content.Shared.GameTicking;
 using Content.Shared.Hands.Components;
 using Content.Shared.Interaction.Events;
@@ -61,6 +64,7 @@ public sealed partial class CryoSleepSystem : EntitySystem
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly IPlayerManager _player = default!;
     [Dependency] private readonly InventorySystem _inventory = default!; //For cryosleep warnings
+    [Dependency] private readonly HandsSystem _hands = default!;
 
     private readonly Dictionary<NetUserId, StoredBody?> _storedBodies = new();
     private EntityUid? _storageMap;
@@ -292,39 +296,54 @@ public bool IsBodyInCryoPod(EntityUid body, Entity<CryoSleepComponent?> cryopod)
     }
 
     /// <summary>
-    /// Scans the inventory of an entity about to cryo in order to contrusct a warning message of all appropriate items.
+    /// Scans the inventory of an entity about to cryo in order to construct a warning message of all appropriate items.
     /// </summary>
     /// <returns>A warning message to be used with CryoSleepEui</returns>
     private CryoSleepWarningMessage? GetWarningMessages(EntityUid entity)
     {
         if (!TryComp<InventoryComponent>(entity, out var inventoryComp))
             return null;
         //Items check
-        SlotDefinition[] slotsToCheck = inventoryComp.Slots;
+        var slotsToCheck = inventoryComp.Slots;
         List<WarningItem> warningItemsList = [];
         //Doing the conversion to WarningItem all at once makes more sense to me
-        List<StorageHelper.FoundItem> unconvertedFoundItem = [];
+        List<StorageHelper.FoundItem> unconvertedFoundItems = [];
         foreach (var slotDefinition in slotsToCheck)
         {
             //The ID is manually checked for a shuttle deed later, and since your PDA *technically* has an uplink in it, this has to be skipped manually.
             if (slotDefinition.Name == "id")
                 continue;
-            //TODO: Check hand slots for important items
             if (_inventory.TryGetSlotEntity(entity, slotDefinition.Name, out var slotItem))
             {
                 if (ShouldItemWarnOnCryo(slotItem.Value))
-                    warningItemsList.Add(new WarningItem(slotDefinition.Name, null, slotItem.Value));
+                    warningItemsList.Add(new WarningItem(slotDefinition.Name, null, null, slotItem.Value));
                 else if (_entityManager.HasComponent<StorageComponent>(slotItem.Value))
-                    StorageHelper.ScanStorageForCondition(slotItem.Value, ShouldItemWarnOnCryo, ref unconvertedFoundItem);
+                    StorageHelper.ScanStorageForCondition(slotItem.Value, ShouldItemWarnOnCryo, ref unconvertedFoundItems);
             }
         }
+        //Check hands (Thank you Alkheemist for the original form of this code)
+        if (TryComp<HandsComponent>(entity, out var handsComp))
+        {
+            foreach (var hand in handsComp.Hands)
+            {
+                if (!_hands.TryGetHeldItem(entity, hand.Key, out var heldEntity))
+                    continue;
+
+                if (ShouldItemWarnOnCryo(heldEntity.Value))
+                    warningItemsList.Add(new WarningItem(null, null, hand.Key, heldEntity.Value));
+                else if (_entityManager.HasComponent<StorageComponent>(heldEntity))
+                    StorageHelper.ScanStorageForCondition(heldEntity.Value, ShouldItemWarnOnCryo, ref unconvertedFoundItems);
+            }
+        }
+
         //Convert all FoundItem to a WarningItem
-        foreach (var found in unconvertedFoundItem)
+        foreach (var found in unconvertedFoundItems)
         {
-            warningItemsList.Add(new WarningItem(null, found.Container, found.Item));
+            warningItemsList.Add(new WarningItem(null, found.Container, null, found.Item));
         }
         //Now, we extract the uplinks and shuttle deeds.
         WarningItem? uplink = null;
+        FixedPoint2 currencyAmount = 0;
         WarningItem? backpackShuttleDeed = null;
         //Listing every point where a shuttle deed was found runs you out of space very fast.
         var foundMoreShuttles = false;
@@ -344,10 +363,13 @@ public bool IsBodyInCryoPod(EntityUid body, Entity<CryoSleepComponent?> cryopod)
 
                 warningItemsList.RemoveAt(i);
             }
-            else if (HasComp<StoreComponent>(itemStruct.Item) && !uplink.HasValue)
+            else if (TryComp<StoreComponent>(itemStruct.Item, out var uplinkComp) && !uplink.HasValue)
             {
                 uplink = itemStruct;
                 warningItemsList.RemoveAt(i);
+                var currencyProtoId = uplinkComp.Balance.Keys.First();
+                currencyAmount = uplinkComp.Balance[currencyProtoId];
+
             }
         }
 
@@ -361,6 +383,7 @@ public bool IsBodyInCryoPod(EntityUid body, Entity<CryoSleepComponent?> cryopod)
             nwBackpackShuttleDeed,
             foundMoreShuttles,
             nwUplink,
+            currencyAmount,
             networkedWarningItems);
     }
 
@@ -387,18 +410,20 @@ private bool TryGetIdCard(EntityUid ent, [NotNullWhen(true)] out EntityUid? idCa
         return false;
     }
 
-    private readonly struct WarningItem(string? slotId, EntityUid? container, EntityUid item)
+    private readonly struct WarningItem(string? slotId, EntityUid? container, string? handId, EntityUid item)
     {
-        //Exactly one of these two values should be null
+        //Exactly one of these three values should not be null
         public readonly string? SlotId = slotId;
         public readonly EntityUid? Container = container;
+        public readonly string? HandId = handId;
 
         public readonly EntityUid Item = item;
 
         public CryoSleepWarningMessage.NetworkedWarningItem ToNetworked(IEntityManager manager)
         {
             return new CryoSleepWarningMessage.NetworkedWarningItem(SlotId,
                 manager.GetNetEntity(Container),
+                HandId,
                 manager.GetNetEntity(Item));
         }
     }

Content.Shared/Atmos/Rotting/SharedRottingSystem.cs

@@ -25,7 +25,6 @@ public override void Initialize()
         SubscribeLocalEvent<PerishableComponent, MobStateChangedEvent>(OnMobStateChanged);
         SubscribeLocalEvent<PerishableComponent, ExaminedEvent>(OnPerishableExamined);
 
-        SubscribeLocalEvent<RottingComponent, ComponentShutdown>(OnShutdown);
         SubscribeLocalEvent<RottingComponent, MobStateChangedEvent>(OnRottingMobStateChanged);
         SubscribeLocalEvent<RottingComponent, RejuvenateEvent>(OnRejuvenate);
         SubscribeLocalEvent<RottingComponent, ExaminedEvent>(OnExamined);
@@ -62,14 +61,6 @@ private void OnPerishableExamined(Entity<PerishableComponent> perishable, ref Ex
         args.PushMarkup(Loc.GetString(description, ("target", Identity.Entity(perishable, EntityManager))));
     }
 
-    private void OnShutdown(EntityUid uid, RottingComponent component, ComponentShutdown args)
-    {
-        if (TryComp<PerishableComponent>(uid, out var perishable))
-        {
-            perishable.RotNextUpdate = TimeSpan.Zero;
-        }
-    }
-
     private void OnRottingMobStateChanged(EntityUid uid, RottingComponent component, MobStateChangedEvent args)
     {
         if (args.NewMobState == MobState.Dead)

Content.Shared/Execution/SharedExecutionSystem.cs

@@ -53,6 +53,13 @@ private void OnGetInteractionsVerbs(EntityUid uid, ExecutionComponent comp, GetV
         var weapon = args.Using.Value;
         var victim = args.Target;
 
+        // Frontier: remove self execute
+        if (attacker == victim)
+        {
+            return;
+        }
+        // End Frontier
+
         if (!CanBeExecuted(victim, attacker))
             return;
 

Content.Shared/_NF/CryoSleep/CryoSleepWarningMessage.cs

@@ -1,44 +1,50 @@
 using Content.Shared.Eui;
+using Content.Shared.FixedPoint;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared._NF.CryoSleep;
 
 /// <summary>
 /// A message for CryoSleepEui containing all the items the server found, along with some other data to build the clientside warning messages.
 /// </summary>
-[Serializable] [NetSerializable]
+[Serializable, NetSerializable]
 public sealed class CryoSleepWarningMessage(
     bool shuttleOnPda,
     CryoSleepWarningMessage.NetworkedWarningItem? inventoryShuttleDeed,
     bool foundMoreShuttles,
     CryoSleepWarningMessage.NetworkedWarningItem? foundUplink,
+    FixedPoint2 uplinkBalance,
     List<CryoSleepWarningMessage.NetworkedWarningItem> importantItems)
     : EuiMessageBase
 {
     public readonly bool ShuttleOnPDA = shuttleOnPda;
     public readonly NetworkedWarningItem? InventoryShuttleDeed = inventoryShuttleDeed;
     public readonly bool FoundMoreShuttles = foundMoreShuttles;
     public readonly NetworkedWarningItem? FoundUplink = foundUplink;
+    public readonly FixedPoint2 UplinkBalance = uplinkBalance;
     public readonly List<NetworkedWarningItem> ImportantItems = importantItems;
 
-    [Serializable] [NetSerializable]
+
+    [Serializable, NetSerializable]
     public struct NetworkedWarningItem
     {
-    public NetworkedWarningItem(string? slotId, NetEntity? container, NetEntity item)
+    public NetworkedWarningItem(string? slotId, NetEntity? container, string? handId, NetEntity item)
     {
-        if (slotId == null && !container.HasValue)
+        if (slotId is null && !container.HasValue && handId is null)
         {
             throw new ArgumentException(
-                "CryoSleepWarningMessage.NetworkedWarningItem was attempted to be created with both slotId and container as null values");
+                "CryoSleepWarningMessage.NetworkedWarningItem was attempted to be created with all values as null values");
         }
 
         SlotId = slotId;
+        HandId = handId;
         Container = container;
         Item = item;
-        }
- //Exactly one of these two values should be null
+    }
+        //Exactly one of these values should not be null
         public readonly string? SlotId;
         public readonly NetEntity? Container;
+        public readonly string? HandId;
 
         public readonly NetEntity Item;
     }

Content.Shared/_NF/Whitelist/Components/NFPlushieComponent.cs

@@ -0,0 +1,7 @@
+namespace Content.Shared._NF.Whitelist.Components;
+
+/// <summary>
+/// Whitelist component for plushies to avoid tag redefinition and collisions
+/// </summary>
+[RegisterComponent]
+public sealed partial class NFPlushieComponent : Component;