From 333e2a58ba74263cfc8d98b0da9926a7e1e75d63 Mon Sep 17 00:00:00 2001
From: CHOMPStation2StaffMirrorBot
 <94713762+CHOMPStation2StaffMirrorBot@users.noreply.github.com>
Date: Tue, 3 Feb 2026 11:43:44 -0700
Subject: [PATCH] [MIRROR] Bow Loading Fix (#12357)

Co-authored-by: Will <7099514+Willburd@users.noreply.github.com>
---
 code/modules/projectiles/guns/launcher/bows.dm     | 8 +++++---
 code/modules/projectiles/guns/launcher/crossbow.dm | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/code/modules/projectiles/guns/launcher/bows.dm b/code/modules/projectiles/guns/launcher/bows.dm
index a4e1515962..5dc07a2d54 100644
--- a/code/modules/projectiles/guns/launcher/bows.dm
+++ b/code/modules/projectiles/guns/launcher/bows.dm
@@ -131,6 +131,7 @@
 	icon_state = "bow_hardlight"
 	item_state = "bow_hardlight"
 	desc = "An energy bow, capable of producing arrows from an internal power supply."
+	hardlight = TRUE
 
 /obj/item/gun/launcher/crossbow/bow/hardlight/unload(mob/user)
 	QDEL_NULL(bolt)
@@ -144,12 +145,13 @@
 		user.visible_message(span_infoplain(span_bold("[user]") + " relaxes the tension on [src]'s string."),span_infoplain("You relax the tension on [src]'s string."))
 		drawn = FALSE
 		update_icon()
-	else if(!bolt)
+		return
+	// Automatically knock the arrow as it forms
+	if(!bolt)
 		user.visible_message(span_infoplain(span_bold("[user]") + " fabricates a new hardlight projectile with [src]."),span_infoplain("You fabricate a new hardlight projectile with [src]."))
 		bolt = new /obj/item/arrow/energy(src)
 		update_icon()
-	else
-		draw(user)
+	draw(user)
 
 /obj/item/gun/launcher/crossbow/bow/glamour
 	name = "glamour bow"
diff --git a/code/modules/projectiles/guns/launcher/crossbow.dm b/code/modules/projectiles/guns/launcher/crossbow.dm
index 7486bc1ecf..0685c87bfd 100644
--- a/code/modules/projectiles/guns/launcher/crossbow.dm
+++ b/code/modules/projectiles/guns/launcher/crossbow.dm
@@ -92,7 +92,7 @@
 	if(.)
 		return TRUE
 	if(is_bow)
-		return TRUE
+		return FALSE
 	if(tension)
 		if(bolt)
 			user.visible_message("[user] relaxes the tension on [src]'s string and removes [bolt].","You relax the tension on [src]'s string and remove [bolt].")