From ee1b04eefb0f005652df9040371b67383d6830dc Mon Sep 17 00:00:00 2001
From: Fermi <phasondragon@googlemail.com>
Date: Tue, 6 Aug 2019 19:54:07 +0100
Subject: [PATCH] Fixes potential "trapped as ghost" problems and
 examine+scanner text

---
 code/game/objects/items/devices/scanners.dm     | 8 ++++++++
 code/modules/mob/living/carbon/human/examine.dm | 7 +++++++
 code/modules/mob/living/simple_animal/astral.dm | 2 +-
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index 925e14f7c9..8c55312892 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -213,9 +213,17 @@ SLIME SCANNER
 	if(advanced && M.hallucinating())
 		msg += "\t<span class='info'>Subject is hallucinating.</span>\n"
 
+	//MKUltra
 	if(M.has_status_effect(/datum/status_effect/chem/enthrall))
 		msg += "\t<span class='info'>Subject has abnormal brain fuctions.</span>\n"
 
+	//Astrogen shenanigans
+	if(M.reagents.has_reagent("astral"))
+		if(M.mind)
+			msg += "<span class='danger'>Warning: subject may be possesed.</span>\n"
+		else
+			msg += "<span class='notice'>Subject appears to be astrally projecting.</span>\n"
+
 	//Eyes and ears
 	if(advanced)
 		if(iscarbon(M))
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index 2fa98c59de..5b224444e0 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -281,6 +281,13 @@
 			if(91.01 to INFINITY)
 				msg += "[t_He] [t_is] a shitfaced, slobbering wreck.\n"
 
+	if(reagents.has_reagent("astral"))
+		msg += "[t_He] have wild, spacey eyes"
+		if(mind)
+			msg += " and have a strange, abnormal look to them.\n"
+		else
+			msg += " and don't look like they're all there.\n"
+
 	if(isliving(user))
 		var/mob/living/L = user
 		if(src != user && HAS_TRAIT(L, TRAIT_EMPATH) && !appears_dead)
diff --git a/code/modules/mob/living/simple_animal/astral.dm b/code/modules/mob/living/simple_animal/astral.dm
index d58788ac51..9bac53ef22 100644
--- a/code/modules/mob/living/simple_animal/astral.dm
+++ b/code/modules/mob/living/simple_animal/astral.dm
@@ -45,7 +45,7 @@
 				var/mob/living/carbon/human/H = A
 				if(H.reagents.has_reagent("astral") && !H.mind)
 					var/datum/reagent/fermi/astral/As = locate(/datum/reagent/fermi/astral) in H.reagents.reagent_list
-					if(As.originalmind == src.mind && As.current_cycle < 10)
+					if(As.originalmind == src.mind && As.current_cycle < 10 && H.stat != DEAD) //So you can return to your body.
 						to_chat(src, "<span class='warning'><b><i>The intensity of the astrogen in your body is too much allow you to return to yourself yet!</b></i></span>")
 						return
 					to_chat(src, "<b><i>You astrally possess [H]!</b></i>")