Merge pull request #5944 from Mechoid/Fix_DivZero

I shouldn't do math at 2 AM
This commit is contained in:
Atermonera
2019-02-09 21:09:14 -08:00
committed by GitHub
+6 -5
View File
@@ -149,12 +149,13 @@
/obj/item/weapon/gun/energy/examine(mob/user)
. = ..()
if(power_supply)
var/shots_remaining = 0
if(power_supply.charge)
shots_remaining = round(power_supply.charge / charge_cost)
user << "Has [shots_remaining] shot\s remaining."
if(charge_cost)
var/shots_remaining = round(power_supply.charge / max(1, charge_cost)) // Paranoia
to_chat(user, "Has [shots_remaining] shot\s remaining.")
else
to_chat(user, "Has infinite shots remaining.")
else
user << "Does not have a power cell."
to_chat(user, "Does not have a power cell.")
return
/obj/item/weapon/gun/energy/update_icon(var/ignore_inhands)