Skip to content

Commit

Permalink
Cleanbots destroy cigarette butts (#3279)
Browse files Browse the repository at this point in the history
## About The Pull Request

Cleanbots now shoot acid at cigarette butts like they do to normal
trash. Increased the amount of acid cleanbots shoot out by an amount so
the trash actually gets destroyed.

## Why It's Good For The Game

To restore order in a ship full of smokers

## Changelog

:cl:
add: Cleanbots now destroy cigarette butts, and dispense enough acid to
do so.
/:cl:
  • Loading branch information
generalthrax authored Aug 10, 2024
1 parent 30dd1ce commit d5d7a28
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion code/modules/mob/living/simple_animal/bot/cleanbot.dm
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,9 @@
if(!target && trash) //Then for trash.
target = scan(/obj/item/trash)

if(!target && trash) //Then for Chainsmokers.
target = scan(/obj/item/cigbutt)

if(!target && trash) //Search for dead mices.
target = scan(/obj/item/reagent_containers/food/snacks/deadmouse)

Expand Down Expand Up @@ -317,6 +320,7 @@
target_types += list(
/obj/item/trash,
/obj/item/reagent_containers/food/snacks/deadmouse,
/obj/item/cigbutt,
)

target_types = typecacheof(target_types)
Expand All @@ -340,7 +344,7 @@
else if(istype(A, /obj/item) || istype(A, /obj/effect/decal/remains))
visible_message("<span class='danger'>[src] sprays hydrofluoric acid at [A]!</span>")
playsound(src, 'sound/effects/spray2.ogg', 50, TRUE, -6)
A.acid_act(75, 10)
A.acid_act(100, 10)
target = null
else if(istype(A, /mob/living/simple_animal/hostile/cockroach) || istype(A, /mob/living/simple_animal/mouse))
var/mob/living/simple_animal/M = target
Expand Down

0 comments on commit d5d7a28

Please sign in to comment.