From 2f61e6b4bcc9068c471c62b91f5bccadaf0d1f45 Mon Sep 17 00:00:00 2001 From: Bizzonium Date: Sun, 2 Aug 2020 18:49:26 +0300 Subject: [PATCH 1/2] Fix runtime in Hallucination.dm when target.client is null --- code/modules/flufftext/Hallucination.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index 905b629a0b9..78cda2c0f88 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -159,6 +159,8 @@ Gunshots/explosions/opening doors/less rare audio (done) next_expand = world.time + FAKE_FLOOD_EXPAND_TIME /obj/effect/hallucination/fake_flood/proc/Expand() + if(!target) + qdel(src) for(var/turf/FT in flood_turfs) for(var/dir in GLOB.cardinal) var/turf/T = get_step(FT, dir) From 372fd1ba818edf30038a8da539e83939a9e1f9b4 Mon Sep 17 00:00:00 2001 From: Bizzonium Date: Mon, 3 Aug 2020 00:13:03 +0300 Subject: [PATCH 2/2] Code improvements --- code/modules/flufftext/Hallucination.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index 78cda2c0f88..21b99acb910 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -149,18 +149,18 @@ Gunshots/explosions/opening doors/less rare audio (done) /obj/effect/hallucination/fake_flood/process() if(!target) qdel(src) + return if(next_expand <= world.time) radius++ if(radius > FAKE_FLOOD_MAX_RADIUS) qdel(src) + return Expand() if((get_turf(target) in flood_turfs) && !target.internal) target.hallucinate("fake_alert", "too_much_tox") next_expand = world.time + FAKE_FLOOD_EXPAND_TIME /obj/effect/hallucination/fake_flood/proc/Expand() - if(!target) - qdel(src) for(var/turf/FT in flood_turfs) for(var/dir in GLOB.cardinal) var/turf/T = get_step(FT, dir)