From e1af66e5230547bc33eb741b84d15087f7132d78 Mon Sep 17 00:00:00 2001
From: Snowy1237 <54201120+Snowy1237@users.noreply.github.com>
Date: Sun, 20 Oct 2024 14:22:12 +0300
Subject: [PATCH] Fixes greimorian workers making greimorians out of dead
 greimorians. (#20084)

Greimorians are no longer the ultimate lifeform and have lost their
mastery over recycling.

This will help with greimorian offsites/odysseys/any time it's not
intended for them to balloon into a singularity.
---
 .../simple_animal/hostile/giant_spider.dm     |  2 +-
 html/changelogs/Snowy1237-grem_fix.yml        | 58 +++++++++++++++++++
 2 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 html/changelogs/Snowy1237-grem_fix.yml

diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
index 1c29b38bb73..44fdf09caf8 100644
--- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
+++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
@@ -247,7 +247,7 @@
 			if(!busy && prob(30))
 				//first, check for potential food nearby to cocoon
 				for(var/mob/living/C in view(src, world.view))
-					if(C.stat)
+					if(C.stat && !istype(C, /mob/living/simple_animal/hostile/giant_spider))
 						cocoon_target = C
 						busy = MOVING_TO_TARGET
 						GLOB.move_manager.move_to(src, C, 1, move_to_delay)
diff --git a/html/changelogs/Snowy1237-grem_fix.yml b/html/changelogs/Snowy1237-grem_fix.yml
new file mode 100644
index 00000000000..837de965f4b
--- /dev/null
+++ b/html/changelogs/Snowy1237-grem_fix.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: Snowy1237
+
+# 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: "Fixed greimorian workers making greimorians out of dead greimorians."