From 8b08f8ff34834e13bb73422d10913e00ae98a6d7 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Sat, 15 Aug 2015 02:37:13 -0400 Subject: [PATCH] Fixes explosions deleting projectiles --- .../objects/items/weapons/grenades/fragmentation.dm | 1 - code/modules/projectiles/projectile.dm | 10 ++++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/code/game/objects/items/weapons/grenades/fragmentation.dm b/code/game/objects/items/weapons/grenades/fragmentation.dm index 6ae37db22dd..d52c008cfea 100644 --- a/code/game/objects/items/weapons/grenades/fragmentation.dm +++ b/code/game/objects/items/weapons/grenades/fragmentation.dm @@ -7,7 +7,6 @@ spread_step = 20 //silenced = 1 //embedding messages are still produced so it's kind of weird when enabled. - move_delay = 10 muzzle_type = null /obj/item/weapon/grenade/frag diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index aab5835fbae..37a8468e31c 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -265,13 +265,11 @@ qdel(src) return 1 -/obj/item/projectile/CanPass(atom/movable/mover, turf/target, height=0, air_group=0) - if(air_group || (height==0)) return 1 +/obj/item/projectile/ex_act() + return //explosions probably shouldn't delete projectiles - if(istype(mover, /obj/item/projectile)) - return prob(95) //ha - else - return 1 +/obj/item/projectile/CanPass(atom/movable/mover, turf/target, height=0, air_group=0) + return 1 /obj/item/projectile/process() var/first_step = 1