From b6eb1bdf3acf378248fda8988bce968d35a413fc Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Thu, 7 Jan 2021 00:14:36 +0100
Subject: [PATCH] [MIRROR] suppermatter doesn't get angry with mindless wights
 (#2530)

* suppermatter doesn't get angry with mindless wights (#55960)

Co-authored-by: Ghom <42542238+Ghommie@ users.noreply.github.com>

* suppermatter doesn't get angry with mindless wights

Co-authored-by: spessbro <51048066+spessbro@users.noreply.github.com>
Co-authored-by: Ghom <42542238+Ghommie@ users.noreply.github.com>
---
 code/modules/power/supermatter/supermatter.dm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm
index ac7d150389d..736009f6b52 100644
--- a/code/modules/power/supermatter/supermatter.dm
+++ b/code/modules/power/supermatter/supermatter.dm
@@ -709,6 +709,8 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
 	for(var/mob/living/carbon/human/l in view(src, HALLUCINATION_RANGE(power)))
 		// Someone (generally a Psychologist), when looking at the SM
 		// within hallucination range makes it easier to manage.
+		if (QDELETED(l.mind))
+			continue
 		if(HAS_TRAIT(l.mind, TRAIT_SUPERMATTER_SOOTHER))
 			toAdd = 0.05
 			psy_overlay = TRUE