diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm index ab023d38b55..b6a960e05ad 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm @@ -84,6 +84,9 @@ else to_chat(user, span_notice("There are no modifications currently installed.")) +/obj/item/gun/energy/recharge/kinetic_accelerator/try_fire_gun(atom/target, mob/living/user, params) + return fire_gun(target, user, user.Adjacent(target) && !isturf(target), params) + /obj/item/gun/energy/recharge/kinetic_accelerator/attack_hand_secondary(mob/user, list/modifiers) . = ..() if(. == SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN) @@ -192,6 +195,7 @@ var/pressure_decrease = 0.25 var/obj/item/gun/energy/recharge/kinetic_accelerator/kinetic_gun + /obj/projectile/kinetic/Destroy() kinetic_gun = null return ..() diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 961d32c96ee..d06a36056d1 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -169,6 +169,9 @@ else . = ..(amount=1) +/obj/item/gun/energy/plasmacutter/try_fire_gun(atom/target, mob/living/user, params) + return fire_gun(target, user, user.Adjacent(target) && !isturf(target), params) + #undef PLASMA_CUTTER_CHARGE_WELD /obj/item/gun/energy/plasmacutter/adv