That

Citadel-Station-13 · Jan 28, 2025 · 0db6539 · 0db6539
1 parent cc024b6
commit 0db6539
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git 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("<span class='notice'>[user] opens \the [src] and starts pumping the handle.</span>", \
@@ -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("<span class='notice'>[user] begins to turn the crank of \the [src].</span>", \

diff --git 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("<span class='notice'>[user] begins to tighten \the [src]'s electric bowstring.</span>", \
 						"<span class='notice'>You begin to tighten \the [src]'s electric bowstring</span>")