From b5ca546ac3503462b800ac1b660a481ce97382bf Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Mon, 20 Jan 2020 22:45:21 -0700
Subject: [PATCH] patch

---
 code/datums/brain_damage/brain_trauma.dm               | 2 +-
 code/modules/antagonists/abductor/abductee/abductee.dm | 6 +++++-
 code/modules/antagonists/abductor/abductee/trauma.dm   | 9 ++++++---
 code/modules/mob/living/brain/brain_item.dm            | 1 +
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/code/datums/brain_damage/brain_trauma.dm b/code/datums/brain_damage/brain_trauma.dm
index 1aa1341c9c..eaaab8da45 100644
--- a/code/datums/brain_damage/brain_trauma.dm
+++ b/code/datums/brain_damage/brain_trauma.dm
@@ -14,7 +14,7 @@
 	var/can_gain = TRUE
 	var/random_gain = TRUE //can this be gained through random traumas?
 	var/resilience = TRAUMA_RESILIENCE_BASIC //how hard is this to cure?
-	var/clonable = TRUE // will this transfer if the brain is cloned?
+	var/clonable = TRUE // will this transfer if the brain is cloned? - currently has no effect
 
 /datum/brain_trauma/Destroy()
 	if(brain && brain.traumas)
diff --git a/code/modules/antagonists/abductor/abductee/abductee.dm b/code/modules/antagonists/abductor/abductee/abductee.dm
index cf09a76912..901d2f5b11 100644
--- a/code/modules/antagonists/abductor/abductee/abductee.dm
+++ b/code/modules/antagonists/abductor/abductee/abductee.dm
@@ -2,6 +2,7 @@
 	name = "Abductee"
 	roundend_category = "abductees"
 	antagpanel_category = "Abductee"
+	var/datum/brain_trauma/abductee/brain_trauma
 
 /datum/antagonist/abductee/on_gain()
 	give_objective()
@@ -24,7 +25,10 @@
 	update_abductor_icons_added(mob_override ? mob_override.mind : owner,"abductee")
 	var/mob/living/carbon/C = mob_override || owner?.current
 	if(istype(C))
-		C.gain_trauma_type(/datum/brain_trauma/abductee, TRAUMA_RESILIENCE_SURGERY)
+		if(brain_trauma)
+			qdel(brain_trauma)			//make sure there's no lingering trauma
+		brain_trauma = C.gain_trauma(/datum/brain_trauma/abductee, TRAUMA_RESILIENCE_SURGERY)
 
 /datum/antagonist/abductee/remove_innate_effects(mob/living/mob_override)
 	update_abductor_icons_removed(mob_override ? mob_override.mind : owner)
+	qdel(brain_trauma)
diff --git a/code/modules/antagonists/abductor/abductee/trauma.dm b/code/modules/antagonists/abductor/abductee/trauma.dm
index 1edc96421d..1518825e1b 100644
--- a/code/modules/antagonists/abductor/abductee/trauma.dm
+++ b/code/modules/antagonists/abductor/abductee/trauma.dm
@@ -8,8 +8,11 @@
 	clonable = TRUE
 
 /datum/brain_trauma/abductee/on_gain()
-	if(!owner.has_antag_datum(/datum/antagonist/abductee))
-		owner.add_antag_datum(/datum/antagonist/abductee)
+	. = ..()
+	if(owner.mind)
+		if(!owner.mind.has_antag_datum(/datum/antagonist/abductee))
+			owner.mind.add_antag_datum(/datum/antagonist/abductee)
 
 /datum/brain_trauma/abductee/on_lose()
-	owner.remove_antag_datum(/datum/antagonist/abductee)
+	. = ..()
+	owner.mind?.remove_antag_datum(/datum/antagonist/abductee)
diff --git a/code/modules/mob/living/brain/brain_item.dm b/code/modules/mob/living/brain/brain_item.dm
index f2ea4f2b01..15cab5fc64 100644
--- a/code/modules/mob/living/brain/brain_item.dm
+++ b/code/modules/mob/living/brain/brain_item.dm
@@ -389,6 +389,7 @@
 	if(resilience)
 		actual_trauma.resilience = resilience
 	SSblackbox.record_feedback("tally", "traumas", 1, actual_trauma.type)
+	return actual_trauma
 
 //Add a random trauma of a certain subtype
 /obj/item/organ/brain/proc/gain_trauma_type(brain_trauma_type = /datum/brain_trauma, resilience)