Merge commit '179a607a90ad7ec62bdaff4e6fe72af60ee56442' of https://github.com/tgstation/tgstation into upstream-24-10b

This commit is contained in:
Majkl-J
2024-10-23 23:27:16 -07:00
4642 changed files with 25352 additions and 14167 deletions
@@ -324,3 +324,18 @@
if(istype(crushed_can))
crushed_can.icon_state = pick(soda_icons)
return crushed_can
/obj/effect/spawner/random/trash/ghetto_containers
name = "ghetto container spawner"
loot = list(
/obj/item/reagent_containers/cup/bucket = 5,
/obj/item/reagent_containers/cup/glass/bottle = 5,
/obj/item/reagent_containers/cup/glass/bottle/small = 5,
/obj/item/reagent_containers/cup/glass/mug = 5,
/obj/item/reagent_containers/cup/glass/shaker = 5,
/obj/item/reagent_containers/cup/watering_can/wood = 5,
/obj/item/reagent_containers/cup/mortar = 2,
/obj/item/reagent_containers/cup/soup_pot = 2,
/obj/item/reagent_containers/cup/blastoff_ampoule = 1,
/obj/item/reagent_containers/cup/maunamug = 1,
)