cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #999 from ESwordTheCat/riW3nfAj

Browse Source 
Add Destroy() to energy guns.
This commit is contained in:
d3athrow
2014-07-04 10:39:52 -05:00
parent 5d6c218294 41404001e8
commit 5d0c369399
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
code/modules/projectiles/guns/energy.dm
View File

@@ -16,16 +16,6 @@
..()
New()
..()
if(cell_type)
power_supply = new cell_type(src)
else
power_supply = new(src)
power_supply.give(power_supply.maxcharge)
return
load_into_chamber()
if(in_chamber) return 1
if(!power_supply) return 0
@@ -42,3 +32,20 @@
icon_state = "[modifystate][ratio]"
else
icon_state = "[initial(icon_state)][ratio]"
/obj/item/weapon/gun/energy/New()
. = ..()
if(cell_type)
power_supply = new cell_type(src)
else
power_supply = new(src)
power_supply.give(power_supply.maxcharge)
/obj/item/weapon/gun/energy/Destroy()
if(power_supply)
power_supply.loc = get_turf(src)
power_supply = null
..()