Merge pull request #7352 from Citadel-Station-13/upstream-merge-38931

[MIRROR] Fixes pulse rifles exploding structures in nullspace and that sort of thing
This commit is contained in:
deathride58
2018-07-10 01:57:08 -04:00
committed by GitHub
+1 -1
View File
@@ -90,7 +90,7 @@
/obj/item/projectile/beam/pulse/on_hit(atom/target, blocked = FALSE)
. = ..()
if(isturf(target) || istype(target, /obj/structure/))
if (!QDELETED(target) && (isturf(target) || istype(target, /obj/structure/)))
target.ex_act(EXPLODE_HEAVY)
/obj/item/projectile/beam/pulse/shotgun