cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

I shouldn't do math at 2 AM

Browse Source
This commit is contained in:
Atermonera
2019-02-09 21:09:14 -08:00
committed by VirgoBot
parent 30ab44613d
commit 47bcf542fc
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/modules/projectiles/guns/energy.dm
View File

@@ -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)