mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-30 08:37:43 +01:00
RusselNotSCPandGitHub
3fa92e5883
Re-alphabetized the incorrectly placed items from a few relatively recent PRs, and also moved grenadine to the non-alcoholic section ## About The Pull Request Fixes a few annoying inconsistencies with how certain items in the booze-o-mat were organized. Specifically, moves grenadine, which is a non-alcoholic syrup, from the alcoholic section and into the non-alcoholic section. Additionally, a few bottles which were added in somewhat recent PRs and which had been simply appended at the end of the list after been properly moved to be alphabetized with the rest of the items. ## Why It's Good For The Game UX consistency makes things easier to use and less confusing. ## Changelog 🆑 qol: Bottles in the booze-o-mat vending machine have been re-alphabetized. fix: Jester's Grenadine has been moved to the non-alcoholic section of the booze-o-mat. /🆑
107 lines
5.0 KiB
Plaintext
107 lines
5.0 KiB
Plaintext
/obj/machinery/vending/boozeomat
|
|
name = "\improper Booze-O-Mat"
|
|
desc = "A technological marvel, supposedly able to mix just the mixture you'd like to drink the moment you ask for one."
|
|
icon_state = "boozeomat"
|
|
icon_deny = "boozeomat-deny"
|
|
panel_type = "panel22"
|
|
|
|
product_categories = list(
|
|
list(
|
|
"name" = "Alcoholic",
|
|
"icon" = "wine-bottle",
|
|
"products" = list(
|
|
/obj/item/reagent_containers/cup/glass/bottle/curacao = 5,
|
|
/obj/item/reagent_containers/cup/glass/bottle/coconut_rum = 5,
|
|
/obj/item/reagent_containers/cup/glass/bottle/applejack = 5,
|
|
/obj/item/reagent_containers/cup/glass/bottle/tequila = 5,
|
|
/obj/item/reagent_containers/cup/glass/bottle/aperitivo = 5,
|
|
/obj/item/reagent_containers/cup/glass/bottle/rum = 5,
|
|
/obj/item/reagent_containers/cup/glass/bottle/cognac = 5,
|
|
/obj/item/reagent_containers/cup/glass/bottle/maraschino = 5,
|
|
/obj/item/reagent_containers/cup/glass/bottle/wine = 5,
|
|
/obj/item/reagent_containers/cup/glass/bottle/absinthe = 5,
|
|
/obj/item/reagent_containers/cup/glass/bottle/vermouth = 5,
|
|
/obj/item/reagent_containers/cup/glass/bottle/gin = 5,
|
|
/obj/item/reagent_containers/cup/glass/bottle/hcider = 5,
|
|
/obj/item/reagent_containers/cup/glass/bottle/amaretto = 5,
|
|
/obj/item/reagent_containers/cup/glass/bottle/ale = 6,
|
|
/obj/item/reagent_containers/cup/glass/bottle/yuyake = 5,
|
|
/obj/item/reagent_containers/cup/glass/bottle/grappa = 5,
|
|
/obj/item/reagent_containers/cup/glass/bottle/navy_rum = 5,
|
|
/obj/item/reagent_containers/cup/glass/bottle/maltliquor = 6,
|
|
/obj/item/reagent_containers/cup/glass/bottle/kahlua = 5,
|
|
/obj/item/reagent_containers/cup/glass/bottle/sake = 5,
|
|
/obj/item/reagent_containers/cup/glass/bottle/shochu = 5,
|
|
/obj/item/reagent_containers/cup/glass/bottle/beer = 6,
|
|
/obj/item/reagent_containers/cup/glass/bottle/vodka = 5,
|
|
/obj/item/reagent_containers/cup/glass/bottle/whiskey = 5,
|
|
/obj/item/reagent_containers/cup/glass/bottle/wine_voltaic = 5,
|
|
/obj/item/reagent_containers/cup/soda_cans/beer = 10,
|
|
/obj/item/reagent_containers/cup/soda_cans/beer/rice = 10,
|
|
),
|
|
),
|
|
|
|
list(
|
|
"name" = "Non-Alcoholic",
|
|
"icon" = "bottle-water",
|
|
"products" = list(
|
|
/obj/item/reagent_containers/cup/glass/bottle/hakka_mate = 5,
|
|
/obj/item/reagent_containers/cup/glass/ice = 10,
|
|
/obj/item/reagent_containers/cup/glass/bottle/grenadine = 4,
|
|
/obj/item/reagent_containers/cup/soda_cans/melon_soda = 5,
|
|
/obj/item/reagent_containers/cup/glass/bottle/juice/lemonjuice = 4,
|
|
/obj/item/reagent_containers/cup/glass/bottle/juice/limejuice = 4,
|
|
/obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice = 4,
|
|
/obj/item/reagent_containers/cup/glass/bottle/juice/menthol = 4,
|
|
/obj/item/reagent_containers/cup/glass/bottle/juice/cream = 4,
|
|
/obj/item/reagent_containers/cup/glass/bottle/juice/tomatojuice = 4,
|
|
/obj/item/reagent_containers/cup/soda_cans/sodawater = 15,
|
|
/obj/item/reagent_containers/cup/soda_cans/sol_dry = 8,
|
|
/obj/item/reagent_containers/cup/soda_cans/cola = 8,
|
|
/obj/item/reagent_containers/cup/soda_cans/tonic = 8,
|
|
),
|
|
),
|
|
|
|
list(
|
|
"name" = "Glassware",
|
|
"icon" = "wine-glass",
|
|
"products" = list(
|
|
/obj/item/reagent_containers/cup/glass/drinkingglass = 30,
|
|
/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass = 12,
|
|
/obj/item/reagent_containers/cup/glass/flask = 3,
|
|
/obj/item/reagent_containers/cup/glass/bottle = 15,
|
|
/obj/item/reagent_containers/cup/glass/bottle/small = 15,
|
|
),
|
|
),
|
|
)
|
|
|
|
contraband = list(
|
|
/obj/item/reagent_containers/cup/glass/bottle/herbal_liqueur = 2,
|
|
/obj/item/reagent_containers/cup/glass/mug/tea = 12,
|
|
/obj/item/reagent_containers/cup/glass/bottle/fernet = 5,
|
|
)
|
|
premium = list(
|
|
/obj/item/reagent_containers/cup/glass/bottle/bitters = 5,
|
|
/obj/item/reagent_containers/cup/glass/bottle/herbal_liqueur = 2,
|
|
/obj/item/reagent_containers/cup/bottle/ethanol = 4,
|
|
/obj/item/reagent_containers/cup/glass/bottle/champagne = 5,
|
|
/obj/item/reagent_containers/cup/glass/bottle/trappist = 5,
|
|
)
|
|
|
|
product_slogans = "I hope nobody asks me for a bloody cup o' tea...;Alcohol is humanity's friend. Would you abandon a friend?;Quite delighted to serve you!;Is nobody thirsty on this station?"
|
|
product_ads = "Drink up!;Booze is good for you!;Alcohol is humanity's best friend.;Quite delighted to serve you!;Care for a nice, cold beer?;Nothing cures you like booze!;Have a sip!;Have a drink!;Have a beer!;Beer is good for you!;Only the finest alcohol!;Best quality booze since 2053!;Award-winning wine!;Maximum alcohol!;Man loves beer.;A toast for progress!"
|
|
refill_canister = /obj/item/vending_refill/boozeomat
|
|
default_price = PAYCHECK_CREW * 0.9
|
|
extra_price = PAYCHECK_COMMAND
|
|
payment_department = ACCOUNT_SRV
|
|
light_mask = "boozeomat-light-mask"
|
|
|
|
/obj/machinery/vending/boozeomat/syndicate
|
|
age_restrictions = FALSE
|
|
initial_language_holder = /datum/language_holder/syndicate
|
|
allow_custom = FALSE
|
|
|
|
/obj/item/vending_refill/boozeomat
|
|
machine_name = "Booze-O-Mat"
|
|
icon_state = "refill_booze"
|