issue with identity transfer

This commit is contained in:
Aurorablade
2016-02-13 15:20:21 -05:00
parent 9a55bb11b9
commit 400ed30455
4 changed files with 5 additions and 13 deletions
-9
View File
@@ -25,15 +25,6 @@
switch(destroys)
if("gib")
target.gib()
if("gib_brain")
if(ishuman(target))
var/mob/living/carbon/C = target
var/obj/item/organ/internal/brain/B = C.get_int_organ(/obj/item/organ/internal/brain)//do we has brains?
if(B)
B.loc = get_turf(C)
B.transfer_identity(C)
C.internal_organs -= B
target.gib()
if("disintegrate")
target.dust()
@@ -17,7 +17,7 @@
if(iscarbon(user))
var/mob/living/carbon/human/C = user
C.vomit()
egg.loc = get_turf(user)
egg.forceMove(get_turf(user))
user.reagents.add_reagent("mutadone", 10)
user.reagents.add_reagent("potass_iodide", 10)
@@ -59,7 +59,7 @@
/obj/item/organ/internal/brain/remove(var/mob/living/user,var/special)
if(!owner) return ..() // Probably a redundant removal; just bail
//if(!owner) return ..() // Probably a redundant removal; just bail
var/obj/item/organ/internal/brain/B = src
if(istype(B) && istype(owner) && is_primary_organ())
@@ -16,8 +16,9 @@
for(var/obj/item/organ/internal/I in internal_organs)
if(istype(loc,/turf))
I.remove(src)
spawn()
I.throw_at(get_edge_target_turf(src,pick(alldirs)),rand(1,3),5)
I.forceMove(get_turf(src))
//spawn()
I.throw_at(get_edge_target_turf(src,pick(alldirs)),rand(1,3),5)
for(var/obj/item/organ/external/E in src.organs)
if(istype(E, /obj/item/organ/external/chest))