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

[MIRROR] Fix family heirloom being lost on cloning

code/datums/traits/_quirk.dm

@@ -55,6 +55,9 @@
 /datum/quirk/proc/post_add() //for text, disclaimers etc. given after you spawn in with the trait
 /datum/quirk/proc/on_transfer() //code called when the trait is transferred to a new mob
 
+/datum/quirk/proc/clone_data() //return additional data that should be remembered by cloning
+/datum/quirk/proc/on_clone(data) //create the quirk from clone data
+
 /datum/quirk/process()
 	if(QDELETED(quirk_holder))
 		quirk_holder = null

code/datums/traits/negative.dm

@@ -85,7 +85,11 @@
 		quirk_holder.SendSignal(COMSIG_CLEAR_MOOD_EVENT, "family_heirloom")
 		quirk_holder.SendSignal(COMSIG_ADD_MOOD_EVENT, "family_heirloom_missing", /datum/mood_event/family_heirloom_missing)
 
+/datum/quirk/family_heirloom/clone_data()
+	return heirloom
 
+/datum/quirk/family_heirloom/on_clone(data)
+	heirloom = data
 
 /datum/quirk/heavy_sleeper
 	name = "Heavy Sleeper"