Merge remote-tracking branch 'refs/remotes/wizards/master'

Author: VigersRay

Content.Client/UserInterface/Systems/Inventory/InventoryUIController.cs

@@ -132,6 +132,9 @@ private void UpdateInventoryHotbar(InventorySlotsComponent? clientInv)
         if (clientInv == null)
         {
             _inventoryHotbar?.ClearButtons();
+            if (_inventoryButton != null)
+                _inventoryButton.Visible = false;
+
             return;
         }
 
@@ -409,6 +412,8 @@ private void UnloadSlots()
         {
             slotGroup.ClearButtons();
         }
+
+        UpdateInventoryHotbar(null);
     }
 
     private void SpriteUpdated(SlotSpriteUpdate update)

Content.Server/Electrocution/Components/ElectrifiedComponent.cs

@@ -11,33 +11,63 @@ public sealed partial class ElectrifiedComponent : Component
     [DataField("enabled")]
     public bool Enabled = true;
 
+    /// <summary>
+    /// Should player get damage on collide
+    /// </summary>
     [DataField("onBump")]
     public bool OnBump = true;
 
+    /// <summary>
+    /// Should player get damage on attack
+    /// </summary>
     [DataField("onAttacked")]
     public bool OnAttacked = true;
 
+    /// <summary>
+    /// When true - disables power if a window is present in the same tile
+    /// </summary>
     [DataField("noWindowInTile")]
     public bool NoWindowInTile = false;
 
+    /// <summary>
+    /// Should player get damage on interact with empty hand
+    /// </summary>
     [DataField("onHandInteract")]
     public bool OnHandInteract = true;
 
+    /// <summary>
+    /// Should player get damage on interact while holding an object in their hand
+    /// </summary>
     [DataField("onInteractUsing")]
     public bool OnInteractUsing = true;
 
+    /// <summary>
+    /// Indicates if the entity requires power to function
+    /// </summary>
     [DataField("requirePower")]
     public bool RequirePower = true;
 
+    /// <summary>
+    /// Indicates if the entity uses APC power
+    /// </summary>
     [DataField("usesApcPower")]
     public bool UsesApcPower = false;
 
+    /// <summary>
+    /// Identifier for the high voltage node.
+    /// </summary>
     [DataField("highVoltageNode")]
     public string? HighVoltageNode;
 
+    /// <summary>
+    /// Identifier for the medium voltage node.
+    /// </summary>
     [DataField("mediumVoltageNode")]
     public string? MediumVoltageNode;
 
+    /// <summary>
+    /// Identifier for the low voltage node.
+    /// </summary>
     [DataField("lowVoltageNode")]
     public string? LowVoltageNode;
 
@@ -69,7 +99,7 @@ public sealed partial class ElectrifiedComponent : Component
     public float ShockDamage = 7.5f;
 
     /// <summary>
-    ///     Shock time, in seconds.
+    /// Shock time, in seconds.
     /// </summary>
     [DataField("shockTime")]
     public float ShockTime = 8f;