Merge pull request #6973 from Citadel-Station-13/upstream-merge-38180

[MIRROR] Fix family heirloom being lost on cloning
2018-06-02 07:29:17 -05:00
parent 7c597ea289 953ba7b35a
commit 5646dd794b
4 changed files with 10 additions and 2 deletions
@@ -476,7 +476,7 @@
 	R.fields["quirks"] = list()
 	for(var/V in mob_occupant.roundstart_quirks)
 		var/datum/quirk/T = V
-		R.fields["quirks"] += T.type
+		R.fields["quirks"][T.type] = T.clone_data()

 	if (!isnull(mob_occupant.mind)) //Save that mind so traitors can continue traitoring after cloning.
 		R.fields["mind"] = "[REF(mob_occupant.mind)]"