From 18932a5d3177c6d3bca7cee924986eff0bde8aa2 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 5 Feb 2018 00:51:34 -0600 Subject: [PATCH] [MIRROR] [s] Fixes clogged vents delamming the supermatter (#5303) * [s] Fixes clogged vents delamming the supermatter (#35300) wow forgot to commit thiss to the PR lmao * [s] Fixes clogged vents delamming the supermatter --- code/modules/power/supermatter/supermatter.dm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index 5e62ea9729..20b5480da8 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -588,11 +588,12 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_shard) matter_power += 200 else if(istype(AM, /obj/singularity)) return - else if(isobj(AM) && !istype(AM, /obj/effect)) - investigate_log("has consumed [AM].", INVESTIGATE_SUPERMATTER) + else if(isobj(AM)) + if(!istype(AM, /obj/effect)) + investigate_log("has consumed [AM].", INVESTIGATE_SUPERMATTER) qdel(AM) - - matter_power += 200 + if(!istype(AM, /obj/effect)) + matter_power += 200 //Some poor sod got eaten, go ahead and irradiate people nearby. radiation_pulse(src, 3000, 2, TRUE)