From b8871b804528d49e7abb6f6877c2d0119f102f08 Mon Sep 17 00:00:00 2001 From: Alan Date: Sat, 1 Aug 2026 02:22:55 -0400 Subject: [PATCH] Make spiders ignore SSD players as wrapping targets. (#32346) --- .../mob/living/basic/hostile/giant_spider/giant_spider.dm | 4 +++- .../mob/living/basic/hostile/giant_spider/giant_spider_ai.dm | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/basic/hostile/giant_spider/giant_spider.dm b/code/modules/mob/living/basic/hostile/giant_spider/giant_spider.dm index cfc3421aed7..1c3fe2a07c8 100644 --- a/code/modules/mob/living/basic/hostile/giant_spider/giant_spider.dm +++ b/code/modules/mob/living/basic/hostile/giant_spider/giant_spider.dm @@ -103,6 +103,8 @@ continue if(L.stat != DEAD) continue + if(isLivingSSD(L)) + continue if(istype(L, /mob/living/basic/giant_spider)) continue if(Adjacent(L)) @@ -117,7 +119,7 @@ if(length(choices)) cocoon_target = tgui_input_list(src, "What do you wish to cocoon?", "Cocoon Wrapping", choices) else - to_chat(src, "No suitable dead prey or wrappable objects found nearby.") + to_chat(src, SPAN_WARNING("No suitable dead prey or wrappable objects found nearby.")) return if(cocoon_target) diff --git a/code/modules/mob/living/basic/hostile/giant_spider/giant_spider_ai.dm b/code/modules/mob/living/basic/hostile/giant_spider/giant_spider_ai.dm index 77eb0c27dbe..a6ac107df69 100644 --- a/code/modules/mob/living/basic/hostile/giant_spider/giant_spider_ai.dm +++ b/code/modules/mob/living/basic/hostile/giant_spider/giant_spider_ai.dm @@ -182,7 +182,7 @@ var/list/food = list() var/list/can_see = view(scan_range, spider) for(var/mob/living/C in can_see) - if(C.stat && !istype(C, /mob/living/basic/giant_spider) && !C.anchored) + if(C.stat && !istype(C, /mob/living/basic/giant_spider) && !C.anchored && !isLivingSSD(C)) food += C if(length(food)) controller.set_blackboard_key(target_key, pick(food))