cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-09 16:14:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #6644

Browse Source
This commit is contained in:
D3athrow
2015-11-19 17:21:47 -06:00
parent 0d5b4b692f
commit a42bcc700b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/mecha/equipment/weapons/weapons.dm
View File

@@ -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