diff --git a/_maps/map_files/GaxStation/GaxStation.dmm b/_maps/map_files/GaxStation/GaxStation.dmm index 939127c62b20..7c87bf0acfeb 100644 --- a/_maps/map_files/GaxStation/GaxStation.dmm +++ b/_maps/map_files/GaxStation/GaxStation.dmm @@ -10993,7 +10993,7 @@ "fwr" = ( /obj/machinery/smoke_machine, /obj/item/reagent_containers/glass/beaker/large/silver_sulfadiazine{ - list_reagents = list(/datum/reagent/consumable/condensedcapsaicin = 100); + list_reagents = list(/datum/reagent/consumable/condensedcapsaicin=100); name = "liquid pepper spray" }, /turf/open/floor/plasteel/dark, @@ -13101,7 +13101,7 @@ }, /obj/machinery/computer/atmos_control/tank/toxin_tank{ dir = 4; - sensors = list("tox_sensor" = "Tank") + sensors = list("tox_sensor"="Tank") }, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /obj/machinery/door/firedoor/border_only{ @@ -15997,7 +15997,7 @@ }, /obj/machinery/computer/atmos_control/tank/oxygen_tank{ dir = 4; - sensors = list("o2_sensor" = "Tank") + sensors = list("o2_sensor"="Tank") }, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /obj/machinery/door/firedoor/border_only{ @@ -16266,7 +16266,7 @@ /obj/structure/window/reinforced, /obj/machinery/computer/atmos_control/tank/carbon_tank{ dir = 1; - sensors = list("co2_sensor" = "Tank") + sensors = list("co2_sensor"="Tank") }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -16717,7 +16717,7 @@ dir = 1 }, /obj/machinery/computer/atmos_control/tank/mix_tank{ - sensors = list("mix_sensor" = "Tank") + sensors = list("mix_sensor"="Tank") }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -22571,7 +22571,7 @@ /obj/structure/window/reinforced, /obj/machinery/computer/atmos_control/tank/nitrous_tank{ dir = 1; - sensors = list("n2o_sensor" = "Tank") + sensors = list("n2o_sensor"="Tank") }, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 @@ -23698,6 +23698,9 @@ pixel_x = 6; pixel_y = -6 }, +/obj/machinery/vending/wallhypo{ + pixel_y = -28 + }, /turf/open/floor/plasteel/white, /area/medical/storage) "lVD" = ( @@ -39749,7 +39752,7 @@ }, /obj/machinery/computer/atmos_control/tank/nitrogen_tank{ dir = 4; - sensors = list("n2_sensor" = "Tank") + sensors = list("n2_sensor"="Tank") }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -44201,7 +44204,7 @@ }, /obj/machinery/computer/atmos_control/tank/air_tank{ dir = 4; - sensors = list("air_sensor" = "Tank") + sensors = list("air_sensor"="Tank") }, /obj/machinery/door/firedoor/border_only{ dir = 8 diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index afb0c7a7c6da..0bbe20fe1b96 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -2763,7 +2763,7 @@ /obj/effect/turf_decal/bot_white, /obj/machinery/smoke_machine, /obj/item/reagent_containers/glass/beaker/large/silver_sulfadiazine{ - list_reagents = list(/datum/reagent/consumable/condensedcapsaicin = 100); + list_reagents = list(/datum/reagent/consumable/condensedcapsaicin=100); name = "liquid pepper spray" }, /turf/open/floor/plasteel/dark, @@ -5192,7 +5192,7 @@ }, /obj/item/reagent_containers/food/drinks/drinkingglass{ icon_state = "cognacglass"; - list_reagents = list(/datum/reagent/consumable/ethanol/cognac = 20); + list_reagents = list(/datum/reagent/consumable/ethanol/cognac=20); pixel_x = -5; pixel_y = -3 }, @@ -14261,7 +14261,7 @@ }, /obj/machinery/computer/atmos_control/tank/air_tank{ dir = 4; - sensors = list("air_sensor" = "Tank") + sensors = list("air_sensor"="Tank") }, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /turf/open/floor/plasteel/dark, @@ -17726,10 +17726,6 @@ pixel_x = 7; pixel_y = -5 }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 28 - }, /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 }, @@ -20715,6 +20711,10 @@ dir = 8 }, /obj/effect/turf_decal/trimline/yellow/filled/corner, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -26 + }, /turf/open/floor/plasteel/white, /area/medical/storage) "dLs" = ( @@ -22326,7 +22326,7 @@ }, /obj/machinery/computer/atmos_control/tank/carbon_tank{ dir = 8; - sensors = list("co2_sensor" = "Tank") + sensors = list("co2_sensor"="Tank") }, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /obj/machinery/door/firedoor/border_only{ @@ -25359,7 +25359,7 @@ }, /obj/machinery/computer/atmos_control/tank/toxin_tank{ dir = 8; - sensors = list("tox_sensor" = "Tank") + sensors = list("tox_sensor"="Tank") }, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 9 @@ -25542,6 +25542,9 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 }, +/obj/machinery/vending/wallhypo{ + pixel_x = -28 + }, /turf/open/floor/plasteel/white, /area/medical/storage) "fQn" = ( @@ -30822,7 +30825,7 @@ }, /obj/machinery/computer/atmos_control/tank/mix_tank{ dir = 4; - sensors = list("mix_sensor" = "Tank") + sensors = list("mix_sensor"="Tank") }, /turf/open/floor/plasteel/dark, /area/engine/atmos_distro) @@ -46350,7 +46353,7 @@ }, /obj/machinery/computer/atmos_control/tank/oxygen_tank{ dir = 4; - sensors = list("o2_sensor" = "Tank") + sensors = list("o2_sensor"="Tank") }, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /obj/machinery/door/firedoor/border_only{ @@ -54493,7 +54496,7 @@ }, /obj/machinery/computer/atmos_control/tank/nitrous_tank{ dir = 8; - sensors = list("n2o_sensor" = "Tank") + sensors = list("n2o_sensor"="Tank") }, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /obj/machinery/door/firedoor/border_only{ @@ -55019,7 +55022,7 @@ }, /obj/machinery/computer/atmos_control/tank/nitrogen_tank{ dir = 4; - sensors = list("n2_sensor" = "Tank") + sensors = list("n2_sensor"="Tank") }, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /turf/open/floor/plasteel/dark, diff --git a/_maps/map_files/Yogsmeta/Yogsmeta.dmm b/_maps/map_files/Yogsmeta/Yogsmeta.dmm index 43ca9c041bf1..a73a3a14b9c2 100644 --- a/_maps/map_files/Yogsmeta/Yogsmeta.dmm +++ b/_maps/map_files/Yogsmeta/Yogsmeta.dmm @@ -40991,9 +40991,6 @@ /turf/open/floor/plasteel/grimy, /area/chapel/office) "bWi" = ( -/obj/structure/noticeboard{ - pixel_y = 32 - }, /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 5 }, @@ -56717,9 +56714,6 @@ /turf/open/floor/plasteel, /area/engine/atmos) "dsh" = ( -/obj/structure/sign/poster/official/random{ - pixel_y = -32 - }, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -56738,6 +56732,10 @@ pixel_x = -3; pixel_y = 15 }, +/obj/structure/noticeboard{ + dir = 1; + pixel_y = -32 + }, /turf/open/floor/plasteel/white, /area/medical/medbay/aft) "dsN" = ( @@ -66854,7 +66852,7 @@ }, /obj/machinery/computer/atmos_control/tank/carbon_tank{ dir = 1; - sensors = list("co2_sensor" = "Tank") + sensors = list("co2_sensor"="Tank") }, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 @@ -66893,7 +66891,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/computer/atmos_control/tank/air_tank{ - sensors = list("air_sensor" = "Tank") + sensors = list("air_sensor"="Tank") }, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 @@ -67673,7 +67671,7 @@ }, /obj/machinery/computer/atmos_control/tank/toxin_tank{ dir = 1; - sensors = list("tox_sensor" = "Tank") + sensors = list("tox_sensor"="Tank") }, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 @@ -70356,7 +70354,7 @@ }, /obj/machinery/computer/atmos_control/tank/mix_tank{ dir = 1; - sensors = list("mix_sensor" = "Tank") + sensors = list("mix_sensor"="Tank") }, /turf/open/floor/plasteel/dark, /area/engine/atmos_distro) @@ -71007,6 +71005,9 @@ name = "medbay camera"; network = list("ss13","medbay") }, +/obj/machinery/vending/wallhypo{ + pixel_y = -28 + }, /turf/open/floor/plasteel/dark, /area/medical/storage) "odP" = ( @@ -81351,7 +81352,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/computer/atmos_control/tank/nitrogen_tank{ - sensors = list("n2_sensor" = "Tank") + sensors = list("n2_sensor"="Tank") }, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 @@ -82121,7 +82122,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/computer/atmos_control/tank/oxygen_tank{ - sensors = list("o2_sensor" = "Tank") + sensors = list("o2_sensor"="Tank") }, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 @@ -82736,7 +82737,7 @@ }, /obj/machinery/computer/atmos_control/tank/nitrous_tank{ dir = 1; - sensors = list("n2o_sensor" = "Tank") + sensors = list("n2o_sensor"="Tank") }, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm index 4fbf7bee6771..f6f713d97205 100644 --- a/code/game/objects/items/circuitboards/machine_circuitboards.dm +++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm @@ -608,6 +608,7 @@ /obj/machinery/vending/clothing = "ClothesMate", /obj/machinery/vending/medical = "NanoMed Plus", /obj/machinery/vending/wallmed = "NanoMed", + /obj/machinery/vending/wallhypo = "HypoMed", /obj/machinery/vending/assist = "Vendomat", /obj/machinery/vending/engivend = "Engi-Vend", /obj/machinery/vending/hydronutrients = "NutriMax", diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index 65bb2499b950..b91206e703d3 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -385,7 +385,7 @@ name = "basic hypospray kit" desc = "A hypospray kit containing a hypospray and vials for most common situations." stored_hypo = /obj/item/hypospray - custom_premium_price = 300 + custom_premium_price = 150 /obj/item/storage/firstaid/hypospray/brute name = "brute hypospray vial kit" @@ -464,7 +464,7 @@ desc = "A hypospray kit containing vials for most situations." icon_state = "hyporad" item_state = "firstaid-rad" - custom_premium_price = 300 + custom_premium_price = 200 /obj/item/storage/firstaid/hypospray/advanced/PopulateContents() if(empty) @@ -484,7 +484,7 @@ name = "advanced hypospray kit" desc = "An advanced kit containing a hypospray and vials for most situations." stored_hypo = /obj/item/hypospray - custom_premium_price = 500 + custom_premium_price = 250 /obj/item/storage/firstaid/hypospray/deluxe name = "deluxe hypospray kit" diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index e0aca24b6d23..6fd4287ae9ac 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -1460,10 +1460,11 @@ /datum/supply_pack/medical/vending name = "Medical Vending Crate" - desc = "Contains one NanoMed Plus refill and one wall-mounted NanoMed refill." - cost = 2000 + desc = "Contains one NanoMed Plus refill, one wall-mounted NanoMed refill, and one wall-mounted HypoMed refill." + cost = 2500 contains = list(/obj/item/vending_refill/medical, - /obj/item/vending_refill/wallmed) + /obj/item/vending_refill/wallmed, + /obj/item/vending_refill/wallhypo) crate_name = "medical vending crate" ////////////////////////////////////////////////////////////////////////////// diff --git a/code/modules/reagents/reagent_containers/bottle.dm b/code/modules/reagents/reagent_containers/bottle.dm index b2e18d9c3937..54c2afeee2b0 100644 --- a/code/modules/reagents/reagent_containers/bottle.dm +++ b/code/modules/reagents/reagent_containers/bottle.dm @@ -495,61 +495,73 @@ name = "vial (Libital)" icon_state = "vial_red" list_reagents = list(/datum/reagent/medicine/c2/libital = 15) + custom_premium_price = 25 /obj/item/reagent_containers/glass/bottle/vial/aiuri name = "vial (Aiuri)" icon_state = "vial_orange" list_reagents = list(/datum/reagent/medicine/c2/aiuri = 15) + custom_premium_price = 25 /obj/item/reagent_containers/glass/bottle/vial/charcoal name = "vial (Charcoal)" icon_state = "vial_green" list_reagents = list(/datum/reagent/medicine/charcoal = 15) + custom_premium_price = 25 /obj/item/reagent_containers/glass/bottle/vial/perfluorodecalin name = "vial (Perfluorodecalin)" icon_state = "vial_blue" list_reagents = list(/datum/reagent/medicine/perfluorodecalin = 15) + custom_premium_price = 25 /obj/item/reagent_containers/glass/bottle/vial/epi name = "vial (Epinephrine)" icon_state = "vial_white" list_reagents = list(/datum/reagent/medicine/epinephrine = 12, /datum/reagent/medicine/coagulant = 3) + custom_premium_price = 25 /obj/item/reagent_containers/glass/bottle/vial/styptic name = "vial (Styptic Powder)" icon_state = "vial_orange" list_reagents = list(/datum/reagent/medicine/styptic_powder = 15) + custom_premium_price = 30 /obj/item/reagent_containers/glass/bottle/vial/silver_sulfadiazine name = "vial (Silver Sulfadiazine)" icon_state = "vial_red" list_reagents = list(/datum/reagent/medicine/silver_sulfadiazine = 15) + custom_premium_price = 30 /obj/item/reagent_containers/glass/bottle/vial/sal_acid name = "vial (Salicyclic Acid)" icon_state = "vial_white" list_reagents = list(/datum/reagent/medicine/sal_acid = 15) + custom_premium_price = 50 /obj/item/reagent_containers/glass/bottle/vial/oxandrolone name = "vial (Oxandrolone)" icon_state = "vial_black" list_reagents = list(/datum/reagent/medicine/oxandrolone = 15) + custom_premium_price = 50 /obj/item/reagent_containers/glass/bottle/vial/calomel name = "vial (Calomel)" icon_state = "vial_black" list_reagents = list(/datum/reagent/medicine/calomel = 15) + custom_premium_price = 50 /obj/item/reagent_containers/glass/bottle/vial/salbutamol name = "vial (Salbutamol)" icon_state = "vial_white" list_reagents = list(/datum/reagent/medicine/salbutamol = 15) + custom_premium_price = 50 /obj/item/reagent_containers/glass/bottle/vial/coagulant name = "vial (Coagulant)" icon_state = "vial_red" list_reagents = list(/datum/reagent/medicine/coagulant = 15) + custom_premium_price = 50 /obj/item/reagent_containers/glass/bottle/vial/lavaland name = "vial (Lavaland Extract Mix)" diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 8dc07a179ab2..8292dd79e7f3 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -625,6 +625,61 @@ mode = HYPO_DRAW to_chat(user, span_notice("[src] is now set to draw on application.")) +/obj/item/hypospray/attackby(obj/item/I, mob/living/user) + if(istype(I, /obj/item/hypospray_upgrade)) + var/obj/item/hypospray_upgrade/MK = I + if(MK.install(src, user)) + to_chat(user, span_notice("You install the [MK] into the [src].")) + playsound(src, 'sound/items/screwdriver.ogg', 100, 1) + qdel(MK) + else + ..() + +/obj/item/hypospray_upgrade + name = "hypospray modification kit" + desc = "An upgrade for hyposprays." + icon = 'icons/obj/objects.dmi' + icon_state = "modkit" + w_class = WEIGHT_CLASS_SMALL + +/obj/item/hypospray_upgrade/attackby(obj/item/A, mob/user) + if(istype(A, /obj/item/hypospray) && !issilicon(user)) + if(install(A, user)) + to_chat(user, span_notice("You install the [src] into the [A].")) + playsound(A, 'sound/items/screwdriver.ogg', 100, 1) + qdel(src) + else + ..() + +/obj/item/hypospray_upgrade/proc/install(var/obj/item/hypospray/hypo, mob/user) + to_chat(user, span_notice("The modkit you're trying to install is not meant to exist.")) + return FALSE + +/obj/item/hypospray_upgrade/quickload + name = "hypospray quickload upgrade" + desc = "An upgrade for hyposprays that installs a quickloading mechanism, allowing tactical reloads by using a container on it." + +/obj/item/hypospray_upgrade/quickload/install(var/obj/item/hypospray/hypo, mob/user) + if(hypo.quickload) + to_chat(user, span_notice("[hypo] already has a quickloading mechanism!")) + return FALSE + else + hypo.quickload = TRUE + return TRUE + +/obj/item/hypospray_upgrade/piercing + name = "hypospray piercing upgrade" + desc = "An upgrade for hyposprays that installs a diamond tipped needle, allowing it to pierce thick clothing." + +/obj/item/hypospray_upgrade/piercing/install(var/obj/item/hypospray/hypo, mob/user) + if(hypo.penetrates) + to_chat(user, span_notice("[hypo] already has a piercing mechanism!")) + return FALSE + else + hypo.penetrates = TRUE + return TRUE + #undef HYPO_INJECT #undef HYPO_SPRAY #undef HYPO_DRAW + diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm index 900e65f9479d..1e7e313c304f 100644 --- a/code/modules/research/designs/medical_designs.dm +++ b/code/modules/research/designs/medical_designs.dm @@ -271,6 +271,16 @@ category = list("Tool Designs") departmental_flags = DEPARTMENTAL_FLAG_MEDICAL +/datum/design/hypospraypierceupg + name = "Hypospray Piercing Upgrade" + desc = "An upgrade for hyposprays that installs a diamond tipped needle, allowing it to pierce thick clothing." + id = "hypospraypierceupg" + build_path = /obj/item/hypospray_upgrade/piercing + build_type = PROTOLATHE + materials = list(/datum/material/glass = 2000, /datum/material/diamond = 1000) + category = list("Tool Designs") + departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + ///////////////////////////////////////// //////////Cybernetic Implants//////////// ///////////////////////////////////////// diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index cef97acf2a22..0877ce3a74cf 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -63,7 +63,7 @@ display_name = "Advanced Biotechnology" description = "Advanced Biotechnology" prereq_ids = list("biotech") - design_ids = list("hypospray", "piercesyringe", "pinpointer_crew", "smoke_machine", "plasmarefiller", "limbgrower", "meta_beaker", "healthanalyzer_advanced", "harvester", "holobarrier_med", "detective_scanner", "detective_scanner_advanced" , "defibrillator_compact") + design_ids = list("hypospray", "piercesyringe", "hypospraypierceupg", "pinpointer_crew", "smoke_machine", "plasmarefiller", "limbgrower", "meta_beaker", "healthanalyzer_advanced", "harvester", "holobarrier_med", "detective_scanner", "detective_scanner_advanced" , "defibrillator_compact") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) export_price = 5000 diff --git a/code/modules/vending/medical.dm b/code/modules/vending/medical.dm index 466cdebbc11f..ed1ff59a9861 100644 --- a/code/modules/vending/medical.dm +++ b/code/modules/vending/medical.dm @@ -20,8 +20,6 @@ /obj/item/reagent_containers/glass/bottle/salglu_solution = 3, /obj/item/reagent_containers/glass/bottle/toxin = 3, /obj/item/reagent_containers/syringe/antiviral = 6, - /obj/item/reagent_containers/medspray/styptic = 2, - /obj/item/reagent_containers/medspray/silver_sulf = 2, /obj/item/sensor_device = 2, /obj/item/pinpointer/crew = 2, /obj/item/healthanalyzer/wound = 4, @@ -37,12 +35,6 @@ /obj/item/reagent_containers/autoinjector/medipen = 3, /obj/item/storage/belt/medical = 3, /obj/item/wrench/medical = 1, - /obj/item/storage/firstaid/hypospray/basic/hypo = 3, - /obj/item/storage/firstaid/hypospray/brute = 1, - /obj/item/storage/firstaid/hypospray/burn = 1, - /obj/item/storage/firstaid/hypospray/toxin = 1, - /obj/item/storage/firstaid/hypospray/oxygen = 1, - /obj/item/storage/firstaid/hypospray/advanced/hypo = 3, /obj/item/storage/firstaid/advanced = 2) armor = list(MELEE = 100, BULLET = 100, LASER = 100, ENERGY = 100, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 50) resistance_flags = FIRE_PROOF diff --git a/code/modules/vending/medical_wall.dm b/code/modules/vending/medical_wall.dm index 8380ee4e5c87..c5d725527363 100644 --- a/code/modules/vending/medical_wall.dm +++ b/code/modules/vending/medical_wall.dm @@ -6,11 +6,9 @@ tiltable = FALSE density = FALSE products = list(/obj/item/reagent_containers/syringe = 3, - /obj/item/reagent_containers/pill/patch/styptic = 5, + /obj/item/reagent_containers/pill/patch/styptic = 5, /obj/item/reagent_containers/pill/patch/silver_sulf = 5, /obj/item/reagent_containers/pill/charcoal = 2, - /obj/item/reagent_containers/medspray/styptic = 2, - /obj/item/reagent_containers/medspray/silver_sulf = 2, /obj/item/healthanalyzer/wound = 2, /obj/item/stack/medical/bone_gel = 2) contraband = list(/obj/item/reagent_containers/pill/tox = 2, @@ -25,4 +23,41 @@ /obj/item/vending_refill/wallmed machine_name = "NanoMed" icon_state = "refill_medical" - \ No newline at end of file + +/obj/machinery/vending/wallhypo + name = "\improper HypoMed" + desc = "Wall-mounted Hypospray Equipment dispenser." + icon_state = "wallhypo" + icon_deny = "wallhypo-deny" + tiltable = FALSE + density = FALSE + // No default products, all of this shit costs money + premium = list( /obj/item/hypospray = 5, + /obj/item/hypospray_upgrade/quickload = 5, + /obj/item/reagent_containers/glass/bottle/vial/libital = 10, + /obj/item/reagent_containers/glass/bottle/vial/aiuri = 10, + /obj/item/reagent_containers/glass/bottle/vial/charcoal = 10, + /obj/item/reagent_containers/glass/bottle/vial/perfluorodecalin = 10, + /obj/item/reagent_containers/glass/bottle/vial/epi = 10, + /obj/item/reagent_containers/glass/bottle/vial/styptic = 10, + /obj/item/reagent_containers/glass/bottle/vial/silver_sulfadiazine = 10, + /obj/item/reagent_containers/glass/bottle/vial/sal_acid = 10, + /obj/item/reagent_containers/glass/bottle/vial/oxandrolone = 10, + /obj/item/reagent_containers/glass/bottle/vial/calomel = 10, + /obj/item/reagent_containers/glass/bottle/vial/salbutamol = 10, + /obj/item/reagent_containers/glass/bottle/vial/coagulant = 10, + /obj/item/storage/firstaid/hypospray/basic = 5, + /obj/item/storage/firstaid/hypospray/advanced = 5, + /obj/item/storage/firstaid/hypospray/brute = 3, + /obj/item/storage/firstaid/hypospray/burn = 3, + /obj/item/storage/firstaid/hypospray/toxin = 3, + /obj/item/storage/firstaid/hypospray/oxygen = 3) + extra_price = 50 + armor = list(MELEE = 100, BULLET = 100, LASER = 100, ENERGY = 100, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 50) + resistance_flags = FIRE_PROOF + refill_canister = /obj/item/vending_refill/wallhypo + payment_department = ACCOUNT_MED + +/obj/item/vending_refill/wallhypo + machine_name = "HypoMed" + icon_state = "refill_medical" diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi index 0bad4d3364c0..e91e7352a95c 100644 Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ