cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-30 16:47:13 +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/items/lighter.dm
+10 -1
View File
@@ -37,11 +37,14 @@
"thirteen",
"snake",
)
/// Whether the lighter starts with fuel
var/spawns_with_reagent = TRUE
/obj/item/lighter/Initialize(mapload)
. = ..()
create_reagents(maximum_fuel, REFILLABLE | DRAINABLE)
reagents.add_reagent(/datum/reagent/fuel, maximum_fuel)
if(spawns_with_reagent)
reagents.add_reagent(/datum/reagent/fuel, maximum_fuel)
if(!overlay_state)
overlay_state = pick(overlay_list)
AddComponent(\
@@ -367,3 +370,9 @@
/obj/item/lighter/mime,
/obj/item/lighter/bright,
)
/obj/item/lighter/empty
spawns_with_reagent = FALSE
/obj/item/lighter/greyscale/empty
spawns_with_reagent = FALSE
code/game/objects/items/storage/fancy.dm
+93
View File
@@ -231,6 +231,8 @@
. = ..()
register_context()
if(!spawn_count)
update_appearance()
/obj/item/storage/fancy/cigarettes/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
. = ..()
@@ -294,6 +296,11 @@
. += "[use_icon_state]_[cig_position]"
cig_position++
/obj/item/storage/fancy/cigarettes/empty
spawn_count = 0
spawn_coupon = FALSE
open_status = FANCY_CONTAINER_OPEN
/obj/item/storage/fancy/cigarettes/dromedaryco
name = "\improper DromedaryCo packet"
desc = "A packet of six imported DromedaryCo cancer sticks. A label on the packaging reads, \"Wouldn't a slow death make a change?\""
@@ -301,6 +308,11 @@
base_icon_state = "dromedary"
spawn_type = /obj/item/cigarette/dromedary
/obj/item/storage/fancy/cigarettes/dromedaryco/empty
spawn_count = 0
spawn_coupon = FALSE
open_status = FANCY_CONTAINER_OPEN
/obj/item/storage/fancy/cigarettes/cigpack_uplift
name = "\improper Uplift Smooth packet"
desc = "Your favorite brand, now menthol flavored."
@@ -308,6 +320,11 @@
base_icon_state = "uplift"
spawn_type = /obj/item/cigarette/uplift
/obj/item/storage/fancy/cigarettes/cigpack_uplift/empty
spawn_count = 0
spawn_coupon = FALSE
open_status = FANCY_CONTAINER_OPEN
/obj/item/storage/fancy/cigarettes/cigpack_robust
name = "\improper Robust packet"
desc = "Smoked by the robust."
@@ -315,6 +332,11 @@
base_icon_state = "robust"
spawn_type = /obj/item/cigarette/robust
/obj/item/storage/fancy/cigarettes/cigpack_robust/empty
spawn_count = 0
spawn_coupon = FALSE
open_status = FANCY_CONTAINER_OPEN
/obj/item/storage/fancy/cigarettes/cigpack_robustgold
name = "\improper Robust Gold packet"
desc = "Smoked by the truly robust."
@@ -322,6 +344,11 @@
base_icon_state = "robustg"
spawn_type = /obj/item/cigarette/robustgold
/obj/item/storage/fancy/cigarettes/cigpack_robustgold/empty
spawn_count = 0
spawn_coupon = FALSE
open_status = FANCY_CONTAINER_OPEN
/obj/item/storage/fancy/cigarettes/cigpack_greytide
name = "\improper Mainthol Grey packet"
desc = "The thin grey line."
@@ -329,6 +356,11 @@
base_icon_state = "greytide"
spawn_type = /obj/item/cigarette/greytide
/obj/item/storage/fancy/cigarettes/cigpack_greytide/empty
spawn_count = 0
spawn_coupon = FALSE
open_status = FANCY_CONTAINER_OPEN
/obj/item/storage/fancy/cigarettes/cigpack_carp
name = "\improper Carp Classic packet"
desc = "Since 2313."
@@ -336,6 +368,11 @@
base_icon_state = "carp"
spawn_type = /obj/item/cigarette/carp
/obj/item/storage/fancy/cigarettes/cigpack_carp/empty
spawn_count = 0
spawn_coupon = FALSE
open_status = FANCY_CONTAINER_OPEN
/obj/item/storage/fancy/cigarettes/cigpack_syndicate
name = "cigarette packet"
desc = "An obscure brand of cigarettes."
@@ -343,6 +380,11 @@
base_icon_state = "syndie"
spawn_type = /obj/item/cigarette/syndicate
/obj/item/storage/fancy/cigarettes/cigpack_syndicate/empty
spawn_count = 0
spawn_coupon = FALSE
open_status = FANCY_CONTAINER_OPEN
/obj/item/storage/fancy/cigarettes/cigpack_midori
name = "\improper Midori Tabako packet"
desc = "You can't understand the runes, but the packet smells funny."
@@ -350,6 +392,11 @@
base_icon_state = "midori"
spawn_type = /obj/item/cigarette/rollie/nicotine
/obj/item/storage/fancy/cigarettes/cigpack_midori/empty
spawn_count = 0
spawn_coupon = FALSE
open_status = FANCY_CONTAINER_OPEN
/obj/item/storage/fancy/cigarettes/cigpack_candy
name = "\improper Timmy's First Candy Smokes packet"
desc = "Unsure about smoking? Want to bring your children safely into the family tradition? Look no more with this special packet! Includes 100%* Nicotine-Free candy cigarettes."
@@ -365,6 +412,11 @@
if(prob(7))
spawn_type = /obj/item/cigarette/candy/nicotine //uh oh!
/obj/item/storage/fancy/cigarettes/cigpack_candy/empty
spawn_count = 0
spawn_coupon = FALSE
open_status = FANCY_CONTAINER_OPEN
/obj/item/storage/fancy/cigarettes/cigpack_shadyjims
name = "\improper Shady Jim's Super Slims packet"
desc = "Is your weight slowing you down? Having trouble running away from gravitational singularities? Can't stop stuffing your mouth? Smoke Shady Jim's Super Slims and watch all that fat burn away. Guaranteed results!"
@@ -372,6 +424,11 @@
base_icon_state = "shadyjim"
spawn_type = /obj/item/cigarette/shadyjims
/obj/item/storage/fancy/cigarettes/cigpack_shadyjims/empty
spawn_count = 0
spawn_coupon = FALSE
open_status = FANCY_CONTAINER_OPEN
/obj/item/storage/fancy/cigarettes/cigpack_xeno
name = "\improper Xeno Filtered packet"
desc = "Loaded with 100% pure slime. And also nicotine."
@@ -379,6 +436,11 @@
base_icon_state = "slime"
spawn_type = /obj/item/cigarette/xeno
/obj/item/storage/fancy/cigarettes/cigpack_xeno/empty
spawn_count = 0
spawn_coupon = FALSE
open_status = FANCY_CONTAINER_OPEN
/obj/item/storage/fancy/cigarettes/cigpack_cannabis
name = "\improper Freak Brothers' Special packet"
desc = "A label on the packaging reads, \"Endorsed by Phineas, Freddy and Franklin.\""
@@ -386,6 +448,11 @@
base_icon_state = "midori"
spawn_type = /obj/item/cigarette/rollie/cannabis
/obj/item/storage/fancy/cigarettes/cigpack_cannabis/empty
spawn_count = 0
spawn_coupon = FALSE
open_status = FANCY_CONTAINER_OPEN
/obj/item/storage/fancy/cigarettes/cigpack_mindbreaker
name = "\improper Leary's Delight packet"
desc = "Banned in over 36 galaxies."
@@ -393,6 +460,11 @@
base_icon_state = "shadyjim"
spawn_type = /obj/item/cigarette/rollie/mindbreaker
/obj/item/storage/fancy/cigarettes/cigpack_mindbreaker/empty
spawn_count = 0
spawn_coupon = FALSE
open_status = FANCY_CONTAINER_OPEN
/obj/item/storage/fancy/rollingpapers
name = "rolling paper pack"
desc = "A pack of Nanotrasen brand rolling papers."
@@ -407,11 +479,20 @@
has_open_closed_states = FALSE
storage_type = /datum/storage/rolling_paper_pack
/obj/item/storage/fancy/rollingpapers/Initialize(mapload)
. = ..()
if(!spawn_count)
update_appearance()
/obj/item/storage/fancy/rollingpapers/update_overlays()
. = ..()
if(!contents.len)
. += "[base_icon_state]_empty"
/obj/item/storage/fancy/rollingpapers/empty
spawn_count = 0
/////////////
//CIGAR BOX//
/////////////
@@ -435,6 +516,10 @@
//reset any changes the parent call may have made
icon_state = base_icon_state
/obj/item/storage/fancy/cigarettes/cigars/empty
spawn_count = 0
open_status = FANCY_CONTAINER_OPEN
/obj/item/storage/fancy/cigarettes/cigars/update_overlays()
. = ..()
if(!open_status)
@@ -451,6 +536,10 @@
base_icon_state = "cohibacase"
spawn_type = /obj/item/cigarette/cigar/cohiba
/obj/item/storage/fancy/cigarettes/cigars/cohiba/empty
spawn_count = 0
open_status = FANCY_CONTAINER_OPEN
/obj/item/storage/fancy/cigarettes/cigars/havana
name = "\improper premium Havanian cigar case"
desc = "A case of classy Havanian cigars."
@@ -458,6 +547,10 @@
base_icon_state = "cohibacase"
spawn_type = /obj/item/cigarette/cigar/havana
/obj/item/storage/fancy/cigarettes/cigars/havana/empty
spawn_count = 0
open_status = FANCY_CONTAINER_OPEN
/*
* Heart Shaped Box w/ Chocolates
*/