From abdbcc0b53aa4d1b3887d1bb303697ad024c1282 Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Wed, 12 Apr 2017 00:48:38 -0700 Subject: [PATCH] fixes supermatter being able to disintegrate singularities (#26063) * Update supermatter.dm * Update supermatter.dm * Update supermatter.dm --- 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 cacf66cd629..5149a2d75e9 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -491,6 +491,8 @@ investigate_log("has consumed [key_name(user)].", "supermatter") user.dust() matter_power += 200 + else if(istype(AM, /obj/singularity)) + return else if(isobj(AM) && !istype(AM, /obj/effect)) investigate_log("has consumed [AM].", "supermatter") qdel(AM)