cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 23:58:07 +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/game/objects/effects/spawners/random/bureaucracy.dm
+1
View File
@@ -42,6 +42,7 @@
icon_state = "paper"
loot = list(
/obj/item/paper = 20,
/obj/item/paperplane = 2,
/obj/item/paper/crumpled = 2,
/obj/item/paper/crumpled/bloody = 2,
/obj/item/paper/crumpled/muddy = 2,
code/game/objects/effects/spawners/random/trash.dm
+67 -13
View File
@@ -7,24 +7,30 @@
name = "garbage spawner"
loot = list(
/obj/effect/spawner/random/trash/food_packaging = 20,
/obj/item/trash/can = 15,
/obj/effect/spawner/random/trash/crushed_can = 15,
/obj/item/shard = 10,
/obj/effect/spawner/random/trash/cigbutt = 10,
/obj/effect/spawner/random/trash/cigpack = 5,
/obj/effect/spawner/random/trash/bacteria = 5,
/obj/effect/spawner/random/trash/botanical_waste = 5,
/obj/item/reagent_containers/cup/glass/drinkingglass = 5,
/obj/item/broken_bottle = 5,
/obj/item/light/tube/broken = 5,
/obj/item/light/bulb/broken = 5,
/obj/item/assembly/mousetrap/armed = 5,
/obj/item/stack/cable_coil = 5,
/obj/item/food/deadmouse = 1,
/obj/effect/spawner/random/bureaucracy/paper = 5,
/obj/item/assembly/mousetrap = 3,
/obj/item/assembly/mousetrap/armed = 3,
/obj/item/stack/cable_coil = 3,
/obj/item/stack/cable_coil/cut = 3,
/obj/item/reagent_containers/syringe = 3,
/obj/item/reagent_containers/cup/glass/drinkingglass = 2,
/obj/item/food/deadmouse = 2,
/obj/item/c_tube = 2,
/obj/item/plate_shard = 2,
/obj/item/lighter/greyscale/empty = 2,
/obj/item/lighter/empty = 1,
/obj/item/trash/candle = 1,
/obj/item/rag = 1,
/obj/item/trash/flare = 1,
/obj/item/popsicle_stick = 1,
/obj/item/reagent_containers/syringe = 1,
/obj/item/reagent_containers/cup/glass/sillycup = 1,
/obj/item/rag = 1,
/obj/item/shard/plasma = 1,
)
@@ -48,7 +54,7 @@
/mob/living/basic/snail = 1,
/obj/item/food/grown/cannabis = 1,
/obj/item/rag = 1,
/obj/effect/spawner/random/entertainment/drugs= 1,
/obj/effect/spawner/random/entertainment/drugs = 1,
/obj/item/modular_computer/pda = 1,
/obj/item/reagent_containers/syringe = 1,
/obj/effect/spawner/random/entertainment/cigar = 1,
@@ -62,6 +68,29 @@
loot -= /mob/living/basic/snail
return ..()
/obj/effect/spawner/random/trash/cigpack
name = "empty cigarette pack spawner"
loot = list(
/obj/item/storage/fancy/cigarettes/empty = 5,
/obj/item/storage/fancy/cigarettes/cigpack_uplift/empty = 5,
/obj/item/storage/fancy/cigarettes/cigpack_robust/empty = 5,
/obj/item/storage/fancy/cigarettes/cigpack_robustgold/empty = 5,
/obj/item/storage/fancy/cigarettes/cigpack_carp/empty = 5,
/obj/item/storage/fancy/cigarettes/cigpack_midori/empty = 5,
/obj/item/storage/fancy/rollingpapers/empty = 3,
/obj/item/storage/fancy/cigarettes/cigars/empty = 3,
/obj/item/storage/fancy/cigarettes/cigars/cohiba/empty = 3,
/obj/item/storage/fancy/cigarettes/cigars/havana/empty = 3,
/obj/item/storage/fancy/cigarettes/cigpack_greytide/empty = 3,
/obj/item/storage/fancy/cigarettes/dromedaryco/empty = 2,
/obj/item/storage/fancy/cigarettes/cigpack_shadyjims/empty = 2,
/obj/item/storage/fancy/cigarettes/cigpack_xeno/empty = 2,
/obj/item/storage/fancy/cigarettes/cigpack_candy/empty = 2,
/obj/item/storage/fancy/cigarettes/cigpack_cannabis/empty = 1,
/obj/item/storage/fancy/cigarettes/cigpack_mindbreaker/empty = 1,
/obj/item/storage/fancy/cigarettes/cigpack_syndicate/empty = 1,
)
/obj/effect/spawner/random/trash/cigbutt
name = "cigarette butt spawner"
loot = list(
@@ -83,20 +112,45 @@
/obj/item/trash/sosjerky = 2,
/obj/item/trash/pistachios = 2,
/obj/item/trash/peanuts = 2,
/obj/item/reagent_containers/cup/glass/sillycup = 2,
/obj/item/trash/boritos = 1,
/obj/item/trash/boritos/green = 1,
/obj/item/trash/boritos/purple = 1,
/obj/item/trash/boritos/red = 1,
/obj/item/trash/can/food/beans = 1,
/obj/item/trash/can/food/peaches = 1,
/obj/item/trash/can/food/envirochow = 1,
/obj/item/trash/popcorn = 1,
/obj/item/trash/energybar = 1,
/obj/item/trash/can/food/peaches/maint = 1,
/obj/item/trash/can/food/tomatoes = 1,
/obj/item/trash/can/food/envirochow = 1,
/obj/item/trash/can/food/squid_ink = 1,
/obj/item/trash/can/food/chap = 1,
/obj/item/trash/can/food/jellyfish = 1,
/obj/item/trash/can/food/desert_snails = 1,
/obj/item/trash/can/food/larvae = 1,
/obj/item/trash/can/food/pine_nuts = 1,
/obj/item/trash/popcorn = 1,
/obj/item/trash/popcorn/salty = 1,
/obj/item/trash/energybar = 1,
/obj/item/trash/semki = 1,
/obj/item/trash/semki/healthy = 1,
/obj/item/trash/cnds = 1,
/obj/item/trash/syndi_cakes = 1,
/obj/item/trash/shrimp_chips = 1,
/obj/item/trash/hot_shots = 1,
/obj/item/trash/sticko = 1,
/obj/item/trash/sticko/matcha = 1,
/obj/item/trash/sticko/nutty = 1,
/obj/item/trash/sticko/pineapple = 1,
/obj/item/trash/sticko/yuyake = 1,
/obj/item/trash/shok_roks = 1,
/obj/item/trash/shok_roks/citrus = 1,
/obj/item/trash/shok_roks/berry = 1,
/obj/item/trash/shok_roks/tropical = 1,
/obj/item/trash/shok_roks/lanternfruit = 1,
/obj/item/trash/fleet_ration = 1,
/obj/item/trash/spacers_sidekick = 1,
/obj/item/popsicle_stick = 1,
/obj/item/trash/ready_donk = 1,
/obj/item/trash/tray = 1,
)