From 7554538acaa26b8085e6d47feecbdb69abf87a82 Mon Sep 17 00:00:00 2001 From: Hatterhat <31829017+Hatterhat@users.noreply.github.com> Date: Wed, 14 Jun 2023 14:50:55 -0500 Subject: [PATCH] Fixes MOD plasma core recharge amount from plasma sheets (#76022) ## About The Pull Request title ## Why It's Good For The Game this looks like it was erroneously done and has kneecapped recharging off sheets in the process ## Changelog :cl: fix: MOD plasma cores' improved recharging from sheets (2000 charge up from 1500) is back again. /:cl: --------- Co-authored-by: Hatterhat --- code/modules/mod/mod_core.dm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/code/modules/mod/mod_core.dm b/code/modules/mod/mod_core.dm index 6b67d735a29..06dace8b5b0 100644 --- a/code/modules/mod/mod_core.dm +++ b/code/modules/mod/mod_core.dm @@ -279,6 +279,9 @@ return mod.wearer.throw_alert(ALERT_MODSUIT_CHARGE, /atom/movable/screen/alert/nocell) +#define PLASMA_CORE_ORE_CHARGE 1500 +#define PLASMA_CORE_SHEET_CHARGE 2000 + /obj/item/mod/core/plasma name = "MOD plasma core" icon_state = "mod-core-plasma" @@ -289,7 +292,7 @@ /// How much charge we are currently storing. var/charge = 10000 /// Associated list of charge sources and how much they charge, only stacks allowed. - var/list/charger_list = list(/obj/item/stack/ore/plasma = 1500, /obj/item/stack/sheet/mineral/plasma =SHEET_MATERIAL_AMOUNT) + var/list/charger_list = list(/obj/item/stack/ore/plasma = PLASMA_CORE_ORE_CHARGE, /obj/item/stack/sheet/mineral/plasma = PLASMA_CORE_SHEET_CHARGE) /obj/item/mod/core/plasma/install(obj/item/mod/control/mod_unit) . = ..() @@ -356,6 +359,9 @@ balloon_alert(user, "core refueled") return TRUE +#undef PLASMA_CORE_ORE_CHARGE +#undef PLASMA_CORE_SHEET_CHARGE + /obj/item/mod/core/plasma/lavaland name = "MOD plasma flower core" icon_state = "mod-core-plasma-flower"