Merge pull request #582 from Citadel-Station-13/upstream-merge-26471

[MIRROR] Fixes chameleon guns projectile
2017-04-27 12:52:14 -05:00
parent 98be8d236f 3a80e3529f
commit a2873d5b9e
1 changed files with 1 additions and 2 deletions
@@ -455,8 +455,7 @@
 		if(v in blacklisted_vars)
 			continue
 		vars[v] = initial(vars[v])
-	if(chambered.BB)
-		qdel(chambered.BB)
+	QDEL_NULL(chambered.BB)
 	chambered.newshot()

 /obj/item/weapon/gun/energy/laser/chameleon/proc/set_chameleon_ammo(obj/item/ammo_casing/AC, passthrough = TRUE, reset = FALSE)