mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-01-27 17:41:50 +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 /🆑
88 lines
3.7 KiB
Plaintext
88 lines
3.7 KiB
Plaintext
/obj/machinery/vending/cigarette
|
|
name = "\improper ShadyCigs Deluxe"
|
|
desc = "If you want to get cancer, might as well do it in style."
|
|
product_slogans = "Space cigs taste good like a cigarette should.;I'd rather toolbox than switch.;Smoke!;Don't believe the reports - smoke today!"
|
|
product_ads = "Probably not bad for you!;Don't believe the scientists!;It's good for you!;Don't quit, buy more!;Smoke!;Nicotine heaven.;Best cigarettes since 2150.;Award-winning cigs."
|
|
icon_state = "cigs"
|
|
panel_type = "panel5"
|
|
products = list(
|
|
/obj/item/storage/fancy/cigarettes = 5,
|
|
/obj/item/storage/fancy/cigarettes/cigpack_candy = 4,
|
|
/obj/item/storage/fancy/cigarettes/cigpack_uplift = 3,
|
|
/obj/item/storage/fancy/cigarettes/cigpack_robust = 3,
|
|
/obj/item/storage/fancy/cigarettes/cigpack_carp = 3,
|
|
/obj/item/storage/fancy/cigarettes/cigpack_midori = 3,
|
|
/obj/item/storage/box/matches = 10,
|
|
/obj/item/lighter/greyscale = 4,
|
|
/obj/item/storage/fancy/rollingpapers = 5,
|
|
)
|
|
contraband = list(
|
|
/obj/item/vape = 5,
|
|
/obj/item/cigarette/dart = 1,
|
|
/obj/item/storage/fancy/cigarettes/cigpack_greytide = 1,
|
|
)
|
|
premium = list(
|
|
/obj/item/storage/fancy/cigarettes/cigpack_robustgold = 3,
|
|
/obj/item/storage/box/gum/nicotine = 2,
|
|
/obj/item/lighter = 3,
|
|
/obj/item/storage/fancy/cigarettes/cigars = 1,
|
|
/obj/item/storage/fancy/cigarettes/cigars/havana = 1,
|
|
/obj/item/storage/fancy/cigarettes/cigars/cohiba = 1,
|
|
)
|
|
|
|
refill_canister = /obj/item/vending_refill/cigarette
|
|
default_price = PAYCHECK_CREW
|
|
extra_price = PAYCHECK_COMMAND
|
|
payment_department = ACCOUNT_SRV
|
|
light_mask = "cigs-light-mask"
|
|
allow_custom = TRUE
|
|
|
|
/obj/machinery/vending/cigarette/syndicate
|
|
products = list(
|
|
/obj/item/storage/fancy/cigarettes/cigpack_syndicate = 7,
|
|
/obj/item/storage/fancy/cigarettes/cigpack_uplift = 3,
|
|
/obj/item/storage/fancy/cigarettes/cigpack_candy = 2,
|
|
/obj/item/storage/fancy/cigarettes/cigpack_robust = 2,
|
|
/obj/item/storage/fancy/cigarettes/cigpack_carp = 3,
|
|
/obj/item/storage/fancy/cigarettes/cigpack_midori = 1,
|
|
/obj/item/storage/fancy/cigarettes/cigpack_greytide = 1,
|
|
/obj/item/storage/box/matches = 10,
|
|
/obj/item/lighter/greyscale = 4,
|
|
/obj/item/storage/fancy/rollingpapers = 5,
|
|
)
|
|
initial_language_holder = /datum/language_holder/syndicate
|
|
allow_custom = FALSE
|
|
|
|
/obj/machinery/vending/cigarette/beach //Used in the lavaland_biodome_beach.dmm ruin
|
|
name = "\improper ShadyCigs Ultra"
|
|
desc = "Now with extra premium products!"
|
|
product_ads = "Probably not bad for you!;Dope will get you through times of no money better than money will get you through times of no dope!;It's good for you!"
|
|
product_slogans = "Turn on, tune in, drop out!;Better living through chemistry!;Toke!;Don't forget to keep a smile on your lips and a song in your heart!"
|
|
products = list(
|
|
/obj/item/storage/fancy/cigarettes = 5,
|
|
/obj/item/storage/fancy/cigarettes/cigpack_uplift = 3,
|
|
/obj/item/storage/fancy/cigarettes/cigpack_robust = 3,
|
|
/obj/item/storage/fancy/cigarettes/cigpack_carp = 3,
|
|
/obj/item/storage/fancy/cigarettes/cigpack_midori = 3,
|
|
/obj/item/storage/fancy/cigarettes/cigpack_cannabis = 5,
|
|
/obj/item/storage/box/matches = 10,
|
|
/obj/item/lighter/greyscale = 4,
|
|
/obj/item/storage/fancy/rollingpapers = 5,
|
|
)
|
|
premium = list(
|
|
/obj/item/storage/fancy/cigarettes/cigpack_mindbreaker = 5,
|
|
/obj/item/vape = 5,
|
|
/obj/item/lighter = 3,
|
|
)
|
|
initial_language_holder = /datum/language_holder/beachbum
|
|
allow_custom = FALSE
|
|
|
|
/obj/item/vending_refill/cigarette
|
|
machine_name = "ShadyCigs Deluxe"
|
|
icon_state = "refill_smoke"
|
|
|
|
/obj/machinery/vending/cigarette/pre_throw(obj/item/thrown_item)
|
|
if(istype(thrown_item, /obj/item/lighter))
|
|
var/obj/item/lighter/thrown_lighter = thrown_item
|
|
thrown_lighter.set_lit(TRUE)
|