Merge pull request #4123 from Citadel-Station-13/upstream-merge-32993

[MIRROR] A few investigate_log and message_admin fixes

code/modules/flufftext/Hallucination.dm

@@ -13,13 +13,6 @@ Gunshots/explosions/opening doors/less rare audio (done)
 
 #define HAL_LINES_FILE "hallucination.json"
 
-/mob/living/carbon
-	var/image/halimage
-	var/image/halbody
-	var/obj/halitem
-	var/hal_screwyhud = SCREWYHUD_NONE
-	var/next_hallucination = 0
-
 GLOBAL_LIST_INIT(hallucinations_minor, list(
 	/datum/hallucination/sounds,
 	/datum/hallucination/bolts,
@@ -82,6 +75,7 @@ GLOBAL_LIST_INIT(hallucinations_major, list(
 
 /datum/hallucination/Destroy()
 	target.investigate_log("was afflicted with a hallucination of type [type]. [feedback_details]", INVESTIGATE_HALLUCINATIONS)
+	target = null
 	return ..()
 
 /obj/effect/hallucination
@@ -203,7 +197,6 @@ GLOBAL_LIST_INIT(hallucinations_major, list(
 	flood_turfs = list()
 	if(target.client)
 		target.client.images.Remove(flood_images)
-	target = null
 	qdel(flood_images)
 	flood_images = list()
 	return ..()
@@ -1159,4 +1152,3 @@ GLOBAL_LIST_INIT(hallucinations_major, list(
 	H.preparePixelProjectile(target, start)
 	H.fire()
 	qdel(src)
-

code/modules/mob/living/carbon/carbon_defines.dm

@@ -49,3 +49,10 @@
 
 	var/icon_render_key = ""
 	var/static/list/limb_icon_cache = list()
+
+	//halucination vars
+	var/image/halimage
+	var/image/halbody
+	var/obj/halitem
+	var/hal_screwyhud = SCREWYHUD_NONE
+	var/next_hallucination = 0