From 1a15772c3a5ab81e13dc884d214bc0e08430c82a Mon Sep 17 00:00:00 2001 From: swindly Date: Mon, 11 Dec 2017 21:37:23 -0500 Subject: [PATCH 1/2] Makes swarmers check for mobs in objects (#33425) --- code/game/gamemodes/miniantags/bot_swarm/swarmer.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm index c26bb584ee..3fe32a7f33 100644 --- a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm +++ b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm @@ -167,9 +167,13 @@ /turf/closed/indestructible/swarmer_act() return FALSE -/obj/swarmer_act() +/obj/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) if(resistance_flags & INDESTRUCTIBLE) return FALSE + for(var/mob/living/L in contents) + if(!issilicon(L) && !isbrain(L)) + to_chat(S, "An organism has been detected inside this object. Aborting.") + return FALSE return ..() /obj/item/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)