Braining/debraining fixes

This commit is contained in:
CitadelStationBot
2017-04-23 14:48:31 -05:00
parent fd976abca6
commit de50b582ae
9 changed files with 51 additions and 24 deletions
@@ -137,14 +137,10 @@
loc = LB
/obj/item/organ/brain/transfer_to_limb(obj/item/bodypart/head/LB, mob/living/carbon/human/C)
if(C.mind && C.mind.changeling)
LB.brain = new //changeling doesn't lose its real brain organ, we drop a decoy.
LB.brain.loc = LB
LB.brain.decoy_override = TRUE
else //if not a changeling, we put the brain organ inside the dropped head
Remove(C) //and put the player in control of the brainmob
loc = LB
LB.brain = src
Remove(C) //Changeling brain concerns are now handled in Remove
loc = LB
LB.brain = src
if(brainmob)
LB.brainmob = brainmob
brainmob = null
LB.brainmob.loc = LB
@@ -32,7 +32,7 @@
var/datum/action/A = X
A.Grant(M)
//Special is for instant replacement like autosurgeons
/obj/item/organ/proc/Remove(mob/living/carbon/M, special = 0)
owner = null
if(M)
@@ -78,7 +78,7 @@
/obj/item/organ/Destroy()
if(owner)
Remove(owner, 1)
Remove(owner)
return ..()
/obj/item/organ/attack(mob/living/carbon/M, mob/user)