From 40448e731a024963b3fad389248e589f37ca389e Mon Sep 17 00:00:00 2001 From: Joan Lung Date: Mon, 14 Nov 2016 11:34:18 -0500 Subject: [PATCH] Fixes infinite cooldown KAs --- .../projectiles/guns/energy/kinetic_accelerator.dm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm index 00688571713..4fc3f39acfa 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm @@ -226,7 +226,7 @@ /obj/item/borg/upgrade/modkit/attackby(obj/item/A, mob/user) if(istype(A, /obj/item/weapon/gun/energy/kinetic_accelerator) && !issilicon(user)) - install(A) + install(A, user) else ..() @@ -298,7 +298,8 @@ modifier = 2.5 /obj/item/borg/upgrade/modkit/cooldown/install(obj/item/weapon/gun/energy/kinetic_accelerator/KA, mob/user) - if(..()) + . = ..() + if(.) KA.overheat_time -= modifier /obj/item/borg/upgrade/modkit/cooldown/uninstall(obj/item/weapon/gun/energy/kinetic_accelerator/KA) @@ -355,9 +356,11 @@ name = "modified trigger guard" desc = "Allows creatures normally incapable of firing guns to operate the weapon when installed." cost = 20 + denied_type = /obj/item/borg/upgrade/modkit/trigger_guard /obj/item/borg/upgrade/modkit/trigger_guard/install(obj/item/weapon/gun/energy/kinetic_accelerator/KA, mob/user) - if(..()) + . = ..() + if(.) KA.trigger_guard = TRIGGER_GUARD_ALLOW_ALL /obj/item/borg/upgrade/modkit/trigger_guard/uninstall(obj/item/weapon/gun/energy/kinetic_accelerator/KA) @@ -375,7 +378,8 @@ var/chassis_icon = "kineticgun_u" /obj/item/borg/upgrade/modkit/chassis_mod/install(obj/item/weapon/gun/energy/kinetic_accelerator/KA, mob/user) - if(..()) + . = ..() + if(.) KA.icon_state = chassis_icon /obj/item/borg/upgrade/modkit/chassis_mod/uninstall(obj/item/weapon/gun/energy/kinetic_accelerator/KA)