Merge pull request #34838 from ShizCalev/sm-godmode-fix

Fixes poly's ghost SM spam
2018-01-24 19:07:49 -05:00
parent 9652fc4127
commit fa3693c00f
2 changed files with 4 additions and 2 deletions
@@ -146,7 +146,7 @@
 /obj/singularity/energy_ball/proc/dust_mobs(atom/A)
 	if(isliving(A))
 		var/mob/living/L = A
-		if(L.incorporeal_move)
+		if(L.incorporeal_move || L.status_flags & GODMODE)
 			return
 	if(!iscarbon(A))
 		return