diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index 9758c00ef3..cc08969788 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -110,7 +110,7 @@ return examine(user) //Start growing a human clone in the pod! -/obj/machinery/clonepod/proc/growclone(ckey, clonename, ui, mutation_index, mindref, blood_type, datum/species/mrace, list/features, factions, list/quirks, datum/bank_account/insurance, list/traumas) +/obj/machinery/clonepod/proc/growclone(ckey, clonename, ui, mutation_index, mindref, blood_type, datum/species/mrace, list/features, factions, list/quirks, datum/bank_account/insurance, list/traumas, fatness) //GS13 EDIT if(panel_open) return FALSE if(mess || attempting) @@ -172,6 +172,11 @@ if(clonemind) clonemind.transfer_to(H) + // GS13 EDIT START + if(fatness) + H.fatness_real = fatness + // GS13 EDIT END + else if(get_clone_mind == CLONEPOD_POLL_MIND) poll_for_mind(H, clonename) diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 16aa4f72be..e9bdce6679 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -79,7 +79,7 @@ if(pod.occupant) continue //how though? - if(pod.growclone(R.fields["ckey"], R.fields["name"], R.fields["UI"], R.fields["SE"], R.fields["mind"], R.fields["blood_type"], R.fields["mrace"], R.fields["features"], R.fields["factions"], R.fields["quirks"], R.fields["bank_account"], R.fields["traumas"])) + if(pod.growclone(R.fields["ckey"], R.fields["name"], R.fields["UI"], R.fields["SE"], R.fields["mind"], R.fields["blood_type"], R.fields["mrace"], R.fields["features"], R.fields["factions"], R.fields["quirks"], R.fields["bank_account"], R.fields["traumas"], fatness = R.fields["fatness"])) //GS13 EDIT temp = "[R.fields["name"]] => Cloning cycle in progress..." records -= R @@ -243,7 +243,7 @@ else if(pod.occupant) temp = "Warning: Cloning cycle already in progress." playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) - else if(pod.growclone(C.fields["ckey"], C.fields["name"], C.fields["UI"], C.fields["SE"], C.fields["mind"], C.fields["blood_type"], C.fields["mrace"], C.fields["features"], C.fields["factions"], C.fields["quirks"], C.fields["bank_account"], C.fields["traumas"])) + else if(pod.growclone(C.fields["ckey"], C.fields["name"], C.fields["UI"], C.fields["SE"], C.fields["mind"], C.fields["blood_type"], C.fields["mrace"], C.fields["features"], C.fields["factions"], C.fields["quirks"], C.fields["bank_account"], C.fields["traumas"], fatness = C.fields["fatness"])) //GS13 EDIT temp = "Notice: [C.fields["name"]] => Cloning cycle in progress..." playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) records.Remove(C) @@ -448,6 +448,15 @@ if (!isnull(mob_occupant.mind)) //Save that mind so traitors can continue traitoring after cloning. R.fields["mind"] = "[REF(mob_occupant.mind)]" + //GS13 EDIT START + var/fatness_to_save = 0 + var/mob/living/carbon/human/clone_human = C + if(istype(clone_human)) + fatness_to_save = clone_human.fatness_real + + R.fields["fatness"] = fatness_to_save + // GS13 EDIT END + //Add an implant if needed var/obj/item/implant/health/imp for(var/obj/item/implant/health/HI in mob_occupant.implants)