Renamed Mk1 hypo to iHypo, accidently included some code that put thi…

…ngs in the CMO locker, corrected.

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

@@ -240,19 +240,23 @@
 
 //RS Add MkI Hypo Rework
 /obj/item/weapon/storage/firstaid/mkIhypokit
-	name = "mk.I hypospray kit"
-	desc = "Contains a revised MK.I Hypospray and its hypovials. It can only hold hypospray related items."
+	name = "iHypo Kit"
+	desc = "Contains a WolfApple iHypo and its vials. It can only hold iHypo related items."
 	icon = 'icons/obj/storage.dmi'
 	icon_state = "vialcaselight"
 	slot_flags = SLOT_BELT
 	max_storage_space = ITEMSIZE_COST_SMALL * 7
-	starts_with = list(/obj/item/weapon/revised_hypospray, /obj/item/weapon/reagent_containers/glass/beaker/vial = 5)
+	starts_with = list(/obj/item/weapon/revised_hypospray, /obj/item/weapon/reagent_containers/glass/beaker/vial/preloaded/tramadol,
+	/obj/item/weapon/reagent_containers/glass/beaker/vial/preloaded/bicaridine,
+	/obj/item/weapon/reagent_containers/glass/beaker/vial/preloaded/antitoxin,
+	/obj/item/weapon/reagent_containers/glass/beaker/vial/preloaded/keloderma,
+	/obj/item/weapon/reagent_containers/glass/beaker/vial/preloaded/dexalin)
 	can_hold = list(/obj/item/weapon/revised_hypospray, /obj/item/weapon/reagent_containers/glass/beaker/vial)
 	//can fit vials, and the mk.I hyospray.
 
 /obj/item/weapon/storage/firstaid/mkIhypokit/cmo
-	name = "CMO's mk.I hypospray  kit"
-	desc = "Contains a revised mk.I Deluxe Hypospray and its hypovials, can hold bottles."
+	name = "Deluxe iHypo Kit"
+	desc = "Contains a Deluxe WolfApple iHypo and its vials and its hypovials, can hold bottles."
 	icon_state = "vialcasedark"
 	max_storage_space = ITEMSIZE_COST_SMALL * 10
 	starts_with = list(/obj/item/weapon/revised_hypospray/CMO,

code/game/objects/structures/crates_lockers/closets/secure/medical.dm

@@ -146,7 +146,6 @@
 		/obj/item/device/radio/headset/heads/cmo/alt,
 		/obj/item/device/flash,
 		/obj/item/weapon/storage/firstaid/mkIhypokit/cmo, //RS Add
-		/obj/item/weapon/storage/firstaid/hypokit/cmo, //RS Add (I thought this spawned in here already?)
 		/obj/item/clothing/suit/storage/hooded/wintercoat/medical,
 		/obj/item/clothing/suit/storage/hooded/wintercoat/medical/cmo,
 		/obj/item/clothing/shoes/boots/winter/medical,

code/modules/economy/vending_machines.dm

@@ -409,7 +409,7 @@
 					/obj/item/weapon/reagent_containers/syringe/antiviral = 4,
 					/obj/item/weapon/reagent_containers/syringe = 12,
 					//Sari Mk1's
-					/obj/item/weapon/storage/firstaid/mkIhypokit = 8,
+					/obj/item/weapon/storage/firstaid/mkIhypokit = 2,
 					//No vials included as they can be printed in the chem-master
 					//Pooj Mk2's
 					/obj/item/weapon/reagent_containers/glass/bottle/hypovial/small = 12,

code/modules/reagents/reagent_containers/hypospray_rs.dm

@@ -1,13 +1,13 @@
 /obj/item/weapon/revised_hypospray
-	name = "hypospray"
+	name = "iHypo"
 	icon_state = "nhypo"
 	icon = 'icons/obj/syringe.dmi'
 	item_state = "nhypo"
 	item_icons = list(
 		slot_l_hand_str = 'icons/mob/items/lefthand.dmi',
 		slot_r_hand_str = 'icons/mob/items/righthand.dmi',
 		)
-	desc = "A refined development from DeForest Medical, altered construction materials enable wider availability, this hypospray takes 30-unit vials as the drug supply for easy swapping."
+	desc = "The premier in hypospray technology brought to you by WolfApple technologies, WolfApple: Be the wolf among sheep. This premium hypospray takes 30-unit vials as the drug supply for easy swapping, even compatible with your existing hardware."
 	w_class = ITEMSIZE_SMALL
 	var/list/allowed_containers = list(/obj/item/weapon/reagent_containers/glass/beaker/vial)
 	var/obj/item/weapon/reagent_containers/glass/beaker/vial/vial
@@ -26,11 +26,11 @@
 	preserve_item = TRUE
 
 /obj/item/weapon/revised_hypospray/CMO
-	name = "revised hypospray CMO"
+	name = "iHypo Deluxe"
 	allowed_containers = list(/obj/item/weapon/reagent_containers/glass/bottle, /obj/item/weapon/reagent_containers/glass/beaker/vial)
 	icon_state = "nadvhypo"
 	item_state = "nadvhypo"
-	desc = "The CMO Hypospray can take larger-size vials. It also acts faster and delivers more reagents per spray."
+	desc = "The premier in hypospray technology brought to you by WolfApple technologies, WolfApple: Be the wolf among sheep. This Deluxe hypospray takes 60-unit Bottles, while retaining compatability with the 30u vials."
 	possible_transfer_amounts = list("vial",1,5,10,15,25,30)
 	start_vial = /obj/item/weapon/reagent_containers/glass/bottle/preloaded/tricordrazine
 
@@ -300,7 +300,7 @@
 	icon_state = "vial"
 	prefill = list("anti_toxin" = 30)
 
-/obj/item/weapon/reagent_containers/glass/beaker/vial/preloaded/kelotane
+/obj/item/weapon/reagent_containers/glass/beaker/vial/preloaded/keloderma
 	name = "KeloDerma vial"
 	icon_state = "vial"
 	prefill = list("kelotane" = 15, "dermaline" = 15)

code/modules/research/designs/medical_vr.dm

@@ -31,8 +31,8 @@
 	sort_string = "KCAVB"
 */// Replaced with printable hypo as they are REBALANCED NOW, wowwww
 /datum/design/item/medical/hypospray
-	name = "mk.i hypospray"
-	desc = "A refined development from DeForest Medical, altered construction materials enable wider availability, this hypospray takes 30-unit vials as the drug supply for easy swapping."
+	name = "iHypo"
+	desc = "The premier in hypospray technology brought to you by WolfApple technologies, WolfApple: Be the wolf among sheep. This premium hypospray takes 30-unit vials as the drug supply for easy swapping, even compatible with your existing hardware."
 	id = "hypospray"
 	req_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 3, TECH_POWER = 2, TECH_BIO = 4, TECH_ILLEGAL = 2)
 	materials = list(MAT_STEEL = 500, MAT_GLASS = 1500, MAT_SILVER = 2000, MAT_GOLD = 1500, MAT_URANIUM = 1000)