diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm
index 631877e1482..0285effdd21 100644
--- a/code/modules/mob/living/simple_animal/hostile/hostile.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm
@@ -251,8 +251,10 @@ mob/living/simple_animal/hostile/hitby(atom/movable/AM as mob|obj,var/speed = TH
 		return FALSE
 
 	var/target_hit = FALSE
-
-	for(var/mob/M in check_trajectory(target_mob, src, pass_flags=PASSTABLE))
+	var/flags = PASSTABLE
+	if(istype(projectiletype, /obj/item/projectile/beam))
+		flags |= (PASSGLASS|PASSGRILLE)
+	for(var/mob/M in check_trajectory(target_mob, src, pass_flags=flags))
 		if(M == target_mob)
 			target_hit = TRUE
 		if((M.faction == faction) || (M in friends))
diff --git a/html/changelogs/Sindorman-hostile.yml b/html/changelogs/Sindorman-hostile.yml
new file mode 100644
index 00000000000..c04da2537a2
--- /dev/null
+++ b/html/changelogs/Sindorman-hostile.yml
@@ -0,0 +1,41 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.  
+author: PoZe
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - tweak: "Hostile mobs can now determine if they can shoot through windows. They will check trajectory and if able to shoot through windows - will shoot."