shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4051 from Citadel-Station-13/upstream-merge-32773

Browse Source 
[MIRROR] Integrated circuit fixes and code improvements
This commit is contained in:
deathride58
2017-11-21 19:59:38 +00:00
committed by GitHub
parent 03d67c753e 9f80325c52
commit 4b284f2e0d
21 changed files with 713 additions and 754 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/recharger.dm
+1 -4
View File
@@ -108,10 +108,7 @@
use_power(250 * recharge_coeff)
using_power = 1
update_icon(using_power)
if(istype(charging, /obj/item/gun/energy))
var/obj/item/gun/energy/E = charging
E.recharge_newshot()
return
if(istype(charging, /obj/item/ammo_box/magazine/recharge))
var/obj/item/ammo_box/magazine/recharge/R = charging
if(R.stored_ammo.len < R.max_ammo)