Integrated circuit fixes and code improvements

This commit is contained in:
ACCount
2017-11-21 12:04:09 +03:00
committed by CitadelStationBot
parent 065a816183
commit 8a64287249
21 changed files with 720 additions and 555 deletions
+10
View File
@@ -102,6 +102,16 @@
chambered = null //either way, released the prepared shot
recharge_newshot() //try to charge a new shot
/obj/item/gun/energy/process_fire()
if(!chambered && can_shoot())
process_chamber() // If the gun was drained and then recharged, load a new shot.
return ..()
/obj/item/gun/energy/process_burst()
if(!chambered && can_shoot())
process_chamber() // Ditto.
return ..()
/obj/item/gun/energy/proc/select_fire(mob/living/user)
select++
if (select > ammo_type.len)
@@ -126,7 +126,6 @@
/obj/item/gun/energy/kinetic_accelerator/proc/reload()
cell.give(cell.maxcharge)
recharge_newshot(1)
if(!suppressed)
playsound(src.loc, 'sound/weapons/kenetic_reload.ogg', 60, 1)
else
@@ -145,12 +145,10 @@
var/obj/item/stack/sheet/S = A
S.use(1)
cell.give(1000)
recharge_newshot(1)
to_chat(user, "<span class='notice'>You insert [A] in [src], recharging it.</span>")
else if(istype(A, /obj/item/ore/plasma))
qdel(A)
cell.give(500)
recharge_newshot(1)
to_chat(user, "<span class='notice'>You insert [A] in [src], recharging it.</span>")
else
..()