Fixes Tajaran Transformation. Few sanity checks and bugfixes added.

This commit is contained in:
SkyMarshal
2012-05-20 12:32:00 -07:00
parent 17372eab8e
commit 69b6926293
5 changed files with 21 additions and 15 deletions

View File

@@ -1,30 +1,35 @@
/mob/living/carbon/human/proc/Tajaraize()
if (monkeyizing)
return
for(var/obj/item/W in src)
drop_from_slot(W)
update_clothing()
monkeyizing = 1
canmove = 0
icon = null
invisibility = 101
overlays = list()
var/atom/movable/overlay/animation = new /atom/movable/overlay( loc )
animation.icon_state = "blank"
animation.icon = 'mob.dmi'
animation.master = src
flick("h2monkey", animation)
sleep(48)
sleep(18)
//animation = null
var/mob/living/carbon/human/tajaran/O = new /mob/living/carbon/human/tajaran( loc )
del(animation)
del(O.organs)
O.organs = organs
for(var/name in O.organs)
for(var/name in O.organs) //Ensuring organ trasnfer
var/datum/organ/external/organ = O.organs[name]
organ.owner = O
for(var/obj/item/weapon/implant/implant in organ.implant)
implant.imp_in = O
for(var/obj/hud/H in contents) //Lets not get a duplicate hud
del(H)
for(var/named in vars) //Making them keep their crap.
if(istype(vars[named], /obj/item))
O.vars[named] = vars[named]
else if (named == "contents")
O.vars[named] = vars[named]
O.real_name = real_name
O.name = name
@@ -44,7 +49,8 @@
mind.transfer_to(O)
O.update_body()
O.update_face()
O.update_clothing()
spawn(1)
O.update_clothing()
O << "<B>You are now a Tajara.</B>"
spawn(0)//To prevent the proc from returning null.
del(src)

View File

@@ -28,7 +28,7 @@
..()
/mob/living/carbon/human/tajaran/update_clothing()
..()
// ..()
if (monkeyizing)
return