From 957edb44208d8318c7ac9fd18b2ecd6f37ad8a81 Mon Sep 17 00:00:00 2001 From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Mon, 4 Oct 2021 15:26:57 -0400 Subject: [PATCH] Fixes being able to install 0 cost upgrades on an energy crossbow (#16861) * Fixes being able to install 0 cost upgrades on an energy crossbow * Just uses max_mod_capacity * Update code/modules/projectiles/guns/energy/kinetic_accelerator.dm Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> --- .../projectiles/guns/energy/kinetic_accelerator.dm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm index 4f38db8ad8c..fc19c2e12ed 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm @@ -36,7 +36,7 @@ . += "There is a [M.name] mod installed, using [M.cost]% capacity." /obj/item/gun/energy/kinetic_accelerator/attackby(obj/item/I, mob/user) - if(istype(I, /obj/item/borg/upgrade/modkit)) + if(istype(I, /obj/item/borg/upgrade/modkit) && max_mod_capacity) var/obj/item/borg/upgrade/modkit/MK = I MK.install(src, user) else @@ -44,6 +44,8 @@ /obj/item/gun/energy/kinetic_accelerator/crowbar_act(mob/user, obj/item/I) . = TRUE + if(!max_mod_capacity) + return if(!modkits.len) to_chat(user, "There are no modifications currently installed.") return @@ -270,7 +272,11 @@ /obj/item/borg/upgrade/modkit/attackby(obj/item/A, mob/user) if(istype(A, /obj/item/gun/energy/kinetic_accelerator) && !issilicon(user)) - install(A, user) + var/obj/item/gun/energy/kinetic_accelerator/KA = A + if(KA.max_mod_capacity) + install(A, user) + else + return ..() else return ..()