mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-01-27 01:21:30 +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 /🆑
165 lines
6.5 KiB
Plaintext
165 lines
6.5 KiB
Plaintext
|
|
/obj/machinery/vending/cola
|
|
name = "\improper Robust Softdrinks"
|
|
desc = "A soft drinks vendor provided by Robust Industries, LLC."
|
|
icon_state = "Cola_Machine"
|
|
panel_type = "panel2"
|
|
product_slogans = "Robust Softdrinks: More robust than a toolbox to the head!"
|
|
product_ads = "Refreshing!;Hope you're thirsty!;Over 1 million drinks sold!;Thirsty? Why not cola?;Please, have a drink!;Drink up!;The best drinks in space."
|
|
products = list(
|
|
/obj/item/reagent_containers/cup/soda_cans/cola = 10,
|
|
/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind = 10,
|
|
/obj/item/reagent_containers/cup/soda_cans/dr_gibb = 10,
|
|
/obj/item/reagent_containers/cup/soda_cans/starkist = 10,
|
|
/obj/item/reagent_containers/cup/soda_cans/space_up = 10,
|
|
/obj/item/reagent_containers/cup/soda_cans/pwr_game = 10,
|
|
/obj/item/reagent_containers/cup/soda_cans/lemon_lime = 10,
|
|
/obj/item/reagent_containers/cup/soda_cans/sol_dry = 10,
|
|
/obj/item/reagent_containers/cup/glass/waterbottle = 10,
|
|
/obj/item/reagent_containers/cup/glass/bottle/mushi_kombucha = 3,
|
|
/obj/item/reagent_containers/cup/soda_cans/volt_energy = 3,
|
|
)
|
|
contraband = list(
|
|
/obj/item/reagent_containers/cup/soda_cans/thirteenloko = 6,
|
|
/obj/item/reagent_containers/cup/soda_cans/shamblers = 6,
|
|
/obj/item/reagent_containers/cup/soda_cans/wellcheers = 6,
|
|
)
|
|
premium = list(
|
|
/obj/item/reagent_containers/cup/glass/drinkingglass/filled/nuka_cola = 1,
|
|
/obj/item/reagent_containers/cup/soda_cans/air = 1,
|
|
/obj/item/reagent_containers/cup/soda_cans/monkey_energy = 1,
|
|
/obj/item/reagent_containers/cup/soda_cans/grey_bull = 1,
|
|
/obj/item/reagent_containers/cup/glass/bottle/rootbeer = 1,
|
|
)
|
|
refill_canister = /obj/item/vending_refill/cola
|
|
default_price = PAYCHECK_CREW * 0.7
|
|
extra_price = PAYCHECK_CREW
|
|
payment_department = ACCOUNT_SRV
|
|
allow_custom = TRUE
|
|
|
|
var/static/list/spiking_booze = list(
|
|
// Your "common" spiking booze
|
|
/datum/reagent/consumable/ethanol/vodka = 5,
|
|
/datum/reagent/consumable/ethanol/beer = 5,
|
|
/datum/reagent/consumable/ethanol/whiskey = 5,
|
|
/datum/reagent/consumable/ethanol/gin = 5,
|
|
/datum/reagent/consumable/ethanol/rum = 5,
|
|
// A bit rarer, can be dangerous if you take too much
|
|
/datum/reagent/consumable/ethanol/thirteenloko = 3,
|
|
/datum/reagent/consumable/ethanol/absinthe = 3,
|
|
/datum/reagent/consumable/ethanol/hooch = 3,
|
|
/datum/reagent/consumable/ethanol/moonshine = 3,
|
|
// Gets funky here
|
|
/datum/reagent/consumable/ethanol/beepsky_smash = 1,
|
|
/datum/reagent/consumable/ethanol/gargle_blaster = 1,
|
|
/datum/reagent/consumable/ethanol/neurotoxin = 1,
|
|
)
|
|
|
|
/obj/machinery/vending/cola/on_dispense(obj/item/vended_item, dispense_returned = FALSE)
|
|
// Only apply to newly dispensed items
|
|
if(dispense_returned)
|
|
return
|
|
// 35% chance that your drink will be safe, as safe pure acid and sugar that these drinks probably are can be
|
|
if(!onstation || !HAS_TRAIT(SSstation, STATION_TRAIT_SPIKED_DRINKS) || !prob(65))
|
|
return
|
|
// Don't fill booze with more booze
|
|
if (isnull(vended_item.reagents) || vended_item.reagents.has_reagent(/datum/reagent/consumable/ethanol, check_subtypes = TRUE))
|
|
return
|
|
var/removed_volume = vended_item.reagents.remove_all(rand(5, vended_item.reagents.maximum_volume * 0.5))
|
|
if (!removed_volume)
|
|
return
|
|
// Don't want bubbling sodas when we add some rum to cola
|
|
ADD_TRAIT(vended_item, TRAIT_SILENT_REACTIONS, VENDING_MACHINE_TRAIT)
|
|
vended_item.reagents.add_reagent(pick_weight(spiking_booze), removed_volume)
|
|
vended_item.reagents.handle_reactions()
|
|
REMOVE_TRAIT(vended_item, TRAIT_SILENT_REACTIONS, VENDING_MACHINE_TRAIT)
|
|
|
|
/obj/item/vending_refill/cola
|
|
machine_name = "Robust Softdrinks"
|
|
icon_state = "refill_cola"
|
|
|
|
/obj/machinery/vending/cola/blue
|
|
icon_state = "Cola_Machine"
|
|
light_mask = "cola-light-mask"
|
|
light_color = COLOR_MODERATE_BLUE
|
|
allow_custom = FALSE
|
|
|
|
/obj/machinery/vending/cola/black
|
|
icon_state = "cola_black"
|
|
light_mask = "cola-light-mask"
|
|
allow_custom = FALSE
|
|
|
|
/obj/machinery/vending/cola/red
|
|
icon_state = "red_cola"
|
|
name = "\improper Space Cola Vendor"
|
|
desc = "It vends cola, in space."
|
|
product_slogans = "Cola in space!"
|
|
light_mask = "red_cola-light-mask"
|
|
light_color = COLOR_DARK_RED
|
|
allow_custom = FALSE
|
|
|
|
/obj/machinery/vending/cola/space_up
|
|
icon_state = "space_up"
|
|
name = "\improper Space-up! Vendor"
|
|
desc = "Indulge in an explosion of flavor."
|
|
product_slogans = "Space-up! Like a hull breach in your mouth."
|
|
light_mask = "space_up-light-mask"
|
|
light_color = COLOR_DARK_MODERATE_LIME_GREEN
|
|
allow_custom = FALSE
|
|
|
|
/obj/machinery/vending/cola/starkist
|
|
icon_state = "starkist"
|
|
name = "\improper Star-kist Vendor"
|
|
desc = "The taste of a star in liquid form."
|
|
product_slogans = "Drink the stars! Star-kist!"
|
|
panel_type = "panel7"
|
|
light_mask = "starkist-light-mask"
|
|
light_color = COLOR_LIGHT_ORANGE
|
|
allow_custom = FALSE
|
|
|
|
/obj/machinery/vending/cola/sodie
|
|
icon_state = "soda"
|
|
panel_type = "panel7"
|
|
light_mask = "soda-light-mask"
|
|
light_color = COLOR_WHITE
|
|
allow_custom = FALSE
|
|
|
|
/obj/machinery/vending/cola/pwr_game
|
|
icon_state = "pwr_game"
|
|
name = "\improper Pwr Game Vendor"
|
|
desc = "You want it, we got it. Brought to you in partnership with Vlad's Salads."
|
|
product_slogans = "The POWER that gamers crave! PWR GAME!"
|
|
light_mask = "pwr_game-light-mask"
|
|
light_color = COLOR_STRONG_VIOLET
|
|
allow_custom = FALSE
|
|
|
|
/obj/machinery/vending/cola/shamblers
|
|
name = "\improper Shambler's Vendor"
|
|
desc = "~Shake me up some of that Shambler's Juice!~"
|
|
icon_state = "shamblers_juice"
|
|
products = list(
|
|
/obj/item/reagent_containers/cup/soda_cans/cola = 10,
|
|
/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind = 10,
|
|
/obj/item/reagent_containers/cup/soda_cans/dr_gibb = 10,
|
|
/obj/item/reagent_containers/cup/soda_cans/starkist = 10,
|
|
/obj/item/reagent_containers/cup/soda_cans/space_up = 10,
|
|
/obj/item/reagent_containers/cup/soda_cans/pwr_game = 10,
|
|
/obj/item/reagent_containers/cup/soda_cans/lemon_lime = 10,
|
|
/obj/item/reagent_containers/cup/soda_cans/sol_dry = 10,
|
|
/obj/item/reagent_containers/cup/soda_cans/shamblers = 10,
|
|
/obj/item/reagent_containers/cup/soda_cans/wellcheers = 5,
|
|
)
|
|
product_slogans = "~Shake me up some of that Shambler's Juice!~"
|
|
product_ads = "Refreshing!;Thirsty for DNA? Satiate your craving!;Over 1 trillion souls drank!;Made with real DNA!;The hivemind demands your thirst!;Drink up!;Absorb your thirst."
|
|
light_mask = "shamblers-light-mask"
|
|
light_color = COLOR_MOSTLY_PURE_PINK
|
|
allow_custom = FALSE
|
|
|
|
/obj/machinery/vending/cola/shamblers/Initialize(mapload)
|
|
. = ..()
|
|
set_active_language(get_random_spoken_language())
|
|
|
|
/obj/machinery/vending/cola/shamblers/speak(message)
|
|
. = ..()
|
|
set_active_language(get_random_spoken_language())
|