From c3170eaae8c157e561927622c0e8429269ec89ac Mon Sep 17 00:00:00 2001 From: palpatine213 Date: Thu, 18 Jun 2015 01:28:10 -0700 Subject: [PATCH 1/2] Fixes Posibrains removing Traitors from check antags and also being pulled out of posibrains when debrained --- code/modules/mob/living/carbon/brain/posibrain.dm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/code/modules/mob/living/carbon/brain/posibrain.dm b/code/modules/mob/living/carbon/brain/posibrain.dm index efdceeb7529..c2e73f27b3f 100644 --- a/code/modules/mob/living/carbon/brain/posibrain.dm +++ b/code/modules/mob/living/carbon/brain/posibrain.dm @@ -78,17 +78,13 @@ var/global/posibrain_notif_cooldown = 0 return /obj/item/device/mmi/posibrain/proc/transfer_personality(var/mob/candidate) - if(brainmob && brainmob.key) //Prevents hostile takeover if two ghosts get the prompt for the same brain. + if(brainmob.key) //Prevents hostile takeover if two ghosts get the prompt for the same brain. candidate << "This brain has already been taken! Please try your possesion again later!" return notified = 0 - brainmob.mind = candidate.mind brainmob.ckey = candidate.ckey name = "positronic brain ([brainmob.name])" - brainmob.mind.remove_all_antag() - brainmob.mind.wipe_memory() - brainmob << "ALL PAST LIVES ARE FORGOTTEN." brainmob << "You are a positronic brain, brought into existence on [station_name()]." From 9e7c67c6a504b8fcf2a76f79eea51ec64189768a Mon Sep 17 00:00:00 2001 From: palpatine213 Date: Thu, 18 Jun 2015 14:55:35 -0700 Subject: [PATCH 2/2] Fixes a check --- code/modules/mob/living/carbon/brain/posibrain.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/brain/posibrain.dm b/code/modules/mob/living/carbon/brain/posibrain.dm index c2e73f27b3f..37a596ab08a 100644 --- a/code/modules/mob/living/carbon/brain/posibrain.dm +++ b/code/modules/mob/living/carbon/brain/posibrain.dm @@ -78,7 +78,7 @@ var/global/posibrain_notif_cooldown = 0 return /obj/item/device/mmi/posibrain/proc/transfer_personality(var/mob/candidate) - if(brainmob.key) //Prevents hostile takeover if two ghosts get the prompt for the same brain. + if(brainmob && brainmob.key) //Prevents hostile takeover if two ghosts get the prompt or link for the same brain. candidate << "This brain has already been taken! Please try your possesion again later!" return notified = 0