From 4cc53d68a2bdf0ceae5c36ce506e6d2e8f488b3a Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Mon, 23 Oct 2017 09:38:00 -0400 Subject: [PATCH 1/2] Makes cleanbots clean up remains (#31876) * Makes cleanbots clean up remains * Gooooooooo * Acid_act --- code/modules/mob/living/simple_animal/bot/cleanbot.dm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/simple_animal/bot/cleanbot.dm b/code/modules/mob/living/simple_animal/bot/cleanbot.dm index af4d8736b6..18c4dcd40c 100644 --- a/code/modules/mob/living/simple_animal/bot/cleanbot.dm +++ b/code/modules/mob/living/simple_animal/bot/cleanbot.dm @@ -124,6 +124,9 @@ if(!target) //Search for decals then. target = scan(/obj/effect/decal/cleanable) + + if(!target) //Checks for remains + target = scan(/obj/effect/decal/remains) if(!target && trash) //Then for trash. target = scan(/obj/item/trash) @@ -178,7 +181,8 @@ /obj/effect/decal/cleanable/ash, /obj/effect/decal/cleanable/greenglow, /obj/effect/decal/cleanable/dirt, - /obj/effect/decal/cleanable/deadcockroach + /obj/effect/decal/cleanable/deadcockroach, + /obj/effect/decal/remains ) if(blood) @@ -213,9 +217,9 @@ target = null mode = BOT_IDLE icon_state = "cleanbot[on]" - else if(istype(A, /obj/item)) + else if(istype(A, /obj/item) || istype(A, /obj/effect/decal/remains)) visible_message("[src] sprays hydrofluoric acid at [A]!") - playsound(src.loc, 'sound/effects/spray2.ogg', 50, 1, -6) + playsound(src, 'sound/effects/spray2.ogg', 50, 1, -6) A.acid_act(75, 10) else if(istype(A, /mob/living/simple_animal/cockroach) || istype(A, /mob/living/simple_animal/mouse)) var/mob/living/simple_animal/M = target