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

[MIRROR] Slimepeople now transfer traits on body-swap, and traits now transfer correctly
2018-03-27 17:51:35 +00:00
parent e6c16ba8f8 ea970d5a1d
commit d351caf92f
2 changed files with 5 additions and 0 deletions
@@ -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()