Merge pull request #38180 from AutomaticFrenzy/patch/heirloom-clone

Fix family heirloom being lost on cloning
This commit is contained in:
Jordan Brown
2018-06-01 10:49:57 -04:00
committed by letterjay
parent 340c6d2e83
commit f2124aa3cf
4 changed files with 10 additions and 2 deletions
+2 -1
View File
@@ -204,7 +204,8 @@
H.faction |= factions
for(var/V in quirks)
new V(H)
var/datum/quirk/Q = new V(H)
Q.on_clone(quirks[V])
H.set_cloned_appearance()
+1 -1
View File
@@ -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)]"