Merge pull request #2625 from Aurorablade/FixyFixy

[Fix] Ghost in the Swarming Shell

code/game/objects/effects/overlays.dm

@@ -19,6 +19,41 @@
 		..()
 		spawn(10) qdel(src)
 
+
+/obj/effect/overlay/temp
+	anchored = 1
+	layer = 4.1
+	mouse_opacity = 0
+	var/duration = 10
+	var/randomdir = 1
+
+/obj/effect/overlay/temp/New()
+	if(randomdir)
+		dir = pick(cardinal)
+	spawn(duration)
+		qdel(src)
+
+/obj/effect/overlay/temp/revenant
+	name = "spooky lights"
+	icon = 'icons/effects/effects.dmi'
+	icon_state = "purplesparkles"
+
+/obj/effect/overlay/temp/revenant/cracks
+	name = "glowing cracks"
+	icon_state = "purplecrack"
+	duration = 6
+
+/obj/effect/overlay/temp/emp
+	name = "emp sparks"
+	icon = 'icons/effects/effects.dmi'
+	icon_state = "empdisable"
+
+/obj/effect/overlay/temp/emp/pulse
+	name = "emp pulse"
+	icon_state = "emp pulse"
+	duration = 20
+	randomdir = 0
+
 /obj/effect/overlay/palmtree_r
 	name = "Palm tree"
 	icon = 'icons/misc/beach2.dmi'

code/game/objects/empulse.dm

@@ -9,13 +9,7 @@ proc/empulse(turf/epicenter, heavy_range, light_range, log=0)
 		log_game("EMP with size ([heavy_range], [light_range]) in area [epicenter.loc.name] ")
 
 	if(heavy_range > 1)
-		var/obj/effect/overlay/pulse = new/obj/effect/overlay ( epicenter )
-		pulse.icon = 'icons/effects/effects.dmi'
-		pulse.icon_state = "emppulse"
-		pulse.name = "emp pulse"
-		pulse.anchored = 1
-		spawn(20)
-			pulse.delete()
+		new/obj/effect/overlay/temp/emp/pulse(epicenter)
 
 	if(heavy_range > light_range)
 		light_range = heavy_range

code/game/objects/items/weapons/shards.dm

@@ -53,6 +53,8 @@
 /obj/item/weapon/shard/Crossed(AM as mob|obj)
 	if(isliving(AM))
 		var/mob/living/M = AM
+		if (M.incorporeal_move || M.flying)//you are incorporal or flying..no shard stepping!
+			return
 		M << "\red <B>You step on \the [src]!</B>"
 		playsound(src.loc, 'sound/effects/glass_step.ogg', 50, 1) // not sure how to handle metal shards with sounds
 		if(ishuman(M))