mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-23 13:10:02 +01:00
John WillardandGitHub
4a274a6e4b
* Makes condiments their own subtype, fixes geese, prepares for merging * Fixes geese checking drink type instead of edible foodtype to eat gross food. * Renames foodtype var on drinks to drink_types to prevent above from happening again because it KEEPS HAPPENING. DRINKS AREN'T FOOD! * Makes Condiments their own subtype of reagent_containers because they don't make any use of being a subtype of food, at all. * Starts moving things from food to /food/drink subtype in preparation for merging /food/drink with /drink * fully removes Food subtype * /reagent_containers/drinks are now /reagent_containers/cup - This is so it's no longer confused with eachother. * /food/drinks is now /reagent_containers/cup/drinks, so we can keep their special abilities. * Fixes a LOT of errors with food, which are STILL checking the reagent_containers, despite ACTUAL food being refactored away from it a long time ago. This doesn't compile yet, but I do want to make sure my progress is well tracked. * remove copypaste code, changes soda cans * Removes most copy paste code between the two drinks, moving most stuff to parent whenever needed. * Made soda cans their own subtype since they didn't share anything with glass bottles anyways. * Fixes more problems with food/drinks, especially with geese. Geese really were just broken this whole time and no one said a word... * Removes a snowflake signal, now that both drink types share a common one. * Adds everything to the .dme Currently my goal is to get this all compiling, then remove isGlass var by making glass be all glass ones only. * Moves all icons into a single drinks dmi I'm not that great at icon stuff, hopefully I didn't forget/break anything. * Turns juices into their own subtype This allows us to let them check for type in molotov, to both get rid of a use of isGlass, and so non-glass non-cartons don't show up as 'carton'. * fixes compile issues, adds updatepaths * a better updatepaths * updates the damn maps now * properly names the updatepath * how did that get there * i suck at handling merge conflicts * how am i this bad * code improvement and soda fix * more fixes * Don't be a timer Ports from old food bottles to trans the reagents, rather than add a timer to. * Merge conflicts and fixes bottle smashing * Bottle smashing is now consistently functional regardless of how much liquid they have in them, when before it would spill first, then smash on the second hit. * runs updatepaths again
92 lines
3.3 KiB
Plaintext
92 lines
3.3 KiB
Plaintext
/obj/machinery/vending/medical
|
|
name = "\improper NanoMed Plus"
|
|
desc = "Medical drug dispenser."
|
|
icon_state = "med"
|
|
icon_deny = "med-deny"
|
|
panel_type = "panel11"
|
|
product_ads = "Go save some lives!;The best stuff for your medbay.;Only the finest tools.;Natural chemicals!;This stuff saves lives.;Don't you want some?;Ping!"
|
|
req_access = list(ACCESS_MEDICAL)
|
|
products = list(
|
|
/obj/item/stack/medical/gauze = 8,
|
|
/obj/item/reagent_containers/syringe = 12,
|
|
/obj/item/reagent_containers/dropper = 3,
|
|
/obj/item/healthanalyzer = 4,
|
|
/obj/item/wrench/medical = 1,
|
|
/obj/item/stack/sticky_tape/surgical = 3,
|
|
/obj/item/healthanalyzer/wound = 4,
|
|
/obj/item/stack/medical/ointment = 2,
|
|
/obj/item/stack/medical/suture = 2,
|
|
/obj/item/stack/medical/bone_gel/four = 4,
|
|
/obj/item/cane/white = 2,
|
|
)
|
|
contraband = list(
|
|
/obj/item/storage/box/gum/happiness = 3,
|
|
/obj/item/storage/box/hug/medical = 1,
|
|
)
|
|
premium = list(
|
|
/obj/item/reagent_containers/hypospray/medipen = 3,
|
|
/obj/item/storage/belt/medical = 3,
|
|
/obj/item/sensor_device = 2,
|
|
/obj/item/pinpointer/crew = 2,
|
|
/obj/item/storage/medkit/advanced = 2,
|
|
/obj/item/shears = 1,
|
|
/obj/item/storage/organbox = 1,
|
|
)
|
|
refill_canister = /obj/item/vending_refill/medical
|
|
default_price = PAYCHECK_CREW
|
|
extra_price = PAYCHECK_COMMAND
|
|
payment_department = ACCOUNT_MED
|
|
light_mask = "med-light-mask"
|
|
|
|
/obj/item/vending_refill/medical
|
|
machine_name = "NanoMed Plus"
|
|
icon_state = "refill_medical"
|
|
|
|
/obj/machinery/vending/medical/syndicate_access
|
|
name = "\improper SyndiMed Plus"
|
|
req_access = list(ACCESS_SYNDICATE)
|
|
|
|
//Created out of a necessity to get these dumb chems out of the medical tools vendor.
|
|
/obj/machinery/vending/drugs
|
|
name = "\improper NanoDrug Plus"
|
|
desc = "Medical drugs dispenser."
|
|
icon_state = "drug"
|
|
icon_deny = "drug-deny"
|
|
panel_type = "panel11"
|
|
product_ads = "Go save some lives!;The best stuff for your medbay.;Only the finest tools.;Natural chemicals!;This stuff saves lives.;Don't you want some?;Ping!"
|
|
req_access = list(ACCESS_MEDICAL)
|
|
products = list(
|
|
/obj/item/reagent_containers/pill/patch/libital = 5,
|
|
/obj/item/reagent_containers/pill/patch/aiuri = 5,
|
|
/obj/item/reagent_containers/syringe/convermol = 2,
|
|
/obj/item/reagent_containers/pill/insulin = 5,
|
|
/obj/item/reagent_containers/cup/bottle/multiver = 2,
|
|
/obj/item/reagent_containers/cup/bottle/syriniver = 2,
|
|
/obj/item/reagent_containers/cup/bottle/epinephrine = 3,
|
|
/obj/item/reagent_containers/cup/bottle/morphine = 4,
|
|
/obj/item/reagent_containers/cup/bottle/potass_iodide = 1,
|
|
/obj/item/reagent_containers/cup/bottle/salglu_solution = 3,
|
|
/obj/item/reagent_containers/cup/bottle/toxin = 3,
|
|
/obj/item/reagent_containers/syringe/antiviral = 6,
|
|
/obj/item/reagent_containers/medigel/libital = 2,
|
|
/obj/item/reagent_containers/medigel/aiuri = 2,
|
|
/obj/item/reagent_containers/medigel/sterilizine = 1,
|
|
)
|
|
contraband = list(
|
|
/obj/item/reagent_containers/pill/tox = 3,
|
|
/obj/item/reagent_containers/pill/morphine = 4,
|
|
/obj/item/reagent_containers/pill/multiver = 6,
|
|
)
|
|
premium = list(
|
|
/obj/item/reagent_containers/medigel/synthflesh = 2,
|
|
/obj/item/storage/pill_bottle/psicodine = 2,
|
|
)
|
|
default_price = 50
|
|
extra_price = 100
|
|
payment_department = ACCOUNT_MED
|
|
refill_canister = /obj/item/vending_refill/drugs
|
|
|
|
/obj/item/vending_refill/drugs
|
|
machine_name = "NanoDrug Plus"
|
|
icon_state = "refill_medical"
|