mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-30 16:47:13 +01:00
Fix wands losing a charge even when no shot was actually fired (#4588).
This commit is contained in:
@@ -28,7 +28,7 @@
|
||||
icon_state = "[initial(icon_state)][BB ? "-live" : ""]"
|
||||
desc = "[initial(desc)][BB ? "" : " This one is spent"]"
|
||||
|
||||
/obj/item/ammo_casing/proc/newshot() //For energy weapons and shotgun shells.
|
||||
/obj/item/ammo_casing/proc/newshot() //For energy weapons, shotgun shells and wands (!).
|
||||
if (!BB)
|
||||
BB = new projectile_type(src)
|
||||
return
|
||||
|
||||
@@ -32,7 +32,11 @@
|
||||
/obj/item/weapon/gun/magic/proc/newshot()
|
||||
if (charges && chambered)
|
||||
chambered.newshot()
|
||||
charges--
|
||||
return
|
||||
|
||||
/obj/item/weapon/gun/magic/process_chamber()
|
||||
if(chambered && !chambered.BB) //if BB is null, i.e the shot has been fired...
|
||||
charges--//... drain a charge
|
||||
return
|
||||
|
||||
/obj/item/weapon/gun/magic/New()
|
||||
|
||||
Reference in New Issue
Block a user