expands medipens

code/game/objects/items/weapons/storage/boxes.dm

@@ -119,6 +119,21 @@
 	new /obj/item/weapon/reagent_containers/syringe( src )
 	new /obj/item/weapon/reagent_containers/syringe( src )
 
+/obj/item/weapon/storage/box/medipens
+	name = "box of medipens"
+	desc = "A box full of inaprovaline MediPens."
+	icon_state = "syringe"
+
+/obj/item/weapon/storage/box/medipens/New()
+	..()
+	new /obj/item/weapon/reagent_containers/hypospray/medipen( src )
+	new /obj/item/weapon/reagent_containers/hypospray/medipen( src )
+	new /obj/item/weapon/reagent_containers/hypospray/medipen( src )
+	new /obj/item/weapon/reagent_containers/hypospray/medipen( src )
+	new /obj/item/weapon/reagent_containers/hypospray/medipen( src )
+	new /obj/item/weapon/reagent_containers/hypospray/medipen( src )
+	new /obj/item/weapon/reagent_containers/hypospray/medipen( src )
+
 /obj/item/weapon/storage/box/beakers
 	name = "box of beakers"
 	icon_state = "beaker"

code/modules/clothing/spacesuits/hardsuit.dm

@@ -90,10 +90,11 @@
 	//Mining hardsuit
 /obj/item/clothing/head/helmet/space/hardsuit/mining
 	name = "mining hardsuit helmet"
-	desc = "A special helmet designed for work in a hazardous, low pressure environment. Has reinforced plating."
+	desc = "A special helmet designed for work in a hazardous, low pressure environment. Has an IV port for chemical injections."
 	icon_state = "hardsuit0-mining"
 	item_state = "mining_helm"
 	item_color = "mining"
+	flags = HEADCOVERSEYES | BLOCKHAIR | HEADCOVERSMOUTH | STOPSPRESSUREDMAGE
 	armor = list(melee = 40, bullet = 5, laser = 10, energy = 5, bomb = 50, bio = 100, rad = 50)
 
 /obj/item/clothing/suit/space/hardsuit/mining

code/modules/mining/equipment_locker.dm

@@ -228,12 +228,12 @@
 	anchored = 1.0
 	var/obj/item/weapon/card/id/inserted_id
 	var/list/prize_list = list(
-		new /datum/data/mining_equipment("Chili",               /obj/item/weapon/reagent_containers/food/snacks/hotchili,          100),
+		new /datum/data/mining_equipment("Stimpack MediPen",	/obj/item/weapon/reagent_containers/hypospray/medipen/stimpack,    100),
+		new /datum/data/mining_equipment("Leporazine MediPen",	/obj/item/weapon/reagent_containers/hypospray/medipen/leporazine,  100),
 		new /datum/data/mining_equipment("Whiskey",             /obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey,    100),
 		new /datum/data/mining_equipment("Cigar",               /obj/item/clothing/mask/cigarette/cigar/havana,                    150),
 		new /datum/data/mining_equipment("Soap",                /obj/item/weapon/soap/nanotrasen, 						           200),
 		new /datum/data/mining_equipment("Jaunter",             /obj/item/device/wormhole_jaunter,                                 250),
-		new /datum/data/mining_equipment("Stimulant Pills",     /obj/item/weapon/storage/pill_bottle/stimulant, 				   350),
 		new /datum/data/mining_equipment("Advanced Scanner",	/obj/item/device/t_scanner/adv_mining_scanner,                     400),
 		new /datum/data/mining_equipment("Laser Pointer",       /obj/item/device/laser_pointer, 				                   400),
 		new /datum/data/mining_equipment("Alien Toy",           /obj/item/clothing/mask/facehugger/toy, 		                   450),

code/modules/reagents/reagent_containers/hypospray.dm

@@ -1,3 +1,5 @@
+//Hyposprays
+
 /obj/item/weapon/reagent_containers/hypospray
 	name = "hypospray"
 	desc = "The DeForest Medical Corporation hypospray is a sterile, air-needle autoinjector for rapid administration of drugs to patients."
@@ -44,7 +46,7 @@
 
 /obj/item/weapon/reagent_containers/hypospray/combat
 	name = "combat stimulant injector"
-	desc = "A modified air-needle autoinjector, used by operatives trained in medical practices to quickly heal injuries in the field."
+	desc = "A modified air-needle autoinjector, used by support operatives to quickly heal injuries in combat."
 	amount_per_transfer_from_this = 10
 	icon_state = "combat_hypo"
 	volume = 60
@@ -52,16 +54,20 @@
 
 /obj/item/weapon/reagent_containers/hypospray/combat/New()
 	..()
-	reagents.add_reagent("synaptizine", 30)
+	reagents.add_reagent("tricordazine", 15)
+	reagents.add_reagent("synaptizine", 15)
+
+
+
+//MediPens
 
 /obj/item/weapon/reagent_containers/hypospray/medipen
-	name = "\improper MediPen" //lol epipen is copyrighted
+	name = "inaprovaline medipen" //lol epipen is copyrighted
 	desc = "A rapid and safe way to stabilize patients in critical condition for personnel without advanced medical knowledge."
 	icon_state = "medipen"
-	item_state = "syringe_10"
+	item_state = "medipen"
 	amount_per_transfer_from_this = 10
 	volume = 10
-	var/emagged = 0
 
 /obj/item/weapon/reagent_containers/hypospray/medipen/New()
 	..()
@@ -87,4 +93,30 @@
 	if(reagents && reagents.reagent_list.len)
 		usr << "<span class='notice'>It is currently loaded.</span>"
 	else
-		usr << "<span class='notice'>It is spent.</span>"
+		usr << "<span class='notice'>It is spent.</span>"
+
+
+/obj/item/weapon/reagent_containers/hypospray/medipen/leporazine
+	name = "leporazine medipen"
+	desc = "A rapid and safe way to regulate your body's temperature."
+	icon_state = "lepopen"
+
+/obj/item/weapon/reagent_containers/hypospray/medipen/leporazine/New()
+	..()
+	reagents.remove_reagent("inaprovaline", 10)
+	reagents.add_reagent("leporazine", 10)
+	update_icon()
+	return
+
+/obj/item/weapon/reagent_containers/hypospray/medipen/stimpack
+	name = "stimpack medipen"
+	desc = "A rapid and safe way to stimulate your body's adrenaline, allowing for freer movement in bulky clothing at the cost of toxicity."
+	icon_state = "stimpen"
+
+/obj/item/weapon/reagent_containers/hypospray/medipen/stimpack/New()
+	..()
+	reagents.remove_reagent("inaprovaline", 10)
+	reagents.add_reagent("hyperzine", 7)
+	reagents.add_reagent("toxin", 3)
+	update_icon()
+	return