Merge pull request #6130 from Citadel-Station-13/upstream-merge-36663

[MIRROR] Slimepeople now transfer traits on body-swap, and traits now transfer correctly

code/modules/mob/living/carbon/human/species_types/jellypeople.dm

@@ -241,6 +241,7 @@
 	var/datum/species/jelly/slime/spare_datum = spare.dna.species
 	spare_datum.bodies = origin_datum.bodies
 
+	H.transfer_trait_datums(spare)
 	H.mind.transfer_to(spare)
 	spare.visible_message("<span class='warning'>[H] distorts as a new body \
 		\"steps out\" of them.</span>",
@@ -379,6 +380,7 @@
 			"<span class='notice'>You stop moving this body...</span>")
 	else
 		to_chat(M.current, "<span class='notice'>You abandon this body...</span>")
+	M.current.transfer_trait_datums(dupe)
 	M.transfer_to(dupe)
 	dupe.visible_message("<span class='notice'>[dupe] blinks and looks \
 		around.</span>",