From d4e2df4123366112bdbd37a43b8644a9830fdbcb Mon Sep 17 00:00:00 2001
From: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
Date: Thu, 1 Aug 2024 17:53:47 +0200
Subject: [PATCH] Crusher will not stop and stare at effects anymore (#19724)

Crusher will not stop and stare at effects anymore

Fixes #19723
---
 .../mob/living/simple_animal/friendly/cat.dm  |  2 +-
 .../fluffyghost-fixcrusherseeingeffects.yml   | 58 +++++++++++++++++++
 2 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 html/changelogs/fluffyghost-fixcrusherseeingeffects.yml

diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm
index fe17acc42bb..1bba511b5b8 100644
--- a/code/modules/mob/living/simple_animal/friendly/cat.dm
+++ b/code/modules/mob/living/simple_animal/friendly/cat.dm
@@ -81,7 +81,7 @@
 				var/turf/T = spook.loc
 				var/list/visible = list()
 				for(var/obj/O in T.contents)
-					if(!O.invisibility && O.name)
+					if(!O.invisibility && O.name && !istype(O, /obj/effect))
 						visible += O
 				if(visible.len)
 					var/atom/A = pick(visible)
diff --git a/html/changelogs/fluffyghost-fixcrusherseeingeffects.yml b/html/changelogs/fluffyghost-fixcrusherseeingeffects.yml
new file mode 100644
index 00000000000..122173d55ac
--- /dev/null
+++ b/html/changelogs/fluffyghost-fixcrusherseeingeffects.yml
@@ -0,0 +1,58 @@
+################################
+# 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
+#     - (fixes bugs)
+#   wip
+#     - (work in progress)
+#   qol
+#     - (quality of life)
+#   soundadd
+#     - (adds a sound)
+#   sounddel
+#     - (removes a sound)
+#   rscadd
+#     - (adds a feature)
+#   rscdel
+#     - (removes a feature)
+#   imageadd
+#     - (adds an image or sprite)
+#   imagedel
+#     - (removes an image or sprite)
+#   spellcheck
+#     - (fixes spelling or grammar)
+#   experiment
+#     - (experimental change)
+#   balance
+#     - (balance changes)
+#   code_imp
+#     - (misc internal code change)
+#   refactor
+#     - (refactors code)
+#   config
+#     - (makes a change to the config files)
+#   admin
+#     - (makes changes to administrator tools)
+#   server
+#     - (miscellaneous changes to server)
+#################################
+
+# Your name.
+author: FluffyGhost
+
+# 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, this gets changed to [] after reading.  Just remove the brackets when you add new shit.
+# Please surround your changes in  double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - bugfix: "Crusher will not stop and stare at effects anymore."