From a42bcc700bef4fd58e11024b4a7610809b166054 Mon Sep 17 00:00:00 2001 From: D3athrow Date: Thu, 19 Nov 2015 17:21:47 -0600 Subject: [PATCH] Fixes #6644 --- code/game/mecha/equipment/weapons/weapons.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index a8a8f86c7b6..c1a267ec06e 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -88,7 +88,7 @@ var/mob/M = A add_logs(firer, M, "shot", object="[src]") if(life <= 0) - del(src) + returnToPool(src) return /obj/item/mecha_parts/mecha_equipment/weapon/energy/taser @@ -215,7 +215,7 @@ if(!targloc || targloc == curloc) break playsound(chassis, fire_sound, 80, 1) - var/obj/item/projectile/A = new projectile(curloc) + var/obj/item/projectile/A = getFromPool(projectile,curloc)//new projectile(curloc) src.projectiles-- A.original = target A.current = curloc