A few investigate_log and message_admin fixes

This commit is contained in:
Jordie
2017-11-25 15:42:06 +11:00
committed by CitadelStationBot
parent ff94b3e1e1
commit 4053499c83
5 changed files with 151 additions and 9 deletions
+1 -9
View File
@@ -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)