From 47bcf542fc961dcd4d28fc1be0e5a3f85fb11921 Mon Sep 17 00:00:00 2001 From: Atermonera Date: Sat, 9 Feb 2019 21:09:14 -0800 Subject: [PATCH] I shouldn't do math at 2 AM --- code/modules/projectiles/guns/energy.dm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index 9cfd0d152a..f57feb4c6a 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -149,10 +149,18 @@ /obj/item/weapon/gun/energy/examine(mob/user) . = ..() if(power_supply) +<<<<<<< HEAD var/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.") +>>>>>>> 2ce4013... Merge pull request #5944 from Mechoid/Fix_DivZero 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)