cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 04:30:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

More trash added to spawners plus unit test (#93045)

Browse Source 
## About The Pull Request
This adds more trash: 
- Paper 
- Empty cigarette packs
- Empty lighters
- Empty food containers from snacks
- Empty can containers
- Unarmed mousetraps
- Cut wire
- Broken plates
- ~~Empty bowls~~

This slightly tweaks some existing values to make things feel fresh.
Also adds a unit test to enforce trash food types to be added to the
trash spawner.
 
## Why It's Good For The Game
The more trash we have, the less we'll feel bad about being garbage
players.

## Changelog
🆑
qol: More types of garbage (empty lighters, empty cigarette packs, empty
food, etc.) have been added to the trash spawner.
qol: Paper plane added to the paper spawner, which is now used in the
trash spawner.
/🆑
This commit is contained in:
Tim
2025-10-05 07:31:21 +02:00
committed by GitHub
parent 606a903182
commit d1cf293c58
6 changed files with 206 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/unit_tests/_unit_tests.dm
+1
View File
@@ -314,6 +314,7 @@
#include "trait_addition_and_removal.dm"
#include "traitor.dm"
#include "traitor_mail_content_check.dm"
#include "trash_food.dm"
#include "trauma_granting.dm"
#include "turf_icons.dm"
#include "tutorial_sanity.dm"
code/modules/unit_tests/trash_food.dm
+34
View File
@@ -0,0 +1,34 @@
/// Checks to make sure all food trash is included in /obj/effect/spawner/random/trash/food_packaging
/datum/unit_test/trash_food
/datum/unit_test/trash_food/Run()
var/list/food_trash = /obj/effect/spawner/random/trash/food_packaging::loot
// list of pieces of trash we never want to include because they are special or rare (usually mutated botany plants)
var/list/food_trash_blacklist = list(
// already added to botanical_waste spawner or too exotic
/obj/item/grown/bananapeel,
/obj/item/grown/bananapeel/bombanana,
/obj/item/grown/bananapeel/mimanapeel,
/obj/item/grown/bananapeel/bluespace,
/obj/item/food/grown/bungopit,
/obj/item/food/egg,
/obj/item/gun/ballistic/revolver/peashooter,
/obj/item/grown/corncob,
/obj/item/grown/corncob/pepper,
// misc waste products that don't belong in trash spawner
/obj/item/reagent_containers/cup/bowl,
/obj/item/plate,
/obj/item/stack/rods, // kebab
/obj/item/paper/paperslip/fortune, // fortune cookie
/obj/item/dice/fudge, // /obj/item/food/fudgedice
)
for(var/path in subtypesof(/obj/item/food))
var/obj/item/food/food = path
var/trash = food::trash_type
if(!trash)
continue
if(trash in food_trash_blacklist)
continue
TEST_ASSERT(food_trash[trash], "[food] must include its trash_type for loot table /obj/effect/spawner/random/trash/food_packaging or be added to this unit tests food_trash_blacklist")