diff --git a/code/modules/projectiles/guns/gun/projectile/energy/frontier.dm b/code/modules/projectiles/guns/gun/projectile/energy/frontier.dm
index 5fb674cb7f1..44f0592d059 100644
--- a/code/modules/projectiles/guns/gun/projectile/energy/frontier.dm
+++ b/code/modules/projectiles/guns/gun/projectile/energy/frontier.dm
@@ -23,10 +23,12 @@
. = ..()
if(.)
return
- #warn inactive held item check
var/mob/user = e_args.performer
+ if(!user.inventory.count_empty_hands())
+ return
if(recharging)
return
+ . = TRUE
recharging = 1
update_icon()
user.visible_message("[user] opens \the [src] and starts pumping the handle.", \
@@ -108,10 +110,14 @@
/obj/item/gun/projectile/energy/frontier/taj/on_attack_hand(datum/event_args/actor/clickchain/e_args)
. = ..()
- #warn inactive held check or component this shit
+ if(.)
+ return
+ if(!user.inventory.count_empty_hands())
+ return
var/mob/user = e_args.performer
if(recharging)
return
+ . = TRUE
recharging = 1
update_icon()
user.visible_message("[user] begins to turn the crank of \the [src].", \
diff --git a/code/modules/projectiles/guns/gun/projectile/energy/hardlight_bow.dm b/code/modules/projectiles/guns/gun/projectile/energy/hardlight_bow.dm
index 2c711a02cfe..5cc1569b452 100644
--- a/code/modules/projectiles/guns/gun/projectile/energy/hardlight_bow.dm
+++ b/code/modules/projectiles/guns/gun/projectile/energy/hardlight_bow.dm
@@ -18,10 +18,12 @@
. = ..()
if(.)
return
- #warn offhand or component
var/mob/user = e_args.performer
+ if(!user.inventory.count_empty_hands())
+ return
if(recharging)
return
+ . = TRUE
recharging = 1
user.visible_message("[user] begins to tighten \the [src]'s electric bowstring.", \
"You begin to tighten \the [src]'s electric bowstring")