From 24c772e86ab03f9f3c5051c8abb584008db9f809 Mon Sep 17 00:00:00 2001
From: FenodyreeAv <fenodyree.av@gmail.com>
Date: Tue, 4 Aug 2026 11:50:23 +0100
Subject: [PATCH] Fixes window frames blocking bullets and thrown grenades
 (#22995)

- bugfix: "Fixed window frames blocking thrown grenades and bullets."
- bugfix: "Fixed grenades launched instead of being thrown getting stuck
on railings and tables."
---
 code/game/objects/items/weapons/grenades/grenade.dm | 1 +
 code/game/objects/structures/full_window_frame.dm   | 6 +++++-
 html/changelogs/Fenodyree-FixWindowFrames.yml       | 7 +++++++
 3 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 html/changelogs/Fenodyree-FixWindowFrames.yml

diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm
index 92343121903..110f249c99d 100644
--- a/code/game/objects/items/weapons/grenades/grenade.dm
+++ b/code/game/objects/items/weapons/grenades/grenade.dm
@@ -12,6 +12,7 @@
 	throw_speed = 4
 	throw_range = 20
 	obj_flags = OBJ_FLAG_CONDUCTABLE
+	pass_flags_self = PASSTABLE | PASSRAILING
 	slot_flags = SLOT_BELT
 	contained_sprite = 1
 	var/active = 0
diff --git a/code/game/objects/structures/full_window_frame.dm b/code/game/objects/structures/full_window_frame.dm
index 2eb0d2eb3c9..84b99da33ea 100644
--- a/code/game/objects/structures/full_window_frame.dm
+++ b/code/game/objects/structures/full_window_frame.dm
@@ -6,7 +6,7 @@
 	maxhealth = OBJECT_HEALTH_MEDIUM
 	color = COLOR_GRAY20
 	build_amt = 4
-	pass_flags_self = PASSRAILING
+	pass_flags_self = PASSRAILING | LETPASSTHROW
 	layer = WINDOW_FRAME_LAYER
 	anchored = TRUE
 	density = TRUE
@@ -54,6 +54,10 @@
 		return TRUE
 	if(istype(mover, /obj/structure/closet/crate))
 		return TRUE
+	if(istype(mover,/obj/projectile))
+		return TRUE
+	if(mover.throwing)
+		return TRUE
 	if(istype(mover) && mover.pass_flags & PASSTABLE)
 		return TRUE
 	if(locate(/obj/structure/window_frame) in get_turf(mover))
diff --git a/html/changelogs/Fenodyree-FixWindowFrames.yml b/html/changelogs/Fenodyree-FixWindowFrames.yml
new file mode 100644
index 00000000000..1dca1d0072c
--- /dev/null
+++ b/html/changelogs/Fenodyree-FixWindowFrames.yml
@@ -0,0 +1,7 @@
+author: Fenodyree
+
+delete-after: True
+
+changes:
+  - bugfix: "Fixed window frames blocking thrown grenades and bullets."
+  - bugfix: "Fixed grenades launched instead of being thrown getting stuck on railings and tables."