From 0f39d85a801862e32abb533e3ee2fefbfb57f009 Mon Sep 17 00:00:00 2001
From: Ashe Higgs <ashe.f.higgs@gmail.com>
Date: Mon, 26 Mar 2018 22:11:33 -0400
Subject: [PATCH] Fixes slimeperson traits (#36663)

---
 code/datums/traits/_trait.dm                                   | 3 +++
 .../mob/living/carbon/human/species_types/jellypeople.dm       | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/code/datums/traits/_trait.dm b/code/datums/traits/_trait.dm
index b7cf589ef5..1b51d6a190 100644
--- a/code/datums/traits/_trait.dm
+++ b/code/datums/traits/_trait.dm
@@ -41,6 +41,9 @@
 /datum/trait/proc/transfer_mob(mob/living/to_mob)
 	trait_holder.roundstart_traits -= src
 	to_mob.roundstart_traits += src
+	if(mob_trait)
+		trait_holder.remove_trait(mob_trait, ROUNDSTART_TRAIT)
+		to_mob.add_trait(mob_trait, ROUNDSTART_TRAIT)
 	trait_holder = to_mob
 	on_transfer()
 
diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
index 2ae8125c5e..8880df8dc5 100644
--- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
+++ b/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>",