From 46f1261573819fbb50822ea15e178d277b0d9f1d Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sun, 15 Jun 2014 03:39:27 +0930 Subject: [PATCH] Amending a runtime in the mmi change. Conflicts: code/modules/mob/transform_procs.dm --- code/modules/mob/transform_procs.dm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index cbd4bb0f512..e59c01dd87e 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -212,12 +212,11 @@ O.gender = gender O.invisibility = 0 - if(mind) //TODO mind.transfer_to(O) if(O.mind.assigned_role == "Cyborg") O.mind.original = O - else if(mind.special_role) + else if(mind && mind.special_role) O.mind.store_memory("In case you look at this after being borged, the objectives are only here until I find a way to make them not show up for you, as I can't simply delete them without screwing up round-end reporting. --NeoFite") else O.key = key @@ -233,7 +232,7 @@ else O.mmi = new /obj/item/device/mmi(O) - O.mmi.transfer_identity(src) //Does not transfer key/client. + if(O.mmi) O.mmi.transfer_identity(src) //Does not transfer key/client. callHook("borgify", list(O))