part 2

code/game/objects/items/grenades/clusterbuster.dm

@@ -15,6 +15,7 @@
 	var/segment_chance = 35
 
 /obj/item/grenade/clusterbuster/prime()
+	. = ..()
 	update_mob()
 	var/numspawned = rand(min_spawned,max_spawned)
 	var/again = 0
@@ -29,7 +30,7 @@
 
 	new payload_spawner(drop_location(), payload, numspawned)//Launches payload
 	playsound(src, prime_sound, 75, 1, -3)
-	qdel(src)
+	resolve()
 
 //////////////////////
 //Clusterbang segment
@@ -62,7 +63,7 @@
 /obj/item/grenade/clusterbuster/segment/prime()
 	new payload_spawner(drop_location(), payload, rand(min_spawned,max_spawned))
 	playsound(src, prime_sound, 75, 1, -3)
-	qdel(src)
+	resolve()
 
 //////////////////////////////////
 //The payload spawner effect