Stable merge (#42732)

Content.Server/Species/Systems/NymphSystem.cs

@@ -36,7 +36,7 @@ public sealed partial class NymphSystem : EntitySystem
             _zombie.ZombifyEntity(nymph);
 
         // Move the mind if there is one and it's supposed to be transferred
-        if (comp.TransferMind == true && _mindSystem.TryGetMind(args.Target, out var mindId, out var mind))
+        if (comp.TransferMind && _mindSystem.TryGetMind(uid, out var mindId, out var mind))
             _mindSystem.TransferTo(mindId, nymph, mind: mind);
 
         // Delete the old organ

Content.Shared/Inventory/InventorySystem.Equip.cs

@@ -570,7 +570,10 @@ public abstract partial class InventorySystem
     {
         foreach (var item in GetHandOrInventoryEntities((ent, null, ent)))
         {
-            args.Giblets.Add(item);
+            // Give me liberty, give me death
+            // TODO: Give me an API that can tell the difference between a virtual item and an electropak being removed.
+            if (!HasComp<AttachedClothingComponent>(item))
+                args.Giblets.Add(item);
         }
     }
 }

Resources/Prototypes/Body/Species/diona.yml

@@ -286,6 +286,7 @@
   id: OrganDionaBrainNymphing
   components:
   - type: Nymph
+    transferMind: true
     entityPrototype: OrganDionaNymphBrain
 
 - type: entity

Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml

@@ -105,5 +105,3 @@
   - type: MobPrice
     price: 150
   - type: FloatingVisuals
-  - type: GhostOnMove
-    mustBeDead: true

Resources/Prototypes/Entities/Mobs/base.yml

@@ -146,6 +146,8 @@
   - type: LightningTarget
     priority: 2
     lightningExplode: false
+  - type: GhostOnMove
+    mustBeDead: true
 
 # Used for mobs that can enter combat mode and can attack.
 - type: entity

Resources/Prototypes/FeedbackPopup/feedbackpopups.yml

@@ -20,7 +20,7 @@
 
 - type: feedbackPopup
   id: UplinkFeedback
-  popupOrigin: wizden_master
+  popupOrigin: wizden
   title: "[bold]Feedback on Traitor Uplink Changes[/bold]"
   description: >-
     If you have any feedback on the changes to the Traitor Uplink, feel free to leave them in this thread on the forums!