diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index c0935751c3e..a7af66b69be 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -1941,32 +1941,25 @@ "Пинг!" ) req_access = list(ACCESS_MEDICAL) - products = list( -/obj/item/reagent_containers/hypospray/autoinjector = 5, -/obj/item/stack/medical/bruise_pack = 4, /obj/item/stack/medical/ointment = 4, -/obj/item/stack/medical/bruise_pack/advanced = 4, /obj/item/stack/medical/ointment/advanced = 4, -/obj/item/stack/medical/bruise_pack/extended = 2, /obj/item/stack/medical/ointment/extended = 2, -/obj/item/stack/medical/splint = 4, - -/obj/item/reagent_containers/food/pill/patch/styptic = 4, /obj/item/reagent_containers/food/pill/patch/silver_sulf = 4, -/obj/item/reagent_containers/applicator/brute = 3, /obj/item/reagent_containers/applicator/burn = 3, - -/obj/item/healthanalyzer = 4,/obj/item/healthupgrade = 4, -/obj/item/reagent_containers/hypospray/safety = 2, /obj/item/sensor_device = 2, /obj/item/pinpointer/crew = 2, - -/obj/item/reagent_containers/food/pill/mannitol = 10, /obj/item/reagent_containers/food/pill/salbutamol = 10, /obj/item/reagent_containers/food/pill/mutadone = 5, - -/obj/item/reagent_containers/syringe/antiviral = 6, /obj/item/reagent_containers/syringe/calomel = 10, -/obj/item/reagent_containers/syringe/insulin = 6, /obj/item/reagent_containers/syringe/heparin = 4, - -/obj/item/reagent_containers/glass/bottle/oculine = 2, /obj/item/reagent_containers/glass/bottle/epinephrine = 4, -/obj/item/reagent_containers/glass/bottle/saline = 5, /obj/item/reagent_containers/glass/bottle/charcoal = 4, -/obj/item/reagent_containers/glass/bottle/salicylic = 4, /obj/item/reagent_containers/glass/bottle/morphine = 4, /obj/item/reagent_containers/glass/bottle/ether = 4, -/obj/item/reagent_containers/glass/bottle/potassium_iodide = 3, /obj/item/reagent_containers/glass/bottle/atropine = 3, -/obj/item/reagent_containers/glass/bottle/diphenhydramine = 4, /obj/item/reagent_containers/glass/bottle/toxin = 4, - -/obj/item/reagent_containers/syringe = 12, /obj/item/reagent_containers/dropper = 4, /obj/item/reagent_containers/glass/beaker = 4, -/obj/item/reagent_containers/iv_bag/slime = 1) + products = list(/obj/item/reagent_containers/hypospray/autoinjector = 5, + /obj/item/stack/medical/bruise_pack = 4, /obj/item/stack/medical/ointment = 4, + /obj/item/stack/medical/bruise_pack/advanced = 4, /obj/item/stack/medical/ointment/advanced = 4, + /obj/item/stack/medical/bruise_pack/extended = 2, /obj/item/stack/medical/ointment/extended = 2, + /obj/item/stack/medical/splint = 4, + /obj/item/reagent_containers/food/pill/patch/styptic = 4, /obj/item/reagent_containers/food/pill/patch/silver_sulf = 4, + /obj/item/reagent_containers/applicator/brute = 3, /obj/item/reagent_containers/applicator/burn = 3, + /obj/item/healthanalyzer = 4,/obj/item/healthupgrade = 4, + /obj/item/reagent_containers/hypospray/safety = 2, /obj/item/sensor_device = 2, /obj/item/pinpointer/crew = 2, + /obj/item/reagent_containers/food/pill/mannitol = 10, /obj/item/reagent_containers/food/pill/salbutamol = 10, /obj/item/reagent_containers/food/pill/mutadone = 5, + /obj/item/reagent_containers/syringe/antiviral = 6, /obj/item/reagent_containers/syringe/calomel = 10, + /obj/item/reagent_containers/syringe/insulin = 6, /obj/item/reagent_containers/syringe/heparin = 4, + /obj/item/reagent_containers/glass/bottle/oculine = 2, /obj/item/reagent_containers/glass/bottle/epinephrine = 4, + /obj/item/reagent_containers/glass/bottle/saline = 5, /obj/item/reagent_containers/glass/bottle/charcoal = 4, + /obj/item/reagent_containers/glass/bottle/salicylic = 4, /obj/item/reagent_containers/glass/bottle/morphine = 4, /obj/item/reagent_containers/glass/bottle/ether = 4, + /obj/item/reagent_containers/glass/bottle/potassium_iodide = 3, /obj/item/reagent_containers/glass/bottle/atropine = 3, + /obj/item/reagent_containers/glass/bottle/diphenhydramine = 4, /obj/item/reagent_containers/glass/bottle/toxin = 4, + /obj/item/reagent_containers/syringe = 12, /obj/item/reagent_containers/dropper = 4, /obj/item/reagent_containers/glass/beaker = 4, + /obj/item/reagent_containers/iv_bag/slime = 1) contraband = list(/obj/item/reagent_containers/glass/bottle/sulfonal = 1, /obj/item/reagent_containers/glass/bottle/pancuronium = 1) prices = list(/obj/item/stack/medical/bruise_pack/extended = 200, /obj/item/stack/medical/ointment/extended = 200) armor = list(melee = 50, bullet = 20, laser = 20, energy = 20, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 70) diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 28ad7822279..591b2c5d08d 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -236,6 +236,8 @@ belt_icon = "advanced_trauma_kit" heal_brute = 30 stop_bleeding = 0 + amount = 12 + max_amount = 12 /obj/item/stack/medical/bruise_pack/advanced/cyborg @@ -310,6 +312,8 @@ item_state = "burnkit" belt_icon = "advanced_burn_kit" heal_burn = 30 + amount = 12 + max_amount = 12 //Medical Herbs// /obj/item/stack/medical/bruise_pack/comfrey