Replaces shipside chemical machines with a vendor (#252)

code/game/machinery/vending/vendor_types/medical.dm

@@ -165,6 +165,7 @@
 		list("Pill Bottle (Kelotane)", round(scale * 3), /obj/item/storage/pill_bottle/kelotane, VENDOR_ITEM_REGULAR),
 		list("Pill Bottle (Peridaxon)", round(scale * 2), /obj/item/storage/pill_bottle/peridaxon, VENDOR_ITEM_REGULAR),
 		list("Pill Bottle (Tramadol)", round(scale * 3), /obj/item/storage/pill_bottle/tramadol, VENDOR_ITEM_REGULAR),
+		list("Pill Bottle (Tricordazine)", round(scale * 3), /obj/item/storage/pill_bottle/tricord, VENDOR_ITEM_REGULAR),
 
 		list("MEDICAL UTILITIES", -1, null, null),
 		list("Surgical Line", round(scale * 2), /obj/item/tool/surgery/surgical_line, VENDOR_ITEM_REGULAR),

code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm

@@ -157,7 +157,6 @@ GLOBAL_LIST_INIT(cm_vending_clothing_medic, list(
 		list("Pressurized Reagent Canister Pouch (Bicaridine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/bicaridine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED),
 		list("Pressurized Reagent Canister Pouch (Kelotane)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/kelotane, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED),
 		list("Pressurized Reagent Canister Pouch (Tricordrazine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/tricordrazine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED),
-		list("Pressurized Reagent Canister Pouch (EMPTY)", 0, /obj/item/storage/pouch/pressurized_reagent_canister, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED),
 		list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
 		list("Vial Pouch (Full)", 0, /obj/item/storage/pouch/vials/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
 
@@ -336,3 +335,33 @@ GLOBAL_LIST_INIT(cm_vending_clothing_forecon_medic, list(
 
 /obj/structure/machinery/cm_vending/clothing/medic/forecon/get_listed_products(mob/user)
 	return GLOB.cm_vending_clothing_forecon_medic
+
+
+// Chemical vendor
+
+GLOBAL_LIST_INIT(cm_vending_chemical_medic, list(
+		list("PILL BOTTLES", 0, null, null, null),
+		list("Pill Bottle (Imidazoline-Alkysine)", 40, /obj/item/storage/pill_bottle/imialk, null, VENDOR_ITEM_REGULAR),
+		list("Pill Bottle (Meralyne-Bicardine)", 40, /obj/item/storage/pill_bottle/merabica, null, VENDOR_ITEM_REGULAR),
+		list("Pill Bottle (Kelotane-Dermaline)", 40, /obj/item/storage/pill_bottle/keloderm, null, VENDOR_ITEM_REGULAR),
+		list("Pill Bottle (Nitrogen-Water)", 40, /obj/item/storage/pill_bottle/nitrogenwater, null, VENDOR_ITEM_REGULAR),
+		list("Pill Bottle (Dexalin+)", 40, /obj/item/storage/pill_bottle/dexalinplus, null, VENDOR_ITEM_REGULAR),
+		list("Pill Bottle (Iron)", 40, /obj/item/storage/pill_bottle/iron, null, VENDOR_ITEM_REGULAR),
+	))
+
+/obj/structure/machinery/cm_vending/gear/medic_chemical
+	name = "\improper ColMarTech Squad Medical Chemical Rack"
+	desc = "An automated gear rack for specialized chemicals for the hospital corpsman."
+	icon_state = "med_chem"
+	show_points = TRUE
+	use_snowflake_points = TRUE
+	vendor_role = list(JOB_SQUAD_MEDIC)
+	req_access = list(ACCESS_MARINE_MEDPREP)
+
+/obj/structure/machinery/cm_vending/gear/medic_chemical/get_listed_products(mob/user)
+	return GLOB.cm_vending_chemical_medic
+
+/obj/structure/machinery/cm_vending/gear/medic_chemical/upp
+	name = "\improper UnTech Squad Medical Equipment Rack"
+	req_access = list(ACCESS_UPP_MEDPREP)
+	vendor_theme = VENDOR_THEME_UPP

code/game/objects/items/reagent_containers/pill.dm

@@ -178,6 +178,11 @@
 	pill_initial_reagents = list("kelotane" = 15)
 	pill_icon_class = "kelo"
 
+/obj/item/reagent_container/pill/keloderm
+	pill_desc = "A Kelotane-Dermaline pill. Used to rapidly treat burns."
+	pill_initial_reagents = list("kelotane" = 10, "dermaline" = 10)
+	pill_icon_class = "kelo"
+
 /obj/item/reagent_container/pill/oxycodone
 	pill_desc = "A Oxycodone pill. A powerful painkiller."
 	pill_initial_reagents = list("oxycodone" = 15)
@@ -213,6 +218,11 @@
 	pill_initial_reagents = list("dexalin" = 15)
 	pill_icon_class = "dex"
 
+/obj/item/reagent_container/pill/dexalinplus
+	pill_desc = "A Dexalin+ pill. Used to instantly treat oxygen deprivation."
+	pill_initial_reagents = list("dexalinp" = 10)
+	pill_icon_class = "qc"
+
 /obj/item/reagent_container/pill/spaceacillin
 	pill_desc = "A Spaceacillin pill. Used to slow down viral infections."
 	pill_initial_reagents = list("spaceacillin" = 10)
@@ -248,11 +258,21 @@
 	pill_initial_reagents = list("alkysine" = 10)
 	pill_icon_class = "alky"
 
+/obj/item/reagent_container/pill/imialk
+	pill_desc = "A pill containing Imidazoline and Alkysine, used to heal brain and ear damage."
+	pill_initial_reagents = list("imidazoline" = 10, "alkysine" = 10)
+	pill_icon_class = "imi"
+
 /obj/item/reagent_container/pill/bicaridine
 	pill_desc = "A Bicaridine pill. Heals brute damage."
 	pill_initial_reagents = list("bicaridine" = 15)
 	pill_icon_class = "bica"
 
+/obj/item/reagent_container/pill/merabica
+	pill_desc = "A Meralyne-Bicaridine pill. Rapidly heals brute damage."
+	pill_initial_reagents = list("bicaridine" = 10, "meralyne" = 10)
+	pill_icon_class = "bica"
+
 /obj/item/reagent_container/pill/ultrazine
 	pill_desc = "An Ultrazine pill. A highly-potent, long-lasting combination CNS and muscle stimulant. Extremely addictive."
 	pill_initial_reagents = list("ultrazine" = 5)
@@ -269,3 +289,13 @@
 /obj/item/reagent_container/pill/stimulant
 	pill_initial_reagents = list("antag_stimulant" = 10)
 	pill_icon_class = "stim"
+
+/obj/item/reagent_container/pill/iron
+	pill_desc = "An iron pill. Used to regenerate blood."
+	pill_initial_reagents = list("iron" = 15)
+	pill_icon_class = "spac"
+
+/obj/item/reagent_container/pill/nitrogenwater
+	pill_desc = "A pill containing nitrogen and water. Used to treat Tramadol overdoses."
+	pill_initial_reagents = list("nitrogen" = 15, "water" = 15)
+	pill_icon_class = "spac"

code/game/objects/items/storage/firstaid.dm

@@ -536,6 +536,12 @@
 /obj/item/storage/pill_bottle/kelotane/skillless
 	skilllock = SKILL_MEDICAL_DEFAULT
 
+/obj/item/storage/pill_bottle/keloderm
+	name = "\improper Kelotane-Dermaline pill bottle"
+	icon_state = "pill_canister15"
+	pill_type_to_fill = /obj/item/reagent_container/pill/keloderm
+	maptext_label = "KD"
+
 /obj/item/storage/pill_bottle/antitox
 	name = "\improper Dylovene pill bottle"
 	icon_state = "pill_canister6"
@@ -582,6 +588,12 @@
 /obj/item/storage/pill_bottle/bicaridine/skillless
 	skilllock = SKILL_MEDICAL_DEFAULT
 
+/obj/item/storage/pill_bottle/merabica
+	name = "\improper Meralyne-Bicaridine pill bottle"
+	icon_state = "pill_canister8"
+	pill_type_to_fill = /obj/item/reagent_container/pill/merabica
+	maptext_label = "MB"
+
 /obj/item/storage/pill_bottle/dexalin
 	name = "\improper Dexalin pill bottle"
 	icon_state = "pill_canister1"
@@ -591,6 +603,12 @@
 /obj/item/storage/pill_bottle/dexalin/skillless
 	skilllock = SKILL_MEDICAL_DEFAULT
 
+/obj/item/storage/pill_bottle/dexalinplus
+	name = "\improper Dexalin+ pill bottle"
+	icon_state = "pill_canister13"
+	pill_type_to_fill = /obj/item/reagent_container/pill/dexalinplus
+	maptext_label = "D+"
+
 //Alkysine
 /obj/item/storage/pill_bottle/alkysine
 	name = "\improper Alkysine pill bottle"
@@ -720,6 +738,30 @@
 	skilllock = SKILL_MEDICAL_DEFAULT
 	maptext_label = "Pc"
 
+/obj/item/storage/pill_bottle/imialk
+	name = "\improper Imidazoline-Alkysine pill bottle"
+	icon_state = "pill_canister14"
+	pill_type_to_fill = /obj/item/reagent_container/pill/imialk
+	maptext_label = "IA"
+
+/obj/item/storage/pill_bottle/iron
+	name = "\improper Iron pill bottle"
+	icon_state = "pill_canister4"
+	pill_type_to_fill = /obj/item/reagent_container/pill/iron
+	maptext_label = "FE"
+
+/obj/item/storage/pill_bottle/nitrogenwater
+	name = "\improper Nitrogen-Water pill bottle"
+	icon_state = "pill_canister12"
+	pill_type_to_fill = /obj/item/reagent_container/pill/nitrogenwater
+	maptext_label = "NW"
+
+/obj/item/storage/pill_bottle/tricord
+	name = "\improper Tricordazine pill bottle"
+	icon_state = "pill_canister"
+	pill_type_to_fill = /obj/item/reagent_container/pill/tricordrazine
+	maptext_label = "Ti"
+
 //---------PILL PACKETS---------
 /obj/item/storage/pill_bottle/packet
 	name = "\improper pill packet"