From 83da8141f4cdd31b8e8f0617fbd93aa7f2e4198e Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 30 Jun 2017 20:41:49 -0500 Subject: [PATCH] Fixes SM getting energy when hit in space. (#1723) --- code/modules/power/supermatter/supermatter.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index 1ef3ae3d7a..18bb841c6d 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -426,7 +426,7 @@ /obj/machinery/power/supermatter_shard/bullet_act(obj/item/projectile/Proj) var/turf/L = loc - if(!istype(L)) // We don't run process() when we are in space + if(!istype(L) || isspaceturf(L)) // We don't run process() when we are in space return FALSE // This stops people from being able to really power up the supermatter // Then bring it inside to explode instantly upon landing on a valid turf. if(!istype(Proj.firer, /obj/machinery/power/emitter))