mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-01-27 09:31:54 +00:00
87ebbba36a
## About The Pull Request The list of options you could choose from when screwdrivering a custom vending machine circuit board was hard-coded and also contained copy pastes of every vending machine name (some of which were outdated). It was yucky - Add a new var on `/obj/machinery/vending` called `allow_custom`, defaults to FALSE and determines whether that type shows up as an option when screwdrivering a custom vending machine board, I've went through and made assignments for it mirror what was in the old static list i.e. this won't introduce any new options - Change the hard-coded static list to be built on Initialize, populating with every subtype that has `allow_custom` set to TRUE - Eliminate a second static list that was just the inverse of the first one (first one was typepath = name and this one was just name = typepath) - Changed an `istype` check to `==` because old behavior meant subtypes of a given vending machine would have their type set to the supertype if that was also a valid custom vending machine option ## Why It's Good For The Game Cleaner code, no needing to maintain two separate entries for the name of a vending machine, eligibility for a machine to be used in custom vending machines is now a var on the type instead of in a random file pertaining to circuit boards ## Changelog 🆑 refactor: refactored custom vending machine brand code, a new var on /obj/machinery/vending called allow_custom now determines whether the machine can be chosen when screwdrivering the circuit board /🆑
27 lines
1.1 KiB
Plaintext
27 lines
1.1 KiB
Plaintext
/obj/machinery/vending/coffee
|
|
name = "\improper Solar's Best Hot Drinks"
|
|
desc = "A vending machine which dispenses hot drinks."
|
|
product_ads = "Have a drink!;Drink up!;It's good for you!;Would you like a hot joe?;I'd kill for some coffee!;The best beans in the galaxy.;Only the finest brew for you.;Mmmm. Nothing like a coffee.;I like coffee, don't you?;Coffee helps you work!;Try some tea.;We hope you like the best!;Try our new chocolate!;Admin conspiracies"
|
|
icon_state = "coffee"
|
|
icon_vend = "coffee-vend"
|
|
panel_type = "panel9"
|
|
products = list(
|
|
/obj/item/reagent_containers/cup/glass/coffee = 6,
|
|
/obj/item/reagent_containers/cup/glass/mug/tea = 6,
|
|
/obj/item/reagent_containers/cup/glass/mug/coco = 3,
|
|
)
|
|
contraband = list(
|
|
/obj/item/reagent_containers/cup/glass/ice = 12,
|
|
)
|
|
refill_canister = /obj/item/vending_refill/coffee
|
|
default_price = PAYCHECK_LOWER
|
|
extra_price = PAYCHECK_CREW
|
|
payment_department = ACCOUNT_SRV
|
|
light_mask = "coffee-light-mask"
|
|
light_color = COLOR_DARK_MODERATE_ORANGE
|
|
allow_custom = TRUE
|
|
|
|
/obj/item/vending_refill/coffee
|
|
machine_name = "Solar's Best Hot Drinks"
|
|
icon_state = "refill_joe"
|