Amending a runtime in the mmi change.

Conflicts:
	code/modules/mob/transform_procs.dm
This commit is contained in:
Zuhayr
2014-06-14 22:05:11 -04:00
committed by ZomgPonies
parent f219643f96
commit 46f1261573
+2 -3
View File
@@ -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))