From 3d1b6717035a494e1e1e85a070ff87914770cecf Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Wed, 13 May 2015 23:04:33 +0200 Subject: [PATCH 1/2] Asking for more energy than a cell has stored now drains the cell. Fixes #9252. --- code/modules/power/cell.dm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index 55c78538d6..553891565c 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -42,10 +42,8 @@ if(rigged && amount > 0) explode() return 0 - - if(charge < amount) return 0 - charge = (charge - amount) - return 1 + charge = max(0, charge - amount) + return charge // recharge the cell /obj/item/weapon/cell/proc/give(var/amount) From 09754dbd1808c101088a9e90d155be31624d92f0 Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Wed, 13 May 2015 23:39:03 +0200 Subject: [PATCH 2/2] Changelog entry. --- html/changelogs/PsiOmegaDelta-BatteryDepletion.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/PsiOmegaDelta-BatteryDepletion.yml diff --git a/html/changelogs/PsiOmegaDelta-BatteryDepletion.yml b/html/changelogs/PsiOmegaDelta-BatteryDepletion.yml new file mode 100644 index 0000000000..e36fc586da --- /dev/null +++ b/html/changelogs/PsiOmegaDelta-BatteryDepletion.yml @@ -0,0 +1,5 @@ +author: PsiOmegaDelta +delete-after: True + +changes: + - bugfix: "Cells now drain when using more charge than what is available."