From a58d3115f2a0428a802d55ffd5c91e1de1bfefcf Mon Sep 17 00:00:00 2001 From: Roxy <75404941+TealSeer@users.noreply.github.com> Date: Wed, 15 Oct 2025 20:39:35 -0400 Subject: [PATCH] Fixes for d1cf293c5872add00add5196fe8384f664f0892e --- .../objects/effects/spawners/random/trash.dm | 27 +++++++++++++++++++ code/modules/unit_tests/trash_food.dm | 14 ++++++++++ 2 files changed, 41 insertions(+) diff --git a/code/game/objects/effects/spawners/random/trash.dm b/code/game/objects/effects/spawners/random/trash.dm index 86de8afca29..3e598fe097c 100644 --- a/code/game/objects/effects/spawners/random/trash.dm +++ b/code/game/objects/effects/spawners/random/trash.dm @@ -152,6 +152,33 @@ /obj/item/popsicle_stick = 1, /obj/item/trash/ready_donk = 1, /obj/item/trash/tray = 1, + // BUBBER EDIT ADDITION BEGIN + /obj/item/trash/can/food/tuna = 1, + /obj/item/trash/candy/hundred_credit_bar = 1, + /obj/item/trash/candy/coconut_joy = 1, + /obj/item/trash/candy/hurr_bar = 1, + /obj/item/trash/candy/laughter_bar = 1, + /obj/item/trash/candy/kit_catgirl_metaclique_bar = 1, + /obj/item/trash/candy/twink_bar = 1, + /obj/item/trash/candy/elon_musk_bar = 1, + /obj/item/trash/candy/malf_way = 1, + /obj/item/trash/candy/triggerfinger = 1, + /obj/item/trash/pljeskavica = 1, + /obj/item/trash/nachos = 1, + /obj/item/trash/blins = 1, + /obj/item/trash/empty_food_tray = 1, + /obj/item/trash/empty_side_pack/nt = 1, + /obj/item/trash/empty_side_pack/yangyu = 1, + /obj/item/trash/empty_side_pack/moth = 1, + /obj/item/trash/empty_side_pack/tizira = 1, + /obj/item/trash/vendor_trash = 1, + /obj/item/trash/vendor_trash/rice_crackers = 1, + /obj/item/trash/vendor_trash/mochi_ice_cream = 1, + /obj/item/trash/vendor_trash/mothmallow = 1, + /obj/item/trash/vendor_trash/moth_bag = 1, + /obj/item/trash/vendor_trash/lizard_bag = 1, + /obj/item/trash/vendor_trash/lizard_box = 1, + // BUBBER EDIT ADDITION END ) /obj/effect/spawner/random/trash/botanical_waste diff --git a/code/modules/unit_tests/trash_food.dm b/code/modules/unit_tests/trash_food.dm index 570531c187d..1baf0fc10f7 100644 --- a/code/modules/unit_tests/trash_food.dm +++ b/code/modules/unit_tests/trash_food.dm @@ -21,6 +21,20 @@ /obj/item/stack/rods, // kebab /obj/item/paper/paperslip/fortune, // fortune cookie /obj/item/dice/fudge, // /obj/item/food/fudgedice + // BUBBER EDIT ADDITION BEGIN + /obj/item/stack/sheet/mineral/sandfruitcore, + /obj/item/stack/sheet/mineral/uraniberrycore, + /obj/item/stack/sheet/mineral/plasmaplumcore, + /obj/item/stack/sheet/mineral/bluegemdrupecore, + /obj/item/stack/sheet/mineral/agberginecore, + /obj/item/stack/sheet/mineral/auberginecore, + /obj/item/stack/sheet/mineral/dimantiscore, + /obj/item/stack/sheet/mineral/ferrotubercore, + /obj/item/stack/sheet/mineral/titanitubercore, + /obj/item/stack/sheet/mineral/adamapplecore, + /obj/item/stack/sheet/mineral/runescoopercore, + /obj/item/stack/sheet/mineral/bananiumberrycore, + // BUBBER EDIT ADDITION END ) for(var/path in subtypesof(/obj/item/food))