shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-31034

Browse Source
This commit is contained in:
LetterJay
2017-10-03 20:15:07 -04:00
committed by GitHub
parent 037ea0ce13 d483932395
commit 1c199d426b
31 changed files with 488 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/brain/brain_item.dm
+3 -11
View File
@@ -18,12 +18,12 @@
vital = FALSE
decoy_override = TRUE
/obj/item/organ/brain/Insert(mob/living/carbon/C, special = 0)
/obj/item/organ/brain/Insert(mob/living/carbon/C, special = 0,no_id_transfer = FALSE)
..()
name = "brain"
if(C.mind && C.mind.changeling) //congrats, you're trapped in a body you don't control
if(C.mind && C.mind.changeling && !no_id_transfer) //congrats, you're trapped in a body you don't control
if(brainmob && !(C.stat == DEAD || (C.status_flags & FAKEDEATH)))
to_chat(brainmob, "<span class = danger>You can't feel your body! You're still just a brain!</span>")
loc = C
@@ -44,17 +44,9 @@
//Update the body's icon so it doesnt appear debrained anymore
C.update_hair()
<<<<<<< HEAD
/obj/item/organ/brain/Remove(mob/living/carbon/C, special = 0)
=======
/obj/item/organ/brain/Remove(mob/living/carbon/C, special = 0, no_id_transfer = FALSE)
>>>>>>> 085632f... Nightmare organs (#31034)
..()
if(!special)
if(C.has_brain_worms())
var/mob/living/simple_animal/borer/B = C.has_brain_worms()
B.leave_victim() //Should remove borer if the brain is removed - RR
if(!gc_destroyed || (owner && !owner.gc_destroyed))
if((!gc_destroyed || (owner && !owner.gc_destroyed)) && !no_id_transfer)
transfer_identity(C)
C.update_hair()